Improve local dev

.devcontainer/devcontainer.json

@@ -1,26 +1,29 @@
 {
-    "name": "App Container",
-    "image": "mcr.microsoft.com/devcontainers/javascript-node:latest",
-    "features": {
-      "ghcr.io/devcontainers/features/node:1": {
-        "version": "lts",
-        "pnpm": "latest"
-      }
-    },
-    "customizations": {
-      "vscode": {
-        "settings": {
-          "terminal.integrated.defaultProfile.linux": "bash",
-          "editor.tabSize": 2
-        },
-        "extensions": [
-          "dbaeumer.vscode-eslint"
-        ]
-      }
-    },
-    "mounts": [
-      "source=${localEnv:HOME}/.gitconfig,target=/home/node/.gitconfig,type=bind,consistency=cached",
-      "source=${localEnv:HOME}/.ssh,target=/home/node/.ssh,type=bind,consistency=cached"
-    ],
-    "postCreateCommand": "pnpm install"
-  }
+  "name": "App Container",
+  "image": "mcr.microsoft.com/devcontainers/javascript-node:latest",
+  "features": {
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "lts",
+      "pnpm": "latest"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash",
+        "editor.tabSize": 2
+      },
+      "extensions": [
+        "dbaeumer.vscode-eslint"
+      ]
+    }
+  },
+  "mounts": [
+    "source=${localEnv:HOME}/.gitconfig,target=/home/node/.gitconfig,type=bind,consistency=cached",
+    "source=${localEnv:HOME}/.ssh,target=/home/node/.ssh,type=bind,consistency=cached"
+  ],
+  "postCreateCommand": "pnpm install",
+  "containerEnv": {
+    "npm_config_store_dir": "/home/node/.local/share/pnpm/store"
+  }
+}

.github/workflows/branch_build.yml

@@ -11,110 +11,75 @@ jobs:
       contents: write
     name: Test / Build
     timeout-minutes: 30
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --no-tags --depth=1 origin master
 
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-
       - name: Clone repo
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: pnpm/action-setup@v4
-        name: Install pnpm
-        id: pnpm-install
-        with:
-          version: 9
-          run_install: false
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile --strict-peer-dependencies
-
-      - name: Lint
-        run: pnpm run lint
-
-      - name: Type check
-        run: pnpm tsc --noemit
-
-      - name: Run tests
-        run: pnpm test:coverage
-
-      - name: Get previous commit hash
-        run: |
-          PREV_COMMIT=$(git log -1 --pretty=format:%H -- manifest.json)
-          echo "Previous commit hash is $PREV_COMMIT"
-        id: get-commit-hash
-
-      - name: Get version number
-        run: |
-          VERSION=$(git show ${{ steps.get-commit-hash.outputs.PREV_COMMIT }}:manifest.json | grep version | awk -F'"' '{print $4}')
-          echo "Version number is $VERSION"
-        id: get-version
-
-      - name: Get version labels
-        id: labels
-        run: |
-          commit_sha=$(git rev-parse HEAD)
-
-          pull_request_number=$(git log --format='%s' -n 1 | grep -oP '(?<=Merge pull request #)\d+' || true)
-
-          milestone=""
-
-          if [[ -n "$pull_request_number" ]]; then
-            pull_request_info=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-              "https://api.github.com/repos/${GITHUB_REPOSITORY}/pulls/${pull_request_number}")
-
-            milestone=$(echo "$pull_request_info" | jq -r '.labels[].name' | grep -E 'major-version|minor-version' | head -1)
-          fi
-
-          echo "milestone=${milestone}" >> $GITHUB_OUTPUT
-
-      - name: Bump Version
+      - name: Prep local dev
         run: |
-          git config --global user.name "git log -1 --pretty=format:%an"
+          touch ~/.gitconfig
+          mkdir ~/.ssh
+          git config --global user.name "$(git log -1 --pretty=format:%an)"
           git config --global user.email "$(git log -1 --pretty=format:%ae)"
 
-          if [ "$(git log -1 --pretty=format:%ae)" = "noreply@github.com" ]; then
-            echo "Skipping workflow run because previous commit was not made by workflow."
-            exit 0
-          fi
-
-          if [[ "${{ steps.labels.outputs.milestone }}" == "major-version" ]]; then
-            pnpm run bumpManifestVer major ${{ steps.get-version.outputs.VERSION }}
-          elif [[ "${{ steps.labels.outputs.milestone }}" == "minor-version" ]]; then
-            pnpm run bumpManifestVer minor ${{ steps.get-version.outputs.VERSION }}
-          else
-            pnpm run bumpManifestVer patch ${{ steps.get-version.outputs.VERSION }}
-          fi
-
-          pnpm prettier --write manifest.json
+      - name: Export PR Labels
+        id: extract_labels
+        run: echo "labels=$(jq -r '[.[] | .name] | join(",")' <<< '${{ toJson(github.event.pull_request.labels) }}')" >> $GITHUB_OUTPUT
 
+      - name: Lint, Test, Build, and Tag
+        uses: devcontainers/ci@v0.3
+        env:
+          LABELS: "${{ steps.extract_labels.outputs.labels }}"
+        with:
+          env: LABELS
+          runCmd: |
+            set -e
+
+            # Lint
+            pnpm run lint
+            pnpm tsc --noemit
+
+            # Test
+            pnpm test:coverage
+
+            # Build
+            pnpm run build
+
+            # Tag
+            if [ "$(git log -1 --pretty=format:%ae)" = "noreply@github.com" ]; then
+              echo "Skipping workflow run because previous commit was made by workflow."
+              exit 0
+            fi
+
+            ## Get current version number
+            PREV_COMMIT=$(git log -1 --pretty=format:%H -- manifest.json)
+            VERSION=$(git show $PREV_COMMIT:manifest.json | grep version | head -n 1 | awk -F'"' '{print $4}')
+            ## Get the commit message
+            MILESTONE=$(echo "$LABELS" | grep -E 'major-version|minor-version' | head -1)
+
+            echo "Current Version is $VERSION and the milestone is $MILESTONE"
+            if [[ "$MILESTONE" == "major-version" ]]; then
+              pnpm run bumpManifestVer major $VERSION
+            elif [[ "$MILESTONE" == "minor-version" ]]; then
+              pnpm run bumpManifestVer minor $VERSION
+            else
+              pnpm run bumpManifestVer patch $VERSION
+            fi
+
+            pnpm prettier --write manifest.json
+
+      - name: Update the Manifest in git
+        run: |
           git add manifest.json
-
           git commit -m "Updated Manifest"
-
           git push origin master
 
-      - name: Build
-        run: pnpm run build
-
       - name: Package app zip
         working-directory: dist
         run: |
@@ -154,4 +119,3 @@ jobs:
     uses: DeskproApps/app-template-vite/.github/workflows/subworkflow-release.yml@master
     secrets: inherit
     needs: [deskpro_app_test_and_build]
-

.github/workflows/pr_build.yml

@@ -9,73 +9,70 @@ jobs:
   deskpro_app_test_and_build:
     name: Test / Build
     timeout-minutes: 30
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --no-tags --depth=1 origin master
 
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "22"
-
       - name: Clone repo
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - uses: pnpm/action-setup@v4
-        name: Install pnpm
-        id: pnpm-install
-        with:
-          version: 9
-          run_install: false
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
+      - name: Prep local dev
         run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
+          touch ~/.gitconfig
+          mkdir ~/.ssh
+          git config --global user.name "$(git log -1 --pretty=format:%an)"
+          git config --global user.email "$(git log -1 --pretty=format:%ae)"
+
+      - name: Export PR Labels
+        id: extract_labels
+        run: echo "labels=$(jq -r '[.[] | .name] | join(",")' <<< '${{ toJson(github.event.pull_request.labels) }}')" >> $GITHUB_OUTPUT
+
+      - name: Lint, Test, Build, and Tag
+        uses: devcontainers/ci@v0.3
+        env:
+          LABELS: "${{ steps.extract_labels.outputs.labels }}"
         with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile --strict-peer-dependencies
+          env: LABELS
+          runCmd: |
+            set -e
 
-      - name: Lint
-        run: pnpm run lint
+            # Lint
+            pnpm run lint
+            pnpm tsc --noemit
 
-      - name: Type check
-        run: pnpm tsc --noemit
+            # Test
+            pnpm test:coverage
 
-      - name: Run tests
-        run: pnpm test:coverage
+            # Build
+            pnpm run build
 
-      - name: Get labels from pull request
-        id: labels
-        run: echo "milestone=$(jq --raw-output '.pull_request.labels[].name' $GITHUB_EVENT_PATH | grep -E 'major-version|minor-version' | head -1)" >> $GITHUB_OUTPUT
+            # Tag
+            if [ "$(git log -1 --pretty=format:%ae)" = "noreply@github.com" ]; then
+              echo "Skipping workflow run because previous commit was made by workflow."
+              exit 0
+            fi
+
+            ## Get current version number
+            PREV_COMMIT=$(git log -1 --pretty=format:%H -- manifest.json)
+            VERSION=$(git show $PREV_COMMIT:manifest.json | grep version | head -n 1 | awk -F'"' '{print $4}')
+
+            ## Get the commit message
+            MILESTONE=$(echo "$LABELS" | grep -E 'major-version|minor-version' | head -1)
+
+            echo "Current Version is $VERSION and the milestone is $MILESTONE"
+            if [[ "$MILESTONE" == "major-version" ]]; then
+              pnpm run bumpManifestVer major $VERSION
+            elif [[ "$MILESTONE" == "minor-version" ]]; then
+              pnpm run bumpManifestVer minor $VERSION
+            else
+              pnpm run bumpManifestVer patch $VERSION
+            fi
+
+            pnpm prettier --write manifest.json
 
-      - name: Bump Version
-        run: |
-          git config --global user.name "git log -1 --pretty=format:%an"
-          git config --global user.email "$(git log -1 --pretty=format:%ae)"
-          if [ "$(git log -1 --pretty=format:%ae)" = "noreply@github.com" ]; then
-            echo "Skipping workflow run because previous commit was not made by workflow."
-            exit 0
-          fi
-          if [[ "${{ steps.labels.outputs.milestone }}" == "major-version" ]]; then
-            pnpm run bumpManifestVer major
-          elif [[ "${{ steps.labels.outputs.milestone }}" == "minor-version" ]]; then
-            pnpm run bumpManifestVer minor
-          else
-            pnpm run bumpManifestVer
-          fi
-
-      - name: Build
-        run: pnpm run build
       - name: Package app zip
         working-directory: dist
         run: |
@@ -88,7 +85,7 @@ jobs:
           path: |
             dist/app.zip
             dist/manifest.json
-          retention-days: 1
+          retention-days: 7
 
   deploy:
     uses: DeskproApps/app-template-vite/.github/workflows/subworkflow-deploy.yml@master

.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Launch Server",
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["start"],
+      "skipFiles": ["<node_internals>/**"],
+      "console": "integratedTerminal"
+    }
+  ]
+}

.vscode/tasks.json

@@ -0,0 +1,25 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "shell",
+      "command": "pnpm build:package",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": [],
+      "label": "pnpm: build:package"
+    },
+    {
+      "type": "shell",
+      "command": "pnpm test",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "problemMatcher": [],
+      "label": "pnpm: test"
+    }
+  ]
+}