Bump to 4.1.5_1.11.17 (element-web upgrade)

Upgrade/element web v1.11.17 with conflicts resolution, a tag is attached to this merge commit
tchapgouv · Jan 23, 2023 · df222ad · df222ad
2 parents 4a815ab + 2e255ea
commit df222ad
Show file tree

Hide file tree

Showing 215 changed files with 7,473 additions and 7,489 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,82 +1,102 @@
 module.exports = {
     plugins: ["matrix-org"],
-    extends: [
-        "plugin:matrix-org/babel",
-        "plugin:matrix-org/react",
-    ],
+    extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react"],
     env: {
         browser: true,
         node: true,
     },
     rules: {
         // Things we do that break the ideal style
-        "quotes": "off",
+        quotes: "off",
     },
     settings: {
         react: {
-            version: 'detect',
+            version: "detect",
         },
     },
-    overrides: [{
-        files: [
-            "src/**/*.{ts,tsx}",
-            "test/**/*.{ts,tsx}",
-            "module_system/**/*.{ts,tsx}",
-            // :TCHAP: Lint our cypress files, copied from react-sdk. React-sdk lints them too, so we keep up !
-            "cypress/**/*.ts",
-            "test/**/*.{ts,tsx,js}",
-        ],
-        extends: [
-            "plugin:matrix-org/typescript",
-            "plugin:matrix-org/react",
-        ],
-        // NOTE: These rules are frozen and new rules should not be added here.
-        // New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/
-        rules: {
-            // Things we do that break the ideal style
-            "prefer-promise-reject-errors": "off",
-            "quotes": "off",
-
-            // We disable this while we're transitioning
-            "@typescript-eslint/no-explicit-any": "off",
-            // We're okay with assertion errors when we ask for them
-            "@typescript-eslint/no-non-null-assertion": "off",
+    overrides: [
+        {
+            files: [
+                "src/**/*.{ts,tsx}",
+                "test/**/*.{ts,tsx}",
+                "module_system/**/*.{ts,tsx}",
+                // :TCHAP: Lint our cypress files, copied from react-sdk. React-sdk lints them too, so we keep up !
+                "cypress/**/*.ts",
+                "test/**/*.{ts,tsx,js}",
+            ],
+            extends: [
+                "plugin:matrix-org/typescript",
+                "plugin:matrix-org/react",
+            ],
+            // NOTE: These rules are frozen and new rules should not be added here.
+            // New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/
+            rules: {
+                // Things we do that break the ideal style
+                "prefer-promise-reject-errors": "off",
+                "quotes": "off",
 
-            // TCHAP: for cypress only
-            "@typescript-eslint/no-empty-interface": "off",
+                // We disable this while we're transitioning
+                "@typescript-eslint/no-explicit-any": "off",
+                // We're okay with assertion errors when we ask for them
+                "@typescript-eslint/no-non-null-assertion": "off",
 
-            // Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
-            "no-restricted-imports": ["error", {
-                "paths": [{
-                    "name": "matrix-js-sdk",
-                    "message": "Please use matrix-js-sdk/src/matrix instead",
-                }, {
-                    "name": "matrix-js-sdk/",
-                    "message": "Please use matrix-js-sdk/src/matrix instead",
-                }, {
-                    "name": "matrix-js-sdk/src",
-                    "message": "Please use matrix-js-sdk/src/matrix instead",
-                }, {
-                    "name": "matrix-js-sdk/src/",
-                    "message": "Please use matrix-js-sdk/src/matrix instead",
-                }, {
-                    "name": "matrix-js-sdk/src/index",
-                    "message": "Please use matrix-js-sdk/src/matrix instead",
-                }, {
-                    "name": "matrix-react-sdk",
-                    "message": "Please use matrix-react-sdk/src/index instead",
-                }, {
-                    "name": "matrix-react-sdk/",
-                    "message": "Please use matrix-react-sdk/src/index instead",
-                }],
-                "patterns": [{
-                    "group": ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
-                    "message": "Please use matrix-js-sdk/src/* instead",
-                }, {
-                    "group": ["matrix-react-sdk/lib", "matrix-react-sdk/lib/", "matrix-react-sdk/lib/**"],
-                    "message": "Please use matrix-react-sdk/src/* instead",
+                // TCHAP: for cypress only
+                "@typescript-eslint/no-empty-interface": "off",
+                // Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
+                "no-restricted-imports": ["error", {
+                    "paths": [{
+                        "name": "matrix-js-sdk",
+                        "message": "Please use matrix-js-sdk/src/matrix instead",
+                    }, {
+                        "name": "matrix-js-sdk/",
+                        "message": "Please use matrix-js-sdk/src/matrix instead",
+                    }, {
+                        "name": "matrix-js-sdk/src",
+                        "message": "Please use matrix-js-sdk/src/matrix instead",
+                    }, {
+                        "name": "matrix-js-sdk/src/",
+                        "message": "Please use matrix-js-sdk/src/matrix instead",
+                    }, {
+                        "name": "matrix-js-sdk/src/index",
+                        "message": "Please use matrix-js-sdk/src/matrix instead",
+                    }, {
+                        "name": "matrix-react-sdk",
+                        "message": "Please use matrix-react-sdk/src/index instead",
+                    }, {
+                        "name": "matrix-react-sdk/",
+                        "message": "Please use matrix-react-sdk/src/index instead",
+                    }],
+                    "patterns": [{
+                        "group": ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
+                        "message": "Please use matrix-js-sdk/src/* instead",
+                    }, {
+                        "group": ["matrix-react-sdk/lib", "matrix-react-sdk/lib/", "matrix-react-sdk/lib/**"],
+                        "message": "Please use matrix-react-sdk/src/* instead",
+                    }],
                 }],
-            }],
+            },
         },
-    }],
+        {
+            files: ["test/**/*.{ts,tsx}"],
+            rules: {
+                // We don't need super strict typing in test utilities
+                "@typescript-eslint/explicit-function-return-type": "off",
+                "@typescript-eslint/explicit-member-accessibility": "off",
+            },
+        },
+        {
+            files: [
+                "src/**/*Tchap*.{ts,tsx}",
+                "src/**/*ContentScan*.{ts,tsx}",
+                "src/lib/ExpiredAccountHandler.ts",
+                "src/lib/IncomingKeyRequestHandler.ts",
+                "src/components/views/dialogs/ExpiredAccountDialog.tsx",
+            ],
+            rules: {
+                // Tchap files are not up to date yet in proper typescript style. Use warnings instead of errors to unbreak the CI.
+                "@typescript-eslint/explicit-function-return-type": "warn",
+                "@typescript-eslint/explicit-member-accessibility": "warn",
+            },
+        },
+    ],
 };
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1,4 @@
-* @vector-im/element-web
+*                         @vector-im/element-web
+/.github/workflows/**     @vector-im/element-web-app-team
+/package.json             @vector-im/element-web-app-team
+/yarn.lock                @vector-im/element-web-app-team
diff --git a/.github/ISSUE_TEMPLATE/bug-web.yml b/.github/ISSUE_TEMPLATE/bug-web.yml
@@ -2,31 +2,31 @@ name: Bug report for Tchap Web (in browser)
 description: File a bug report if you are using Element in a web browser like Firefox, Chrome, Edge, and so on.
 labels: [web, v4, bug]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
+    - type: markdown
+      attributes:
+          value: |
+              Thanks for taking the time to fill out this bug report!
 
-        Please report security issues by email to [email protected]
-  - type: textarea
-    id: reproduction-steps
-    attributes:
-      label: Steps to reproduce
-      description: Please attach screenshots, videos or logs if you can.
-      placeholder: Tell us what you see!
-      value: |
-        1. Where are you starting? What can you see?
-        2. What do you click?
-        3. More steps…
-    validations:
-      required: true
-  - type: textarea
-    id: result
-    attributes:
-      label: Outcome
-      placeholder: Tell us what went wrong
-      value: |
-        #### What did you expect?
+              Please report security issues by email to [email protected]
+    - type: textarea
+      id: reproduction-steps
+      attributes:
+          label: Steps to reproduce
+          description: Please attach screenshots, videos or logs if you can.
+          placeholder: Tell us what you see!
+          value: |
+              1. Where are you starting? What can you see?
+              2. What do you click?
+              3. More steps…
+      validations:
+          required: true
+    - type: textarea
+      id: result
+      attributes:
+          label: Outcome
+          placeholder: Tell us what went wrong
+          value: |
+              #### What did you expect?
 
         #### What happened instead?
     validations:
@@ -42,7 +42,7 @@ body:
     id: browser
     attributes:
       label: Browser information
-      description: Which browser are you using? Which version?
+      description: Which browser are you using? Which version? 
       placeholder: e.g. Chromium Version 92.0.4515.131
     validations:
       required: false
@@ -78,7 +78,7 @@ body:
       description:  |
         Did you know that you can send a /rageshake command from the web application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
       options:
-        - 'Yes'
-        - 'No'
+        - "Yes"
+        - "No"
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -15,22 +15,22 @@ body:
       value: |
         #### What would you like to do?
 
-        #### Why would you like to do it?
+              #### Why would you like to do it?
 
-        #### How would you like to achieve it?
-    validations:
-      required: true
-  - type: textarea
-    id: alternative
-    attributes:
-      label: Have you considered any alternatives?
-      placeholder: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: false
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      placeholder: Is there anything else you'd like to add?
-    validations:
-      required: false
+              #### How would you like to achieve it?
+      validations:
+          required: true
+    - type: textarea
+      id: alternative
+      attributes:
+          label: Have you considered any alternatives?
+          placeholder: A clear and concise description of any alternative solutions or features you've considered.
+      validations:
+          required: false
+    - type: textarea
+      id: additional-context
+      attributes:
+          label: Additional context
+          placeholder: Is there anything else you'd like to add?
+      validations:
+          required: false
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,9 +2,9 @@
 
 ## Checklist
 
-* [ ] Tests written for new code (and old code if feasible)
-* [ ] Linter and other CI checks pass
-* [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/vector-im/element-web/blob/develop/CONTRIBUTING.md))
+-   [ ] Tests written for new code (and old code if feasible)
+-   [ ] Linter and other CI checks pass
+-   [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/vector-im/element-web/blob/develop/CONTRIBUTING.md))
 
 <!--
 If you would like to specify text for the changelog entry other than your PR title, add the following:

diff --git a/.github/cfp_headers b/.github/cfp_headers
@@ -0,0 +1,10 @@
+/*
+  X-XSS-Protection: 1; mode=block
+  X-Content-Type-Options: nosniff
+  Strict-Transport-Security: max-age=31536000; includeSubDomains; preload
+
+/version
+  Content-Type: text/plain
+
+/apple-app-site-association
+  Content-Type: application/json
diff --git a/.github/deactivated_workflows/backport.yml b/.github/deactivated_workflows/backport.yml
@@ -0,0 +1,30 @@
+name: Backport
+on:
+    pull_request_target:
+        types:
+            - closed
+            - labeled
+        branches:
+            - develop
+
+jobs:
+    backport:
+        name: Backport
+        runs-on: ubuntu-latest
+        # Only react to merged PRs for security reasons.
+        # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
+        if: >
+            github.event.pull_request.merged
+            && (
+              github.event.action == 'closed'
+              || (
+                github.event.action == 'labeled'
+                && contains(github.event.label.name, 'backport')
+              )
+            )
+        steps:
+            - uses: tibdex/backport@v2
+              with:
+                  labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
+                  # We can't use GITHUB_TOKEN here or CI won't run on the new PR
+                  github_token: ${{ secrets.ELEMENT_BOT_TOKEN }}