Skip to content

Commit 526645c

Browse files
committed
Apply prettier formatting
1 parent 1cac306 commit 526645c

File tree

1,576 files changed

+65862
-62955
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,576 files changed

+65862
-62955
lines changed

.eslintrc.js

+48-48
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
module.exports = {
2-
plugins: [
3-
"matrix-org",
4-
],
5-
extends: [
6-
"plugin:matrix-org/babel",
7-
"plugin:matrix-org/react",
8-
"plugin:matrix-org/a11y",
9-
],
2+
plugins: ["matrix-org"],
3+
extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react", "plugin:matrix-org/a11y"],
104
env: {
115
browser: true,
126
node: true,
@@ -40,34 +34,47 @@ module.exports = {
4034
],
4135

4236
// Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
43-
"no-restricted-imports": ["error", {
44-
"paths": [{
45-
"name": "matrix-js-sdk",
46-
"message": "Please use matrix-js-sdk/src/matrix instead",
47-
}, {
48-
"name": "matrix-js-sdk/",
49-
"message": "Please use matrix-js-sdk/src/matrix instead",
50-
}, {
51-
"name": "matrix-js-sdk/src",
52-
"message": "Please use matrix-js-sdk/src/matrix instead",
53-
}, {
54-
"name": "matrix-js-sdk/src/",
55-
"message": "Please use matrix-js-sdk/src/matrix instead",
56-
}, {
57-
"name": "matrix-js-sdk/src/index",
58-
"message": "Please use matrix-js-sdk/src/matrix instead",
59-
}, {
60-
"name": "matrix-react-sdk",
61-
"message": "Please use matrix-react-sdk/src/index instead",
62-
}, {
63-
"name": "matrix-react-sdk/",
64-
"message": "Please use matrix-react-sdk/src/index instead",
65-
}],
66-
"patterns": [{
67-
"group": ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
68-
"message": "Please use matrix-js-sdk/src/* instead",
69-
}],
70-
}],
37+
"no-restricted-imports": [
38+
"error",
39+
{
40+
paths: [
41+
{
42+
name: "matrix-js-sdk",
43+
message: "Please use matrix-js-sdk/src/matrix instead",
44+
},
45+
{
46+
name: "matrix-js-sdk/",
47+
message: "Please use matrix-js-sdk/src/matrix instead",
48+
},
49+
{
50+
name: "matrix-js-sdk/src",
51+
message: "Please use matrix-js-sdk/src/matrix instead",
52+
},
53+
{
54+
name: "matrix-js-sdk/src/",
55+
message: "Please use matrix-js-sdk/src/matrix instead",
56+
},
57+
{
58+
name: "matrix-js-sdk/src/index",
59+
message: "Please use matrix-js-sdk/src/matrix instead",
60+
},
61+
{
62+
name: "matrix-react-sdk",
63+
message: "Please use matrix-react-sdk/src/index instead",
64+
},
65+
{
66+
name: "matrix-react-sdk/",
67+
message: "Please use matrix-react-sdk/src/index instead",
68+
},
69+
],
70+
patterns: [
71+
{
72+
group: ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
73+
message: "Please use matrix-js-sdk/src/* instead",
74+
},
75+
],
76+
},
77+
],
7178

7279
// There are too many a11y violations to fix at once
7380
// Turn violated rules off until they are fixed
@@ -90,15 +97,8 @@ module.exports = {
9097
},
9198
overrides: [
9299
{
93-
files: [
94-
"src/**/*.{ts,tsx}",
95-
"test/**/*.{ts,tsx}",
96-
"cypress/**/*.ts",
97-
],
98-
extends: [
99-
"plugin:matrix-org/typescript",
100-
"plugin:matrix-org/react",
101-
],
100+
files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "cypress/**/*.ts"],
101+
extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
102102
rules: {
103103
// temporary disabled
104104
"@typescript-eslint/explicit-function-return-type": "off",
@@ -151,12 +151,12 @@ module.exports = {
151151
"src/components/views/rooms/MessageComposer.tsx",
152152
"src/components/views/rooms/ReplyPreview.tsx",
153153
"src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx",
154-
"src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx"
154+
"src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx",
155155
],
156156
rules: {
157157
"@typescript-eslint/no-var-requires": "off",
158158
},
159-
}
159+
},
160160
],
161161
settings: {
162162
react: {
@@ -166,7 +166,7 @@ module.exports = {
166166
};
167167

168168
function buildRestrictedPropertiesOptions(properties, message) {
169-
return properties.map(prop => {
169+
return properties.map((prop) => {
170170
let [object, property] = prop.split(".");
171171
if (object === "*") {
172172
object = undefined;

.github/PULL_REQUEST_TEMPLATE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
## Checklist
44

5-
* [ ] Tests written for new code (and old code if feasible)
6-
* [ ] Linter and other CI checks pass
7-
* [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/matrix-org/matrix-react-sdk/blob/develop/CONTRIBUTING.md))
5+
- [ ] Tests written for new code (and old code if feasible)
6+
- [ ] Linter and other CI checks pass
7+
- [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/matrix-org/matrix-react-sdk/blob/develop/CONTRIBUTING.md))
88

99
<!--
1010
If you would like to specify text for the changelog entry other than your PR title, add the following:

.github/renovate.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [
4-
"github>matrix-org/renovate-config-element-web"
5-
]
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": ["github>matrix-org/renovate-config-element-web"]
64
}

.github/workflows/backport.yml

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
name: Backport
22
on:
3-
pull_request_target:
4-
types:
5-
- closed
6-
- labeled
7-
branches:
8-
- develop
3+
pull_request_target:
4+
types:
5+
- closed
6+
- labeled
7+
branches:
8+
- develop
99

1010
jobs:
11-
backport:
12-
name: Backport
13-
runs-on: ubuntu-latest
14-
# Only react to merged PRs for security reasons.
15-
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
16-
if: >
17-
github.event.pull_request.merged
18-
&& (
19-
github.event.action == 'closed'
20-
|| (
21-
github.event.action == 'labeled'
22-
&& contains(github.event.label.name, 'backport')
23-
)
24-
)
25-
steps:
26-
- uses: tibdex/backport@v2
27-
with:
28-
labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
29-
# We can't use GITHUB_TOKEN here or CI won't run on the new PR
30-
github_token: ${{ secrets.ELEMENT_BOT_TOKEN }}
11+
backport:
12+
name: Backport
13+
runs-on: ubuntu-latest
14+
# Only react to merged PRs for security reasons.
15+
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
16+
if: >
17+
github.event.pull_request.merged
18+
&& (
19+
github.event.action == 'closed'
20+
|| (
21+
github.event.action == 'labeled'
22+
&& contains(github.event.label.name, 'backport')
23+
)
24+
)
25+
steps:
26+
- uses: tibdex/backport@v2
27+
with:
28+
labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
29+
# We can't use GITHUB_TOKEN here or CI won't run on the new PR
30+
github_token: ${{ secrets.ELEMENT_BOT_TOKEN }}

0 commit comments

Comments
 (0)