Merge tag 'v3.6.0' into AMP.chat

[Full Changelog](matrix-org/matrix-react-sdk@v3.6.0-rc.1...v3.6.0)
* Upgrade JS SDK to 8.5.0
* [Release] Fix templating for v1 jitsi widgets
[\matrix-org#5306](matrix-org#5306)
* [Release] Use new preparing event for widget communications
[\matrix-org#5304](matrix-org#5304)

Change-Id: Ia0572048c370cf386992faab220330afb8693393

Author: awesome-michael

.eslintignore.errorfiles

@@ -2,7 +2,6 @@
 
 src/components/structures/RoomDirectory.js
 src/components/structures/RoomStatusBar.js
-src/components/structures/RoomView.js
 src/components/structures/ScrollPanel.js
 src/components/structures/SearchBox.js
 src/components/structures/UploadBar.js

.eslintrc.js

@@ -1,121 +1,34 @@
-const path = require('path');
-
-// get the path of the js-sdk so we can extend the config
-// eslint supports loading extended configs by module,
-// but only if they come from a module that starts with eslint-config-
-// So we load the filename directly (and it could be in node_modules/
-// or or ../node_modules/ etc)
-//
-// We add a `..` to the end because the js-sdk lives out of lib/, but the eslint
-// config is at the project root.
-const matrixJsSdkPath = path.join(path.dirname(require.resolve('matrix-js-sdk')), '..');
-
 module.exports = {
+    extends: ["matrix-org", "matrix-org/react-legacy"],
     parser: "babel-eslint",
-    extends: [matrixJsSdkPath + "/.eslintrc.js"],
-    plugins: [
-      "react",
-      "react-hooks",
-      "flowtype",
-      "babel"
-    ],
-    globals: {
-        LANGUAGES_FILE: "readonly",
-    },
+
     env: {
-        es6: true,
+        browser: true,
+        node: true,
     },
-    parserOptions: {
-        ecmaFeatures: {
-            jsx: true,
-            legacyDecorators: true,
-        }
+    globals: {
+        LANGUAGES_FILE: "readonly",
     },
     rules: {
-        // eslint's built in no-invalid-this rule breaks with class properties
-        "no-invalid-this": "off",
-        // so we replace it with a version that is class property aware
-        "babel/no-invalid-this": "error",
-
-        // We appear to follow this most of the time, so let's enforce it instead
-        // of occasionally following it (or catching it in review)
-        "keyword-spacing": "error",
-
-        /** react **/
-        // This just uses the react plugin to help eslint known when
-        // variables have been used in JSX
-        "react/jsx-uses-vars": "error",
-        // Don't mark React as unused if we're using JSX
-        "react/jsx-uses-react": "error",
-
-        // bind or arrow function in props causes performance issues
-        // (but we currently use them in some places)
-        // It's disabled here, but we should using it sparingly.
-        "react/jsx-no-bind": "off",
-        "react/jsx-key": ["error"],
-
-        // Components in JSX should always be defined.
-        "react/jsx-no-undef": "error",
-
-        // Assert no spacing in JSX curly brackets
-        // <Element prop={ consideredError} prop={notConsideredError} />
-        //
-        // https://github.com/yannickcr/eslint-plugin-react/blob/HEAD/docs/rules/jsx-curly-spacing.md
-        //
-        // Disabled for now - if anything we'd like to *enforce* spacing in JSX
-        // curly brackets for legibility, but in practice it's not clear that the
-        // consistency particularly improves legibility here. --Matthew
-        //
-        // "react/jsx-curly-spacing": ["error", {"when": "never", "children": {"when": "always"}}],
-
-        // Assert spacing before self-closing JSX tags, and no spacing before or
-        // after the closing slash, and no spacing after the opening bracket of
-        // the opening tag or closing tag.
-        //
-        // https://github.com/yannickcr/eslint-plugin-react/blob/HEAD/docs/rules/jsx-tag-spacing.md
-        "react/jsx-tag-spacing": ["error"],
-
-        /** flowtype **/
-        "flowtype/require-parameter-type": ["warn", {
-            "excludeArrowFunctions": true,
-        }],
-        "flowtype/define-flow-type": "warn",
-        "flowtype/require-return-type": ["warn",
-            "always",
-            {
-              "annotateUndefined": "never",
-              "excludeArrowFunctions": true,
-            }
-        ],
-        "flowtype/space-after-type-colon": ["warn", "always"],
-        "flowtype/space-before-type-colon": ["warn", "never"],
-
-        /*
-         * things that are errors in the js-sdk config that the current
-         * code does not adhere to, turned down to warn
-         */
-        "max-len": ["warn", {
-            // apparently people believe the length limit shouldn't apply
-            // to JSX.
-            ignorePattern: '^\\s*<',
-            ignoreComments: true,
-            ignoreRegExpLiterals: true,
-            code: 120,
-        }],
-        "valid-jsdoc": ["warn"],
-        "new-cap": ["warn"],
-        "key-spacing": ["warn"],
-        "prefer-const": ["warn"],
-
-        // crashes currently: https://github.com/eslint/eslint/issues/6274
-        "generator-star-spacing": "off",
-
-        "react-hooks/rules-of-hooks": "error",
-        "react-hooks/exhaustive-deps": "warn",
+        // Things we do that break the ideal style
+        "no-constant-condition": "off",
+        "prefer-promise-reject-errors": "off",
+        "no-async-promise-executor": "off",
+        "quotes": "off",
+        "indent": "off",
     },
-    settings: {
-        flowtype: {
-            onlyFilesWithFlowAnnotation: true
+
+    overrides: [{
+        "files": ["src/**/*.{ts,tsx}"],
+        "extends": ["matrix-org/ts"],
+        "rules": {
+            // 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",
+
+            "quotes": "off",
+            "no-extra-boolean-cast": "off",
         },
-    },
+    }],
 };

.stylelintrc.js

@@ -17,7 +17,7 @@ module.exports = {
         "at-rule-no-unknown": null,
         "no-descending-specificity": null,
         "scss/at-rule-no-unknown": [true, {
-            // https://github.com/vector-im/riot-web/issues/10544
+            // https://github.com/vector-im/element-web/issues/10544
             "ignoreAtRules": ["define-mixin"],
         }],
     }