From c9f6f2eef5ec87b7766f665bda9df65072802dfc Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:13:24 +1300 Subject: [PATCH 01/10] Squashed 'extensions/' changes from fddfe3be5..c276fc9e7 c276fc9e7 add missing format check (#32) git-subtree-dir: extensions git-subtree-split: c276fc9e7ae34067aff2eaa1d38c956635ef9180 --- .stylelintrc.cjs | 4 ++++ package-lock.json | 21 ++++++++++++++------- package.json | 4 +++- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs index a8534cc879..f959736685 100644 --- a/.stylelintrc.cjs +++ b/.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/package-lock.json b/package-lock.json index 29a7170cb3..ef52130e23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -120,6 +120,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -150,6 +151,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -175,7 +177,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5098,10 +5101,11 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -16614,9 +16618,9 @@ } }, "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -20240,7 +20244,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -20277,6 +20283,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index ff0e9b1bb6..7fe00b42b4 100644 --- a/package.json +++ b/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_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", "postinstall": "tsx ./lib/add-remotes.ts", "create-extension": "tsx ./lib/create-extension.ts", "update-from-templates": "tsx ./lib/update-from-templates.ts" From 1b89194c2b261238b05056f2491fc970aa6d23a3 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:18:53 +1300 Subject: [PATCH 02/10] Squashed 'extensions/src/hello-someone/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/hello-someone git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -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/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,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": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "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" }, "browserslist": [], "peerDependencies": { From 5ab00b5135c2b345320237d0ca545eacbf05e92c Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:22:04 +1300 Subject: [PATCH 03/10] Squashed 'extensions/src/hello-world/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/hello-world git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -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/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,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": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "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" }, "browserslist": [], "peerDependencies": { From 3ebc69740b56f5dd547f4d48fbae9c5ec2fea71c Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:24:42 +1300 Subject: [PATCH 04/10] Squashed 'extensions/src/legacy-comment-manager/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/legacy-comment-manager git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -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/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,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": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "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" }, "browserslist": [], "peerDependencies": { From 1a90198084b8957c68cf98191074fe0bd449a665 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:26:13 +1300 Subject: [PATCH 05/10] Squashed 'extensions/src/paratext-registration/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/paratext-registration git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -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/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,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": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "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" }, "browserslist": [], "peerDependencies": { From ddb3d23b3385f6650ff7d2f0a435186e7faf0e41 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:27:14 +1300 Subject: [PATCH 06/10] Squashed 'extensions/src/platform-scripture/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/platform-scripture git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -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/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,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": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "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" }, "browserslist": [], "peerDependencies": { From bf9981d51e35fb703257d9224a557d51f5edf825 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:34:20 +1300 Subject: [PATCH 07/10] Squashed 'extensions/src/platform-scripture-editor/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/platform-scripture-editor git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -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/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,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": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "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" }, "browserslist": [], "peerDependencies": { From 20a4e718b399153174fdfba9be3e177d9bf6ff01 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:35:55 +1300 Subject: [PATCH 08/10] Squashed 'extensions/src/quick-verse/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/quick-verse git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -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/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,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": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "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" }, "browserslist": [], "peerDependencies": { From d40368d55776cd469cd50d9c6069ae5236c5d288 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Wed, 20 Nov 2024 09:23:32 +1300 Subject: [PATCH 09/10] add missing format checks - let prettier format CSS & SCSS - fix format errors - also `npm audit fix` --- extensions/src/evil/assets/evil.web-view.html | 2 +- .../src/hello-someone.web-view.html | 2 +- .../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 | 7 +- 12 files changed, 126 insertions(+), 117 deletions(-) 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 @@ - +