Merge branch 'develop' into lingohub_language_update_2023-01-09Z

.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

.github/workflows/pr-title-checker.yml

@@ -7,6 +7,6 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: thehanimo/pr-title-checker@v1.3.4
+      - uses: thehanimo/pr-title-checker@v1.3.6
         with:
           GITHUB_TOKEN: ${{ secrets.RC_TITLE_CHECKER }}

.vscode/client.code-snippets

@@ -0,0 +1,36 @@
+{
+  "Storybook stories module for React component": {
+    "scope": "typescriptreact",
+    "prefix": "sbmodule",
+    "body": [
+      "import type { ComponentMeta, ComponentStory } from '@storybook/react';",
+      "import React from 'react';",
+      "",
+      "import $1 from './$1';",
+      "",
+      "export default {",
+      "\ttitle: '$2',",
+      "\tcomponent: $1,",
+      "} as ComponentMeta<typeof $1>;",
+      "",
+      "export const Example: ComponentStory<typeof $1> = (args) => <$1 {...args} />;",
+    ]
+  },
+  "Storybook meta": {
+    "scope": "typescriptreact",
+    "prefix": "sbmeta",
+    "body": [
+      "export default {",
+      "\ttitle: '$1',",
+      "\tcomponent: $2,",
+      "} as ComponentMeta<typeof $2>;"
+    ]
+  },
+  "Storybook story": {
+    "scope": "typescriptreact",
+    "prefix": "sbstory",
+    "body": [
+      "export const $1: ComponentStory<typeof $2> = (args) => <$2 {...args} />;"
+    ]
+  }
+}

.vscode/settings.json

@@ -14,10 +14,5 @@
 		}
 	],
 	"typescript.tsdk": "./node_modules/typescript/lib",
-	"cSpell.words": [
-		"livechat",
-		"omnichannel",
-		"photoswipe",
-		"tmid"
-	]
+	"cSpell.words": ["katex", "livechat", "omnichannel", "photoswipe", "tmid"]
 }

_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