Merge branch 'develop'

Author: megahirt

.github/workflows/build-and-publish-base-php.yml

@@ -13,19 +13,19 @@ jobs:
       IMAGE: sillsdev/web-languageforge:base-php
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-qemu-action@v3
 
-      - uses: docker/setup-buildx-action@v2
+      - uses: docker/setup-buildx-action@v3
         with:
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
 
       - name: Build, tag and push image
-        run: docker buildx build --push --platform linux/amd64,linux/arm64 -t ${{ env.IMAGE }} -f docker/base-php/Dockerfile .
+        run: docker buildx build --push --platform linux/amd64 -t ${{ env.IMAGE }} -f docker/base-php/Dockerfile .

.github/workflows/e2e-tests.yml

@@ -17,14 +17,16 @@ jobs:
 
     steps:
       -
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      -
+        uses: pnpm/action-setup@v4
       -
         name: Playwright E2E Tests
         run: make e2e-tests-ci browser=${{ matrix.browser }} shard="${{ matrix.shard }}/${{ matrix.shards }}"
       -
         name: Upload Playwright test results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results-${{ matrix.browser }}-${{ matrix.shard }}
           path: test/e2e/test-results

.github/workflows/integrate-and-deploy.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       -
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         run: |
           docker --version
@@ -54,15 +54,17 @@ jobs:
           TAG_LFMERGE=${TAG_LFMERGE:-latest}
           echo "TAG_LFMERGE=${TAG_LFMERGE}" >> $GITHUB_OUTPUT
       -
-        uses: actions/setup-node@v3
+        uses: pnpm/action-setup@v4
+      -
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.14.0'
-          cache: 'npm'
+          node-version: '22.2.0'
+          cache: 'pnpm'
       -
-        run: npm ci
+        run: pnpm install
       -
         name: Build legacy app
-        run: docker compose build --build-arg ENVIRONMENT=production --build-arg BUILD_VERSION=${{ steps.image.outputs.TAG_APP }} app
+        run: docker compose -f docker-compose.yml -f docker-compose.production.yml build --build-arg BUILD_VERSION=${{ steps.image.outputs.TAG_APP }} app
       -
         name: Verify version stamping
         run: |

.github/workflows/pull-request.yml

@@ -20,13 +20,13 @@ jobs:
     outputs:
       status: ${{ steps.check-labels.outputs.status }}
     steps:
-      - uses: mheap/github-action-required-labels@v3
+      - uses: mheap/github-action-required-labels@5847eef68201219cf0a4643ea7be61e77837bbce # v5.4.1
         id: check-labels
         with:
           mode: exactly
           count: 1
           labels: "bug, feature, engineering, security fix, testing"
-      - uses: mheap/github-action-required-labels@v3
+      - uses: mheap/github-action-required-labels@5847eef68201219cf0a4643ea7be61e77837bbce # v5.4.1
         with:
           mode: exactly
           count: 0
@@ -41,7 +41,7 @@ jobs:
 
     steps:
       -
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Unit Tests
         run: make unit-tests-ci
@@ -61,14 +61,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       -
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: pnpm/action-setup@v4
+      -
+        uses: actions/setup-node@v4
         with:
-          node-version: "16.14.0"
-          cache: "npm"
+          node-version: "22.2.0"
+          cache: "pnpm"
       -
         name: Run prettier check
         run: |
-          npx prettier -v
-          npx prettier --check .
+          pnpm dlx prettier -v
+          pnpm dlx prettier --check .

.github/workflows/set-backlog-fields.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@v1.7
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
         with:
           app_id: ${{ secrets.LFPROJECTBOARDAUTOMATION_APP_ID }}
           private_key: ${{ secrets.LFPROJECTBOARDAUTOMATION_PRIVATE_KEY }}

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npx lint-staged
+pnpm exec lint-staged

.vscode/tasks.json

@@ -7,9 +7,9 @@
       "label": "npm install",
       "type": "shell",
       "windows": {
-        "command": "bash -c 'npm install'"
+        "command": "bash -c 'pnpm install'"
       },
-      "command": "npm install",
+      "command": "pnpm install",
       "presentation": {
         "reveal": "silent"
       },

Makefile

@@ -2,7 +2,7 @@
 
 .PHONY: start
 start: build
-    # starts the entire runtime infrastructure
+	# starts the entire runtime infrastructure
 	docker compose up -d ssl
 
 .PHONY: dev
@@ -14,22 +14,22 @@ ui-builder:
 
 .PHONY: e2e-tests-ci
 e2e-tests-ci:
-	npm ci
-	$(MAKE) e2e-app
-	npx playwright install ${browser} --with-deps
-	npx playwright test -c ./test/e2e/playwright.config.ts --project=${browser} --shard=${shard}
+	pnpm install
+	"$(MAKE)" e2e-app
+	pnpm exec playwright install ${browser} --with-deps
+	pnpm exec playwright test -c ./test/e2e/playwright.config.ts --project=${browser} --shard=${shard}
 
 .PHONY: e2e-tests
 e2e-tests: ui-builder
-	npm install
-	$(MAKE) e2e-app
-	npx playwright install chromium firefox
-	npx playwright test -c ./test/e2e/playwright.config.ts $(params)
+	pnpm install
+	"$(MAKE)" e2e-app
+	pnpm exec playwright install chromium firefox
+	pnpm exec playwright test -c ./test/e2e/playwright.config.ts $(params)
 
 .PHONY: e2e-app
 e2e-app:
-    # delete any cached session storage state files if the service isn't running
-	docker compose ps e2e-app > /dev/null 2>&1 || $(MAKE) clean-test
+	# delete any cached session storage state files if the service isn't running
+	docker compose ps e2e-app > /dev/null 2>&1 || "$(MAKE)" clean-test
 	docker compose up -d e2e-app --build
 
 .PHONY: unit-tests
@@ -45,9 +45,9 @@ unit-tests-ci:
 
 .PHONY: build
 build:
-	npm install
+	pnpm install
 
-    # ensure we start with a clean ui-dist volume for every build
+	# ensure we start with a clean ui-dist volume for every build
 	-docker volume rm web-languageforge_lf-ui-dist 2>/dev/null
 
 	docker compose build mail app lfmerge ld-api next-proxy next-app
@@ -83,11 +83,11 @@ clean:
 
 .PHONY: clean-test
 clean-test:
-	cd test/e2e && npx rimraf test-storage-state
+	cd test/e2e && pnpm dlx rimraf test-storage-state
 
 .PHONY: clean-powerwash
 clean-powerwash: clean
-	$(MAKE) clean-test
+	"$(MAKE)" clean-test
 	docker system prune -f --volumes
 	- docker rmi -f `docker images -q "lf-*"` sillsdev/web-languageforge:base-php
 	docker builder prune -f