Skip to content

Commit 04e3ede

Browse files
committed
fix: upgrade base images, nodejs and pnpm
Refs: RATY-319
1 parent 4ffc49b commit 04e3ede

6 files changed

Lines changed: 38 additions & 54 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ jobs:
1313
secrets:
1414
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
1515
with:
16-
node-version: 22.x
16+
node-version: 24.x
1717
extra-commands: pnpm update-runtime-env

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v22.13.1
1+
v24.15.0

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ============================================================
22
# STAGE 1: Build the Static Assets
33
# ============================================================
4-
FROM helsinki.azurecr.io/ubi9/nodejs-22-pnpm-builder-base AS appbase
4+
FROM helsinki.azurecr.io/ubi9/nodejs-24-pnpm-builder-base AS appbase
55

66
# 1. Copy needed files for build
77
COPY --chown=default:root package.json pnpm-lock.yaml pnpm-workspace.yaml ./
@@ -48,7 +48,7 @@ RUN pnpm build
4848
# ============================================================
4949
# STAGE 4: Production Runtime
5050
# ============================================================
51-
FROM helsinki.azurecr.io/ubi9/nginx-126-spa-standard AS production
51+
FROM helsinki.azurecr.io/ubi10/nginx-126-spa-standard AS production
5252

5353
ARG REACT_APP_SENTRY_RELEASE
5454
ENV APP_RELEASE=${REACT_APP_SENTRY_RELEASE:-""}

package.json

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"version": "1.20.5",
44
"license": "MIT",
55
"main": "index.js",
6-
"packageManager": "pnpm@10.28.2",
6+
"packageManager": "pnpm@11.1.3",
77
"engines": {
8-
"node": ">=22.13.1",
9-
"pnpm": ">=10.28.2"
8+
"node": ">=24.15.0",
9+
"pnpm": ">=11.1.3"
1010
},
1111
"scripts": {
1212
"app:version": "echo \"$npm_package_version\"",
@@ -141,19 +141,5 @@
141141
"redux-mock-store": "^1.5.4",
142142
"vitest-fetch-mock": "^0.4.5"
143143
},
144-
"pnpm": {
145-
"overrides": {
146-
"@draft-js-plugins/drag-n-drop>immutable": "3.8.3",
147-
"@draft-js-plugins/editor>immutable": "3.8.3",
148-
"@draft-js-plugins/focus>immutable": "3.8.3",
149-
"@draft-js-plugins/image>immutable": "3.8.3",
150-
"@draft-js-plugins/resizeable>immutable": "3.8.3",
151-
"draft-convert>immutable": "3.8.3",
152-
"draft-js-export-html>immutable": "3.8.3",
153-
"draft-js-utils>immutable": "3.8.3",
154-
"draft-js>immutable": "3.8.3",
155-
"@typescript-eslint/typescript-estree>minimatch": "9.0.7"
156-
}
157-
},
158144
"snyk": true
159145
}

pnpm-lock.yaml

Lines changed: 2 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,32 @@
1-
# Don't allow dependencies to be used before they have been released for at least 1 week
1+
# Minimum age for new packages before they can be used (in minutes) – 10080 min = 1 week
22
minimumReleaseAge: 10080
33

4-
# Don't warn about ignored build scripts
5-
ignoredBuiltDependencies: []
6-
7-
# Hoist all dependencies to the root of node_modules, for better compatibility with packages that expect flat node_modules
4+
# Hoist all dependencies to the root of node_modules because some packages
5+
# (e.g. the draft-js ecosystem) do not work correctly with pnpm's default isolation strategy
86
shamefullyHoist: true
7+
8+
# Force all draft-js ecosystem packages to use immutable 3.x –
9+
# newer versions are not compatible with draft-js.
10+
# The minimatch override fixes the version used by @typescript-eslint/typescript-estree.
11+
overrides:
12+
"@draft-js-plugins/drag-n-drop>immutable": 3.8.3
13+
"@draft-js-plugins/editor>immutable": 3.8.3
14+
"@draft-js-plugins/focus>immutable": 3.8.3
15+
"@draft-js-plugins/image>immutable": 3.8.3
16+
"@draft-js-plugins/resizeable>immutable": 3.8.3
17+
"draft-convert>immutable": 3.8.3
18+
"draft-js-export-html>immutable": 3.8.3
19+
"draft-js-utils>immutable": 3.8.3
20+
"draft-js>immutable": 3.8.3
21+
"@typescript-eslint/typescript-estree>minimatch": 9.0.7
22+
23+
# pnpm 11 requires explicit opt-in for packages that run install scripts.
24+
# - @parcel/watcher: used by sass and vite for file system watching
25+
# - core-js: does not require a native build, denied as unnecessary
26+
# - esbuild: downloads its native binary during installation
27+
# - unrs-resolver: Rust-based module resolver used by eslint-plugin-import-x
28+
allowBuilds:
29+
"@parcel/watcher": true
30+
core-js: false
31+
esbuild: true
32+
unrs-resolver: true

0 commit comments

Comments
 (0)