Merge branch 'johannes/webpack-cli-4.10.0' into johannes/webpack-5

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Build
 on:
     pull_request: {}
     push:
-        branches: [master]
+        branches: [develop, master]
 # develop pushes and repository_dispatch handled in build_develop.yaml
 env:
     # These must be set for fetchdep.sh to get the right branch
@@ -10,8 +10,25 @@ env:
     PR_NUMBER: ${{ github.event.pull_request.number }}
 jobs:
     build:
-        name: "Build"
+        name: "Build on ${{ matrix.image }}"
-        runs-on: ubuntu-latest
+        # We build on all 3 platforms to ensure we don't have any OS-specific build incompatibilities
+        strategy:
+            fail-fast: false
+            matrix:
+                image:
+                    - ubuntu-latest
+                    - windows-latest
+                    - macos-latest
+                isDevelop:
+                    - ${{ github.event_name == 'push' && github.ref_name == 'develop' }}
+                # Skip the ubuntu-latest build for the develop branch as the dedicated CD build_develop workflow handles that
+                exclude:
+                    - isDevelop: true
+                      image: ubuntu-latest
+        runs-on: ${{ matrix.image }}
+        defaults:
+            run:
+                shell: bash
         steps:
             - uses: actions/checkout@v4
 

.github/workflows/triage-labelled.yml

@@ -99,45 +99,6 @@ jobs:
                   project-url: https://github.com/orgs/vector-im/projects/48
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
 
-    ps_features1:
-        name: Add labelled issues to PS features team 1
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-Polls') ||
-            contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-            (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
-              !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
-            (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
-              contains(github.event.issue.labels.*.name, 'A-User-Settings'))
-        steps:
-            - uses: actions/add-to-project@main
-              with:
-                  project-url: https://github.com/orgs/vector-im/projects/56
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-    ps_features2:
-        name: Add labelled issues to PS features team 2
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
-            contains(github.event.issue.labels.*.name, 'A-Broadcast')
-        steps:
-            - uses: actions/add-to-project@main
-              with:
-                  project-url: https://github.com/orgs/vector-im/projects/58
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-    ps_features3:
-        name: Add labelled issues to PS features team 3
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
-        steps:
-            - uses: actions/add-to-project@main
-              with:
-                  project-url: https://github.com/orgs/vector-im/projects/57
-                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
     voip:
         name: Add labelled issues to VoIP project board
         runs-on: ubuntu-latest
@@ -159,3 +120,19 @@ jobs:
               with:
                   project-url: https://github.com/orgs/vector-im/projects/57
                   github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
+
+    tech_debt:
+        name: Add labelled issues to tech debt project
+        runs-on: ubuntu-latest
+        if: >
+            contains(github.event.issue.labels.*.name, 'A-Developer-Experience') ||
+            contains(github.event.issue.labels.*.name, 'A-Documentation') ||
+            contains(github.event.issue.labels.*.name, 'A-Packaging') ||
+            contains(github.event.issue.labels.*.name, 'A-Technical-Debt') ||
+            contains(github.event.issue.labels.*.name, 'A-Testing') ||
+            contains(github.event.issue.labels.*.name, 'Z-Flaky-Test')
+        steps:
+            - uses: actions/add-to-project@main
+              with:
+                  project-url: https://github.com/orgs/vector-im/projects/101
+                  github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

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)
 =================================================================================================
 

CONTRIBUTING.md

@@ -204,7 +204,7 @@ and we'll try to fix it :)
 In order to have a concrete record that your contribution is intentional
 and you agree to license it under the same terms as the project's license, we've
 adopted the same lightweight approach that the Linux Kernel
-(https://www.kernel.org/doc/Documentation/SubmittingPatches), Docker
+(https://www.kernel.org/doc/html/latest/process/submitting-patches.html), Docker
 (https://github.com/docker/docker/blob/master/CONTRIBUTING.md), and many other
 projects use: the DCO (Developer Certificate of Origin:
 http://developercertificate.org/). This is a simple declaration that you wrote

code_style.md

@@ -113,15 +113,17 @@ Unless otherwise specified, the following applies to all code:
     }
     ```
 
-14. Explicitly cast to a boolean, rather than relying on implicit truthiness of non-boolean values:
+14. If a variable's type should be boolean, make sure it really is one.
 
     ```typescript
-    const isRealUser = !!userId && ...;
+    const isRealUser = !!userId && ...; // good
-    // ... or ...
+    const isRealUser = Boolean(userId) && Boolean(userName); // also good
-    const isRealUser = Boolean(userId) && ...;
+    const isRealUser = Boolean(userId) && isReal; // also good (where isReal is another boolean variable)
+    const isRealUser = Boolean(userId && userName); // also fine
+    const isRealUser = Boolean(userId || userName); // good: same as &&
+    const isRealUser = userId && ...;   // bad: isRealUser is userId's type, not a boolean
 
-    // but *not*:
+    if (userId) // fine: userId is evaluated for truthiness, not stored as a boolean
-    const isRealUser = userId && ...;   // invalid implicit cast
     ```
 
 15. Use `switch` statements when checking against more than a few enum-like values.

docs/config.md

@@ -139,7 +139,7 @@ complete re-branding/private labeling, a more personalised experience can be ach
    configuration found in the well-known location is used instead.
 10. `welcome_user_id`: An optional user ID to start a DM with after creating an account. Defaults to nothing (no DM created).
 11. `custom_translations_url`: An optional URL to allow overriding of translatable strings. The JSON file must be in a format of
-    `{"affected string": {"languageCode": "new string"}}`. See https://github.com/matrix-org/matrix-react-sdk/pull/7886 for details.
+    `{"affected|translation|key": {"languageCode": "new string"}}`. See https://github.com/matrix-org/matrix-react-sdk/pull/7886 for details.
 12. `branding`: Options for configuring various assets used within the app. Described in more detail down below.
 13. `embedded_pages`: Further optional URLs for various assets used within the app. Described in more detail down below.
 14. `disable_3pid_login`: When `false` (default), **enables** the options to log in with email address or phone number. Set to

docs/translating.md

@@ -1,7 +1,5 @@
 # How to translate Element
 
-# 🚨 Translations are currently frozen as we are migrating Translation Management Systems! 🚨
-
 ## Requirements
 
 -   Web Browser

element.io/develop/config.json

@@ -51,7 +51,7 @@
         "feature_video_rooms": true
     },
     "element_call": {
-        "url": "https://element-call-livekit.netlify.app"
+        "url": "https://call.element.dev"
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "element-web",
-    "version": "1.11.44",
+    "version": "1.11.46",
     "description": "A feature-rich client for Matrix.org",
     "author": "New Vector Ltd.",
     "repository": {
@@ -151,7 +151,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": "^2.7.6",
         "minimist": "^1.2.6",
         "mkdirp": "^3.0.0",

res/apple-app-site-association

@@ -1,26 +1,35 @@
 {
-    "applinks": {
+  "applinks": {
-        "apps": [],
+    "details": [
-        "details": [
+      {
-            {
+        "appIDs": [
-                "appIDs":[
+          "7J4U792NQT.im.vector.app",
-                    "7J4U792NQT.im.vector.app",
+          "7J4U792NQT.io.element.elementx",
-                    "7J4U792NQT.io.element.elementx",
+          "7J4U792NQT.io.element.elementx.nightly",
-                    "7J4U792NQT.io.element.elementx.nightly",
+          "7J4U792NQT.io.element.elementx.pr"
-                    "7J4U792NQT.io.element.elementx.pr"
+        ],
-                ],
+        "components": [
-                "paths": [
+          {
-                    "*"
+            "?": {
-                ]
+              "no_universal_links": "?*"
-            }
+            },
+            "exclude": true,
+            "comment": "Opt out of universal links"
+          },
+          {
+            "/": "/*",
+            "comment": "Matches any URL"
+          }
         ]
-    },
+      }
-    "webcredentials": {
+    ]
-        "apps": [
+  },
-            "7J4U792NQT.im.vector.app",
+  "webcredentials": {
-            "7J4U792NQT.io.element.elementx",
+    "apps": [
-            "7J4U792NQT.io.element.elementx.nightly",
+      "7J4U792NQT.im.vector.app",
-            "7J4U792NQT.io.element.elementx.pr"
+      "7J4U792NQT.io.element.elementx",
-        ]
+      "7J4U792NQT.io.element.elementx.nightly",
-    }
+      "7J4U792NQT.io.element.elementx.pr"
+    ]
+  }
 }

res/manifest.json

@@ -77,6 +77,11 @@
             "url": "https://play.google.com/store/apps/details?id=im.vector.app",
             "id": "im.vector.app"
         },
+        {
+            "platform": "f-droid",
+            "url": "https://f-droid.org/repository/browse/?fdid=im.vector.app",
+            "id": "im.vector.app"
+        },
         {
             "platform": "itunes",
             "url": "https://apps.apple.com/app/vector/id1083446067"

src/async-components/structures/CompatibilityView.tsx

@@ -40,12 +40,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
                 <p>
                     <strong>iOS</strong> (iPhone or iPad)
                 </p>
-                <a
+                <a href={iosCustomUrl} target="_blank" rel="noreferrer noopener" className="mx_ClearDecoration">
-                    href={iosCustomUrl || "https://apps.apple.com/app/vector/id1083446067"}
-                    target="_blank"
-                    rel="noreferrer noopener"
-                    className="mx_ClearDecoration"
-                >
                     <img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
                 </a>
             </>
@@ -63,7 +58,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
         // undefined or string
         android.push(
             <a
-                href={andCustomUrl || "https://play.google.com/store/apps/details?id=im.vector.app"}
+                href={andCustomUrl}
                 target="_blank"
                 rel="noreferrer noopener"
                 className="mx_ClearDecoration"
@@ -77,7 +72,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
         // undefined or string
         android.push(
             <a
-                href={fdroidCustomUrl || "https://f-droid.org/repository/browse/?fdid=im.vector.app"}
+                href={fdroidCustomUrl}
                 target="_blank"
                 rel="noreferrer noopener"
                 className="mx_ClearDecoration"

yarn.lock

@@ -1706,6 +1706,13 @@
   dependencies:
     "@babel/runtime" "^7.17.9"
 
+"@matrix-org/react-sdk-module-api@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.1.1.tgz#54e8617c15185010d608c0325ecaec8d1574d12b"
+  integrity sha512-dYPY3aXtNwPrg2aEmFeWddMdohus/Ha17XES2QH+WMCawt+hH+uq28jH1EmW1RUOOzxVcdY36lRGOwqRtAJbhA==
+  dependencies:
+    "@babel/runtime" "^7.17.9"
+
 "@matrix-org/spec@^1.7.0":
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/@matrix-org/spec/-/spec-1.7.0.tgz#8a6b93edf0d99f8a6e0a25eea8613b5ada3e6b56"
@@ -6030,11 +6037,6 @@ focus-lock@^0.11.6:
   dependencies:
     tslib "^2.0.3"
 
-focus-visible@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/focus-visible/-/focus-visible-5.2.0.tgz#3a9e41fccf587bd25dcc2ef045508284f0a4d6b3"
-  integrity sha512-Rwix9pBtC1Nuy5wysTmKy+UjbDJpIfg8eHjw0rjZ1mX4GNLz1Bmd16uDpI3Gk1i70Fgcs8Csg2lPm8HULFg9DQ==
-
 follow-redirects@^1.0.0:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
@@ -8407,8 +8409,8 @@ matrix-events-sdk@0.0.1:
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "28.2.0"
+  version "29.0.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/d59bb240fa50b736ac6c3cbfff935ee08b697663"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/3cf6f568f3d489e38ca14b5a8927ff27996d96bb"
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.3-alpha.0"
@@ -8433,14 +8435,14 @@ matrix-mock-request@^2.5.0:
     expect "^28.1.0"
 
 "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.81.0"
+  version "3.82.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/13aed62a91e7151246fc38f6c15a79df116792ba"
+  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/217073b7f5d9fc387d190e0ba4f507acece1eb12"
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@matrix-org/analytics-events" "^0.7.0"
     "@matrix-org/emojibase-bindings" "^1.1.2"
     "@matrix-org/matrix-wysiwyg" "^2.4.1"
-    "@matrix-org/react-sdk-module-api" "^2.1.0"
+    "@matrix-org/react-sdk-module-api" "^2.1.1"
     "@matrix-org/spec" "^1.7.0"
     "@sentry/browser" "^7.0.0"
     "@sentry/tracing" "^7.0.0"
@@ -8461,7 +8463,6 @@ matrix-mock-request@^2.5.0:
     escape-html "^1.0.3"
     file-saver "^2.0.5"
     filesize "10.0.12"
-    focus-visible "^5.2.0"
     gfm.css "^1.1.2"
     glob-to-regexp "^0.4.1"
     graphemer "^1.4.0"
@@ -8504,10 +8505,10 @@ matrix-mock-request@^2.5.0:
     uuid "^9.0.0"
     what-input "^5.2.10"
 
-matrix-web-i18n@^3.1.1:
+matrix-web-i18n@^3.1.3:
-  version "3.1.1"
+  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-3.1.1.tgz#da851748515b20ca15fa986817bbce2e242b3dd6"
+  resolved "https://registry.yarnpkg.com/matrix-web-i18n/-/matrix-web-i18n-3.1.3.tgz#b462015b138ebdd288ed945507abea42c896f52d"
-  integrity sha512-BOeOTedtONIqVQUlyHFXpxXkrETWdCoJdToyA+edMU+yGjKOW7bekAd9uAEfkV9jErP5eXw3cHYsKZPpa8ifWg==
+  integrity sha512-9JUUTifqS/Xe6YQr5uDbX04xvr5Pxg8aU7tRKx49/ZLqm4dZoJKo4SKpyLEwCQeNjAvjcKuXibWO+2hkZ2/Ojw==
   dependencies:
     "@babel/parser" "^7.18.5"
     "@babel/traverse" "^7.18.5"