Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into reg/…

…jumpMessage * 'develop' of github.com:RocketChat/Rocket.Chat: (27 commits) Chore: Remove unused migrations (#26102) Regression: Fix files list endpoints (#26226) Regression: Fix Omnichannel not working after meteor update (#26194) Regression: Empty URL previews in messages. (#26160) Regression: OTR with new React Messages (#26179) Regression: Replace contact center icon (#26216) Regression: Fix rendered markdown styling on app info page details section (#26093) [BREAK] Remove webRTC for channels/dm/groups (#26225) Regression: Meteor uses projection for its observes (#26223) Chore: Do not log integrations using `name` key (#26163) Chore: Check for env var values and not just if they are set (#26219) Regression: UIKit buttons auth user validation (#26171) Regression: Cannot logout when CallProvider is unregistered and mounted (#26158) Regression: Change Audio settings for device settings as modal title (#26159) Regression: Inline code and copyonly tag styles (#26173) Regression: remove italic from reaction translation (#26152) Regression: Reverting @rocket.chat/mp3-encoder version to fix Audio Message (#26197) Chore: Info page (#26201) Regression: Fix command previews (#26199) Change Apps-Engine version source for info (#26205) ...
RocketChat · Jul 12, 2022 · b003601 · b003601
2 parents 7ded251 + 1c58b45
commit b003601
Show file tree

Hide file tree

Showing 293 changed files with 3,367 additions and 5,191 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -15,8 +15,8 @@ concurrency:
 
 env:
   CI: true
-  MONGO_URL: mongodb://localhost:27017/rocketchat
-  MONGO_OPLOG_URL: mongodb://mongo:27017/local
+  MONGO_URL: mongodb://localhost:27017/rocketchat?replicaSet=rs0&directConnection=true
+  MONGO_OPLOG_URL: mongodb://mongodb:27017/local?replicaSet=rs0&directConnection=true
   TOOL_NODE_FLAGS: --max_old_space_size=4096
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
 
@@ -79,10 +79,10 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.18.3
+      - name: Use Node.js 14.19.3
         uses: actions/setup-node@v3
         with:
-          node-version: '14.18.3'
+          node-version: '14.19.3'
           cache: 'yarn'
 
       - name: Free disk space
@@ -224,14 +224,15 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['14.18.3']
+        node-version: ['14.19.3']
         mongodb-version: ['4.2', '4.4', '5.0']
 
     steps:
       - name: Launch MongoDB
-        uses: wbari/[email protected]
+        uses: supercharge/[email protected]
         with:
-          mongoDBVersion: ${{ matrix.mongodb-version }} --replSet=rs0
+          mongodb-version: ${{ matrix.mongodb-version }}
+          mongodb-replica-set: rs0
 
       - uses: actions/checkout@v3
 
@@ -244,11 +245,6 @@ jobs:
       - name: Setup Chrome
         run: npm i chromedriver
 
-      - name: Configure Replica Set
-        run: |
-          docker exec mongo mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
-          docker exec mongo mongo --eval 'rs.status()'
-
       - name: yarn install
         run: yarn
 
@@ -310,21 +306,27 @@ jobs:
           IMAGE_NAME="ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${IMAGE_TAG}"
 
           docker run --name rocketchat -d \
-            --link mongo \
+            --link mongodb \
             -p 3000:3000 \
             -e TEST_MODE=true \
-            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
-            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e "MONGO_URL=mongodb://mongodb:27017/rocketchat?replicaSet=rs0&directConnection=true" \
+            -e "MONGO_OPLOG_URL=mongodb://mongodb:27017/local?replicaSet=rs0&directConnection=true" \
             ${IMAGE_NAME}
 
+          until echo "$(docker logs rocketchat)" | grep -q "SERVER RUNNING"; do
+            echo "Waiting Rocket.Chat to start up"
+            ((c++)) && ((c==10)) && exit 1
+            sleep 10
+          done
+
       - name: E2E Test API
         run: |
           docker logs rocketchat --tail=50
 
           cd ./apps/meteor
           for i in $(seq 1 5); do
             docker stop rocketchat
-            docker exec mongo mongo rocketchat --eval 'db.dropDatabase()'
+            docker exec mongodb mongo rocketchat --eval 'db.dropDatabase()'
 
             NOW=$(date "+%Y-%m-%dT%H:%M:%SZ")
             echo $NOW
@@ -354,7 +356,7 @@ jobs:
           docker logs rocketchat --tail=50
 
           docker stop rocketchat
-          docker exec mongo mongo rocketchat --eval 'db.dropDatabase()'
+          docker exec mongodb mongo rocketchat --eval 'db.dropDatabase()'
 
           NOW=$(date "+%Y-%m-%dT%H:%M:%SZ")
           echo $NOW
@@ -383,14 +385,15 @@ jobs:
 
     strategy:
       matrix:
-        node-version: ['14.18.3']
+        node-version: ['14.19.3']
         mongodb-version-ee: ['4.4']
 
     steps:
       - name: Launch MongoDB
-        uses: wbari/[email protected]
+        uses: supercharge/[email protected]
         with:
-          mongoDBVersion: ${{ matrix.mongodb-version-ee }} --replSet=rs0
+          mongodb-version: ${{ matrix.mongodb-version-ee }}
+          mongodb-replica-set: rs0
 
       - name: Launch NATS
         run: sudo docker run --name nats -d -p 4222:4222 nats:2.4
@@ -406,11 +409,6 @@ jobs:
       - name: Setup Chrome
         run: npm i chromedriver
 
-      - name: Configure Replica Set
-        run: |
-          docker exec mongo mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
-          docker exec mongo mongo --eval 'rs.status()'
-
       - name: TurboRepo local server
         uses: felixmosh/turborepo-gh-artifacts@v1
         with:
@@ -499,11 +497,11 @@ jobs:
           LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
 
           docker run --name rocketchat -d \
-            --link mongo \
+            --link mongodb \
             --link nats \
             -e TEST_MODE=true \
-            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
-            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e "MONGO_URL=mongodb://mongodb:27017/rocketchat?replicaSet=rs0&directConnection=true" \
+            -e "MONGO_OPLOG_URL=mongodb://mongodb:27017/local?replicaSet=rs0&directConnection=true" \
             -e TRANSPORTER=nats://nats:4222 \
             -e MOLECULER_LOG_LEVEL=info \
             -e ENTERPRISE_LICENSE="${{ secrets.ENTERPRISE_LICENSE }}" \
@@ -513,11 +511,11 @@ jobs:
 
           # spin up all micro services
           docker run --name ddp-streamer -d \
-            --link mongo \
+            --link mongodb \
             --link nats \
             -e PORT=4000 \
-            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
-            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e "MONGO_URL=mongodb://mongodb:27017/rocketchat?replicaSet=rs0&directConnection=true" \
+            -e "MONGO_OPLOG_URL=mongodb://mongodb:27017/local?replicaSet=rs0&directConnection=true" \
             -e TRANSPORTER=nats://nats:4222 \
             -e MOLECULER_LOG_LEVEL=info \
             --label 'traefik.http.services.ddp-streamer.loadbalancer.server.port=4000' \
@@ -529,10 +527,10 @@ jobs:
           LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
 
           docker run --name stream-hub -d \
-            --link mongo \
+            --link mongodb \
             --link nats \
-            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
-            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e "MONGO_URL=mongodb://mongodb:27017/rocketchat?replicaSet=rs0&directConnection=true" \
+            -e "MONGO_OPLOG_URL=mongodb://mongodb:27017/local?replicaSet=rs0&directConnection=true" \
             -e TRANSPORTER=nats://nats:4222 \
             -e MOLECULER_LOG_LEVEL=info \
             ghcr.io/${LOWERCASE_REPOSITORY}/stream-hub-service:${{ needs.release-versions.outputs.gh-docker-tag }}
@@ -548,10 +546,10 @@ jobs:
           LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
 
           docker run --name account -d \
-            --link mongo \
+            --link mongodb \
             --link nats \
-            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
-            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e "MONGO_URL=mongodb://mongodb:27017/rocketchat?replicaSet=rs0&directConnection=true" \
+            -e "MONGO_OPLOG_URL=mongodb://mongodb:27017/local?replicaSet=rs0&directConnection=true" \
             -e TRANSPORTER=nats://nats:4222 \
             -e MOLECULER_LOG_LEVEL=info \
             ghcr.io/${LOWERCASE_REPOSITORY}/account-service:${{ needs.release-versions.outputs.gh-docker-tag }}
@@ -567,10 +565,10 @@ jobs:
           LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
 
           docker run --name authorization -d \
-            --link mongo \
+            --link mongodb \
             --link nats \
-            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
-            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e "MONGO_URL=mongodb://mongodb:27017/rocketchat?replicaSet=rs0&directConnection=true" \
+            -e "MONGO_OPLOG_URL=mongodb://mongodb:27017/local?replicaSet=rs0&directConnection=true" \
             -e TRANSPORTER=nats://nats:4222 \
             -e MOLECULER_LOG_LEVEL=info \
             ghcr.io/${LOWERCASE_REPOSITORY}/authorization-service:${{ needs.release-versions.outputs.gh-docker-tag }}
@@ -586,10 +584,10 @@ jobs:
           LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
 
           docker run --name presence -d \
-            --link mongo \
+            --link mongodb \
             --link nats \
-            -e MONGO_URL=mongodb://mongo:27017/rocketchat \
-            -e MONGO_OPLOG_URL=mongodb://mongo:27017/local \
+            -e "MONGO_URL=mongodb://mongodb:27017/rocketchat?replicaSet=rs0&directConnection=true" \
+            -e "MONGO_OPLOG_URL=mongodb://mongodb:27017/local?replicaSet=rs0&directConnection=true" \
             -e TRANSPORTER=nats://nats:4222 \
             -e MOLECULER_LOG_LEVEL=info \
             ghcr.io/${LOWERCASE_REPOSITORY}/presence-service:${{ needs.release-versions.outputs.gh-docker-tag }}
@@ -611,7 +609,7 @@ jobs:
             docker stop ddp-streamer
             docker stop presence
 
-            docker exec mongo mongo rocketchat --eval 'db.dropDatabase()'
+            docker exec mongodb mongo rocketchat --eval 'db.dropDatabase()'
 
             NOW=$(date "+%Y-%m-%dT%H:%M:%SZ")
             echo $NOW
@@ -659,7 +657,7 @@ jobs:
           docker stop ddp-streamer
           docker stop presence
 
-          docker exec mongo mongo rocketchat --eval 'db.dropDatabase()'
+          docker exec mongodb mongo rocketchat --eval 'db.dropDatabase()'
 
           NOW=$(date "+%Y-%m-%dT%H:%M:%SZ")
           echo $NOW
@@ -758,7 +756,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.18.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.19.3\", \"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

diff --git a/_templates/package/new/package.json.ejs.t b/_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.3.4"
+		"typescript": "~4.5.5"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",

diff --git a/apps/meteor/.docker-mongo/Dockerfile b/apps/meteor/.docker-mongo/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.18.3-bullseye-slim
+FROM node:14.19.3-bullseye-slim
 
 LABEL maintainer="[email protected]"
 

diff --git a/apps/meteor/.docker/Dockerfile b/apps/meteor/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14.18.3-bullseye-slim
+FROM node:14.19.3-bullseye-slim
 
 LABEL maintainer="[email protected]"
 

diff --git a/apps/meteor/.docker/Dockerfile.alpine b/apps/meteor/.docker/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM node:14.18.3-alpine3.15
+FROM node:14.19.3-alpine3.15
 
 RUN apk add --no-cache ttf-dejavu
 

diff --git a/apps/meteor/.meteor/packages b/apps/meteor/.meteor/packages
@@ -1,6 +1,9 @@
 # Meteor packages used by this project, one per line.
+
 #
+
 # 'meteor add' and 'meteor remove' will edit this file for you,
+
 # but you can also edit it by hand.
 
 rocketchat:ddp
@@ -10,22 +13,22 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-accounts-password@2.2.0
+accounts-password@2.3.1
 [email protected]
 blaze-html-templates
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].1
-typescript@4.4.1
-[email protected].1
-[email protected].0
+[email protected].2
+typescript@4.5.4
+[email protected].2
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-mongo@1.13.0
+mongo@1.15.0
 [email protected]
 [email protected]
 [email protected]
@@ -46,8 +49,11 @@ konecty:multiple-instances-status
 konecty:user-presence
 
 dispatch:run-as-user
-jalik:[email protected]
-jalik:[email protected]
+
+jalik:[email protected]
+jalik:[email protected]
+jalik:[email protected]
+
 jparker:gravatar
 kadira:flow-router
 mizzao:timesync
@@ -64,27 +70,25 @@ rocketchat:[email protected]
 [email protected]
 littledata:synced-cron
 
-edgee:slingshot
-jalik:[email protected]
-[email protected]
-[email protected]
+[email protected]
+[email protected]
 [email protected]
-babel-compiler@7.8.0
-[email protected].1
+babel-compiler@7.9.0
+[email protected].2
 htmljs
 less
 matb33:collection-hooks
 meteorhacks:inject-initial
-[email protected].1
+[email protected].2
 [email protected]
 [email protected]
 [email protected]
 templating
-[email protected].0
+[email protected].1
 [email protected]
 rocketchat:oauth2-server
 rocketchat:i18n
-rocketchat:postcss
 dandv:caret-position
 [email protected]
-url
+[email protected]
+standard-minifier-css
diff --git a/apps/meteor/.meteor/release b/apps/meteor/.meteor/release
@@ -1 +1 @@
-METEOR@2.5.6
+METEOR@2.7.3