Merge pull request #72 from aztfmod/AL-2405

Update packages

Author: arnaudlh

.devcontainer/devcontainer.json

@@ -1,39 +1,40 @@
 {
-    "name": "CAF Documentation website",
-
-    // Update the 'dockerComposeFile' list if you have more compose files or use different names.
-    "dockerComposeFile": "docker-compose.yml",
-
-    // The 'service' property is the name of the service for the container that VS Code should
-    // use. Update this value and .devcontainer/docker-compose.yml to the real service name.
-    "service": "rover",
-
-    // The optional 'workspaceFolder' property is the path VS Code should open by default when
-    // connected. This is typically a volume mount in .devcontainer/docker-compose.yml
-    "workspaceFolder": "/tf/caf",
-
-    // Use 'settings' to set *default* container specific settings.json values on container create.
-    // You can edit these settings after create using File > Preferences > Settings > Remote.
-    "settings": {
-        "files.eol": "\n",
-        "editor.tabSize": 2,
-        "terminal.integrated.scrollback": 64000,
+    "image": "mcr.microsoft.com/vscode/devcontainers/base:ubuntu-22.04",
+    "customizations": {
+      "vscode": {
+        "settings": {
+          "[typescript]": {
+            "editor.defaultFormatter": "esbenp.prettier-vscode",
+            "editor.formatOnSave": true
+          },
+          "[json]": {
+            "editor.defaultFormatter": "esbenp.prettier-vscode",
+            "editor.formatOnSave": true
+          },
+          "[jsonc]": {
+            "editor.defaultFormatter": "esbenp.prettier-vscode",
+            "editor.formatOnSave": true
+          }
+        },
+        "extensions": [
+          "dbaeumer.vscode-eslint",
+          "orta.vscode-jest",
+          "esbenp.prettier-vscode",
+          "streetsidesoftware.code-spell-checker",
+          "ms-vscode.wordcount",
+          "GitHub.copilot"
+        ]
+      }
     },
-
-
-    // Uncomment the next line if you want start specific services in your Docker Compose config.
-    // "runServices": [],
-
-    // Uncomment this like if you want to keep your containers running after VS Code shuts down.
-    // "shutdownAction": "none",
-
-    // Uncomment the next line to run commands after the container is created.
-    "postStartCommand": "cp -R /tmp/.ssh-localhost/* ~/.ssh && chown -R $(whoami):$(whoami) ~ && chmod 400 ~/.ssh/* && apt update && apt install -y vim && git config --global core.editor vim && cd /tf/caf/website && yarn && yarn build && yarn serve",
-    // Add the IDs of extensions you want installed when the container is created in the array below.
-    "extensions": [
-        // "4ops.terraform",
-        "mutantdino.resourcemonitor",
-        "xyc.vscode-mdx-preview",
-        "docsmsft.docs-authoring-pack"
-    ]
-}
+    "forwardPorts": [3000],
+    "containerUser": "vscode",
+    "postCreateCommand": "yarn install",
+    "waitFor": "postCreateCommand", // otherwise automated jest tests fail
+    "features": {
+      "node": {
+        "version": "20"
+      },
+      "github-cli": "latest"
+    }
+  }
+  

.devcontainer/docker-compose.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 17.x
+          node-version: 20.x
       - name: Build website
         working-directory: website
         run: |

.github/workflows/deploy.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 17.x
+          node-version: 20.x
           cache: yarn
           cache-dependency-path: website/yarn.lock
       - name: Install dependencies

.github/workflows/test-deploy.yml

@@ -0,0 +1,53 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": ">Docusaurus build",
+            "type": "shell",
+            "command": "yarn build",
+            "options": {
+                "cwd": "${workspaceFolder}/website"
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "always"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": ">Docusaurus serve",
+            "type": "shell",
+            "command": "yarn serve",
+            "options": {
+                "cwd": "${workspaceFolder}/website"
+            },
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "always"
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": ">Docusaurus upgrade",
+            "type": "shell",
+            "command": "yarn upgrade",
+            "options": {
+                "cwd": "${workspaceFolder}/website"
+            },
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "always"
+            },
+            "problemMatcher": []
+        }
+    ]
+}