-
-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/default-pin-drop
- Loading branch information
Showing
208 changed files
with
10,791 additions
and
8,193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,90 @@ | ||
| 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}", "module_system/**/*.{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", | ||
| overrides: [ | ||
| { | ||
| files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "module_system/**/*.{ts,tsx}"], | ||
| 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", | ||
| // 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", | ||
| }], | ||
| }], | ||
| // 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", | ||
| }, | ||
| }, | ||
| ], | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # prettier | ||
| 7921a6cbf86b035d2b0c1daecb4c24beaf5a5abc |
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.