From 5fc8b5bfc99c2a208733922204f698a18ced5e45 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Wed, 20 Nov 2024 09:23:32 +1300 Subject: [PATCH] add missing format checks - fix format errors - also `npm audit fix` --- extensions/.stylelintrc.cjs | 4 + extensions/package.json | 4 +- extensions/src/evil/assets/evil.web-view.html | 2 +- .../src/hello-someone.web-view.html | 2 +- .../platform-scripture-editor/.stylelintrc.js | 4 + .../src/_commenting.scss | 6 +- .../src/_editor-overrides.scss | 2 +- .../src/_editor.scss | 1 - .../src/_usj-nodes.scss | 192 +++++++++--------- lib/papi-dts/package.json | 2 + lib/platform-bible-react/.babelrc.json | 9 +- lib/platform-bible-react/package.json | 6 +- lib/platform-bible-utils/package.json | 6 +- package-lock.json | 8 +- package.json | 4 +- 15 files changed, 135 insertions(+), 117 deletions(-) diff --git a/extensions/.stylelintrc.cjs b/extensions/.stylelintrc.cjs index a8534cc879..f959736685 100644 --- a/extensions/.stylelintrc.cjs +++ b/extensions/.stylelintrc.cjs @@ -13,6 +13,10 @@ module.exports = { }, ], rules: { + // Disable Stylelint's indentation control + '@stylistic/indentation': null, + // Let Prettier handle selector list formatting + '@stylistic/selector-list-comma-newline-after': null, 'color-named': null, 'max-nesting-depth': 2, 'no-descending-specificity': null, diff --git a/extensions/package.json b/extensions/package.json index 5d5cf51a42..751b543d61 100644 --- a/extensions/package.json +++ b/extensions/package.json @@ -11,6 +11,8 @@ "watch": "npm run build -- --watch", "build:production": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=false webpack", "watch:production": "npm run build:production -- --watch", + "format": "prettier --write .", + "format:check": "prettier --check .", "zip": "tsx ./lib/zip-extensions.ts", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -21,7 +23,7 @@ "lint:scripts": "cross-env NODE_OPTIONS=\"--max-old-space-size=4096\" NODE_ENV=development eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts", + "lint-fix:scripts": "npm run format && npm run lint:scripts", "lint:staged": "lint-staged -q", "postinstall": "tsx ./lib/add-remotes.ts", "create-extension": "tsx ./lib/create-extension.ts", diff --git a/extensions/src/evil/assets/evil.web-view.html b/extensions/src/evil/assets/evil.web-view.html index c8d010dfd2..990166a95e 100644 --- a/extensions/src/evil/assets/evil.web-view.html +++ b/extensions/src/evil/assets/evil.web-view.html @@ -1,4 +1,4 @@ - +