From f6fc6c26e0ad1ade000c8de3ecce6449f112e5bb Mon Sep 17 00:00:00 2001 From: jonasflorencio Date: Tue, 11 Nov 2025 11:23:14 -0300 Subject: [PATCH 1/5] Bump node version to 22.21.1 --- .changeset/perfect-trees-rescue.md | 13 +++++++++++++ .github/workflows/ci-deploy-gh-pages.yml | 2 +- .github/workflows/new-release.yml | 2 +- .github/workflows/pr-update-description.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/release-candidate.yml | 2 +- .github/workflows/update-version-durability.yml | 2 +- apps/meteor/.docker-mongo/Dockerfile | 2 +- apps/meteor/.docker/Dockerfile.alpine | 2 +- apps/meteor/.docker/Dockerfile.debian | 2 +- ee/apps/account-service/Dockerfile | 4 ++-- ee/apps/authorization-service/Dockerfile | 4 ++-- ee/apps/ddp-streamer/Dockerfile | 4 ++-- ee/apps/omnichannel-transcript/Dockerfile | 4 ++-- ee/apps/presence-service/Dockerfile | 4 ++-- ee/apps/queue-worker/Dockerfile | 4 ++-- ee/apps/stream-hub-service/Dockerfile | 4 ++-- package.json | 4 ++-- 18 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 .changeset/perfect-trees-rescue.md diff --git a/.changeset/perfect-trees-rescue.md b/.changeset/perfect-trees-rescue.md new file mode 100644 index 0000000000000..39694824e4c1c --- /dev/null +++ b/.changeset/perfect-trees-rescue.md @@ -0,0 +1,13 @@ +--- +'rocketchat-services': patch +'@rocket.chat/omnichannel-transcript': patch +'@rocket.chat/authorization-service': patch +'@rocket.chat/stream-hub-service': patch +'@rocket.chat/presence-service': patch +'@rocket.chat/account-service': patch +'@rocket.chat/ddp-streamer': patch +'@rocket.chat/queue-worker': patch +'@rocket.chat/meteor': patch +--- + +Bump Node version to 20.21.1 \ No newline at end of file diff --git a/.github/workflows/ci-deploy-gh-pages.yml b/.github/workflows/ci-deploy-gh-pages.yml index 04a0565fc3e93..70740c3d3513a 100644 --- a/.github/workflows/ci-deploy-gh-pages.yml +++ b/.github/workflows/ci-deploy-gh-pages.yml @@ -17,7 +17,7 @@ jobs: - name: Setup NodeJS uses: ./.github/actions/setup-node with: - node-version: 22.16.0 + node-version: 22.21.1 deno-version: 1.43.5 cache-modules: true install: true diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml index 9df9526ff1aa6..1055cab10a40a 100644 --- a/.github/workflows/new-release.yml +++ b/.github/workflows/new-release.yml @@ -34,7 +34,7 @@ jobs: - name: Setup NodeJS uses: ./.github/actions/setup-node with: - node-version: 22.16.0 + node-version: 22.21.1 deno-version: 1.43.5 cache-modules: true install: true diff --git a/.github/workflows/pr-update-description.yml b/.github/workflows/pr-update-description.yml index fdb7c40f93963..788fb0138e90f 100644 --- a/.github/workflows/pr-update-description.yml +++ b/.github/workflows/pr-update-description.yml @@ -21,7 +21,7 @@ jobs: - name: Setup NodeJS uses: ./.github/actions/setup-node with: - node-version: 22.16.0 + node-version: 22.21.1 deno-version: 1.43.5 cache-modules: true install: true diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 4dbc8d10d32fd..55f2175c7c81c 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -24,7 +24,7 @@ jobs: - name: Setup NodeJS uses: ./.github/actions/setup-node with: - node-version: 22.16.0 + node-version: 22.21.1 deno-version: 1.43.5 cache-modules: true install: true diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index 6c1b556809a39..6b82fa239f1d4 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -15,7 +15,7 @@ jobs: - name: Setup NodeJS uses: ./.github/actions/setup-node with: - node-version: 22.16.0 + node-version: 22.21.1 deno-version: 1.43.5 cache-modules: true install: true diff --git a/.github/workflows/update-version-durability.yml b/.github/workflows/update-version-durability.yml index 5eb69ad3effbb..2b8670fbca31d 100644 --- a/.github/workflows/update-version-durability.yml +++ b/.github/workflows/update-version-durability.yml @@ -23,7 +23,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v6.0.0 with: - node-version: 22.16.0 + node-version: 22.21.1 - name: Install dependencies run: | diff --git a/apps/meteor/.docker-mongo/Dockerfile b/apps/meteor/.docker-mongo/Dockerfile index ee02a4101800c..2860ef4e2cb68 100644 --- a/apps/meteor/.docker-mongo/Dockerfile +++ b/apps/meteor/.docker-mongo/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.14.0-bullseye-slim +FROM node:22.21.1-bullseye-slim LABEL maintainer="buildmaster@rocket.chat" diff --git a/apps/meteor/.docker/Dockerfile.alpine b/apps/meteor/.docker/Dockerfile.alpine index 72470b2b67772..bf8f3c4ac59b0 100644 --- a/apps/meteor/.docker/Dockerfile.alpine +++ b/apps/meteor/.docker/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM node:22.16.0-alpine3.20 +FROM node:22.21.1-alpine3.20 LABEL maintainer="buildmaster@rocket.chat" diff --git a/apps/meteor/.docker/Dockerfile.debian b/apps/meteor/.docker/Dockerfile.debian index 27836bc5eacdf..6e0d65eaf87e4 100644 --- a/apps/meteor/.docker/Dockerfile.debian +++ b/apps/meteor/.docker/Dockerfile.debian @@ -2,7 +2,7 @@ ARG DENO_VERSION="1.37.1" FROM denoland/deno:bin-${DENO_VERSION} as deno -FROM node:22.14.0-bullseye-slim +FROM node:22.21.1-bullseye-slim LABEL maintainer="buildmaster@rocket.chat" diff --git a/ee/apps/account-service/Dockerfile b/ee/apps/account-service/Dockerfile index bead093d464cb..ed851356dcde8 100644 --- a/ee/apps/account-service/Dockerfile +++ b/ee/apps/account-service/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.16.0-alpine3.21 AS builder +FROM node:22.21.1-alpine3.21 AS builder ARG SERVICE @@ -89,7 +89,7 @@ WORKDIR /app/ee/apps/${SERVICE} RUN yarn workspaces focus --production -FROM node:22.16.0-alpine3.21 +FROM node:22.21.1-alpine3.21 ARG SERVICE diff --git a/ee/apps/authorization-service/Dockerfile b/ee/apps/authorization-service/Dockerfile index ef525715a258e..2e58af2c554b9 100644 --- a/ee/apps/authorization-service/Dockerfile +++ b/ee/apps/authorization-service/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.16.0-alpine3.21 AS builder +FROM node:22.21.1-alpine3.21 AS builder ARG SERVICE @@ -86,7 +86,7 @@ WORKDIR /app/ee/apps/${SERVICE} RUN yarn workspaces focus --production -FROM node:22.16.0-alpine3.21 +FROM node:22.21.1-alpine3.21 ARG SERVICE diff --git a/ee/apps/ddp-streamer/Dockerfile b/ee/apps/ddp-streamer/Dockerfile index 8ba1e076e7ae6..f9f30b0ace592 100644 --- a/ee/apps/ddp-streamer/Dockerfile +++ b/ee/apps/ddp-streamer/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.16.0-alpine3.21 AS builder +FROM node:22.21.1-alpine3.21 AS builder ARG SERVICE @@ -92,7 +92,7 @@ WORKDIR /app/ee/apps/${SERVICE} RUN yarn workspaces focus --production -FROM node:22.16.0-alpine3.21 +FROM node:22.21.1-alpine3.21 ARG SERVICE diff --git a/ee/apps/omnichannel-transcript/Dockerfile b/ee/apps/omnichannel-transcript/Dockerfile index 545809c333787..347cea276d154 100644 --- a/ee/apps/omnichannel-transcript/Dockerfile +++ b/ee/apps/omnichannel-transcript/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.16.0-alpine3.21 AS builder +FROM node:22.21.1-alpine3.21 AS builder ARG SERVICE @@ -102,7 +102,7 @@ WORKDIR /app/ee/apps/${SERVICE} RUN yarn workspaces focus --production -FROM node:22.16.0-alpine3.21 +FROM node:22.21.1-alpine3.21 ARG SERVICE diff --git a/ee/apps/presence-service/Dockerfile b/ee/apps/presence-service/Dockerfile index cc058f195b711..473b8b1d13560 100644 --- a/ee/apps/presence-service/Dockerfile +++ b/ee/apps/presence-service/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.16.0-alpine3.21 AS builder +FROM node:22.21.1-alpine3.21 AS builder ARG SERVICE @@ -90,7 +90,7 @@ WORKDIR /app/ee/apps/${SERVICE} RUN yarn workspaces focus --production -FROM node:22.16.0-alpine3.21 +FROM node:22.21.1-alpine3.21 ARG SERVICE diff --git a/ee/apps/queue-worker/Dockerfile b/ee/apps/queue-worker/Dockerfile index 545809c333787..347cea276d154 100644 --- a/ee/apps/queue-worker/Dockerfile +++ b/ee/apps/queue-worker/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.16.0-alpine3.21 AS builder +FROM node:22.21.1-alpine3.21 AS builder ARG SERVICE @@ -102,7 +102,7 @@ WORKDIR /app/ee/apps/${SERVICE} RUN yarn workspaces focus --production -FROM node:22.16.0-alpine3.21 +FROM node:22.21.1-alpine3.21 ARG SERVICE diff --git a/ee/apps/stream-hub-service/Dockerfile b/ee/apps/stream-hub-service/Dockerfile index 5043c33c44e7e..92285dc65864a 100644 --- a/ee/apps/stream-hub-service/Dockerfile +++ b/ee/apps/stream-hub-service/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.16.0-alpine3.21 AS builder +FROM node:22.21.1-alpine3.21 AS builder ARG SERVICE @@ -87,7 +87,7 @@ WORKDIR /app/ee/apps/${SERVICE} RUN yarn workspaces focus --production -FROM node:22.16.0-alpine3.21 +FROM node:22.21.1-alpine3.21 ARG SERVICE diff --git a/package.json b/package.json index 88bcfb8eb3b53..12b7bc3e0ec63 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "homepage": "https://github.com/RocketChat/Rocket.Chat#readme", "engines": { "yarn": "4.10.3", - "node": "22.16.0" + "node": "22.21.1" }, "packageManager": "yarn@4.10.3", "houston": { @@ -56,7 +56,7 @@ ] }, "volta": { - "node": "22.16.0", + "node": "22.21.1", "yarn": "4.10.3" }, "resolutions": { From d28782198a43e1a9dd164761e70166158c52941d Mon Sep 17 00:00:00 2001 From: jonasflorencio Date: Tue, 11 Nov 2025 11:34:40 -0300 Subject: [PATCH 2/5] Bump node version to 22.21.1 Dockerfile Service --- apps/meteor/ee/server/services/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/meteor/ee/server/services/Dockerfile b/apps/meteor/ee/server/services/Dockerfile index c3662482d5574..4fc865b112265 100644 --- a/apps/meteor/ee/server/services/Dockerfile +++ b/apps/meteor/ee/server/services/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22.16.0-alpine3.21 as build +FROM node:22.21.1-alpine3.21 as build WORKDIR /app @@ -28,7 +28,7 @@ RUN yarn install RUN yarn workspace @rocket.chat/core-typings run build \ && yarn workspace @rocket.chat/rest-typings run build -FROM node:22.16.0-alpine3.21 +FROM node:22.21.1-alpine3.21 ARG SERVICE From 33847e35452b8728b5dba882d3f0231d4d2ec62d Mon Sep 17 00:00:00 2001 From: FlyeraX <79267723+jonasflorencio@users.noreply.github.com> Date: Tue, 11 Nov 2025 11:47:37 -0300 Subject: [PATCH 3/5] Update .changeset/perfect-trees-rescue.md Co-authored-by: Guilherme Gazzo --- .changeset/perfect-trees-rescue.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/perfect-trees-rescue.md b/.changeset/perfect-trees-rescue.md index 39694824e4c1c..3dfc6ec2abaa8 100644 --- a/.changeset/perfect-trees-rescue.md +++ b/.changeset/perfect-trees-rescue.md @@ -10,4 +10,4 @@ '@rocket.chat/meteor': patch --- -Bump Node version to 20.21.1 \ No newline at end of file +Bump Node version to 22.21.1 \ No newline at end of file From a80d95eb7abb70eb1ba18f2f633765f0c60dd381 Mon Sep 17 00:00:00 2001 From: jonasflorencio Date: Tue, 11 Nov 2025 12:50:47 -0300 Subject: [PATCH 4/5] update node:22.21.1-alpine3.20 > node:22.21.1-alpine3.21 --- apps/meteor/.docker/Dockerfile.alpine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/.docker/Dockerfile.alpine b/apps/meteor/.docker/Dockerfile.alpine index bf8f3c4ac59b0..813d6ca7b80a0 100644 --- a/apps/meteor/.docker/Dockerfile.alpine +++ b/apps/meteor/.docker/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM node:22.21.1-alpine3.20 +FROM node:22.21.1-alpine3.21 LABEL maintainer="buildmaster@rocket.chat" From 8531fc5963b0fa0314470b958b67cf5242e3c4d4 Mon Sep 17 00:00:00 2001 From: jonasflorencio Date: Fri, 14 Nov 2025 12:01:08 -0300 Subject: [PATCH 5/5] update config file --- packages/message-parser/jest.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/message-parser/jest.config.ts b/packages/message-parser/jest.config.ts index e11f29938eb96..9e4834a8f877f 100644 --- a/packages/message-parser/jest.config.ts +++ b/packages/message-parser/jest.config.ts @@ -6,7 +6,7 @@ import type { Config } from 'jest'; export default { preset: server.preset, transform: { - '\\.pegjs$': resolve(__dirname, './loaders/pegtransform.js'), + '\\.pegjs$': resolve(import.meta.dirname, './loaders/pegtransform.js'), }, moduleFileExtensions: ['js', 'ts', 'pegjs'], } satisfies Config;