Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG UBUNTU_NAME=noble
FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-${UBUNTU_NAME}-amd64

ARG NODE_MAJOR=22
ARG PNPM_VERSION=11.10
ARG PNPM_VERSION=12.3.4

# Avoid prompts during package installation
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]
# Continue building in other environments to see which are working.
fail-fast: false
runs-on: ${{matrix.os}}
Expand Down Expand Up @@ -87,6 +87,8 @@ jobs:
run: dotnet tool install --global dotnet-reportgenerator-globaltool
- name: "Deps: RealtimeServer pnpm"
run: cd src/RealtimeServer && (pnpm ci || (sleep 3m && pnpm ci))
- name: "Build: RealtimeServer"
run: cd src/RealtimeServer && pnpm run build
- name: "Deps: Backend nuget"
run: dotnet restore
- name: "Deps: Frontend pnpm"
Expand Down Expand Up @@ -148,7 +150,7 @@ jobs:
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]
fail-fast: false
runs-on: ${{matrix.os}}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-lint-prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]

steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ci-production-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]
os: [ubuntu-latest]

steps:
Expand All @@ -46,7 +46,9 @@ jobs:
run: |
set -xueo pipefail
npm install --global npm@${NPM_VERSION}
- name: Build Realtime server dependencies for Angular
- name: "Deps: RealtimeServer pnpm"
run: cd src/RealtimeServer && (pnpm ci || (sleep 3m && pnpm ci))
- name: "Build: RealtimeServer"
run: cd src/RealtimeServer && pnpm run build
- name: Angular Frontend Production Build
run: cd src/SIL.XForge.Scripture/ClientApp && (pnpm ci || (sleep 3m && pnpm ci)) && pnpm run build
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]

steps:
- name: Checkout repository
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]
if: |
github.event_name != 'pull_request' ||
contains(github.event.pull_request.labels.*.name, 'e2e') ||
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]
runs-on: ${{matrix.os}}
steps:
- name: Checkout
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
matrix:
os: ["ubuntu-24.04"]
dotnet_version: ["10.0.x"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]
runs-on: ${{matrix.os}}
steps:
- name: Checkout
Expand Down Expand Up @@ -255,7 +255,7 @@ jobs:
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]
runs-on: ${{matrix.os}}
steps:
- name: Checkout
Expand Down Expand Up @@ -323,7 +323,7 @@ jobs:
dotnet_version: ["10.0.x"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]
runs-on: ${{matrix.os}}
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-live.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
dotnet_version: "10.0.x"
node_version: "22.13.0"
npm_version: "11.11.0"
pnpm_version: "11.10.0"
pnpm_version: "12.3.4"
# When bumping OS version, the server will need to authorize the new default rsync args.
os: "ubuntu-24.04"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
dotnet_version: "10.0.x"
node_version: "22.13.0"
npm_version: "11.11.0"
pnpm_version: "11.10.0"
pnpm_version: "12.3.4"
# When bumping OS version, the server will need to authorize the new default rsync args.
os: "ubuntu-24.04"

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/storybook-screenshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
os: ["ubuntu-24.04"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]
runs-on: ${{matrix.os}}
steps:
- name: Checkout base
Expand Down Expand Up @@ -96,11 +96,11 @@ jobs:

- name: "Deps: RealtimeServer pnpm"
run: cd src/RealtimeServer && (pnpm ci || (sleep 3m && pnpm ci))
- name: "Deps: Frontend pnpm"
run: cd src/SIL.XForge.Scripture/ClientApp && (pnpm ci || (sleep 3m && pnpm ci))

- name: "Build: RealtimeServer"
run: cd src/RealtimeServer && pnpm run build

- name: "Deps: Frontend pnpm"
run: cd src/SIL.XForge.Scripture/ClientApp && (pnpm ci || (sleep 3m && pnpm ci))
- name: "Build: Frontend"
run: cd src/SIL.XForge.Scripture/ClientApp && pnpm run build
- name: "Build: Storybook"
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
os: ["ubuntu-24.04"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]
runs-on: ${{matrix.os}}
steps:
- name: Checkout branch
Expand Down Expand Up @@ -196,11 +196,11 @@ jobs:

- name: "Deps: RealtimeServer pnpm"
run: cd src/RealtimeServer && (pnpm ci || (sleep 3m && pnpm ci))
- name: "Deps: Frontend pnpm"
run: cd src/SIL.XForge.Scripture/ClientApp && (pnpm ci || (sleep 3m && pnpm ci))

- name: "Build: RealtimeServer"
run: cd src/RealtimeServer && pnpm run build

- name: "Deps: Frontend pnpm"
run: cd src/SIL.XForge.Scripture/ClientApp && (pnpm ci || (sleep 3m && pnpm ci))
- name: "Build: Frontend"
run: cd src/SIL.XForge.Scripture/ClientApp && pnpm run build
- name: "Build: Storybook"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/storybook-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
os: ["ubuntu-24.04"]
node_version: ["22.13.0"]
npm_version: ["11.11.0"]
pnpm_version: ["11.10.0"]
pnpm_version: ["12.3.4"]
runs-on: ${{matrix.os}}
steps:
- name: Checkout
Expand Down Expand Up @@ -66,11 +66,11 @@ jobs:

- name: "Deps: RealtimeServer pnpm"
run: cd src/RealtimeServer && (pnpm ci || (sleep 3m && pnpm ci))
- name: "Build: RealtimeServer"
run: cd src/RealtimeServer && pnpm run build

- name: "Deps: Frontend pnpm"
run: cd src/SIL.XForge.Scripture/ClientApp && (pnpm ci || (sleep 3m && pnpm ci))

- name: "Build: Backend, RealtimeServer"
run: cd src/RealtimeServer && pnpm run build
- name: "Build: Frontend"
run: cd src/SIL.XForge.Scripture/ClientApp && pnpm run build

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/update-npm-audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up pnpm
uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
with:
version: 11.10
version: 12.3.4

- name: Set up Node
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
Expand All @@ -37,6 +37,7 @@ jobs:
run: |
cd src/RealtimeServer
pnpm ci
pnpm run build
pnpm audit --fix update
continue-on-error: true

Expand Down
2 changes: 1 addition & 1 deletion deploy/vagrant/sfdev/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Vagrant.configure("2") do |config|
echo "== Installing npm =="
cd ~/code/web-xforge
retry sudo npm install --global npm@11.11.0
retry sudo npm install --global pnpm@11.10
retry sudo npm install --global pnpm@12.3.4

# Change apt repo to https to avoid problems from stale proxies
sudo sed -i 's|http://archive.ubuntu.com|https://archive.ubuntu.com|g' \
Expand Down
4 changes: 2 additions & 2 deletions scripts/db_tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@sillsdev/scripture": "^1.4.3",
"ajv": "^8.20.0",
"ajv-bsontype": "^1.0.7",
"axios": "^1.19.0",
"axios": "^1.20.0",
"fast-diff": "^1.3.0",
"mongodb": "^4.17.2",
"ot-json0": "^1.1.0",
Expand All @@ -21,7 +21,7 @@
"sharedb-access": "^5.0.0",
"sharedb-mongo": "^1.0.0",
"socket.io-client": "^4.8.3",
"ws": "^8.21.1",
"ws": "^8.21.3",
"yargs": "^17.7.3"
},
"devDependencies": {
Expand Down
Loading
Loading