CCM-16068: Additional pnpm migration changes

Author: m-houston

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

@@ -12,9 +12,9 @@ runs:
     - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
       with:
         node-version: 18
-    - name: Npm cli install
+    - name: Install docs node dependencies
       working-directory: ./docs
-      run: npm ci
+      run: pnpm --ignore-workspace install --frozen-lockfile
       shell: bash
     - name: Setup Ruby
       uses: ruby/setup-ruby@3783f195e29b74ae398d7caca108814bbafde90e # v1.180.1

docs/Makefile

@@ -8,7 +8,7 @@ h help:
 	@egrep '^\S|^$$' Makefile
 
 install:
-	npm install
+	pnpm --ignore-workspace install --frozen-lockfile
 	bundle config set --local path vendor/bundle
 	bundle install
 
@@ -20,10 +20,10 @@ $(if $(BASE_URL),-- --baseurl $(BASE_URL),-- --baseurl "")
 endef
 
 build: version
-	npm run build $(baseurlparam)
+	pnpm --ignore-workspace run build $(baseurlparam)
 
 debug: version
-	npm run debug
+	pnpm --ignore-workspace run debug
 
 version:
 	touch _config.version.yml

docs/_config.yml

@@ -94,7 +94,7 @@ include:
   - .version
   - version.json
 exclude:
-  - package-lock.json
+  - pnpm-lock.yaml
   - package.json
   - Makefile
 #   - .sass-cache/

docs/package-lock.json

@@ -25,6 +25,7 @@ eslint.config.mjs
 infrastructure/terraform/components/
 lambdas/example-lambda/
 package-lock.json
+pnpm-lock.yaml
 package.json
 scripts/**/examples/
 scripts/terraform/terraform.mk

docs/pnpm-lock.yaml

@@ -1,10 +1,9 @@
 build:
 	$(MAKE) -C ../../ version
-	npm install -g @devcontainers/cli
 	ver=$$(head -n 1 ../../.version 2> /dev/null || echo unknown); \
 	verb=$$(echo $$ver | sed 's/\+.*//'); \
 	echo "version: $$verb"; \
-	BUILDKIT_PROGRESS=plain devcontainer build --workspace-folder ./src --image-name "ghcr.io/nhsdigital/nhs-notify-template-repository:$$verb"
+	BUILDKIT_PROGRESS=plain pnpm dlx @devcontainers/cli build --workspace-folder ./src --image-name "ghcr.io/nhsdigital/nhs-notify-template-repository:$$verb"
 
 publish:
 	ver=$$(head -n 1 ../../.version 2> /dev/null || echo unknown); \
@@ -15,7 +14,7 @@ publish:
 	docker push "ghcr.io/nhsdigital/nhs-notify-template-repository:latest"
 
 debug:
-	devcontainer up --workspace-folder ./src
-	devcontainer exec --workspace-folder ./src ls -la ./.devcontainer
-	devcontainer exec --workspace-folder ./src cat ./.devcontainer/packages.txt
-	devcontainer exec --workspace-folder ./src ./.devcontainer/check.sh
+	pnpm dlx @devcontainers/cli up --workspace-folder ./src
+	pnpm dlx @devcontainers/cli exec --workspace-folder ./src ls -la ./.devcontainer
+	pnpm dlx @devcontainers/cli exec --workspace-folder ./src cat ./.devcontainer/packages.txt
+	pnpm dlx @devcontainers/cli exec --workspace-folder ./src ./.devcontainer/check.sh