diff --git a/package.json b/package.json
index 44e6e1caf4..884137cc7f 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",
@@ -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/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 @@
-
+
Rageshake decoder ring
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/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 @@
-
+
<%
// insert