Merge branch 'main' into al-use-get-consent-for

Author: akinsola-guardian

.github/actions/setup-node-and-install/action.yml

@@ -0,0 +1,19 @@
+name: Setup Node and Install Dependencies
+description: Sets up Node, enables corepack, and installs dependencies with pnpm
+runs:
+  using: "composite"
+  steps:
+    - run: npm install --global [email protected]
+      shell: bash
+
+    - run: corepack enable
+      shell: bash
+
+    - name: Setup Node
+      uses: actions/setup-node@v4
+      with:
+        node-version-file: ".nvmrc"
+
+    - name: Install
+      run: pnpm install
+      shell: bash

.github/workflows/bundle-analyser.yml

@@ -16,24 +16,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - run: npm install --global [email protected]
-
-      - run: corepack enable
-        shell: bash
-        working-directory: support-frontend
-
-      - name: Install Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-      # Cache npm dependencies using https://github.com/bahmutov/npm-install
-#      - name: Cache dependencies
-#        uses: bahmutov/npm-install@v1
-#        with:
-#          working-directory: support-frontend
-
-      - name: Install
-        run: pnpm install
+      - name: Setup Node and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
 
       - name: Generate production build for github action
         run: pnpm build-github-action

.github/workflows/chromatic.yml

@@ -13,24 +13,9 @@ jobs:
         with:
           fetch-depth: 0
 
-      - run: npm install --global [email protected]
+      - name: Setup Node and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
 
-      - run: corepack enable
-        shell: bash
-
-      - name: Install Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-
-      # Cache npm dependencies using https://github.com/bahmutov/npm-install
-      # - name: Cache dependencies
-      #   uses: bahmutov/npm-install@v1
-      #   with:
-      #     working-directory: support-frontend
-
-      - name: Install
-        run: pnpm install
       - uses: chromaui/[email protected]
         with:
           workingDir: support-frontend

.github/workflows/compressed-size.yml

@@ -9,38 +9,27 @@ jobs:
   compressed_size:
     if: ${{ github.actor != 'gu-scala-steward-public-repos[bot]' }}
     name: Compressed Size
-    defaults:
-      run:
-        working-directory: support-frontend
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - run: npm install --global [email protected]
+        shell: bash
 
       - run: corepack enable
         shell: bash
 
-      - name: Install Node
+      - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
 
-      # Cache npm dependencies using https://github.com/bahmutov/npm-install
-      # - name: Cache dependencies
-      #   uses: bahmutov/npm-install@v1
-      #   with:
-      #     working-directory: support-frontend
-
-      - name: Print package.json
-        run: cat /home/runner/work/support-frontend/support-frontend/support-frontend/package.json
-
       - name: Check compressed size of JS
         uses: preactjs/compressed-size-action@v2
         with:
+          install-script: "pnpm install"
+          build-script: "--filter support-frontend build-github-action"
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          cwd: "./support-frontend"
-          pattern: "./public/compiled-assets/{javascripts,webpack}/**/*.js"
-          build-script: "build-github-action"
+          pattern: "./support-frontend/public/compiled-assets/{javascripts,webpack}/**/*.js"
           minimum-change-threshold: 500

.github/workflows/dependabot.yml

@@ -24,33 +24,15 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - run: npm install --global [email protected]
-
-      - run: corepack enable
-        shell: bash
-        working-directory: support-frontend
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Install - support-frontend
-        run: pnpm install
-        working-directory: support-frontend
+      - name: Setup Node and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
 
       - name: Test - support-frontend
-        run: pnpm test
-        working-directory: support-frontend
+        run: pnpm --filter support-frontend test
 
       - name: Install & test - CDK
         run: ./script/ci
         working-directory: cdk
 
-      - name: Install - bigquery-acquisitions-publisher
-        run: yarn install
-        working-directory: support-lambdas/bigquery-acquisitions-publisher
-
       - name: Test - bigquery-acquisitions-publisher
-        run: yarn test
-        working-directory: support-lambdas/bigquery-acquisitions-publisher
+        run: pnpm --filter bigquery-acquisitions-publisher test

.github/workflows/knip.yml

@@ -11,23 +11,8 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - run: npm install --global [email protected]
-
-      - run: corepack enable
-        shell: bash
-        working-directory: support-frontend
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          # cache: 'yarn'
-          # cache-dependency-path: support-frontend/yarn.lock
-
-      - name: Install
-        run: pnpm install
-        working-directory: support-frontend
+      - name: Setup Node and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
 
       - name: Knip check
-        run: pnpm knip
-        working-directory: support-frontend
+        run: pnpm --filter support-frontend knip

.github/workflows/payment-api-build.yml

@@ -30,12 +30,8 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Setup Node for CDK
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          cache: "yarn"
-          cache-dependency-path: cdk/yarn.lock
+      - name: Setup Node and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
 
       - name: Build CFN from CDK
         run: ./script/ci

.github/workflows/playwright-cron.yml

@@ -13,18 +13,16 @@ jobs:
       GOOGLE_CHAT_WEB_HOOK: ${{ secrets.GOOGLE_CHAT_WEB_HOOK }}
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 20.11.0
-    - name: Install dependencies
-      working-directory: ./support-e2e
-      run: yarn install
+
+    - name: Setup Node and Install Dependencies
+      uses: ./.github/actions/setup-node-and-install
+
     - name: Install Playwright Browsers
-      working-directory: ./support-e2e
-      run: yarn playwright install --with-deps
+      run: pnpm --filter support-e2e exec playwright install --with-deps
+
     - name: Run Playwright tests
-      working-directory: ./support-e2e
-      run: yarn test-cron
+      run: pnpm --filter support-e2e test-cron
+
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() }}
       with:

.github/workflows/playwright-smoke.yml

@@ -15,18 +15,16 @@ jobs:
       GOOGLE_CHAT_WEB_HOOK: ${{ secrets.GOOGLE_CHAT_WEB_HOOK }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20.11.0
-      - name: Install dependencies
-        working-directory: ./support-e2e
-        run: yarn install
+
+      - name: Setup Node and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
+
       - name: Install Playwright Browsers
-        working-directory: ./support-e2e
-        run: yarn playwright install --with-deps
+        run: pnpm --filter support-e2e exec playwright install --with-deps
+
       - name: Run Playwright tests
-        working-directory: ./support-e2e
-        run: yarn test-smoke
+        run: pnpm --filter support-e2e test-smoke
+
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:

.github/workflows/stripe-patrons-data.yml

@@ -26,12 +26,8 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Setup Node for CDK
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          cache: "yarn"
-          cache-dependency-path: cdk/yarn.lock
+      - name: Setup Node and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
 
       - name: Build CFN from CDK
         run: ./script/ci

.github/workflows/support-frontend-build.yml

@@ -30,32 +30,14 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - run: npm install --global [email protected]
-
-      - run: corepack enable
-        shell: bash
-        working-directory: support-frontend
-
-      # (Respects .nvmrc)
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          # cache: "pnpm"
-          # cache-dependency-path: |
-          #   support-frontend/pnpm-lock.yaml
-
-      - name: Install
-        run: pnpm install
-        working-directory: support-frontend
+      - name: Setup Node and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
 
       - name: Build the html used for SSR pages
-        run: pnpm build-ssr
-        working-directory: support-frontend
+        run: pnpm --filter support-frontend build-ssr
 
       - name: Build assets
-        run: pnpm build-prod
-        working-directory: support-frontend
+        run: pnpm --filter support-frontend build-prod
 
       - name: Build CFN from CDK
         run: ./script/ci

.github/workflows/support-frontend-eslint.yml

@@ -13,21 +13,8 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - run: npm install --global [email protected]
-
-      - run: corepack enable
-        shell: bash
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          # cache: 'pnpm'
-          # cache-dependency-path: support-frontend/pnpm-lock.yaml
-
-      - name: Install
-        run: pnpm install
-        working-directory: support-frontend
+      - name: Setup Node and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
 
       - name: Lint check
         run: pnpm lint:check

.github/workflows/support-frontend-prettier.yml

@@ -13,22 +13,8 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - run: npm install --global [email protected]
-
-      - run: corepack enable
-        shell: bash
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          # cache: 'pnpm'
-          # cache-dependency-path: support-frontend/pnpm-lock.yaml
-
-      - name: Install
-        run: pnpm install
-        working-directory: support-frontend
+      - name: Setup Node and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
 
       - name: Prettier check
-        run: pnpm prettier:check
-        working-directory: support-frontend
+        run: pnpm --filter support-frontend prettier:check

.github/workflows/support-frontend-typescript.yml

@@ -13,22 +13,8 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - run: npm install --global [email protected]
-
-      - run: corepack enable
-        shell: bash
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          # cache: 'pnpm'
-          # cache-dependency-path: support-frontend/pnpm-lock.yaml
-
-      - name: Install
-        run: pnpm install
-        working-directory: support-frontend
+      - name: Setup Node and Install Dependencies
+        uses: ./.github/actions/setup-node-and-install
 
       - name: Type check
-        run: pnpm tsc
-        working-directory: support-frontend
+        run: pnpm --filter support-frontend typecheck