Merge branch 'main' into delete-ar-chromatic-workflow

Author: JamieB-gu

.github/workflows/ab-testing-checks.yml

@@ -23,29 +23,36 @@ jobs:
     name: Checks
     defaults:
       run:
-        working-directory: ab-testing
+        working-directory: ab-testing/config
     env:
       FASTLY_AB_TESTING_CONFIG: ${{ secrets.FASTLY_AB_TESTING_CONFIG }}
       FASTLY_API_TOKEN: ${{ secrets.FASTLY_API_TOKEN }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
-      # https://github.com/denoland/setup-deno#latest-stable-for-a-major
-      - uses: denoland/setup-deno@v1
-        with:
-          deno-version: v2.3
+      - name: Set up Node environment
+        uses: ./.github/actions/setup-node-env
 
       - name: Test
-        run: deno test
+        run: pnpm test
+
+      - name: Lint
+        run: pnpm lint
+
+      - name: Prettier Check
+        run: pnpm prettier:check
+
+      - name: Typecheck
+        run: pnpm tsc
 
       - name: Validate
-        run: deno run scripts/validation/index.ts
+        run: pnpm validate
 
       - name: Build
-        run: deno task build
+        run: pnpm build
 
       - if: ${{ inputs.save_build_artifact }}
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v5
         with:
           name: ab-testing-build
-          path: ab-testing/dist
+          path: ab-testing/config/dist

.github/workflows/ab-testing-deploy.yml

@@ -22,23 +22,21 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ab-testing
+        working-directory: ab-testing/config
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
-      # https://github.com/denoland/setup-deno#latest-stable-for-a-major
-      - uses: denoland/setup-deno@v1
-        with:
-          deno-version: v2.3
+      - name: Set up Node environment
+        uses: ./.github/actions/setup-node-env
 
       - name: Download build artifact
-        uses: actions/download-artifact@v5.0.0
+        uses: actions/download-artifact@v6.0.0
         with:
           name: ab-testing-build
-          path: ab-testing/dist
+          path: ab-testing/config/dist
 
       - name: Deploy
-        run: deno run deploy
+        run: pnpm run deploy
         env:
           FASTLY_AB_TESTING_CONFIG: ${{ secrets.FASTLY_AB_TESTING_CONFIG }}
           FASTLY_API_TOKEN: ${{ secrets.FASTLY_API_TOKEN }}

.github/workflows/ab-testing-ui.yml

@@ -1,4 +1,4 @@
-name: 🦕 AB testing UI
+name: 🧪 AB testing UI
 on:
   pull_request:
     paths:
@@ -15,24 +15,22 @@ jobs:
   build-ui:
     name: AB testing UI build
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     defaults:
       run:
         working-directory: ab-testing/frontend
+    permissions:
+      contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
+
+      - name: Set up Node environment
+        uses: ./.github/actions/setup-node-env
+
+      - name: Build UI
+        run: pnpm build
 
-      # https://github.com/denoland/setup-deno#latest-stable-for-a-major
-      - uses: denoland/setup-deno@v1
-        with:
-          deno-version: v2.3
-      - name: Install
-        run: deno install
-      - name: Build
-        run: deno run build
       - name: Save build
-        uses: actions/upload-artifact@v4.6.2
+        uses: actions/upload-artifact@v5
         with:
           name: ui-build
           path: ab-testing/frontend/output/ab-tests.html
@@ -41,14 +39,15 @@ jobs:
   riff-raff:
     name: AB testing Riffraff upload
     runs-on: ubuntu-latest
+    needs: build-ui
     permissions:
       id-token: write
       contents: read
       pull-requests: write
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -57,7 +56,7 @@ jobs:
         uses: ./.github/actions/setup-node-env
 
       - name: Fetch build
-        uses: actions/download-artifact@v5.0.0
+        uses: actions/download-artifact@v6.0.0
         with:
           name: ui-build
           path: output/ab-tests.html

.github/workflows/ar-ci.yml

@@ -23,7 +23,7 @@ jobs:
 
     # Checkout the repository
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env

.github/workflows/ar-nodejs.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env

.github/workflows/build-check.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env

.github/workflows/bundle-analyser.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env
@@ -20,21 +20,21 @@ jobs:
         working-directory: dotcom-rendering
 
       - name: Archive code coverage results for web bundle
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: bundle-analyser-report-web-bundles
           path: dotcom-rendering/dist/stats/client.web-bundles.html
           if-no-files-found: error
 
       - name: Archive code coverage results for web variant bundle
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: bundle-analyser-report-web
           path: dotcom-rendering/dist/stats/client.web.variant-bundles.html
           if-no-files-found: warn # Variant bundle only exists when an active experiment is going on
 
       - name: Archive code coverage results for apps bundle
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: bundle-analyser-report-apps
           path: dotcom-rendering/dist/stats/client.apps-bundles.html

.github/workflows/container.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Node environment
         uses: ./.github/actions/setup-node-env

.github/workflows/dcr-chromatic.yml

@@ -15,7 +15,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'run_chromatic')  ||  github.ref == 'refs/heads/main'
     steps:
       - name: Checkout - On Pull Request
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         if: ${{ github.event_name == 'pull_request'}}
         with:
           fetch-depth: 0
@@ -24,7 +24,7 @@ jobs:
           # Hopefully by checking out the HEAD commit of a PR instead of the merge commit we can avoid some of those issues.
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Checkout - On Push Event
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         if: ${{ github.event_name == 'push'}}
         with:
           fetch-depth: 0

.github/workflows/deno.yml

@@ -9,7 +9,7 @@ jobs:
     name: 🦕 Deno health
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       # https://github.com/denoland/setup-deno#latest-stable-for-a-major
       - uses: denoland/setup-deno@v1