From 8df49a636a6703a4806dea6b4f3664d01926276b Mon Sep 17 00:00:00 2001 From: Maksim Eltyshev Date: Mon, 16 Jun 2025 21:32:54 +0200 Subject: [PATCH] build: Use Node.js v22 --- .../build-and-publish-release-package.yml | 2 +- .github/workflows/build-and-test.yml | 2 +- .github/workflows/lint.yml | 2 +- Dockerfile | 6 +++--- Dockerfile.dev | 2 +- client/package-lock.json | 14 +++++++++++--- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-and-publish-release-package.yml b/.github/workflows/build-and-publish-release-package.yml index cd1c4d1c..8065586c 100644 --- a/.github/workflows/build-and-publish-release-package.yml +++ b/.github/workflows/build-and-publish-release-package.yml @@ -15,7 +15,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '22' cache: 'npm' - name: Update npm diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index c162e5f5..7d921336 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -24,7 +24,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '22' cache: 'npm' - name: Set up PostgreSQL diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e98b9ec2..c3344d3b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '22' cache: 'npm' - name: Cache Node.js modules diff --git a/Dockerfile b/Dockerfile index a7d03143..c9517b64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18-alpine AS server-dependencies +FROM node:22-alpine AS server-dependencies RUN apk -U upgrade \ && apk add build-base python3 --no-cache @@ -10,7 +10,7 @@ COPY server/package.json server/package-lock.json server/requirements.txt ./ RUN npm install npm --global \ && npm install --omit=dev -FROM node:lts AS client +FROM node:22 AS client WORKDIR /app @@ -21,7 +21,7 @@ RUN npm install npm --global \ RUN DISABLE_ESLINT_PLUGIN=true npm run build -FROM node:18-alpine +FROM node:22-alpine RUN apk -U upgrade \ && apk add bash python3 --no-cache \ diff --git a/Dockerfile.dev b/Dockerfile.dev index 6985fc57..e9c91958 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM node:lts-alpine +FROM node:22-alpine RUN apk -U upgrade \ && apk add bash build-base python3 xdg-utils --no-cache \ diff --git a/client/package-lock.json b/client/package-lock.json index 2295ac8d..a9b75b12 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -4734,11 +4734,19 @@ "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", "dev": true }, + "node_modules/@types/prop-types": { + "version": "15.7.15", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz", + "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==", + "license": "MIT" + }, "node_modules/@types/react": { - "version": "19.1.6", - "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.6.tgz", - "integrity": "sha512-JeG0rEWak0N6Itr6QUx+X60uQmN+5t3j9r/OVDtWzFXKaj6kD1BwJzOksD0FF6iWxZlbE1kB0q9vtnU2ekqa1Q==", + "version": "18.3.23", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.23.tgz", + "integrity": "sha512-/LDXMQh55EzZQ0uVAZmKKhfENivEvWz6E+EYzh+/MCjMhNsotd+ZHhBGIjFDTi6+fz0OhQQQLbTgdQIxxCsC0w==", + "license": "MIT", "dependencies": { + "@types/prop-types": "*", "csstype": "^3.0.2" } },