Merge tag 'v1.11.46' into upgrade/element-web-v1.11.46 (patches not f…

…ixed yet) * Use .well-known to discover a default rendezvous server for use with Sign in with QR ([\#11655](matrix-org/matrix-react-sdk#11655)). Contributed by @hughns. * Message layout will update according to the selected style ([\#10170](matrix-org/matrix-react-sdk#10170)). Fixes #21782. Contributed by @manancodes. * Implement MSC4039: Add an MSC for a new Widget API action to upload files into the media repository ([\#11311](matrix-org/matrix-react-sdk#11311)). Contributed by @dhenneke. * Render space pills with square corners to match new avatar ([\#11632](matrix-org/matrix-react-sdk#11632)). Fixes #26056. * Linkify room topic ([\#11631](matrix-org/matrix-react-sdk#11631)). Fixes #26185. * Show knock rooms in the list ([\#11573](matrix-org/matrix-react-sdk#11573)). Contributed by @maheichyk. * Bump matrix-web-i18n dependency to 3.1.3 ([\#26287](element-hq/element-web#26287)) * Fix: Avatar shrinks with long names ([\#11698](matrix-org/matrix-react-sdk#11698)). Fixes #26252. Contributed by @manancodes. * Update custom translations to support nested fields in structured JSON ([\#11685](matrix-org/matrix-react-sdk#11685)). * Fix: Edited message remove button is hard to reach. ([\#11674](matrix-org/matrix-react-sdk#11674)). Fixes #24917. Contributed by @manancodes. * Fix: Theme selector radio button not aligned in center with the text ([\#11676](matrix-org/matrix-react-sdk#11676)). Fixes #25460. Contributed by @manancodes. * Fix: Unread notification dot aligned ([\#11658](matrix-org/matrix-react-sdk#11658)). Fixes #25285. Contributed by @manancodes. * Fix: sync intentional mentions push rules with legacy rules ([\#11667](matrix-org/matrix-react-sdk#11667)). Fixes #26227. Contributed by @kerryarchibald. * Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](matrix-org/matrix-react-sdk#11634)). Fixes #26209. * Fix: Alignment Fixed ([\#11648](matrix-org/matrix-react-sdk#11648)). Fixes #26169. Contributed by @manancodes. * Fix: onFinished added which closes the menu ([\#11647](matrix-org/matrix-react-sdk#11647)). Fixes #25556. Contributed by @manancodes. * Don't start key backups when opening settings ([\#11640](matrix-org/matrix-react-sdk#11640)). * Fix add to space avatar text centering ([\#11643](matrix-org/matrix-react-sdk#11643)). Fixes #26154. * fix avatar styling in lightbox ([\#11641](matrix-org/matrix-react-sdk#11641)). Fixes #26196.
tchapgouv · Nov 29, 2023 · c04e25a · c04e25a
2 parents bce8b4e + d072737
commit c04e25a
Show file tree

Hide file tree

Showing 14 changed files with 339 additions and 36 deletions.
diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml
@@ -18,22 +18,22 @@ jobs:
                   fetch-depth: 0 # needed for docker-package to be able to calculate the version
 
             - name: Set up QEMU
-              uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2
+              uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55 # v2
+              uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
               with:
                   install: true
 
             - name: Login to Docker Hub
-              uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2
+              uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
               with:
                   username: ${{ secrets.DOCKERHUB_USERNAME }}
                   password: ${{ secrets.DOCKERHUB_TOKEN }}
 
             - name: Docker meta
               id: meta
-              uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4
+              uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5
               with:
                   images: |
                       vectorim/element-web
@@ -44,7 +44,7 @@ jobs:
                       latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
 
             - name: Build and push
-              uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4
+              uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5
               with:
                   context: .
                   push: true

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -31,7 +31,7 @@ jobs:
 
             - name: Get number of CPU cores
               id: cpu-cores
-              uses: SimenB/github-actions-cpu-cores@410541432439795d30db6501fb1d8178eb41e502 # v1
+              uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2
 
             - name: Run tests with coverage
               run: "yarn coverage --ci"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,35 @@
+Changes in [1.11.46](https://github.com/vector-im/element-web/releases/tag/v1.11.46) (2023-10-10)
+=================================================================================================
+
+## ✨ Features
+ * Use .well-known to discover a default rendezvous server for use with Sign in with QR ([\#11655](https://github.com/matrix-org/matrix-react-sdk/pull/11655)). Contributed by @hughns.
+ * Message layout will update according to the selected style  ([\#10170](https://github.com/matrix-org/matrix-react-sdk/pull/10170)). Fixes #21782. Contributed by @manancodes.
+ * Implement MSC4039: Add an MSC for a new Widget API action to upload files into the media repository ([\#11311](https://github.com/matrix-org/matrix-react-sdk/pull/11311)). Contributed by @dhenneke.
+ * Render space pills with square corners to match new avatar ([\#11632](https://github.com/matrix-org/matrix-react-sdk/pull/11632)). Fixes #26056.
+ * Linkify room topic ([\#11631](https://github.com/matrix-org/matrix-react-sdk/pull/11631)). Fixes #26185.
+ * Show knock rooms in the list ([\#11573](https://github.com/matrix-org/matrix-react-sdk/pull/11573)). Contributed by @maheichyk.
+
+## 🐛 Bug Fixes
+ * Bump matrix-web-i18n dependency to 3.1.3 ([\#26287](https://github.com/vector-im/element-web/pull/26287))
+ * Fix: Avatar shrinks with long names ([\#11698](https://github.com/matrix-org/matrix-react-sdk/pull/11698)). Fixes #26252. Contributed by @manancodes.
+ * Update custom translations to support nested fields in structured JSON ([\#11685](https://github.com/matrix-org/matrix-react-sdk/pull/11685)).
+ * Fix: Edited message remove button is hard to reach. ([\#11674](https://github.com/matrix-org/matrix-react-sdk/pull/11674)). Fixes #24917. Contributed by @manancodes.
+ * Fix: Theme selector radio button not aligned in center with the text ([\#11676](https://github.com/matrix-org/matrix-react-sdk/pull/11676)). Fixes #25460. Contributed by @manancodes.
+ * Fix: Unread notification dot aligned ([\#11658](https://github.com/matrix-org/matrix-react-sdk/pull/11658)). Fixes #25285. Contributed by @manancodes.
+ * Fix: sync intentional mentions push rules with legacy rules ([\#11667](https://github.com/matrix-org/matrix-react-sdk/pull/11667)). Fixes #26227. Contributed by @kerryarchibald.
+ * Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](https://github.com/matrix-org/matrix-react-sdk/pull/11634)). Fixes #26209.
+ * Fix: Alignment Fixed ([\#11648](https://github.com/matrix-org/matrix-react-sdk/pull/11648)). Fixes #26169. Contributed by @manancodes.
+ * Fix: onFinished added which closes the menu ([\#11647](https://github.com/matrix-org/matrix-react-sdk/pull/11647)). Fixes #25556. Contributed by @manancodes.
+ * Don't start key backups when opening settings ([\#11640](https://github.com/matrix-org/matrix-react-sdk/pull/11640)).
+ * Fix add to space avatar text centering ([\#11643](https://github.com/matrix-org/matrix-react-sdk/pull/11643)). Fixes #26154.
+ * fix avatar styling in lightbox ([\#11641](https://github.com/matrix-org/matrix-react-sdk/pull/11641)). Fixes #26196.
+
+Changes in [1.11.45](https://github.com/vector-im/element-web/releases/tag/v1.11.45) (2023-09-29)
+=================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix Emoji font on Safari 17 ([\#11673](https://github.com/matrix-org/matrix-react-sdk/pull/11673)).
+
 Changes in [1.11.44](https://github.com/vector-im/element-web/releases/tag/v1.11.44) (2023-09-26)
 =================================================================================================
 

diff --git a/docs/labs.md b/docs/labs.md
@@ -134,6 +134,10 @@ This setting is (currently) _sticky_ to a user's session: it only takes effect w
 
 Refactors visually the room header and room sidebar
 
+## Enable the notifications panel in the room header (`feature_notifications`)
+
+Unreliable in encrypted rooms.
+
 ## Knock rooms (`feature_ask_to_join`) [In Development]
 
 Enables knock feature for rooms. This allows users to ask to join a room.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "element-web",
     "productName": "Tchap",
     "version": "4.3.11",
-    "version-element-web": "1.11.44",
+    "version-element-web": "1.11.46",
     "description": "A feature-rich client for Matrix.org",
     "author": "DINUM",
     "repository": {
@@ -89,8 +89,8 @@
         "jsrsasign": "^10.5.25",
         "katex": "^0.16.0",
         "lodash": "^4.17.21",
-        "matrix-js-sdk": "28.2.0",
-        "matrix-react-sdk": "3.81.0",
+        "matrix-js-sdk": "29.0.0",
+        "matrix-react-sdk": "3.82.0",
         "matrix-widget-api": "^1.3.1",
         "react": "17.0.2",
         "react-dom": "17.0.2",
@@ -183,7 +183,7 @@
         "json-loader": "^0.5.7",
         "loader-utils": "^3.0.0",
         "matrix-mock-request": "^2.5.0",
-        "matrix-web-i18n": "^3.1.1",
+        "matrix-web-i18n": "^3.1.3",
         "mini-css-extract-plugin": "^1",
         "minimist": "^1.2.6",
         "mkdirp": "^3.0.0",

diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
@@ -39,7 +39,7 @@ import type EN from "./i18n/strings/en_EN.json";
  * which we know will be injected by webpack.
  */
 
-export type TranslationKey = Leaves<typeof EN & typeof ReactEN, "|", string | { other: string }>;
+export type TranslationKey = Leaves<typeof EN & typeof ReactEN, "|", string | { other: string }, 4>;
 
 export class UserFriendlyError extends ReactUserFriendlyError {
     public constructor(message: TranslationKey, substitutionVariablesAndCause?: IVariables & ErrorOptions) {

diff --git a/test/setup/setupLanguage.ts b/test/setup/setupLanguage.ts
@@ -25,6 +25,6 @@ fetchMock.config.overwriteRoutes = false;
 
 export function setupLanguageMock() {
     reactSetupLanguageMock();
-    fetchMock.get("end:en_EN.json", _.merge(en, reactEn), { overwriteRoutes: true });
+    fetchMock.get("end:en_EN.json", _.merge({}, en, reactEn), { overwriteRoutes: true });
 }
 setupLanguageMock();
diff --git a/test/unit-tests/async-components/structures/ErrorView-test.tsx b/test/unit-tests/async-components/structures/ErrorView-test.tsx
@@ -18,8 +18,13 @@ import * as React from "react";
 import { render } from "@testing-library/react";
 
 import ErrorView from "../../../../src/async-components/structures/ErrorView";
+import { setupLanguageMock } from "../../../setup/setupLanguage";
 
 describe("<ErrorView />", () => {
+    beforeEach(() => {
+        setupLanguageMock();
+    });
+
     it("should match snapshot", () => {
         const { asFragment } = render(<ErrorView title="TITLE" messages={["MSG1", "MSG2"]} />);
         expect(asFragment()).toMatchSnapshot();

diff --git a/test/unit-tests/components/views/auth/VectorAuthFooter-test.tsx b/test/unit-tests/components/views/auth/VectorAuthFooter-test.tsx
@@ -18,8 +18,13 @@ import * as React from "react";
 import { render } from "@testing-library/react";
 
 import VectorAuthFooter from "../../../../../src/components/views/auth/VectorAuthFooter";
+import { setupLanguageMock } from "../../../../setup/setupLanguage";
 
 describe("<VectorAuthFooter />", () => {
+    beforeEach(() => {
+        setupLanguageMock();
+    });
+
     it("should match snapshot", () => {
         const { asFragment } = render(<VectorAuthFooter />);
         expect(asFragment()).toMatchSnapshot();

diff --git a/test/unit-tests/components/views/auth/VectorAuthPage-test.tsx b/test/unit-tests/components/views/auth/VectorAuthPage-test.tsx
@@ -18,8 +18,13 @@ import * as React from "react";
 import { render } from "@testing-library/react";
 
 import VectorAuthPage from "../../../../../src/components/views/auth/VectorAuthPage";
+import { setupLanguageMock } from "../../../../setup/setupLanguage";
 
 describe("<VectorAuthPage />", () => {
+    beforeEach(() => {
+        setupLanguageMock();
+    });
+
     it("should match snapshot", () => {
         const { asFragment } = render(<VectorAuthPage />);
         expect(asFragment()).toMatchSnapshot();

diff --git a/test/unit-tests/vector/platform/ElectronPlatform-test.ts b/test/unit-tests/vector/platform/ElectronPlatform-test.ts
@@ -26,6 +26,7 @@ import DesktopCapturerSourcePicker from "matrix-react-sdk/src/components/views/e
 import { mocked } from "jest-mock";
 
 import ElectronPlatform from "../../../../src/vector/platform/ElectronPlatform";
+import { setupLanguageMock } from "../../../setup/setupLanguage";
 
 jest.mock("matrix-react-sdk/src/rageshake/rageshake", () => ({
     flush: jest.fn(),
@@ -51,6 +52,7 @@ describe("ElectronPlatform", () => {
         window.electron = mockElectron;
         jest.clearAllMocks();
         Object.defineProperty(window, "navigator", { value: { userAgent: defaultUserAgent }, writable: true });
+        setupLanguageMock();
     });
 
     const getElectronEventHandlerCall = (eventType: string): [type: string, handler: Function] | undefined =>

diff --git a/test/unit-tests/vector/platform/WebPlatform-test.ts b/test/unit-tests/vector/platform/WebPlatform-test.ts
@@ -19,12 +19,14 @@ import { UpdateCheckStatus } from "matrix-react-sdk/src/BasePlatform";
 import { MatrixClientPeg } from "matrix-react-sdk/src/MatrixClientPeg";
 
 import WebPlatform from "../../../../src/vector/platform/WebPlatform";
+import { setupLanguageMock } from "../../../setup/setupLanguage";
 
 fetchMock.config.overwriteRoutes = true;
 
 describe("WebPlatform", () => {
     beforeEach(() => {
         jest.clearAllMocks();
+        setupLanguageMock();
     });
 
     it("returns human readable name", () => {

diff --git a/tsconfig.json b/tsconfig.json
@@ -12,7 +12,7 @@
         "outDir": "./lib",
         "declaration": true,
         "jsx": "react",
-        "lib": ["es2020", "dom", "dom.iterable"],
+        "lib": ["es2021", "dom", "dom.iterable"],
         "strict": true
     },
     "include": [