feat: updated rendering of YAML ManagedReferences and update deployment with Bicep Templates

.github/workflows/main_docs-next.yml

@@ -61,6 +61,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs: build
+    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     permissions:
       id-token: write
       contents: read

.gitignore

@@ -4,27 +4,29 @@
 # build output
 out
 
-ClientApp/dist/
+Source/SuperOffice.DocsNext/ClientApp/dist/
 
-ClientApp/.distA/
-ClientApp/.distB/
+Source/SuperOffice.DocsNext/ClientApp/.distA/
+Source/SuperOffice.DocsNext/ClientApp/.distB/
 
 
 # generated types
-ClientApp/.astro/
+Source/SuperOffice.DocsNext/ClientApp/.astro/
 
 # dependencies
-ClientApp/node_modules/
+Source/SuperOffice.DocsNext/ClientApp/node_modules/
 
 # Build Log
-ClientApp/build.log
+Source/SuperOffice.DocsNext/ClientApp/build.log
 
 
 # .NET
-Server/bin/
-Server/obj/
-Server/wwwroot/
-Server/publish/
+Source/SuperOffice.DocsNext/bin/
+Source/SuperOffice.DocsNext/obj/
+Source/SuperOffice.DocsNext.BicepTemplate/obj/
+Source/SuperOffice.DocsNext.BicepTemplate/bin/
+Source/SuperOffice.DocsNext/wwwroot/
+Source/SuperOffice.DocsNext/publish/
 
 
 # logs
@@ -35,8 +37,8 @@ pnpm-debug.log*
 
 
 # environment variables
-ClientApp/.env
-ClientApp/.env.production
+Source/SuperOffice.DocsNext/ClientApp/.env
+Source/SuperOffice.DocsNext/ClientApp/.env.production
 
 # macOS-specific files
 .DS_Store
@@ -48,12 +50,12 @@ ClientApp/.env.production
 .vscode/settings.json
 
 # Playwright
-ClientApp/e2e-tests/test-results/
-ClientApp/e2e-tests/playwright-report/
-ClientApp/e2e-tests/blob-report/
-ClientApp/e2e-tests/playwright/.cache/
+Source/SuperOffice.DocsNext/ClientApp/e2e-tests/test-results/
+Source/SuperOffice.DocsNext/ClientApp/e2e-tests/playwright-report/
+Source/SuperOffice.DocsNext/ClientApp/e2e-tests/blob-report/
+Source/SuperOffice.DocsNext/ClientApp/e2e-tests/playwright/.cache/
 
 # External content (other GitHub repos)
 
-ClientApp/external-content/
-ClientApp/public/downloads/
+Source/SuperOffice.DocsNext/ClientApp/external-content/
+Source/SuperOffice.DocsNext/ClientApp/public/downloads/

Docs-Next-Solution.sln

@@ -3,7 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{7E46C9BE-8B62-41C2-938E-36BF1703453E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperOffice.DocsNext", "Source\SuperOffice.DocsNext\SuperOffice.DocsNext.csproj", "{7E46C9BE-8B62-41C2-938E-36BF1703453E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SuperOffice.DocsNext.BicepTemplate", "Source\SuperOffice.DocsNext.BicepTemplate\SuperOffice.DocsNext.BicepTemplate.csproj", "{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
+	ProjectSection(SolutionItems) = preProject
+		build\azure-pipelines.yml = build\azure-pipelines.yml
+		build\deploy-env.template.yml = build\deploy-env.template.yml
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,8 +35,23 @@ Global
 		{7E46C9BE-8B62-41C2-938E-36BF1703453E}.Release|x64.Build.0 = Release|Any CPU
 		{7E46C9BE-8B62-41C2-938E-36BF1703453E}.Release|x86.ActiveCfg = Release|Any CPU
 		{7E46C9BE-8B62-41C2-938E-36BF1703453E}.Release|x86.Build.0 = Release|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Debug|x64.Build.0 = Debug|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Debug|x86.Build.0 = Debug|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Release|x64.ActiveCfg = Release|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Release|x64.Build.0 = Release|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Release|x86.ActiveCfg = Release|Any CPU
+		{5BBFC193-83FB-42D6-A6DD-A6C0D0F83A0C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {949BA74E-D973-483D-BD02-D77D1CA99CF2}
+	EndGlobalSection
 EndGlobal

Source/SuperOffice.DocsNext.BicepTemplate/Deploy.ps1

@@ -0,0 +1,61 @@
+Param(
+  [string] $Environment = 'dev',
+  [int] [Parameter(Mandatory = $true)]$DotNetVersion,
+  [switch] $ValidateOnly
+)
+
+Write-Output '', 'Start Deploy-DocsNext'
+
+try {
+  [Microsoft.Azure.Common.Authentication.AzureSession]::ClientFactory.AddUserAgent("VSAzureTools-$UI$($host.name)".replace(' ', '_'), '3.0.0')
+}
+catch { }
+
+$ErrorActionPreference = 'Stop'
+Set-StrictMode -Version 3
+
+function Format-ValidationOutput {
+  param ($ValidationOutput, [int] $Depth = 0)
+  Set-StrictMode -Off
+  return @($ValidationOutput | Where-Object { $_ -ne $null } | ForEach-Object { @('  ' * $Depth + ': ' + $_.Message) + @(Format-ValidationOutput @($_.Details) ($Depth + 1)) })
+}
+
+$ResourceGroupLocation = 'Norway East'
+$ResourceGroupName = "rg-SuperOfficeDocs-$($Environment)"
+$TemplateFile = 'SuperOfficeDocs.bicep'
+
+
+$TemplateFile = [System.IO.Path]::GetFullPath([System.IO.Path]::Combine($PSScriptRoot, $TemplateFile))
+
+# Create the resource group only when it doesn't already exist
+if ($null -eq (Get-AzResourceGroup -Name $ResourceGroupName -Location $ResourceGroupLocation -Verbose -ErrorAction SilentlyContinue)) {
+  New-AzResourceGroup -Name $ResourceGroupName -Location $ResourceGroupLocation -Verbose -Force -ErrorAction Stop
+}
+
+if ($ValidateOnly) {
+  $ErrorMessages = Format-ValidationOutput (Test-AzResourceGroupDeployment -ResourceGroupName $ResourceGroupName `
+      -TemplateFile $TemplateFile `
+      @OptionalParameters)
+  if ($ErrorMessages) {
+    Write-Output '', 'Validation returned the following errors:', @($ErrorMessages), '', 'Template is invalid.'
+    [Environment]::Exit(1)
+  }
+  Write-Output '', 'Template is valid.'
+  Exit 0
+}
+
+$outputs = New-AzResourceGroupDeployment -Name ((Get-ChildItem $TemplateFile).BaseName + '-' + ((Get-Date).ToUniversalTime()).ToString('MMdd-HHmm')) `
+  -ResourceGroupName $ResourceGroupName `
+  -TemplateFile $TemplateFile `
+  -environment $Environment `
+  -dotNetVersion $DotNetVersion `
+  -Force -Verbose `
+  -ErrorVariable ErrorMessages
+if ($ErrorMessages) {
+  Write-Output '', 'Template deployment returned the following errors:', @(@($ErrorMessages) | ForEach-Object { $_.Exception.Message.TrimEnd("`r`n") })
+  [Environment]::Exit(1)
+}
+
+$WebAppName = $outputs.Outputs['webAppName'].value
+
+Write-Host "##vso[task.setvariable variable=WebAppName;isOutput=true]$WebAppName"

Source/SuperOffice.DocsNext.BicepTemplate/SuperOffice.DocsNext.BicepTemplate.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

Source/SuperOffice.DocsNext.BicepTemplate/SuperOfficeDocs.bicep

@@ -0,0 +1,58 @@
+param location string = resourceGroup().location
+@allowed([
+  'dev'
+  'stage'
+  'prod'
+])
+param environment string
+param dotNetVersion int
+param appHostingPlan string = 'B1'
+var webAppHostingPlanName = 'plan-superoffice-docs-${environment}'
+var webAppName = 'app-superoffice-docs-${environment}'
+
+
+resource webAppHostingPlan 'Microsoft.Web/serverfarms@2024-11-01' = {
+  name: webAppHostingPlanName
+  location: location
+  tags: {
+    displayName: 'Web App Hosting Plan'
+  }
+  sku: {
+    name: appHostingPlan
+  }
+  kind: 'linux'
+  properties: {
+    reserved: true
+  }
+}
+
+resource webApp 'Microsoft.Web/sites@2024-11-01' = {
+  name: webAppName
+  location: location
+  tags: {
+    'hidden-related:${resourceGroup().id}/providers/Microsoft.Web/serverfarms/${webAppHostingPlanName}': 'Resource'
+    displayName: '${webAppName} Web App'
+  }
+  kind: 'app,linux'
+  properties: {
+    serverFarmId: webAppHostingPlan.id
+    httpsOnly: true
+    siteConfig: {
+      linuxFxVersion: 'DOTNETCORE|${dotNetVersion}.0'
+    }
+  }
+  identity: {
+    type: 'SystemAssigned'
+  }
+}
+
+resource webAppSettings 'Microsoft.Web/sites/config@2024-11-01' = {
+  parent: webApp
+  name: 'appsettings'
+  properties: {
+    WEBSITES_PORT: '8080'
+    WEBSITE_RUN_FROM_PACKAGE: '1'
+  }
+}
+
+output webAppName string = webAppName

ClientApp/astro.config.mjs → Source/SuperOffice.DocsNext/ClientApp/astro.config.mjs

@@ -98,10 +98,10 @@ export default defineConfig({
     mdx(),
     // pagefind(),
     react(),
-    redirectFrom({
-      contentDir: './external-content',
-      getSlug: getRedirectFromSlug, // Function to get the slug for redirect_from
-    }),
+    // redirectFrom({
+    //   contentDir: './external-content',
+    //   getSlug: getRedirectFromSlug, // Function to get the slug for redirect_from
+    // }),
     robots(), sitemap(),
   ],