From 0d86bab0dc0fa1b5b76dc58c053bc247520bfd6c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 20 Dec 2023 15:32:23 +0000 Subject: [PATCH 1/5] Iterate landmarks around the app in order to improve a11y (#26776) --- src/vector/index.html | 2 +- test/app-tests/loading-test.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vector/index.html b/src/vector/index.html index 2166bd6299..3559bb71bc 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -59,7 +59,7 @@ </head> <body style="height: 100%; margin: 0;"> <noscript>Sorry, Element requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? --> - <section id="matrixchat" style="height: 100%;" class="notranslate"></section> + <div id="matrixchat" style="height: 100%;" class="notranslate"></div> <% // insert <script> tags for the JS entry points diff --git a/test/app-tests/loading-test.tsx b/test/app-tests/loading-test.tsx index af53a29ffd..e5f3b9b089 100644 --- a/test/app-tests/loading-test.tsx +++ b/test/app-tests/loading-test.tsx @@ -377,7 +377,7 @@ describe("loading:", function () { it("does not show a login view", async function () { await awaitRoomView(matrixChat); - await screen.findByLabelText("Spaces"); + await screen.getByRole("tree", { name: "Spaces" }); expect(screen.queryAllByText("Sign in")).toHaveLength(0); }); }); From 2555ffc0d47aec12f35b0361d29343b0ac5c5dbc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 20 Dec 2023 15:38:42 +0000 Subject: [PATCH 2/5] Fix react.d.ts forwardRef types Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.json b/tsconfig.json index d19b111e15..6cf23bc377 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,6 +17,7 @@ }, "include": [ "./node_modules/matrix-js-sdk/src/@types/*.d.ts", + "./node_modules/matrix-react-sdk/src/@types/react.d.ts", "./node_modules/matrix-react-sdk/src/@types/diff-dom.d.ts", "./node_modules/matrix-react-sdk/src/@types/opus-recorder.d.ts", "./node_modules/matrix-react-sdk/src/@types/png-chunks-extract.d.ts", From 258fc405db162996bea986f97109532a565e1881 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Tue, 2 Jan 2024 11:14:57 +0000 Subject: [PATCH 3/5] Update tests not to mock out an ancient server (#26796) The loading test, which mocks a `/versions` response, currently mocks the response of a 2-year-old server. This will soon be incompatible with the JS-SDK. Update the test in preparation. --- test/app-tests/loading-test.tsx | 9 ++++++--- test/app-tests/server-config-test.ts | 5 ++++- test/app-tests/wrapper-test.tsx | 5 ++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/test/app-tests/loading-test.tsx b/test/app-tests/loading-test.tsx index e5f3b9b089..ebd468801b 100644 --- a/test/app-tests/loading-test.tsx +++ b/test/app-tests/loading-test.tsx @@ -39,6 +39,9 @@ import { cleanLocalstorage, deleteIndexedDB, waitForLoadingSpinner, waitForWelco const DEFAULT_HS_URL = "http://my_server"; const DEFAULT_IS_URL = "http://my_is"; +/** The matrix versions our mock server claims to support */ +const SERVER_SUPPORTED_MATRIX_VERSIONS = ["v1.1", "v1.5", "v1.6", "v1.8", "v1.9"]; + describe("loading:", function () { let httpBackend: MockHttpBackend; @@ -155,7 +158,7 @@ describe("loading:", function () { async function expectAndAwaitSync(opts?: { isGuest?: boolean }): Promise<any> { let syncRequest: (typeof MockHttpBackend.prototype.requests)[number] | null = null; httpBackend.when("GET", "/_matrix/client/versions").respond(200, { - versions: ["v1.1"], + versions: SERVER_SUPPORTED_MATRIX_VERSIONS, unstable_features: {}, }); const isGuest = opts?.isGuest; @@ -215,7 +218,7 @@ describe("loading:", function () { }); // Pass the liveliness checks - httpBackend.when("GET", "/versions").respond(200, { versions: ["v1.1"] }); + httpBackend.when("GET", "/versions").respond(200, { versions: SERVER_SUPPORTED_MATRIX_VERSIONS }); httpBackend.when("GET", "/_matrix/identity/v2").respond(200, {}); return sleep(1) @@ -265,7 +268,7 @@ describe("loading:", function () { }); // Pass the liveliness checks - httpBackend.when("GET", "/versions").respond(200, { versions: ["v1.1"] }); + httpBackend.when("GET", "/versions").respond(200, { versions: SERVER_SUPPORTED_MATRIX_VERSIONS }); httpBackend.when("GET", "/_matrix/identity/v2").respond(200, {}); return awaitLoginComponent(matrixChat) diff --git a/test/app-tests/server-config-test.ts b/test/app-tests/server-config-test.ts index e18b766db3..32e92de781 100644 --- a/test/app-tests/server-config-test.ts +++ b/test/app-tests/server-config-test.ts @@ -21,6 +21,9 @@ import fetchMock from "fetch-mock-jest"; import { loadApp } from "../../src/vector/app"; import WebPlatform from "../../src/vector/platform/WebPlatform"; +/** The matrix versions our mock server claims to support */ +const SERVER_SUPPORTED_MATRIX_VERSIONS = ["v1.1", "v1.5", "v1.6", "v1.8", "v1.9"]; + fetchMock.config.overwriteRoutes = true; describe("Loading server config", function () { @@ -29,7 +32,7 @@ describe("Loading server config", function () { PlatformPeg.set(new WebPlatform()); fetchMock.get("https://matrix-client.matrix.org/_matrix/client/versions", { unstable_features: {}, - versions: ["v1.1"], + versions: SERVER_SUPPORTED_MATRIX_VERSIONS, }); fetchMock.get("https://matrix.org/.well-known/matrix/client", { "m.homeserver": { diff --git a/test/app-tests/wrapper-test.tsx b/test/app-tests/wrapper-test.tsx index 0ba1d3f080..a2dbe6cf73 100644 --- a/test/app-tests/wrapper-test.tsx +++ b/test/app-tests/wrapper-test.tsx @@ -28,6 +28,9 @@ import WebPlatform from "../../src/vector/platform/WebPlatform"; import { loadApp } from "../../src/vector/app"; import { waitForLoadingSpinner, waitForWelcomeComponent } from "../test-utils"; +/** The matrix versions our mock server claims to support */ +const SERVER_SUPPORTED_MATRIX_VERSIONS = ["v1.1", "v1.5", "v1.6", "v1.8", "v1.9"]; + fetchMock.config.overwriteRoutes = true; describe("Wrapper", () => { @@ -36,7 +39,7 @@ describe("Wrapper", () => { PlatformPeg.set(new WebPlatform()); fetchMock.get("https://matrix-client.matrix.org/_matrix/client/versions", { unstable_features: {}, - versions: ["v1.1"], + versions: SERVER_SUPPORTED_MATRIX_VERSIONS, }); fetchMock.get("https://matrix.org/.well-known/matrix/client", { "m.homeserver": { From 6ef7aab959792be7a4725d2bdf12adf3f541d89c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:49:09 +0000 Subject: [PATCH 4/5] Update dependency webpack-cli to v5 (#26816) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 74 +++++++++++++++++++++++++++------------------------- 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index 544cc6cba4..53315f109f 100644 --- a/package.json +++ b/package.json @@ -204,7 +204,7 @@ "util": "^0.12.5", "webpack": "^5.89.0", "webpack-bundle-analyzer": "^4.8.0", - "webpack-cli": "^4.10.0", + "webpack-cli": "^5.0.0", "webpack-dev-server": "^4.15.1", "yaml": "^2.3.3" }, diff --git a/yarn.lock b/yarn.lock index cd0de45ff5..17bc96d796 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3418,22 +3418,20 @@ "@webassemblyjs/ast" "1.11.6" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" - integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== +"@webpack-cli/configtest@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" + integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== -"@webpack-cli/info@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" - integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== - dependencies: - envinfo "^7.7.3" +"@webpack-cli/info@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" + integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== -"@webpack-cli/serve@^1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" - integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== +"@webpack-cli/serve@^2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -4470,6 +4468,11 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -4480,7 +4483,7 @@ commander@^6.2.1: resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== -commander@^7.0.0, commander@^7.2.0: +commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -7109,10 +7112,10 @@ internal-slot@^1.0.5: hasown "^2.0.0" side-channel "^1.0.4" -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== +interpret@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" + integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== invariant@^2.2.4: version "2.2.4" @@ -10631,12 +10634,12 @@ readdirp@~3.6.0: dependencies: picomatch "^2.2.1" -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== dependencies: - resolve "^1.9.0" + resolve "^1.20.0" redux@^4.0.0, redux@^4.0.4: version "4.2.1" @@ -10819,7 +10822,7 @@ resolve.exports@^2.0.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== -resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.4, resolve@^1.9.0: +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.4: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -12456,22 +12459,23 @@ webpack-bundle-analyzer@^4.8.0: sirv "^2.0.3" ws "^7.3.1" -webpack-cli@^4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" - integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== +webpack-cli@^5.0.0: + version "5.1.4" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.2.0" - "@webpack-cli/info" "^1.5.0" - "@webpack-cli/serve" "^1.7.0" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" colorette "^2.0.14" - commander "^7.0.0" + commander "^10.0.1" cross-spawn "^7.0.3" + envinfo "^7.7.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" + interpret "^3.1.1" + rechoir "^0.8.0" webpack-merge "^5.7.3" webpack-dev-middleware@^5.3.1: From 188aac111b7d1d06ef8648efff6e286594ccd02b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:53:39 +0000 Subject: [PATCH 5/5] Update dependency prettier to v3 (#26815) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 6 +++--- res/css/structures/ErrorView.pcss | 4 ++-- res/decoder-ring/index.html | 2 +- scripts/gen-workflow-mermaid.ts | 6 +++++- src/vector/jitsi/index.html | 2 +- src/vector/mobile_guide/index.html | 2 +- yarn.lock | 8 ++++---- 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 53315f109f..34f3ca598a 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "scripts": { "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint", "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json", - "i18n:lint": "prettier --write src/i18n/strings/ --ignore-path /dev/null", + "i18n:lint": "prettier --log-level=silent --write src/i18n/strings/ --ignore-path /dev/null", "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", "clean": "rimraf lib webapp", "build": "yarn clean && yarn build:genfiles && yarn build:bundle", @@ -53,7 +53,7 @@ "lint:js:src": "eslint --max-warnings 0 src test && prettier --check .", "lint:js:module_system": "eslint --max-warnings 0 --config .eslintrc-module_system.js module_system", "lint:js-fix": "yarn lint:js-fix:src && yarn lint:js-fix:module_system", - "lint:js-fix:src": "prettier --write . && eslint --fix src test", + "lint:js-fix:src": "prettier --log-level=warn --write . && eslint --fix src test", "lint:js-fix:module_system": "eslint --fix --config .eslintrc-module_system.js module_system", "lint:types": "yarn lint:types:src && yarn lint:types:module_system", "lint:types:src": "tsc --noEmit --jsx react", @@ -185,7 +185,7 @@ "postcss-preset-env": "^6.7.0", "postcss-scss": "^4.0.4", "postcss-simple-vars": "^5.0.2", - "prettier": "2.8.8", + "prettier": "3.1.1", "process": "^0.11.10", "proxy-agent": "^6.3.0", "raw-loader": "^4.0.2", diff --git a/res/css/structures/ErrorView.pcss b/res/css/structures/ErrorView.pcss index afb51023e4..704c68c1e9 100644 --- a/res/css/structures/ErrorView.pcss +++ b/res/css/structures/ErrorView.pcss @@ -14,8 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -// import font-size variables manually, -// ideally this file would get loaded by the theme which has all variables in context +/* import font-size variables manually, + ideally this file would get loaded by the theme which has all variables in context */ @import "../../../node_modules/matrix-react-sdk/res/css/_font-sizes.pcss"; .mx_ErrorView { diff --git a/res/decoder-ring/index.html b/res/decoder-ring/index.html index 4850904edb..c380dd0a36 100644 --- a/res/decoder-ring/index.html +++ b/res/decoder-ring/index.html @@ -1,4 +1,4 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> <title>Rageshake decoder ring</title> diff --git a/scripts/gen-workflow-mermaid.ts b/scripts/gen-workflow-mermaid.ts index d4979f1647..1376323e84 100755 --- a/scripts/gen-workflow-mermaid.ts +++ b/scripts/gen-workflow-mermaid.ts @@ -400,7 +400,11 @@ class MermaidFlowchartPrinter { this.currentIndent += delta * MermaidFlowchartPrinter.INDENT; } - public constructor(direction: "TD" | "TB" | "BT" | "RL" | "LR", title?: string, private readonly markdown = false) { + public constructor( + direction: "TD" | "TB" | "BT" | "RL" | "LR", + title?: string, + private readonly markdown = false, + ) { if (this.markdown) { this.print("```mermaid"); } diff --git a/src/vector/jitsi/index.html b/src/vector/jitsi/index.html index be84a62c2b..7b60e6a22b 100644 --- a/src/vector/jitsi/index.html +++ b/src/vector/jitsi/index.html @@ -1,4 +1,4 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> <meta charset="UTF-8" /> diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index c39041c501..b4d67ba2d3 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -1,4 +1,4 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> <title>Element Mobile Guide</title> diff --git a/yarn.lock b/yarn.lock index 17bc96d796..81cb68ca9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10238,10 +10238,10 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prettier@2.8.8: - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.1.tgz#6ba9f23165d690b6cbdaa88cb0807278f7019848" + integrity sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw== pretty-error@^4.0.0: version "4.0.0"