Merge branch 'develop' into feat/single-contact-id

.changeset/bump-patch-1729526930133.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.

.changeset/bump-patch-1729648473274.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.

.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

.changeset/forty-gorillas-kneel.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/apps-engine": patch
+---
+
+Deprecated the `from` field in the apps email bridge and made it optional, using the server's settings when the field is omitted

.changeset/pre.json

@@ -0,0 +1,176 @@
+{
+  "mode": "pre",
+  "tag": "rc",
+  "initialVersions": {
+    "@rocket.chat/meteor": "7.0.0-develop",
+    "rocketchat-services": "1.3.5",
+    "@rocket.chat/uikit-playground": "0.5.0",
+    "@rocket.chat/account-service": "0.4.8",
+    "@rocket.chat/authorization-service": "0.4.8",
+    "@rocket.chat/ddp-streamer": "0.3.8",
+    "@rocket.chat/omnichannel-transcript": "0.4.8",
+    "@rocket.chat/presence-service": "0.4.8",
+    "@rocket.chat/queue-worker": "0.4.8",
+    "@rocket.chat/stream-hub-service": "0.4.8",
+    "@rocket.chat/license": "0.2.8",
+    "@rocket.chat/network-broker": "0.1.0",
+    "@rocket.chat/omnichannel-services": "0.3.5",
+    "@rocket.chat/pdf-worker": "0.2.5",
+    "@rocket.chat/presence": "0.2.8",
+    "@rocket.chat/ui-theming": "0.3.0",
+    "@rocket.chat/account-utils": "0.0.2",
+    "@rocket.chat/agenda": "0.1.0",
+    "@rocket.chat/api-client": "0.2.8",
+    "@rocket.chat/apps": "0.1.8",
+    "@rocket.chat/apps-engine": "1.47.0-alpha",
+    "@rocket.chat/base64": "1.0.13",
+    "@rocket.chat/cas-validate": "0.0.2",
+    "@rocket.chat/core-services": "0.7.0",
+    "@rocket.chat/core-typings": "7.0.0-develop",
+    "@rocket.chat/cron": "0.1.8",
+    "@rocket.chat/ddp-client": "0.3.8",
+    "@rocket.chat/eslint-config": "0.7.0",
+    "@rocket.chat/favicon": "0.0.2",
+    "@rocket.chat/freeswitch": "0.0.1",
+    "@rocket.chat/fuselage-ui-kit": "11.0.0",
+    "@rocket.chat/gazzodown": "11.0.0",
+    "@rocket.chat/i18n": "0.8.0",
+    "@rocket.chat/instance-status": "0.1.8",
+    "@rocket.chat/jest-presets": "0.0.1",
+    "@rocket.chat/jwt": "0.1.1",
+    "@rocket.chat/livechat": "1.20.0",
+    "@rocket.chat/log-format": "0.0.2",
+    "@rocket.chat/logger": "0.0.2",
+    "@rocket.chat/message-parser": "0.31.31",
+    "@rocket.chat/mock-providers": "0.1.3",
+    "@rocket.chat/model-typings": "0.8.0",
+    "@rocket.chat/models": "0.3.0",
+    "@rocket.chat/poplib": "0.0.2",
+    "@rocket.chat/password-policies": "0.0.2",
+    "@rocket.chat/patch-injection": "0.0.1",
+    "@rocket.chat/peggy-loader": "0.31.27",
+    "@rocket.chat/random": "1.2.2",
+    "@rocket.chat/release-action": "2.2.3",
+    "@rocket.chat/release-changelog": "0.1.0",
+    "@rocket.chat/rest-typings": "7.0.0-develop",
+    "@rocket.chat/server-cloud-communication": "0.0.2",
+    "@rocket.chat/server-fetch": "0.0.3",
+    "@rocket.chat/sha256": "1.0.10",
+    "@rocket.chat/tools": "0.2.2",
+    "@rocket.chat/tracing": "0.0.1",
+    "@rocket.chat/ui-avatar": "7.0.0",
+    "@rocket.chat/ui-client": "11.0.0",
+    "@rocket.chat/ui-composer": "0.3.0",
+    "@rocket.chat/ui-contexts": "11.0.0",
+    "@rocket.chat/ui-kit": "0.36.1",
+    "@rocket.chat/ui-video-conf": "11.0.0",
+    "@rocket.chat/ui-voip": "1.0.0",
+    "@rocket.chat/web-ui-registration": "11.0.0"
+  },
+  "changesets": [
+    "brown-pants-press",
+    "bump-patch-1729526930133",
+    "bump-patch-1729648473274",
+    "chilled-boats-sip",
+    "chilled-files-relate",
+    "chilly-flowers-brake",
+    "cool-dryers-judge",
+    "dry-taxis-cry",
+    "dull-singers-move",
+    "e2ee-composer-freeze",
+    "e2ee-modal-keys",
+    "fair-bees-wash",
+    "fair-seahorses-laugh",
+    "fifty-mails-admire",
+    "five-suns-tickle",
+    "fluffy-knives-count",
+    "forty-actors-care",
+    "forty-needles-sit",
+    "forty-pants-roll",
+    "four-experts-compare",
+    "four-snakes-deny",
+    "fuzzy-cherries-buy",
+    "gentle-kings-greet",
+    "giant-spiders-train",
+    "gold-falcons-hear",
+    "gold-knives-sparkle",
+    "gorgeous-houses-sneeze",
+    "grumpy-lamps-beg",
+    "grumpy-weeks-appear",
+    "heavy-apricots-wash",
+    "heavy-carrots-reflect",
+    "hot-socks-play",
+    "hungry-icons-try",
+    "khaki-boxes-suffer",
+    "kind-clocks-smash",
+    "kind-eels-brush",
+    "large-bikes-brake",
+    "large-pillows-brush",
+    "late-hats-carry",
+    "lemon-tables-nail",
+    "little-bottles-peel",
+    "little-gifts-do",
+    "lovely-trees-call",
+    "many-carrots-care",
+    "many-files-turn",
+    "mean-readers-join",
+    "modern-trees-draw",
+    "moody-phones-admire",
+    "nice-vans-design",
+    "olive-dogs-jam",
+    "perfect-wolves-impress",
+    "pink-wombats-wait",
+    "plenty-hairs-camp",
+    "poor-falcons-doubt",
+    "proud-bugs-cry",
+    "purple-papayas-collect",
+    "purple-tools-heal",
+    "quick-moles-jump",
+    "quiet-kings-rhyme",
+    "rare-hats-lie",
+    "real-avocados-sneeze",
+    "real-plants-mix",
+    "red-crews-behave",
+    "rude-dodos-agree",
+    "selfish-experts-develop",
+    "selfish-schools-leave",
+    "seven-hotels-collect",
+    "sharp-adults-think",
+    "sharp-forks-give",
+    "shiny-falcons-vanish",
+    "six-horses-sin",
+    "sixty-moons-walk",
+    "sixty-owls-arrive",
+    "sixty-vans-grab",
+    "slow-crabs-run",
+    "slow-rules-bow",
+    "smooth-horses-draw",
+    "soft-ducks-build",
+    "soft-planets-cross",
+    "spicy-eggs-march",
+    "strange-spies-clean",
+    "strong-waves-add",
+    "swift-penguins-help",
+    "tame-dolls-know",
+    "tasty-goats-deny",
+    "ten-houses-repair",
+    "tender-cheetahs-teach",
+    "tender-readers-run",
+    "tender-turkeys-breathe",
+    "thick-waves-try",
+    "thirty-trainers-swim",
+    "three-avocados-search",
+    "three-crews-allow",
+    "tidy-suns-move",
+    "tiny-rice-train",
+    "tough-rings-kneel",
+    "tricky-horses-swim",
+    "twenty-ways-think",
+    "two-emus-wash",
+    "two-geckos-train",
+    "unlucky-ducks-arrive",
+    "witty-apples-pretend",
+    "yellow-jobs-serve",
+    "young-maps-push"
+  ]
+}

.changeset/smart-radios-reflect.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/core-services": patch
+---
+
+stops calling an object through proxy calling getQueueWorker

.github/actions/update-version-durability/index.js

@@ -5,7 +5,7 @@ import semver from 'semver';
 import crypto from 'crypto';
 import fs from 'fs/promises';
 import BeautyHtml from 'beauty-html';
-import { DOMParser } from 'xmldom';
+import { DOMParser } from '@xmldom/xmldom';
 import core from '@actions/core';
 import { Octokit } from '@octokit/rest';
 

.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

.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

.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

.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

.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

.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

.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

.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/setup-node@v4.0.4
-      with:
-        node-version: '20.17.0'
+      - name: Use Node.js
+        uses: actions/setup-node@v4.0.4
+        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

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="buildmaster@rocket.chat"
 

apps/meteor/.docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 LABEL maintainer="buildmaster@rocket.chat"
 

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="buildmaster@rocket.chat"
 
@@ -30,21 +30,27 @@ ENV DEPLOY_METHOD=docker \
 
 RUN aptMark="$(apt-mark showmanual)" \
     && apt-get install -y --no-install-recommends g++ make python3 ca-certificates \
-    && cd /app/bundle/programs/server \
+    && apt-mark auto '.*' > /dev/null \
+    && apt-mark manual $aptMark > /dev/null
+
+USER rocketchat
+
+RUN cd /app/bundle/programs/server \
     && npm install \
     && cd npm/node_modules/isolated-vm \
     && npm install \
-    && apt-mark auto '.*' > /dev/null \
-    && apt-mark manual $aptMark > /dev/null \
-    && find /usr/local -type f -executable -exec ldd '{}' ';' \
+    && npm cache clear --force
+
+USER root
+
+RUN find /usr/local -type f -executable -exec ldd '{}' ';' \
     | awk '/=>/ { print $(NF-1) }' \
     | sort -u \
     | xargs -r dpkg-query --search \
     | cut -d: -f1 \
     | sort -u \
     | xargs -r apt-mark manual \
-    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-    && npm cache clear --force
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
 
 USER rocketchat