Upgrade hugo docsy into 1.16

.devcontainer/devcontainer.json

@@ -10,7 +10,7 @@
 		},
 		"ghcr.io/devcontainers/features/hugo:1": {
 			"extended": true,
-			"version": "0.100.2"
+			"version": "0.147.9"
 		},
 		"ghcr.io/devcontainers/features/node:1": {
 			"nodeGypDependencies": true,

.github/pull_request_template.md

@@ -3,11 +3,11 @@ Thank you for helping make the Dapr documentation better!
 **Please follow this checklist before submitting:**
 - [ ] Commits are signed with Developer Certificate of Origin (DCO - [learn more](https://docs.dapr.io/contributing/contributing-overview/#developer-certificate-of-origin-signing-your-work))
 - [ ] [Read the contribution guide](https://docs.dapr.io/contributing/docs-contrib/contributing-docs/)
-- [ ] Commands include options for Linux, MacOS, and Windows within codetabs
+- [ ] Commands include options for Linux, MacOS, and Windows within tabpane
 - [ ] New file and folder names are globally unique
 - [ ] Page references use shortcodes instead of markdown or URL links
 - [ ] Images use HTML style and have alternative text
-- [ ] Places where multiple code/command options are given have codetabs
+- [ ] Places where multiple code/command options are given have tabpane
 
 In addition, please fill out the following to help reviewers understand this pull request:
 

.github/workflows/website-root.yml

@@ -0,0 +1,108 @@
+name: Azure Static Web App Root
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - v1.15
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - v1.15
+
+concurrency:
+  # Cancel the previously triggered build for only PR build.
+  group: website-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
+jobs:
+  build_and_deploy_job:
+    name: Build Hugo Website
+    if: github.event.action != 'closed'
+    runs-on: ubuntu-latest
+    env:
+      SWA_BASE: 'proud-bay-0e9e0e81e'
+      HUGO_ENV: production
+    steps:
+      - name: Checkout docs repo
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+      - name: Setup Hugo
+        uses: peaceiris/[email protected]
+        with:
+          hugo-version: 0.147.9
+          extended: true
+      - name: Setup Submodules
+        run: |
+          cd daprdocs
+          git submodule update --init --recursive
+          cd ..
+          sudo npm install -D --save autoprefixer
+          sudo npm install -D --save postcss-cli
+      - name: Build Hugo Website
+        run: |
+          git config --global --add safe.directory /github/workspace
+          if [ $GITHUB_EVENT_NAME == 'pull_request' ]; then
+            STAGING_URL="https://${SWA_BASE}-${{github.event.number}}.westus2.azurestaticapps.net/"
+          fi
+          hugo ${STAGING_URL+-b "$STAGING_URL"}
+      - name: Deploy docs site
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          action: "upload"
+          app_location: "/daprdocs/public/"
+          output_location: "/"
+          skip_app_build: true
+          skip_deploy_on_missing_secrets: true
+      - name: Upload Hugo artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: hugo_build
+          path: ./daprdocs/public/
+          if-no-files-found: error
+
+  close_staging_site:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
+          action: "close"
+          skip_deploy_on_missing_secrets: true
+
+  algolia_index:
+    name: Index site for Algolia
+    if: github.event_name == 'push'
+    needs: ['build_and_deploy_job']
+    runs-on: ubuntu-latest
+    env:
+      ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
+      ALGOLIA_API_WRITE_KEY: ${{ secrets.ALGOLIA_API_WRITE_KEY }}
+      ALGOLIA_INDEX_NAME: daprdocs
+    steps:
+      - name: Checkout docs repo
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+      - name: Download Hugo artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: hugo_build
+          path: site/
+      - name: Install Python packages
+        run: |
+          pip install --upgrade bs4
+          pip install --upgrade 'algoliasearch>=2.0,<3.0'
+      - name: Index site
+        run: python ./.github/scripts/algolia.py ./site

.github/workflows/website-v1-16.yml

@@ -16,29 +16,45 @@ jobs:
     runs-on: ubuntu-latest
     name: Build and Deploy Job
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
           fetch-depth: 0
-      - name: Setup Docsy
-        run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli
-      - name: Build And Deploy
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+      - name: Setup Hugo
+        uses: peaceiris/[email protected]
+        with:
+          hugo-version: 0.147.9
+          extended: true
+      - name: Setup Submodules
+        run: |
+          cd daprdocs
+          git submodule update --init --recursive
+          cd ..
+          sudo npm install -D --save autoprefixer
+          sudo npm install -D --save postcss-cli
+      - name: Build Hugo Website
+        run: |
+          git config --global --add safe.directory /github/workspace
+          hugo
+      - name: Deploy Website
         id: builddeploy
         uses: Azure/static-web-apps-deploy@v1
         env:
           HUGO_ENV: production
-          HUGO_VERSION: "0.100.2"
+          HUGO_VERSION: "0.147.9"
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_V1_16 }}
           repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
           skip_deploy_on_missing_secrets: true
           action: "upload"
           ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
           # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
-          app_location: "/daprdocs" # App source code path
-          api_location: "api" # Api source code path - optional
-          output_location: "public" # Built app content directory - optional
-          app_build_command: "git config --global --add safe.directory /github/workspace && hugo"
+          app_location: "/daprdocs/public" # App source code path
+          output_location: "/" # Built app content directory - optional
           ###### End of Repository/Build Configurations ######
 
   close_pull_request_job:

.gitignore

@@ -3,6 +3,8 @@
 .idea/
 node_modules/
 daprdocs/public
+public
+resources/_gen
 daprdocs/resources/_gen
 .venv/
 .hugo_build.lock

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "daprdocs/themes/docsy"]
-	path = daprdocs/themes/docsy
-	url = https://github.com/google/docsy.git
 [submodule "sdkdocs/python"]
 	path = sdkdocs/python
 	url = https://github.com/dapr/python-sdk.git

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+    "cSpell.ignoreWords": [
+        "Dapr",
+        "tabpane"
+    ],
+    "cSpell.words": [
+        "Dapr"
+    ]
+}

README.md

@@ -80,15 +80,16 @@ cd ./daprdocs
 git submodule update --init --recursive
 ```
 
-5. Install npm packages:
+1. Navigate back to the repository root and install npm packages:
 
 ```sh
+cd ..
 npm install
 ```
 
 ## Run local server
 
-1. Make sure you're in the `daprdocs` directory
+1. Make sure you're in the root of the repository
 2. Run
 
 ```sh