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

…ove/iframeLogin * 'develop' of github.com:RocketChat/Rocket.Chat: (33 commits) feat: New records page analytics tab (#30373) chore: Changing some key translations - Setup Wizard (#30462) feat: use isolated-vm to run integration scripts (#30229) fix: do not broadcast events from the local node to the local service (duplicated event) (#30446) fix: Microsoft autotranslate not working (#30390) chore: `ResetPasswordPage` a11y improvements (#30479) chore: `ResetPasswordForm` a11y improvements (#30476) chore: Move bad words filter callback to service (#30241) fix: Message disappears from room after deletion even if "Show Deleted Status" is enabled (#30452) chore: add tooltip to mentions (#30445) chore: bump mongo deps (#30450) ci: patch mongo type definitions (#30449) chore: cache incremental ts check (#30447) Release 6.4.0-rc.4 Release 6.4.0-rc.3 chore: update meteor 2.13.0 (#29989) chore: Assertion accuracy on registration test (#30440) ci: Add step to notify external services about a new release after Docker image publish (#30436) regression: close button not working on contact history (#30432) regression: custom fields not showing in current chats (#30428) ...
RocketChat · Sep 27, 2023 · 663d457 · 663d457
2 parents 7560cec + 27c75f1
commit 663d457
Show file tree

Hide file tree

Showing 161 changed files with 3,155 additions and 1,224 deletions.
diff --git a/.changeset/brave-snakes-scream.md b/.changeset/brave-snakes-scream.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed an issue where broadcasted events were published twice within the same instance
diff --git a/.changeset/bump-patch-1694827499043.md b/.changeset/bump-patch-1694827499043.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1695163548038.md b/.changeset/bump-patch-1695163548038.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1695165575069.md b/.changeset/bump-patch-1695165575069.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/fluffy-monkeys-sing.md b/.changeset/fluffy-monkeys-sing.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Changed the name of the administration Logs page to "Records", implemented a tab layout in this page and added a new tab called "Analytic reports" that shows the most recent result of the statistics endpoint.
diff --git a/.changeset/heavy-zebras-wonder.md b/.changeset/heavy-zebras-wonder.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Show correct date for last day time
diff --git a/.changeset/kind-books-love.md b/.changeset/kind-books-love.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed message disappearing from room after erased even if "Show Deleted Status" is enabled
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -57,6 +57,9 @@
     "bright-snakes-vanish",
     "brown-clouds-add",
     "bump-patch-1694741499930",
+    "bump-patch-1694827499043",
+    "bump-patch-1695163548038",
+    "bump-patch-1695165575069",
     "chilled-flies-fold",
     "chilled-phones-give",
     "cool-students-tan",
@@ -86,6 +89,7 @@
     "grumpy-candles-rule",
     "heavy-baboons-laugh",
     "heavy-cougars-marry",
+    "heavy-zebras-wonder",
     "hip-hounds-ring",
     "hip-mugs-promise",
     "honest-glasses-roll",
@@ -139,7 +143,9 @@
     "strong-laws-pump",
     "swift-birds-build",
     "swift-walls-protect",
+    "tall-pumpkins-cross",
     "tame-pens-occur",
+    "three-ants-give",
     "three-birds-tickle",
     "tidy-bears-camp",
     "tiny-turkeys-burn",

diff --git a/.changeset/thirty-pumpkins-fix.md b/.changeset/thirty-pumpkins-fix.md
@@ -0,0 +1,8 @@
+---
+'@rocket.chat/core-typings': minor
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/tools': minor
+'@rocket.chat/meteor': minor
+---
+
+Added option to select between two script engine options for the integrations
diff --git a/.github/workflows/ci-code-check.yml b/.github/workflows/ci-code-check.yml
@@ -44,6 +44,17 @@ jobs:
 
       - uses: dtinth/setup-github-actions-caching-for-turbo@v1
 
+      - name: Cache TypeCheck
+        uses: actions/cache@v3
+        if: matrix.check == 'ts'
+        with:
+          path: ./apps/meteor/tsconfig.typecheck.tsbuildinfo
+          key: typecheck-cache-${{ runner.OS }}-${{ hashFiles('yarn.lock') }}-${{ github.event.issue.number }}
+          restore-keys: |
+            typecheck-cache-${{ runner.OS }}-${{ hashFiles('yarn.lock') }}
+            typecheck-cache-${{ runner.OS }}
+            typecheck-cache
+
       - name: TS TypeCheck
         if: matrix.check == 'ts'
         run: yarn turbo run typecheck

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -356,13 +356,16 @@ jobs:
           echo finished
 
   deploy:
-    name: 🚀 Publish build and update our registry
+    name: 🚀 Publish build assets
     runs-on: ubuntu-20.04
     if: github.event_name == 'release' || github.ref == 'refs/heads/develop'
     needs: [build-gh-docker, release-versions]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: Bhacaz/checkout-files@v2
+        with:
+          files: package.json
+          branch: ${{ github.ref }}
 
       - name: Restore build
         uses: actions/download-artifact@v3
@@ -376,32 +379,17 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: 'us-east-1'
           GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
-          REDHAT_REGISTRY_PID: ${{ secrets.REDHAT_REGISTRY_PID }}
-          REDHAT_REGISTRY_KEY: ${{ secrets.REDHAT_REGISTRY_KEY }}
-          UPDATE_TOKEN: ${{ secrets.UPDATE_TOKEN }}
         run: |
           REPO_VERSION=$(node -p "require('./package.json').version")
+
           if [[ '${{ github.event_name }}' = 'release' ]]; then
             GIT_TAG="${GITHUB_REF#*tags/}"
-            GIT_BRANCH=""
             ARTIFACT_NAME="${REPO_VERSION}"
-            RC_VERSION=$GIT_TAG
-
-            if [[ '${{ needs.release-versions.outputs.release }}' = 'release-candidate' ]]; then
-              SNAP_CHANNEL=candidate
-              RC_RELEASE=candidate
-            elif [[ '${{ needs.release-versions.outputs.release }}' = 'latest' ]]; then
-              SNAP_CHANNEL=stable
-              RC_RELEASE=stable
-            fi
           else
             GIT_TAG=""
-            GIT_BRANCH="${GITHUB_REF#*heads/}"
             ARTIFACT_NAME="${REPO_VERSION}.$GITHUB_SHA"
-            RC_VERSION="${REPO_VERSION}"
-            SNAP_CHANNEL=edge
-            RC_RELEASE=develop
           fi;
+
           ROCKET_DEPLOY_DIR="/tmp/deploy"
           FILENAME="$ROCKET_DEPLOY_DIR/rocket.chat-$ARTIFACT_NAME.tgz";
 
@@ -419,22 +407,6 @@ 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\": \"${{ needs.release-versions.outputs.node-version }}\", \"compatibleMongoVersions\": [\"4.4\", \"5.0\", \"6.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
-          curl --fail https://releases.rocket.chat/$RC_VERSION/info
-
-          if [[ $GIT_TAG ]]; then
-            curl -X POST \
-              https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
-              -H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
-              -H 'Cache-Control: no-cache' \
-              -H 'Content-Type: application/json' \
-              -d '{"tag":"'$GIT_TAG'"}'
-          fi
-
   build-docker-preview:
     name: 🚢 Build Docker Image (preview)
     runs-on: ubuntu-20.04
@@ -665,6 +637,66 @@ jobs:
 
           echo "::endgroup::"
 
+  notify-services:
+    name: 🚀 Notify external services
+    runs-on: ubuntu-20.04
+    needs:
+      - services-docker-image-publish
+      - docker-image-publish
+      - release-versions
+    steps:
+      - uses: Bhacaz/checkout-files@v2
+        with:
+          files: package.json
+          branch: ${{ github.ref }}
+
+      - name: Releases service
+        env:
+          UPDATE_TOKEN: ${{ secrets.UPDATE_TOKEN }}
+        run: |
+          REPO_VERSION=$(node -p "require('./package.json').version")
+
+          if [[ '${{ github.event_name }}' = 'release' ]]; then
+            GIT_TAG="${GITHUB_REF#*tags/}"
+            GIT_BRANCH=""
+            ARTIFACT_NAME="${REPO_VERSION}"
+            RC_VERSION=$GIT_TAG
+
+            if [[ '${{ needs.release-versions.outputs.release }}' = 'release-candidate' ]]; then
+              RC_RELEASE=candidate
+            elif [[ '${{ needs.release-versions.outputs.release }}' = 'latest' ]]; then
+              RC_RELEASE=stable
+            fi
+          else
+            GIT_TAG=""
+            GIT_BRANCH="${GITHUB_REF#*heads/}"
+            ARTIFACT_NAME="${REPO_VERSION}.$GITHUB_SHA"
+            RC_VERSION="${REPO_VERSION}"
+            RC_RELEASE=develop
+          fi;
+
+          curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \
+              "{\"nodeVersion\": \"${{ needs.release-versions.outputs.node-version }}\", \"compatibleMongoVersions\": [\"4.4\", \"5.0\", \"6.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
+          curl --fail https://releases.rocket.chat/$RC_VERSION/info
+
+      - name: RedHat Registry
+        if: github.event_name == 'release'
+        env:
+          REDHAT_REGISTRY_PID: ${{ secrets.REDHAT_REGISTRY_PID }}
+          REDHAT_REGISTRY_KEY: ${{ secrets.REDHAT_REGISTRY_KEY }}
+        run: |
+          GIT_TAG="${GITHUB_REF#*tags/}"
+
+          curl -X POST \
+            https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
+            -H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
+            -H 'Cache-Control: no-cache' \
+            -H 'Content-Type: application/json' \
+            -d '{"tag":"'$GIT_TAG'"}'
+
   trigger-dependent-workflows:
     runs-on: ubuntu-latest
     if: github.event_name == 'release'

diff --git a/.yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch b/.yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch
@@ -0,0 +1,13 @@
+diff --git a/mongodb.d.ts b/mongodb.d.ts
+index dd080b553309594c28093365ea101adec5c0a20c..20a616de8c97ec68629c01a848ea8df4fe122bf2 100644
+--- a/mongodb.d.ts
++++ b/mongodb.d.ts
+@@ -5539,7 +5539,7 @@ export declare interface MonitorOptions extends Omit<ConnectionOptions, 'id' | '
+  * depth any helpers that make use of NestedPaths should devolve to not asserting any
+  * type safety on the input.
+  */
+-export declare type NestedPaths<Type, Depth extends number[]> = Depth['length'] extends 8 ? [] : Type extends string | number | boolean | Date | RegExp | Buffer | Uint8Array | ((...args: any[]) => any) | {
++export declare type NestedPaths<Type, Depth extends number[]> = Depth['length'] extends 1 ? [] : Type extends string | number | boolean | Date | RegExp | Buffer | Uint8Array | ((...args: any[]) => any) | {
+     _bsontype: string;
+ } ? [] : Type extends ReadonlyArray<infer ArrayType> ? [] | [number, ...NestedPaths<ArrayType, [...Depth, 1]>] : Type extends Map<string, any> ? [string] : Type extends object ? {
+     [Key in Extract<keyof Type, string>]: Type[Key] extends Type ? [Key] : Type extends Type[Key] ? [Key] : Type[Key] extends ReadonlyArray<infer ArrayType> ? Type extends ArrayType ? [Key] : ArrayType extends Type ? [Key] : [
diff --git a/apps/meteor/.docker/Dockerfile.alpine b/apps/meteor/.docker/Dockerfile.alpine
@@ -15,6 +15,11 @@ RUN set -x \
     && npm install [email protected] \
     && mv node_modules/sharp npm/node_modules/sharp \
     # End hack for sharp
+    # Start hack for isolated-vm...
+    && rm -rf npm/node_modules/isolated-vm \
+    && npm install [email protected] \
+    && mv node_modules/isolated-vm npm/node_modules/isolated-vm \
+    # End hack for isolated-vm
     && cd npm \
     && npm rebuild bcrypt --build-from-source \
     && npm cache clear --force \

diff --git a/apps/meteor/.gitignore b/apps/meteor/.gitignore
@@ -87,4 +87,5 @@ out.txt
 dist
 *-session.json
 matrix-federation-config/*
-.eslintcache
+.eslintcache
+tsconfig.typecheck.tsbuildinfo
diff --git a/apps/meteor/.meteor/packages b/apps/meteor/.meteor/packages
@@ -25,7 +25,7 @@ [email protected]
 [email protected]
 
 pauli:accounts-linkedin
-[email protected].3
+[email protected].4
 [email protected]
 [email protected]
 
@@ -39,7 +39,7 @@ [email protected]
 [email protected]
 [email protected]
 
-[email protected].6
+[email protected].7
 
 [email protected]
 [email protected]

diff --git a/apps/meteor/.meteor/release b/apps/meteor/.meteor/release
@@ -1 +1 @@
-METEOR@2.12
+METEOR@2.13.3
diff --git a/apps/meteor/.meteor/versions b/apps/meteor/.meteor/versions
@@ -22,7 +22,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
 dispatch:[email protected]
 [email protected]
@@ -38,7 +38,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].3
+[email protected].4
 [email protected]
 [email protected]
 [email protected]
@@ -47,7 +47,7 @@ [email protected]
 kadira:[email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 meteorhacks:[email protected]
@@ -56,7 +56,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].6
+[email protected].7
 [email protected]
 [email protected]
 [email protected]
@@ -92,7 +92,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
 [email protected]
 [email protected]