From 5ce7ad2aa4febee0446d122dc2f19f1f0ff3181a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:01:30 +0000 Subject: [PATCH 1/3] Update dependency prettier to v3 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 544cc6cba41..fcad9d0f15d 100644 --- a/package.json +++ b/package.json @@ -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/yarn.lock b/yarn.lock index cd0de45ff52..81a722a2e6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10235,10 +10235,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" From d3debdd954900ffe62a4cc3e9c3f74478bdac240 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 2 Jan 2024 17:12:35 +0000 Subject: [PATCH 2/3] Prettier Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- 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 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/res/css/structures/ErrorView.pcss b/res/css/structures/ErrorView.pcss index afb51023e49..704c68c1e96 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 4850904edb0..c380dd0a367 100644 --- a/res/decoder-ring/index.html +++ b/res/decoder-ring/index.html @@ -1,4 +1,4 @@ - + Rageshake decoder ring diff --git a/scripts/gen-workflow-mermaid.ts b/scripts/gen-workflow-mermaid.ts index d4979f1647a..1376323e84d 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 be84a62c2bf..7b60e6a22bf 100644 --- a/src/vector/jitsi/index.html +++ b/src/vector/jitsi/index.html @@ -1,4 +1,4 @@ - + diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index c39041c5014..b4d67ba2d37 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -1,4 +1,4 @@ - + Element Mobile Guide From 88ae16a5dc504d4b9ef3b53e4037dcc802d254c0 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 2 Jan 2024 17:41:28 +0000 Subject: [PATCH 3/3] Prettier Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fcad9d0f15d..de9cf6f6c5c 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",