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

…memberList

* 'develop' of github.com:RocketChat/Rocket.Chat: (72 commits)
  fix: respect useEmoji pref on messages (#28975)
  chore: Move 2fa challenge handler to rest api package (#29263)
  refactor(integrations): Replace Fibers dependency by Deasync (#29081)
  chore: improve server stream typings (#29128)
  fix: Livechat `CSP` whitelist validation (#29278)
  chore: `ListItem` stories (#29251)
  regression(push): fix error when adding headers to send push notification (#29287)
  fix: Handle login services errors (#28795)
  chore: skip hook if HUSKY env var is set to 0 (#29283)
  ci: skip husky hooks on ci (#29279)
  chore: Add `roomName` on Composer placeholder (#29255)
  regression: fix console warnings (#29277)
  ci: fix Release Task
  chore: Add Changesets (#29275)
  feat(Marketplace): Scroll to the top of the marketplace apps list when page changed (#29095)
  fix: Members/Channels list infinite scroll (#28636)
  test: use local httpbin container on github CI's (#29067)
  Bump vm2 version 3.9.19 (#29258)
  i18n: Language update from LingoHub 🤖 on 2023-05-16Z (#29252)
  chore: Composer missing scrollbar color (#29256)
  ...

.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/beige-windows-film.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/web-ui-registration': minor
+---
+
+fix: Handle login services errors

.changeset/config.json

@@ -0,0 +1,13 @@
+{
+	"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
+	"changelog": ["@changesets/changelog-github", { "repo": "RocketChat/Rocket.Chat" }],
+	"commit": false,
+	"fixed": [
+		["@rocket.chat/meteor", "@rocket.chat/core-typings", "@rocket.chat/rest-typings"]
+	],
+	"linked": [],
+	"access": "public",
+	"baseBranch": "develop",
+	"updateInternalDependencies": "patch",
+	"ignore": []
+}

.changeset/large-penguins-suffer.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/gazzodown': minor
+'@rocket.chat/meteor': minor
+---
+
+fix: respect useEmoji preference for messages

.changeset/mean-bottles-work.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixes the Livechat CSP validation, which was incorrectly blocking access to the widget for all non whitelisted domains

.changeset/poor-pants-suffer.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fix: Rocket.Chat.Apps using wrong id parameter to emit settings  
+

.changeset/rare-bats-compare.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+chore: Add `roomName` on Composer placeholder

.changeset/seven-rules-search.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/api-client': minor
+---
+
+Moved from patch monkey solution to official one

.changeset/shy-maps-admire.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/meteor': minor
+'@rocket.chat/api-client': minor
+---
+
+ask for totp if the provided one is invalid

.github/workflows/changesets.yml

@@ -0,0 +1,51 @@
+name: Changesets
+
+on:
+  push:
+    branches:
+      - develop
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  release-versions:
+    name: ⚙️ Variables Setup
+    runs-on: ubuntu-latest
+    outputs:
+      node-version: ${{ steps.var.outputs.node-version }}
+    steps:
+      - uses: Bhacaz/checkout-files@v2
+        with:
+          files: package.json
+          branch: ${{ github.ref }}
+
+      - id: var
+        run: |
+          NODE_VERSION=$(node -p "require('./package.json').engines.node")
+          echo "NODE_VERSION: ${NODE_VERSION}"
+          echo "node-version=${NODE_VERSION}" >> $GITHUB_OUTPUT
+
+  release:
+    name: Release
+    needs: [release-versions]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-node
+        with:
+          node-version: ${{ needs.release-versions.outputs.node-version }}
+          cache-modules: true
+          install: true
+
+      - uses: dtinth/setup-github-actions-caching-for-turbo@v1
+
+      - name: Create Release Pull Request
+        uses: changesets/action@v1
+        with:
+          title: 'chore: Bump packages'
+        env:
+          HUSKY: 0
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci-test-e2e.yml

@@ -96,6 +96,23 @@ jobs:
 
       - uses: dtinth/setup-github-actions-caching-for-turbo@v1
 
+      - name: Start httpbin container and wait for it to be ready
+        run: |
+          docker run -d -p 10000:80 --name httpbin-container kennethreitz/httpbin
+          i=0
+          while [ $i -lt 10 ]; do
+            if curl -s -o /dev/null http://localhost:10000; then
+              echo "httpbin is running"
+              break
+            fi
+            i=$((i + 1))
+            sleep 5
+          done
+          if [ $i -eq 10 ]; then
+            echo "Failed to verify httpbin is running"
+            exit 1
+          fi
+
       - name: yarn build
         run: yarn build
 

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
           echo "LOWERCASE_REPOSITORY: ${LOWERCASE_REPOSITORY}"
           echo "lowercase-repo=${LOWERCASE_REPOSITORY}" >> $GITHUB_OUTPUT
 
-          NODE_VERSION=$(node -p "require('./package.json').volta.node")
+          NODE_VERSION=$(node -p "require('./package.json').engines.node")
           echo "NODE_VERSION: ${NODE_VERSION}"
           echo "node-version=${NODE_VERSION}" >> $GITHUB_OUTPUT
 

.husky/pre-push

@@ -1,2 +1,4 @@
+[ "$HUSKY" = "0" ] && echo "skipping push hook" && exit 0
+
 yarn lint && \
 yarn testunit