chore: Bump meteor to 3.0.4 (#33596)

RocketChat · Oct 23, 2024 · b524ba9 · b524ba9
1 parent 247b1c6
commit b524ba9
Show file tree

Hide file tree

Showing 25 changed files with 73 additions and 54 deletions.
diff --git a/.changeset/fair-colts-remain.md b/.changeset/fair-colts-remain.md
@@ -0,0 +1,13 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/account-service": patch
+"@rocket.chat/authorization-service": patch
+"@rocket.chat/ddp-streamer": patch
+"@rocket.chat/omnichannel-transcript": patch
+"@rocket.chat/presence-service": patch
+"@rocket.chat/queue-worker": patch
+"@rocket.chat/stream-hub-service": patch
+"rocketchat-services": patch
+---
+
+Bump meteor to 3.0.4 and Node version to 20.18.0
diff --git 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: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true

diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
@@ -305,7 +305,11 @@ jobs:
           include-hidden-files: true
 
       - name: Show server logs if E2E test failed
-        if: failure()
+        if: failure() && inputs.release == 'ee'
+        run: docker compose -f docker-compose-ci.yml logs
+
+      - name: Show server logs if E2E test failed
+        if: failure() && inputs.release != 'ee'
         run: docker compose -f docker-compose-ci.yml logs rocketchat
 
       - name: Extract e2e:ee:coverage

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -200,7 +200,7 @@ jobs:
         uses: ./.github/actions/setup-node
         if: github.event.action != 'closed'
         with:
-          node-version: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true

diff --git 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: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true

diff --git 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: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true

diff --git 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: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true

diff --git 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: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true

diff --git a/.github/workflows/update-version-durability.yml b/.github/workflows/update-version-durability.yml
@@ -14,22 +14,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - name: Use Node.js
-      uses: actions/[email protected]
-      with:
-        node-version: '20.17.0'
+      - name: Use Node.js
+        uses: actions/[email protected]
+        with:
+          node-version: '20.18.0'
 
-    - name: Install dependencies
-      run: |
-        cd ./.github/actions/update-version-durability
-        npm install
+      - name: Install dependencies
+        run: |
+          cd ./.github/actions/update-version-durability
+          npm install
 
-    - name: Update Version Durability
-      uses: ./.github/actions/update-version-durability
-      with:
-        GH_TOKEN: ${{ secrets.CI_PAT }}
-        D360_TOKEN: ${{ secrets.D360_TOKEN }}
-        D360_ARTICLE_ID: 800f8d52-409d-478d-b560-f82a2c0eb7fb
-        PUBLISH: true
+      - name: Update Version Durability
+        uses: ./.github/actions/update-version-durability
+        with:
+          GH_TOKEN: ${{ secrets.CI_PAT }}
+          D360_TOKEN: ${{ secrets.D360_TOKEN }}
+          D360_ARTICLE_ID: 800f8d52-409d-478d-b560-f82a2c0eb7fb
+          PUBLISH: true
diff --git a/apps/meteor/.docker-mongo/Dockerfile b/apps/meteor/.docker-mongo/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-bullseye-slim
+FROM node:20.18.0-bullseye-slim
 
 LABEL maintainer="[email protected]"
 

diff --git a/apps/meteor/.docker/Dockerfile b/apps/meteor/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 LABEL maintainer="[email protected]"
 

diff --git 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:20.17.0-bullseye-slim
+FROM node:20.18.0-bullseye-slim
 
 LABEL maintainer="[email protected]"
 

diff --git a/apps/meteor/.meteor/packages b/apps/meteor/.meteor/packages
@@ -14,7 +14,7 @@ rocketchat:streamer
 rocketchat:version
 rocketchat:user-presence
 
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -27,14 +27,14 @@ [email protected]
 [email protected]
 [email protected]
 
-[email protected].2
+[email protected].4
 [email protected]
 [email protected]
 [email protected]
 
 [email protected]
 [email protected]
-[email protected].1
+[email protected].3
 
 [email protected]
 
@@ -59,7 +59,7 @@ [email protected]
 [email protected]
 [email protected]
 
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]

diff --git a/apps/meteor/.meteor/release b/apps/meteor/.meteor/release
@@ -1 +1 @@
-[email protected].3
+[email protected].4
diff --git a/apps/meteor/.meteor/versions b/apps/meteor/.meteor/versions
@@ -1,4 +1,4 @@
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -8,24 +8,24 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].4
 [email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 dispatch:[email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -51,7 +51,7 @@ meteorhacks:[email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 [email protected]
 [email protected]
@@ -89,8 +89,8 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].3
-[email protected].1
+[email protected].4
+[email protected].3
 [email protected]
 zodern:[email protected]
 zodern:[email protected]

diff --git a/apps/meteor/client/startup/startup.ts b/apps/meteor/client/startup/startup.ts
@@ -33,9 +33,11 @@ Meteor.startup(() => {
 			return;
 		}
 
-		if (Meteor.loggingIn()) {
-			return;
-		}
+		// TODO: TEMPORARY UNTIL THIS IS FIXED
+		// BACKEND MS SHOULD SEND USER DATA AFTER LOGIN
+		// if (Meteor.loggingIn()) {
+		// 	return;
+		// }
 
 		const user = await synchronizeUserData(uid);
 		if (!user) {

diff --git a/apps/meteor/ee/server/services/Dockerfile b/apps/meteor/ee/server/services/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0 as build
+FROM node:20.18.0 as build
 
 WORKDIR /app
 
@@ -28,7 +28,7 @@ COPY ./tsconfig.base.json .
 RUN yarn workspace @rocket.chat/core-typings run build \
     && yarn workspace @rocket.chat/rest-typings run build
 
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 

diff --git a/ee/apps/account-service/Dockerfile b/ee/apps/account-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 

diff --git a/ee/apps/authorization-service/Dockerfile b/ee/apps/authorization-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 

diff --git a/ee/apps/ddp-streamer/Dockerfile b/ee/apps/ddp-streamer/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 

diff --git a/ee/apps/omnichannel-transcript/Dockerfile b/ee/apps/omnichannel-transcript/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 

diff --git a/ee/apps/presence-service/Dockerfile b/ee/apps/presence-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 

diff --git a/ee/apps/queue-worker/Dockerfile b/ee/apps/queue-worker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 

diff --git a/ee/apps/stream-hub-service/Dockerfile b/ee/apps/stream-hub-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 

diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
 	"homepage": "https://github.com/RocketChat/Rocket.Chat#readme",
 	"engines": {
 		"yarn": "4.5.0",
-		"node": "20.17.0",
+		"node": "20.18.0",
 		"npm": "Use yarn instead"
 	},
 	"packageManager": "[email protected]",
@@ -54,7 +54,7 @@
 		]
 	},
 	"volta": {
-		"node": "20.17.0",
+		"node": "20.18.0",
 		"yarn": "1.22.18"
 	},
 	"resolutions": {