add missing format checks

- fix format errors - also `npm audit fix`
paranext · Nov 20, 2024 · c489d5d · c489d5d
1 parent cba0e36
commit c489d5d
Show file tree

Hide file tree

Showing 15 changed files with 136 additions and 118 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <body>
     <script>

diff --git a/extensions/src/hello-someone/src/hello-someone.web-view.html b/extensions/src/hello-someone/src/hello-someone.web-view.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head> </head>
   <body>

diff --git a/extensions/src/platform-scripture-editor/.stylelintrc.js b/extensions/src/platform-scripture-editor/.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/extensions/src/platform-scripture-editor/src/_commenting.scss b/extensions/src/platform-scripture-editor/src/_commenting.scss
@@ -500,15 +500,15 @@ i.send {
 }
 
 .CommentPlugin_CommentsPanel_List_Thread_Comments
-.CommentPlugin_CommentsPanel_List_Comment:first-child {
+  .CommentPlugin_CommentsPanel_List_Comment:first-child {
   /* stylelint-disable-next-line declaration-property-value-disallowed-list */
   border: none;
   margin-left: 0;
   padding-left: 5px;
 }
 
 .CommentPlugin_CommentsPanel_List_Thread_Comments
-.CommentPlugin_CommentsPanel_List_Comment:first-child.CommentPlugin_CommentsPanel_List_Comment:last-child {
+  .CommentPlugin_CommentsPanel_List_Comment:first-child.CommentPlugin_CommentsPanel_List_Comment:last-child {
   padding-bottom: 5px;
 }
 
@@ -536,7 +536,7 @@ i.send {
 .CommentPlugin_CommentsPanel_DeletedComment,
 .CommentPlugin_CommentsPanel_List_Comment:hover .CommentPlugin_CommentsPanel_List_DeleteButton,
 .CommentPlugin_CommentsPanel_List_Thread_QuoteBox:hover
-.CommentPlugin_CommentsPanel_List_DeleteButton {
+  .CommentPlugin_CommentsPanel_List_DeleteButton {
   opacity: 0.5;
 }
 

diff --git a/extensions/src/platform-scripture-editor/src/_editor-overrides.scss b/extensions/src/platform-scripture-editor/src/_editor-overrides.scss
@@ -101,7 +101,7 @@ button.toolbar-item {
 .CommentPlugin_CommentsPanel_DeletedComment,
 .CommentPlugin_CommentsPanel_List_Comment:hover .CommentPlugin_CommentsPanel_List_DeleteButton,
 .CommentPlugin_CommentsPanel_List_Thread_QuoteBox:hover
-.CommentPlugin_CommentsPanel_List_DeleteButton {
+  .CommentPlugin_CommentsPanel_List_DeleteButton {
   filter: unset;
   opacity: unset;
 }

diff --git a/extensions/src/platform-scripture-editor/src/_editor.scss b/extensions/src/platform-scripture-editor/src/_editor.scss
@@ -430,7 +430,6 @@ i.redo {
   background-image: url('/assets/images/icons/type-h3.svg');
 }
 
-
 .icon.mt,
 .icon.mt1,
 .icon.square-1 {