diff --git a/.devcontainer/codespaces/devcontainer.json b/.devcontainer/codespaces/devcontainer.json
index b32e4026d2374dd6ce7bce5d7094e417ee24e8c8..ca9156fdaa4bf16ea8ed66a8283eab6c88b21277 100644
--- a/.devcontainer/codespaces/devcontainer.json
+++ b/.devcontainer/codespaces/devcontainer.json
@@ -5,7 +5,7 @@
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
"features": {
- "ghcr.io/devcontainers/features/sshd:1": {},
+ "ghcr.io/devcontainers/features/sshd:1": {}
},
"runServices": ["app", "db", "redis"],
@@ -15,16 +15,16 @@
"portsAttributes": {
"3000": {
"label": "web",
- "onAutoForward": "notify",
+ "onAutoForward": "notify"
},
"4000": {
"label": "stream",
- "onAutoForward": "silent",
- },
+ "onAutoForward": "silent"
+ }
},
"otherPortsAttributes": {
- "onAutoForward": "silent",
+ "onAutoForward": "silent"
},
"remoteEnv": {
@@ -33,7 +33,7 @@
"STREAMING_API_BASE_URL": "https://${localEnv:CODESPACE_NAME}-4000.app.github.dev",
"DISABLE_FORGERY_REQUEST_PROTECTION": "true",
"ES_ENABLED": "",
- "LIBRE_TRANSLATE_ENDPOINT": "",
+ "LIBRE_TRANSLATE_ENDPOINT": ""
},
"onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
@@ -43,7 +43,7 @@
"customizations": {
"vscode": {
"settings": {},
- "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"],
- },
- },
+ "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"]
+ }
+ }
}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ed71235b3b3001c59a5ecb3fba2b519d92c97ee2..fa8d6542c18aeca0f7ac8f0717bef4bb9e6f116a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
"features": {
- "ghcr.io/devcontainers/features/sshd:1": {},
+ "ghcr.io/devcontainers/features/sshd:1": {}
},
"forwardPorts": [3000, 4000],
@@ -14,17 +14,17 @@
"3000": {
"label": "web",
"onAutoForward": "notify",
- "requireLocalPort": true,
+ "requireLocalPort": true
},
"4000": {
"label": "stream",
"onAutoForward": "silent",
- "requireLocalPort": true,
- },
+ "requireLocalPort": true
+ }
},
"otherPortsAttributes": {
- "onAutoForward": "silent",
+ "onAutoForward": "silent"
},
"onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
@@ -34,7 +34,7 @@
"customizations": {
"vscode": {
"settings": {},
- "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"],
- },
- },
+ "extensions": ["EditorConfig.EditorConfig", "webben.browserslist"]
+ }
+ }
}
diff --git a/app/javascript/mastodon/test_helpers.tsx b/app/javascript/mastodon/test_helpers.tsx
index 689589556956b4db1ab6c00be5010021d6b4ebb5..69d57b95a0437bdc15e5447a1ad4496b67dd2355 100644
--- a/app/javascript/mastodon/test_helpers.tsx
+++ b/app/javascript/mastodon/test_helpers.tsx
@@ -40,7 +40,7 @@ function render(
ui: React.ReactElement,
{ locale = 'en', signedIn = true, ...renderOptions } = {},
) {
- const Wrapper = (props: { children: React.ReactElement }) => {
+ const Wrapper = (props: { children: React.ReactNode }) => {
return (
<MemoryRouter>
<IntlProvider locale={locale}>
diff --git a/jsconfig.json b/jsconfig.json
index 7b710de83c4fdaa8aec0fbd336a45e71518ae03d..d52816a98b68efb89e30f9795e4bc6bf8ee80e41 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -11,7 +11,7 @@
"noEmit": true,
"resolveJsonModule": true,
"strict": false,
- "target": "ES2022",
+ "target": "ES2022"
},
- "exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"],
+ "exclude": ["**/build/*", "**/node_modules/*", "**/public/*", "**/vendor/*"]
}
diff --git a/streaming/tsconfig.json b/streaming/tsconfig.json
index ba5bd51ff7509dd3b9d0e767febf30fc11613630..37e9a7fee026e3cc01517d501b2e70bafc59c3d2 100644
--- a/streaming/tsconfig.json
+++ b/streaming/tsconfig.json
@@ -6,7 +6,7 @@
"moduleResolution": "NodeNext",
"noUnusedParameters": false,
"tsBuildInfoFile": "../tmp/cache/streaming/tsconfig.tsbuildinfo",
- "paths": {},
+ "paths": {}
},
- "include": ["./*.js", "./.eslintrc.cjs"],
+ "include": ["./*.js", "./.eslintrc.cjs"]
}
diff --git a/tsconfig.json b/tsconfig.json
index dc71fc4a9cad8ece9319c0faf2cd2c1ded6614e3..a193ea35f2fdac3fb6deecf7573c80a11447d3ba 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,12 +15,12 @@
"paths": {
"mastodon": ["app/javascript/mastodon"],
"mastodon/*": ["app/javascript/mastodon/*"],
- "@/*": ["app/javascript/*"],
- },
+ "@/*": ["app/javascript/*"]
+ }
},
"include": [
"app/javascript/mastodon",
"app/javascript/packs",
- "app/javascript/types",
- ],
+ "app/javascript/types"
+ ]
}
diff --git a/yarn.lock b/yarn.lock
index 943c488714735e3b38d89a746fa2115090520737..442473a0922298413c75b085da86890769d69fd5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2881,8 +2881,8 @@ __metadata:
linkType: hard
"@testing-library/jest-dom@npm:^6.0.0":
- version: 6.4.0
- resolution: "@testing-library/jest-dom@npm:6.4.0"
+ version: 6.4.2
+ resolution: "@testing-library/jest-dom@npm:6.4.2"
dependencies:
"@adobe/css-tools": "npm:^4.3.2"
"@babel/runtime": "npm:^7.9.2"
@@ -2909,13 +2909,13 @@ __metadata:
optional: true
vitest:
optional: true
- checksum: 10c0/6b7eba9ca388986a721fb12f84adf0f5534bf7ec5851982023a889c4a0afac6e9e91291bdac39e1f59a05adefd7727e30463d98b21c3da32fbfec229ccb11ef1
+ checksum: 10c0/e7eba527b34ce30cde94424d2ec685bdfed51daaafb7df9b68b51aec6052e99a50c8bfe654612dacdf857a1eb81d68cf294fc89de558ee3a992bf7a6019fffcc
languageName: node
linkType: hard
"@testing-library/react@npm:^14.0.0":
- version: 14.1.2
- resolution: "@testing-library/react@npm:14.1.2"
+ version: 14.2.1
+ resolution: "@testing-library/react@npm:14.2.1"
dependencies:
"@babel/runtime": "npm:^7.12.5"
"@testing-library/dom": "npm:^9.0.0"
@@ -2923,7 +2923,7 @@ __metadata:
peerDependencies:
react: ^18.0.0
react-dom: ^18.0.0
- checksum: 10c0/b5b0990d3aa0ea8b37c55804e0d5d584fc638a5c7d4df90da9a0fdb00bc981b27b6991468b2dc719982a5d0b0107a41596063ce51ad519eeab47b22bc04d6779
+ checksum: 10c0/83b35cf8bf5640f1b63b32223ebc75799dc1a8e034d819120b26838fba0b0ab10bdbe6ad07dd8ae8287365f2b0c52dc9892a6fa11bb24d3e63ad97dfb7f2f296
languageName: node
linkType: hard
@@ -10903,28 +10903,28 @@ __metadata:
linkType: hard
"lint-staged@npm:^15.0.0":
- version: 15.2.0
- resolution: "lint-staged@npm:15.2.0"
+ version: 15.2.2
+ resolution: "lint-staged@npm:15.2.2"
dependencies:
chalk: "npm:5.3.0"
commander: "npm:11.1.0"
debug: "npm:4.3.4"
execa: "npm:8.0.1"
lilconfig: "npm:3.0.0"
- listr2: "npm:8.0.0"
+ listr2: "npm:8.0.1"
micromatch: "npm:4.0.5"
pidtree: "npm:0.6.0"
string-argv: "npm:0.3.2"
yaml: "npm:2.3.4"
bin:
lint-staged: bin/lint-staged.js
- checksum: 10c0/4a1ff25dd06dbd4346fd244c9a0ebb936532ba18c0caedeb895c2e232f3c6c5fd08f6667624716660bc29e3e0f9f0440a9175114394616e991ebd5fab4b1f092
+ checksum: 10c0/a1ba6c7ee53e30a0f6ea9a351d95d3d0d2be916a41b561e22907e9ea513eb18cb3dbe65bff3ec13fad15777999efe56b2e2a95427e31d12a9b7e7948c3630ee2
languageName: node
linkType: hard
-"listr2@npm:8.0.0":
- version: 8.0.0
- resolution: "listr2@npm:8.0.0"
+"listr2@npm:8.0.1":
+ version: 8.0.1
+ resolution: "listr2@npm:8.0.1"
dependencies:
cli-truncate: "npm:^4.0.0"
colorette: "npm:^2.0.20"
@@ -10932,7 +10932,7 @@ __metadata:
log-update: "npm:^6.0.0"
rfdc: "npm:^1.3.0"
wrap-ansi: "npm:^9.0.0"
- checksum: 10c0/6e356df9127c68b69186c927c993645223557e941a76b0bb210e35786aedc53f577df437251db804606ff37ac509c5d945289a84b3daee7fadf2e3dcb889ecc9
+ checksum: 10c0/b565d6ceb3a4c2dbe0c1735c0fd907afd0d6f89de21aced8e05187b2d88ca2f8f9ebc5d743885396a00f05f13146f6be744d098a56ce0402cf1cd131485a7ff1
languageName: node
linkType: hard
@@ -13295,11 +13295,11 @@ __metadata:
linkType: hard
"prettier@npm:^3.0.0":
- version: 3.2.4
- resolution: "prettier@npm:3.2.4"
+ version: 3.2.5
+ resolution: "prettier@npm:3.2.5"
bin:
prettier: bin/prettier.cjs
- checksum: 10c0/88dfeb78ac6096522c9a5b81f1413d875f568420d9bb6a5e5103527912519b993f2bcdcac311fcff5718d5869671d44e4f85827d3626f3a6ce32b9abc65d88e0
+ checksum: 10c0/ea327f37a7d46f2324a34ad35292af2ad4c4c3c3355da07313339d7e554320f66f65f91e856add8530157a733c6c4a897dc41b577056be5c24c40f739f5ee8c6
languageName: node
linkType: hard
@@ -15785,8 +15785,8 @@ __metadata:
linkType: hard
"stylelint@npm:^16.0.2":
- version: 16.2.0
- resolution: "stylelint@npm:16.2.0"
+ version: 16.2.1
+ resolution: "stylelint@npm:16.2.1"
dependencies:
"@csstools/css-parser-algorithms": "npm:^2.5.0"
"@csstools/css-tokenizer": "npm:^2.2.3"
@@ -15828,7 +15828,7 @@ __metadata:
write-file-atomic: "npm:^5.0.1"
bin:
stylelint: bin/stylelint.mjs
- checksum: 10c0/6fdf0451833c11b18c9aa502f687febd6881a912ac94f39d509b894b0f74ccb636f3dac2991c69cc82dc6190731cc2fa48e307fed477d2a0fce57067cd22b572
+ checksum: 10c0/eeaba06885e542c832e5cffc07b2d0dabdc5a72e6ad4d6cb3d01dcc260c29a712b0b935cbd40e059abd68a100e0563fbc617fc4c9bef3b14ecaf6eea651d9d9d
languageName: node
linkType: hard