Merge branch 'develop' into develop

.eslintignore

@@ -1,5 +1,6 @@
-src/component-index.js
 test/end-to-end-tests/node_modules/
 test/end-to-end-tests/element/
 test/end-to-end-tests/synapse/
 test/end-to-end-tests/lib/
+# Legacy skinning file that some people might still have
+src/component-index.js

.eslintrc.js

@@ -40,6 +40,36 @@ module.exports = {
             ),
         ],
 
+        // 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",
+            }],
+        }],
+
         // There are too many a11y violations to fix at once
         // Turn violated rules off until they are fixed
         "jsx-a11y/alt-text": "off",
@@ -57,32 +87,70 @@ module.exports = {
         "jsx-a11y/role-supports-aria-props": "off",
         "jsx-a11y/tabindex-no-positive": "off",
     },
-    overrides: [{
-        files: [
-            "src/**/*.{ts,tsx}",
-            "test/**/*.{ts,tsx}",
-        ],
-        extends: [
-            "plugin:matrix-org/typescript",
-            "plugin:matrix-org/react",
-        ],
-        rules: {
-            // Things we do that break the ideal style
-            "prefer-promise-reject-errors": "off",
-            "quotes": "off",
-            "no-extra-boolean-cast": "off",
+    overrides: [
+        {
+            files: [
+                "src/**/*.{ts,tsx}",
+                "test/**/*.{ts,tsx}",
+            ],
+            extends: [
+                "plugin:matrix-org/typescript",
+                "plugin:matrix-org/react",
+            ],
+            rules: {
+                // Things we do that break the ideal style
+                "prefer-promise-reject-errors": "off",
+                "quotes": "off",
+                "no-extra-boolean-cast": "off",
 
-            // Remove Babel things manually due to override limitations
-            "@babel/no-invalid-this": ["off"],
+                // Remove Babel things manually due to override limitations
+                "@babel/no-invalid-this": ["off"],
 
-            // We're okay being explicit at the moment
-            "@typescript-eslint/no-empty-interface": "off",
-            // We disable this while we're transitioning
-            "@typescript-eslint/no-explicit-any": "off",
-            // We'd rather not do this but we do
-            "@typescript-eslint/ban-ts-comment": "off",
+                // We're okay being explicit at the moment
+                "@typescript-eslint/no-empty-interface": "off",
+                // We disable this while we're transitioning
+                "@typescript-eslint/no-explicit-any": "off",
+                // We'd rather not do this but we do
+                "@typescript-eslint/ban-ts-comment": "off",
+            },
         },
-    }],
+        // temporary override for offending icon require files
+        {
+            files: [
+                "src/SdkConfig.ts",
+                "src/components/structures/FileDropTarget.tsx",
+                "src/components/structures/RoomStatusBar.tsx",
+                "src/components/structures/UserMenu.tsx",
+                "src/components/views/avatars/WidgetAvatar.tsx",
+                "src/components/views/dialogs/AddExistingToSpaceDialog.tsx",
+                "src/components/views/dialogs/ForwardDialog.tsx",
+                "src/components/views/dialogs/InviteDialog.tsx",
+                "src/components/views/dialogs/ModalWidgetDialog.tsx",
+                "src/components/views/dialogs/UploadConfirmDialog.tsx",
+                "src/components/views/dialogs/security/SetupEncryptionDialog.tsx",
+                "src/components/views/elements/AddressTile.tsx",
+                "src/components/views/elements/AppWarning.tsx",
+                "src/components/views/elements/SSOButtons.tsx",
+                "src/components/views/messages/MAudioBody.tsx",
+                "src/components/views/messages/MImageBody.tsx",
+                "src/components/views/messages/MFileBody.tsx",
+                "src/components/views/messages/MStickerBody.tsx",
+                "src/components/views/messages/MVideoBody.tsx",
+                "src/components/views/messages/MVoiceMessageBody.tsx",
+                "src/components/views/right_panel/EncryptionPanel.tsx",
+                "src/components/views/rooms/EntityTile.tsx",
+                "src/components/views/rooms/LinkPreviewGroup.tsx",
+                "src/components/views/rooms/MemberList.tsx",
+                "src/components/views/rooms/MessageComposer.tsx",
+                "src/components/views/rooms/ReplyPreview.tsx",
+                "src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx",
+                "src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx"
+            ],
+            rules: {
+                "@typescript-eslint/no-var-requires": "off",
+            },
+        }
+    ],
     settings: {
         react: {
             version: "detect",

.github/codecov.yml

@@ -0,0 +1,12 @@
+codecov:
+  allow_coverage_offsets: True
+coverage:
+  status:
+    project: off
+    patch: off
+comment:
+  layout: "diff, files"
+  behavior: default
+  require_changes: false
+  require_base: no
+  require_head: no

.github/workflows/develop.yml → .github/workflows/end-to-end-tests.yaml

@@ -1,4 +1,4 @@
-name: Develop
+name: End-to-end Tests
 on:
     # These tests won't work for non-develop branches at the moment as they
     # won't pull in the right versions of other repos, so they're only enabled
@@ -11,6 +11,7 @@ jobs:
     end-to-end:
         runs-on: ubuntu-latest
         env:
+          # This must be set for fetchdep.sh to get the right branch
           PR_NUMBER: ${{github.event.number}}
         container: vectorim/element-web-ci-e2etests-env:latest
         steps:

.github/workflows/layered-build.yaml

@@ -1,10 +1,13 @@
+# Produce a 'layered build' (a build of element-web with this version of
+# react-sdk) and output it as an artifact
 name: Layered Preview Build
 on:
     pull_request:
 jobs:
     build:
         runs-on: ubuntu-latest
         env:
+          # This must be set for fetchdep.sh to get the right branch
           PR_NUMBER: ${{github.event.number}}
         steps:
             - uses: actions/checkout@v2

.github/workflows/netlify.yaml

@@ -1,3 +1,5 @@
+# Triggers after the layered build has finished, taking the artifact
+# and uploading it to netlify
 name: Upload Preview Build to Netlify
 on:
     workflow_run:

.github/workflows/test_coverage.yml

@@ -0,0 +1,34 @@
+name: Test coverage
+on:
+  pull_request: {}
+  push:
+    branches: [develop, main, master]
+jobs:
+  test-coverage:
+    runs-on: ubuntu-latest
+    env:
+      # This must be set for fetchdep.sh to get the right branch
+      PR_NUMBER: ${{github.event.number}}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          # If this is a pull request, make sure we check out its head rather than the
+          # automatically generated merge commit, so that the coverage diff excludes
+          # unrelated changes in the base branch
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || '' }}
+
+      - name: Yarn cache
+        uses: c-hive/gha-yarn-cache@v2
+
+      - name: Install Deps
+        run: "./scripts/ci/install-deps.sh --ignore-scripts"
+
+      - name: Run tests with coverage
+        run: "yarn install && yarn coverage"
+
+      - name: Upload coverage
+        uses: codecov/codecov-action@v2
+        with:
+          fail_ci_if_error: false
+          verbose: true

.github/workflows/typecheck.yaml

@@ -6,6 +6,7 @@ jobs:
     build:
         runs-on: ubuntu-latest
         env:
+          # This must be set for fetchdep.sh to get the right branch
           PR_NUMBER: ${{github.event.number}}
         steps:
             - uses: actions/checkout@v2

.gitignore

@@ -11,6 +11,7 @@ package-lock.json
 /matrix-react-sdk-*.tgz
 
 /.idea
+# Legacy skinning file that some people might still have
 /src/component-index.js
 
 .DS_Store

.stylelintrc.js

@@ -23,5 +23,10 @@ module.exports = {
             // https://github.com/vector-im/element-web/issues/10544
             "ignoreAtRules": ["define-mixin"],
         }],
+        // Disable `&_kind`-style selectors while our unused CSS approach is "Find & Replace All"
+        // rather than a CI thing. Shorthand selectors are harder to detect when searching for a
+        // class name. This regex is trying to *allow* anything except `&words`, such as `&::before`,
+        // `&.mx_Class`, etc.
+        "selector-nested-pattern": "^((&[ :.\\\[,])|([^&]))"
     }
 }