Merge pull request #4709 from marcduiker/upgrade-hugo-docsy

Upgrade hugo docsy

Author: marcduiker

.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

@@ -25,27 +25,27 @@ jobs:
       HUGO_ENV: production
     steps:
       - name: Checkout docs repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '18'
       - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v2.5.0
+        uses: peaceiris/actions-hugo@v3.0.0
         with:
-          hugo-version: 0.102.3
+          hugo-version: 0.147.9
           extended: true
-      - name: Setup Docsy
+      - 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: |
-          cd daprdocs
           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/"
@@ -93,7 +93,7 @@ jobs:
       ALGOLIA_INDEX_NAME: daprdocs
     steps:
       - name: Checkout docs repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: false
       - name: Download Hugo artifacts

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

@@ -16,18 +16,23 @@ 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: 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 And Deploy
         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_15 }}
           repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)

.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"
+    ]
+}