CCM-16068 - Added support for setting up pnpm tooling

.github/actions/build-docs/action.yml

@@ -9,12 +9,17 @@ runs:
   steps:
     - name: Checkout
       uses: actions/checkout@v6.0.2
+    - name: Setup pnpm
+      uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+      with:
+        version: 10.33.0
     - uses: actions/setup-node@v4
       with:
         node-version-file: '.tool-versions'
-    - name: Npm cli install
+        cache: 'pnpm'
+    - name: pnpm install
       working-directory: ./docs
-      run: npm ci --min-release-age 3
+      run: pnpm install --frozen-lockfile
       shell: bash
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1.180.1

.github/actions/node-install/action.yaml

@@ -1,5 +1,5 @@
-name: 'npm install and setup'
-description: 'Setup node, authenticate github package repository and perform clean npm install'
+name: 'pnpm install and setup'
+description: 'Setup node, authenticate github package repository and perform clean pnpm install'
 
 inputs:
   GITHUB_TOKEN:
@@ -9,16 +9,22 @@ inputs:
 runs:
   using: 'composite'
   steps:
+    - name: 'Setup pnpm'
+      uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+      with:
+        version: 10.33.0
+
     - name: 'Use Node.js'
       uses: actions/setup-node@v4
       with:
         node-version-file: '.tool-versions'
         registry-url: 'https://npm.pkg.github.com'
         scope: '@nhsdigital'
+        cache: 'pnpm'
 
     - name: 'Install dependencies'
       shell: bash
       env:
         NODE_AUTH_TOKEN: ${{ inputs.GITHUB_TOKEN }}
       run: |
-        npm ci --min-release-age 3
+        pnpm install --frozen-lockfile

.github/dependabot.yaml

@@ -16,7 +16,7 @@ updates:
     cooldown:
       default-days: 7
 
-  - package-ecosystem: "npm"
+  - package-ecosystem: "pnpm"
     directory: "/"
     schedule:
       interval: "daily"

.github/workflows/stage-2-test.yaml

@@ -48,16 +48,21 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6.0.2
+      - name: "Setup pnpm"
+        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        with:
+          version: 10.33.0
       - name: "Use Node.js"
         uses: actions/setup-node@v4
         with:
           node-version-file: '.tool-versions'
+          cache: 'pnpm'
       - name: "Repo setup"
         run: |
-          npm ci --min-release-age 3
+          pnpm install --frozen-lockfile
       - name: "Generate dependencies"
         run: |
-          npm run generate-dependencies --workspaces --if-present
+          pnpm run generate-dependencies
           git diff --exit-code
   test-unit:
     name: "Unit tests"
@@ -66,16 +71,21 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6.0.2
+      - name: "Setup pnpm"
+        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        with:
+          version: 10.33.0
       - name: "Use Node.js"
         uses: actions/setup-node@v4
         with:
           node-version-file: '.tool-versions'
+          cache: 'pnpm'
       - name: "Repo setup"
         run: |
-          npm ci --min-release-age 3
+          pnpm install --frozen-lockfile
       - name: "Generate dependencies"
         run: |
-          npm run generate-dependencies --workspaces --if-present
+          pnpm run generate-dependencies
       - name: "Run unit test suite"
         run: |
           make test-unit
@@ -98,16 +108,21 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6.0.2
+      - name: "Setup pnpm"
+        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        with:
+          version: 10.33.0
       - name: "Use Node.js"
         uses: actions/setup-node@v4
         with:
           node-version-file: '.tool-versions'
+          cache: 'pnpm'
       - name: "Repo setup"
         run: |
-          npm ci --min-release-age 3
+          pnpm install --frozen-lockfile
       - name: "Generate dependencies"
         run: |
-          npm run generate-dependencies --workspaces --if-present
+          pnpm run generate-dependencies
       - name: "Run linting"
         run: |
           make test-lint
@@ -118,16 +133,21 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v6.0.2
+      - name: "Setup pnpm"
+        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
+        with:
+          version: 10.33.0
       - name: "Use Node.js"
         uses: actions/setup-node@v4
         with:
           node-version-file: '.tool-versions'
+          cache: 'pnpm'
       - name: "Repo setup"
         run: |
-          npm ci --min-release-age 3
+          pnpm install --frozen-lockfile
       - name: "Generate dependencies"
         run: |
-          npm run generate-dependencies --workspaces --if-present
+          pnpm run generate-dependencies
       - name: "Run typecheck"
         run: |
           make test-typecheck

.tool-versions

@@ -2,6 +2,7 @@ act            0.2.64
 gitleaks       8.24.0
 jq             1.6
 nodejs         24.14.1
+pnpm           10.33.0
 pre-commit     3.6.0
 ruby           3.3.6
 terraform      1.10.1

.vscode/settings.json

@@ -11,7 +11,7 @@
     ".github": false,
     ".vscode": false
   },
-  "jest.jestCommandLine": "npm run test:unit --workspaces --",
+  "jest.jestCommandLine": "pnpm run --recursive test:unit --",
   "sonarlint.connectedMode.project": {
     "connectionId": "nhsdigital",
     "projectKey": "NHSDigital_nhs-notify-client-callbacks"

Makefile

@@ -8,7 +8,7 @@ include scripts/init.mk
 # Example CI/CD targets are: dependencies, build, clean, etc.
 
 dependencies: # Install dependencies needed to build and test the project @Pipeline
-	npm ci
+	pnpm install --frozen-lockfile
 
 build: # Build the project artefact @Pipeline
 	(cd docs && make build)

docs/Makefile

@@ -8,7 +8,7 @@ h help:
 	@egrep '^\S|^$$' Makefile
 
 install:
-	npm install
+	pnpm install
 	bundle config set --local path vendor/bundle
 	bundle install
 

docs/package.json

@@ -1,7 +1,7 @@
 {
   "author": "",
   "dependencies": {
-    "nhsuk-frontend": "^8.1.1"
+    "nhsuk-frontend": "catalog:app"
   },
   "description": "",
   "devDependencies": {},

infrastructure/terraform/components/callbacks/pre.sh

@@ -18,9 +18,9 @@ for _tfvar_file in \
 done
 echo "deploy_mock_clients resolved to: ${deploy_mock_clients}"
 
-npm ci
+pnpm install --frozen-lockfile
 
-npm run generate-dependencies --workspaces --if-present
+pnpm run generate-dependencies
 
 "${script_dir}/sync-client-config.sh"
 
@@ -36,4 +36,4 @@ if [ "${deploy_mock_clients}" == "true" ]; then
   fi
 fi
 
-npm run lambda-build --workspaces --if-present
+pnpm run --recursive --if-present lambda-build

lambdas/client-transform-filter-lambda/package.json

@@ -1,30 +1,31 @@
 {
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.1020.0",
-    "@aws-sdk/client-ssm": "^3.1020.0",
-    "@nhs-notify-client-callbacks/logger": "*",
-    "@nhs-notify-client-callbacks/models": "*",
-    "aws-embedded-metrics": "^4.2.1",
-    "cloudevents": "^10.0.0",
-    "esbuild": "^0.27.4",
-    "p-map": "^4.0.0",
-    "zod": "^4.3.6"
+    "@aws-sdk/client-s3": "catalog:aws",
+    "@aws-sdk/client-ssm": "catalog:aws",
+    "@nhs-notify-client-callbacks/logger": "workspace:*",
+    "@nhs-notify-client-callbacks/models": "workspace:*",
+    "aws-embedded-metrics": "catalog:app",
+    "cloudevents": "catalog:app",
+    "esbuild": "catalog:tools",
+    "p-map": "catalog:app",
+    "zod": "catalog:tools"
   },
   "devDependencies": {
-    "@tsconfig/node22": "^22.0.5",
-    "@types/aws-lambda": "^8.10.161",
-    "@types/jest": "^29.5.14",
-    "jest": "^29.7.0",
-    "jest-mock-extended": "^4.0.0",
-    "typescript": "^5.9.3"
+    "@tsconfig/node22": "catalog:tools",
+    "@types/aws-lambda": "catalog:tools",
+    "@types/jest": "catalog:test",
+    "eslint": "catalog:lint",
+    "jest": "catalog:test",
+    "jest-mock-extended": "catalog:test",
+    "typescript": "catalog:tools"
   },
   "engines": {
     "node": ">=24.14.1"
   },
   "name": "nhs-notify-client-transform-filter-lambda",
   "private": true,
   "scripts": {
-    "lambda-build": "rm -rf dist && npx esbuild --bundle --minify --sourcemap --target=es2020 --platform=node --loader:.node=file --entry-names=[name] --outdir=dist src/index.ts",
+    "lambda-build": "rm -rf dist && pnpm exec esbuild --bundle --minify --sourcemap --target=es2020 --platform=node --loader:.node=file --entry-names=[name] --outdir=dist src/index.ts",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "test:unit": "jest",

lambdas/client-transform-filter-lambda/src/services/config-cache.ts

@@ -12,16 +12,12 @@ export class ConfigCache {
 
   get(clientId: string): ClientSubscriptionConfiguration | undefined {
     const entry = this.cache.get(clientId);
-    if (!entry) {
-      return undefined;
-    }
 
-    if (entry.expiresAt <= Date.now()) {
+    if (entry && entry.expiresAt <= Date.now()) {
       this.cache.delete(clientId);
-      return undefined;
     }
 
-    return entry.value;
+    return this.cache.get(clientId)?.value;
   }
 
   set(clientId: string, value: ClientSubscriptionConfiguration): void {

lambdas/client-transform-filter-lambda/src/services/filters/channel-status-filter.ts

@@ -36,14 +36,16 @@ export const matchesChannelStatusSubscription = (
       // Check if supplier status changed AND client is subscribed to it
       const supplierStatusChanged =
         data.previousSupplierStatus !== data.supplierStatus;
-      const clientSubscribedSupplierStatus =
-        subscription.supplierStatuses.includes(data.supplierStatus);
+      const clientSubscribedSupplierStatus = (
+        subscription.supplierStatuses as readonly string[]
+      ).includes(data.supplierStatus);
 
       // Check if channel status changed AND client is subscribed to it
       const channelStatusChanged =
         data.previousChannelStatus !== data.channelStatus;
-      const clientSubscribedChannelStatus =
-        subscription.channelStatuses.includes(data.channelStatus);
+      const clientSubscribedChannelStatus = (
+        subscription.channelStatuses as readonly string[]
+      ).includes(data.channelStatus);
 
       const statusMatch =
         (supplierStatusChanged && clientSubscribedSupplierStatus) ||

lambdas/client-transform-filter-lambda/src/services/filters/message-status-filter.ts

@@ -26,9 +26,9 @@ export const matchesMessageStatusSubscription = (
     .some((subscription) => {
       const messageStatusChanged =
         data.previousMessageStatus !== data.messageStatus;
-      const clientSubscribedStatus = subscription.messageStatuses.includes(
-        data.messageStatus,
-      );
+      const clientSubscribedStatus = (
+        subscription.messageStatuses as readonly string[]
+      ).includes(data.messageStatus);
 
       if (!messageStatusChanged || !clientSubscribedStatus) {
         logger.debug(

lambdas/mock-webhook-lambda/package.json

@@ -1,26 +1,27 @@
 {
   "dependencies": {
-    "@nhs-notify-client-callbacks/logger": "*",
-    "@nhs-notify-client-callbacks/models": "*",
-    "esbuild": "^0.27.4"
+    "@nhs-notify-client-callbacks/logger": "workspace:*",
+    "@nhs-notify-client-callbacks/models": "workspace:*",
+    "esbuild": "catalog:tools"
   },
   "devDependencies": {
-    "@tsconfig/node22": "^22.0.5",
-    "@types/aws-lambda": "^8.10.161",
-    "@types/jest": "^29.5.14",
-    "@types/node": "^22.10.10",
-    "jest": "^29.7.0",
-    "jest-html-reporter": "^4.4.0",
-    "ts-jest": "^29.2.5",
-    "typescript": "^5.9.3"
+    "@tsconfig/node22": "catalog:tools",
+    "@types/aws-lambda": "catalog:tools",
+    "@types/jest": "catalog:test",
+    "@types/node": "catalog:tools",
+    "eslint": "catalog:lint",
+    "jest": "catalog:test",
+    "jest-html-reporter": "catalog:test",
+    "ts-jest": "catalog:test",
+    "typescript": "catalog:tools"
   },
   "engines": {
     "node": ">=24.14.1"
   },
   "name": "nhs-notify-mock-webhook-lambda",
   "private": true,
   "scripts": {
-    "lambda-build": "rm -rf dist && npx esbuild --bundle --minify --sourcemap --target=es2020 --platform=node --entry-names=[name] --outdir=dist src/index.ts",
+    "lambda-build": "rm -rf dist && pnpm exec esbuild --bundle --minify --sourcemap --target=es2020 --platform=node --entry-names=[name] --outdir=dist src/index.ts",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "test:unit": "jest",

lambdas/mock-webhook-lambda/src/index.ts

@@ -41,7 +41,7 @@ async function buildResponse(
     requestContext?: { http?: { method?: string } };
   };
   const headers = Object.fromEntries(
-    Object.entries(event.headers).map(([k, v]) => [k.toLowerCase(), v]),
+    Object.entries(event.headers).map(([k, v]) => [String(k).toLowerCase(), v]),
   ) as Record<string, string | undefined>;
 
   const path = event.path ?? eventWithFunctionUrlFields.rawPath;