Merge branch 'feat/federation-feat-2' into feat/federation-search-pub…

…lic-rooms

.github/workflows/build_and_test.yml

@@ -79,10 +79,10 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.19.3
+      - name: Use Node.js 14.21.2
         uses: actions/setup-node@v3
         with:
-          node-version: '14.19.3'
+          node-version: '14.21.2'
           cache: 'yarn'
 
       - name: Free disk space
@@ -222,7 +222,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['14.19.3']
+        node-version: ['14.21.2']
         mongodb-version: ['4.2', '4.4', '5.0']
 
     steps:
@@ -423,7 +423,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['14.19.3']
+        node-version: ['14.21.2']
         mongodb-version-ee: ['4.4']
 
     steps:
@@ -521,18 +521,18 @@ jobs:
         run: |
           docker ps
 
-          until echo "$(docker compose -f docker-compose-ci.yml logs ddp-streamer-service)" | grep -q "NetworkBroker started successfully"; do
-            echo "Waiting 'ddp-streamer' to start up"
-            ((c++)) && ((c==10)) && docker compose -f docker-compose-ci.yml logs ddp-streamer-service && exit 1
-            sleep 10
-          done;
-
           until echo "$(docker compose -f docker-compose-ci.yml logs rocketchat)" | grep -q "SERVER RUNNING"; do
             echo "Waiting Rocket.Chat to start up"
             ((c++)) && ((c==10)) && docker compose -f docker-compose-ci.yml logs rocketchat && exit 1
             sleep 10
           done;
 
+          until echo "$(docker compose -f docker-compose-ci.yml logs ddp-streamer-service)" | grep -q "NetworkBroker started successfully"; do
+            echo "Waiting 'ddp-streamer' to start up"
+            ((c++)) && ((c==10)) && docker compose -f docker-compose-ci.yml logs ddp-streamer-service && exit 1
+            sleep 10
+          done;
+
       - name: E2E Test API
         env:
           LOWERCASE_REPOSITORY: ${{ steps.docker-env.outputs.lowercase-repo }}
@@ -693,7 +693,7 @@ jobs:
           aws s3 cp $ROCKET_DEPLOY_DIR/ s3://download.rocket.chat/build/ --recursive
 
           curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \
-              "{\"nodeVersion\": \"14.19.3\", \"compatibleMongoVersions\": [\"4.2\", \"4.4\", \"5.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\"}" \
+              "{\"nodeVersion\": \"14.21.2\", \"compatibleMongoVersions\": [\"4.2\", \"4.4\", \"5.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\"}" \
               https://releases.rocket.chat/update
 
           # Makes build fail if the release isn't there

_templates/package/new/package.json.ejs.t

@@ -11,7 +11,7 @@ to: packages/<%= name %>/package.json
 		"eslint": "^8.12.0",
 		"jest": "^27.5.1",
 		"ts-jest": "^27.1.4",
-		"typescript": "~4.5.5"
+		"typescript": "~4.6.4"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",

_templates/service/new/package.json.ejs.t

@@ -42,7 +42,7 @@ to: ee/apps/<%= name %>/package.json
 		"@types/polka": "^0.5.4",
 		"eslint": "^8.29.0",
 		"ts-node": "^10.9.1",
-		"typescript": "~4.5.5"
+		"typescript": "~4.6.4"
 	},
 	"main": "./dist/ee/apps/<%= name %>/src/service.js",
 	"files": [

apps/meteor/.docker-mongo/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.19.3-bullseye-slim
+FROM node:14.21.2-bullseye-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 

apps/meteor/.docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.19.3-bullseye-slim
+FROM node:14.21.2-bullseye-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 

apps/meteor/.docker/Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM node:14.19.3-alpine3.15
+FROM node:14.21.2-alpine3.16
 
 RUN apk add --no-cache ttf-dejavu
 

apps/meteor/.meteor/packages

@@ -13,33 +13,33 @@ accounts-facebook@1.3.3
 accounts-github@1.5.0
 accounts-google@1.4.0
 accounts-meteor-developer@1.5.0
-accounts-password@2.3.1
+accounts-password@2.3.3
 accounts-twitter@1.5.0
 blaze-html-templates
-check@1.3.1
-ddp-rate-limiter@1.1.0
+check@1.3.2
+ddp-rate-limiter@1.1.1
 ddp-common@1.4.0
 dynamic-import@0.7.2
-ecmascript@0.16.2
-typescript@4.5.4
-ejson@1.1.2
-email@2.2.1
+ecmascript@0.16.4
+typescript@4.6.4
+ejson@1.1.3
+email@2.2.3
 http@2.0.0
 logging@1.3.1
 meteor-base@1.5.1
 mobile-experience@1.1.0
-mongo@1.15.0
-random@1.2.0
+mongo@1.16.3
+random@1.2.1
 rate-limit@1.0.9
-reactive-dict@1.3.0
-reactive-var@1.0.11
+reactive-dict@1.3.1
+reactive-var@1.0.12
 reload@1.3.1
-service-configuration@1.3.0
-session@1.2.0
+service-configuration@1.3.1
+session@1.2.1
 shell-server@0.5.0
 spacebars
-standard-minifier-js@2.8.0
-tracker@1.2.0
+standard-minifier-js@2.8.1
+tracker@1.2.1
 
 rocketchat:livechat
 rocketchat:streamer
@@ -66,27 +66,27 @@ raix:handlebar-helpers
 raix:ui-dropped-event
 
 rocketchat:tap-i18n@3.0.0
-underscore@1.0.10
+underscore@1.0.11
 littledata:synced-cron
 
-accounts-base@2.2.3
-accounts-oauth@1.4.1
+accounts-base@2.2.6
+accounts-oauth@1.4.2
 autoupdate@1.8.0
-babel-compiler@7.9.0
-google-oauth@1.4.2
+babel-compiler@7.10.1
+google-oauth@1.4.3
 htmljs
 matb33:collection-hooks
 meteorhacks:inject-initial
-oauth@2.1.2
-oauth2@1.3.1
+oauth@2.1.3
+oauth2@1.3.2
 routepolicy@1.1.1
 sha@1.0.9
 templating
-webapp@1.13.1
-webapp-hashing@1.1.0
+webapp@1.13.2
+webapp-hashing@1.1.1
 rocketchat:oauth2-server
 rocketchat:i18n
 dandv:caret-position
 facts-base@1.0.1
 url@1.3.2
-standard-minifier-css
+standard-minifier-css@1.8.3

apps/meteor/.meteor/release

@@ -1 +1 @@
-METEOR@2.7.3
+METEOR@2.9.1

apps/meteor/.meteor/versions

@@ -1,51 +1,51 @@
-accounts-base@2.2.3
+accounts-base@2.2.6
 accounts-facebook@1.3.3
 accounts-github@1.5.0
 accounts-google@1.4.0
 accounts-meteor-developer@1.5.0
-accounts-oauth@1.4.1
-accounts-password@2.3.1
+accounts-oauth@1.4.2
+accounts-password@2.3.3
 accounts-twitter@1.5.0
 aldeed:simple-schema@1.5.4
 allow-deny@1.1.1
 autoupdate@1.8.0
-babel-compiler@7.9.0
+babel-compiler@7.10.1
 babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
-blaze@2.6.0
-blaze-html-templates@1.2.1
+blaze@2.6.1
+blaze-html-templates@2.0.0
 blaze-tools@1.1.3
 boilerplate-generator@1.7.1
 caching-compiler@1.2.2
 caching-html-compiler@1.2.1
 callback-hook@1.4.0
-check@1.3.1
+check@1.3.2
 coffeescript@2.4.1
 coffeescript-compiler@2.4.1
 dandv:caret-position@2.1.1
-ddp@1.4.0
-ddp-client@2.5.0
+ddp@1.4.1
+ddp-client@2.6.1
 ddp-common@1.4.0
-ddp-rate-limiter@1.1.0
-ddp-server@2.5.0
+ddp-rate-limiter@1.1.1
+ddp-server@2.6.0
 deps@1.0.12
-diff-sequence@1.1.1
+diff-sequence@1.1.2
 dispatch:run-as-user@1.1.1
 dynamic-import@0.7.2
-ecmascript@0.16.2
+ecmascript@0.16.4
 ecmascript-runtime@0.8.0
 ecmascript-runtime-client@0.12.1
 ecmascript-runtime-server@0.11.0
-ejson@1.1.2
-email@2.2.1
+ejson@1.1.3
+email@2.2.3
 es5-shim@4.8.0
-facebook-oauth@1.11.0
+facebook-oauth@1.11.2
 facts-base@1.0.1
-fetch@0.1.1
-geojson-utils@1.0.10
-github-oauth@1.4.0
-google-oauth@1.4.2
+fetch@0.1.3
+geojson-utils@1.0.11
+github-oauth@1.4.1
+google-oauth@1.4.3
 hot-code-push@1.0.4
 html-tools@1.1.3
 htmljs@1.1.1
@@ -66,45 +66,45 @@ launch-screen@1.3.0
 littledata:synced-cron@1.5.1
 localstorage@1.2.0
 logging@1.3.1
-matb33:collection-hooks@1.1.2
+matb33:collection-hooks@1.2.0
 mdg:validation-error@0.5.1
-meteor@1.10.0
+meteor@1.10.4
 meteor-base@1.5.1
-meteor-developer-oauth@1.3.1
+meteor-developer-oauth@1.3.2
 meteorhacks:inject-initial@1.0.5
-minifier-css@1.6.0
-minifier-js@2.7.4
-minimongo@1.8.0
+minifier-css@1.6.2
+minifier-js@2.7.5
+minimongo@1.9.1
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
-modern-browsers@0.1.8
-modules@0.18.0
-modules-runtime@0.13.0
-mongo@1.15.0
+modern-browsers@0.1.9
+modules@0.19.0
+modules-runtime@0.13.1
+mongo@1.16.3
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
 mrt:reactive-store@0.0.1
 mystor:device-detection@0.2.0
 nooitaf:colors@1.2.0
-npm-mongo@4.3.1
-oauth@2.1.2
-oauth1@1.5.0
-oauth2@1.3.1
+npm-mongo@4.12.1
+oauth@2.1.3
+oauth1@1.5.1
+oauth2@1.3.2
 observe-sequence@1.0.20
 ordered-dict@1.1.0
 ostrio:cookies@2.7.2
 pauli:accounts-linkedin@6.0.0
 pauli:linkedin-oauth@6.0.0
-promise@0.12.0
+promise@0.12.2
 raix:eventemitter@1.0.0
 raix:handlebar-helpers@0.2.5
 raix:ui-dropped-event@0.0.7
-random@1.2.0
+random@1.2.1
 rate-limit@1.0.9
 react-fast-refresh@0.2.3
-reactive-dict@1.3.0
-reactive-var@1.0.11
+reactive-dict@1.3.1
+reactive-var@1.0.12
 reload@1.3.1
 retry@1.1.0
 rocketchat:ddp@0.0.1
@@ -117,25 +117,26 @@ rocketchat:streamer@1.1.0
 rocketchat:tap-i18n@3.0.0
 rocketchat:version@1.0.0
 routepolicy@1.1.1
-service-configuration@1.3.0
-session@1.2.0
+service-configuration@1.3.1
+session@1.2.1
 sha@1.0.9
 shell-server@0.5.0
 simple:json-routes@2.3.1
 socket-stream-client@0.5.0
 spacebars@1.3.0
 spacebars-compiler@1.3.1
-standard-minifier-css@1.8.1
-standard-minifier-js@2.8.0
+standard-minifier-css@1.8.3
+standard-minifier-js@2.8.1
 templating@1.4.2
 templating-compiler@1.4.1
-templating-runtime@1.6.0
+templating-runtime@1.6.1
 templating-tools@1.2.2
-tracker@1.2.0
-twitter-oauth@1.3.0
-typescript@4.5.4
+tracker@1.2.1
+twitter-oauth@1.3.2
+typescript@4.6.4
 ui@1.0.13
-underscore@1.0.10
+underscore@1.0.11
 url@1.3.2
-webapp@1.13.1
-webapp-hashing@1.1.0
+webapp@1.13.2
+webapp-hashing@1.1.1
+zodern:types@1.0.9