Merge pull request #1165 from libris/fix-husky-and-lint-staged

libris · Nov 15, 2024 · 7fac6a9 · 7fac6a9
2 parents 1dfe25c + 82e6056
commit 7fac6a9
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 42 deletions.
diff --git a/.github/workflows/codemirror-lang-lxlquery.yml b/.github/workflows/codemirror-lang-lxlquery.yml
@@ -21,6 +21,8 @@ jobs:
         with:
           node-version: 22
       - name: Install dependencies
+        env:
+          HUSKY: ${{ env.HUSKY }}
         run: npm ci
       - name: Run tests
         run: npm run test
diff --git a/.github/workflows/lxl-web.yml b/.github/workflows/lxl-web.yml
@@ -25,6 +25,8 @@ jobs:
         with:
           node-version: 22
       - name: Install dependencies
+        env:
+          HUSKY: ${{ env.HUSKY }}
         run: npm ci
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps

diff --git a/.github/workflows/supersearch.yml b/.github/workflows/supersearch.yml
@@ -21,6 +21,8 @@ jobs:
         with:
           node-version: 22
       - name: Install dependencies
+        env:
+          HUSKY: ${{ env.HUSKY }}
         run: npm ci
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps

diff --git a/.husky/install.mjs b/.husky/install.mjs
@@ -0,0 +1,6 @@
+// Skip Husky install in production and CI
+if (process.env.NODE_ENV === "production" || process.env.CI === "true") {
+  process.exit(0);
+}
+const husky = (await import("husky")).default;
+console.log(husky());
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1 @@
+npx lint-staged
diff --git a/lxl-web/.husky/pre-commit b/lxl-web/.husky/pre-commit
diff --git a/lxl-web/.lintstagedrc b/lxl-web/.lintstagedrc
@@ -0,0 +1,7 @@
+{
+	"*.{js,ts,svelte,css,scss,postcss,md,json}": [
+		"prettier --write --plugin-search-dir=.",
+		"prettier --check --plugin-search-dir=."
+	],
+	"*.{js,ts,svelte}": "eslint"
+}
diff --git a/lxl-web/package.json b/lxl-web/package.json
@@ -14,15 +14,7 @@
 		"lint": "prettier --check . && eslint .",
 		"format": "prettier --write .",
 		"test:integration": "playwright test",
-		"test:unit": "vitest",
-		"prepare": "cd .. && husky lxl-web/.husky"
-	},
-	"lint-staged": {
-		"*.{js,ts,svelte,css,scss,postcss,md,json}": [
-			"prettier --write --plugin-search-dir=.",
-			"prettier --check --plugin-search-dir=."
-		],
-		"*.{js,ts,svelte}": "eslint"
+		"test:unit": "vitest"
 	},
 	"devDependencies": {
 		"@axe-core/playwright": "^4.9.1",
@@ -43,10 +35,8 @@
 		"eslint-plugin-svelte": "^2.43.0",
 		"estree-walker": "^3.0.3",
 		"globals": "^15.9.0",
-		"husky": "^9.1.4",
 		"jmespath": "^0.16.0",
 		"js-cookie": "^3.0.5",
-		"lint-staged": "^15.2.9",
 		"lxljs": "^1.1.0",
 		"magic-string": "^0.30.11",
 		"mdsvex": "^0.12.3",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,5 +6,12 @@
     "packages/*",
     "lxl-web",
     "lxljs"
-  ]
+  ],
+  "devDependencies": {
+    "husky": "^9.1.6",
+    "lint-staged": "^15.2.10"
+  },
+  "scripts": {
+    "prepare": "node .husky/install.mjs"
+  }
 }
diff --git a/packages/codemirror-lang-lxlquery/.husky/pre-commit b/packages/codemirror-lang-lxlquery/.husky/pre-commit
diff --git a/packages/codemirror-lang-lxlquery/.lintstagedrc b/packages/codemirror-lang-lxlquery/.lintstagedrc
@@ -0,0 +1,7 @@
+{
+	"*.{js,ts,md,json}": [
+		"prettier --write --plugin-search-dir=.",
+		"prettier --check --plugin-search-dir=."
+	],
+	"*.{js,ts}": "eslint"
+}
diff --git a/packages/codemirror-lang-lxlquery/package.json b/packages/codemirror-lang-lxlquery/package.json
@@ -4,17 +4,10 @@
 	"description": "Libris XL query language support for CodeMirror",
 	"scripts": {
 		"test": "vitest",
-		"prepare": "cd ../../ && husky && cd ./packages/codemirror-lang-lxlquery && rollup -c",
+		"prepare": "rollup -c",
 		"lint": "eslint . && prettier --check .",
 		"format": "prettier --write ."
 	},
-	"lint-staged": {
-		"*.{js,ts,md,json}": [
-			"prettier --write --plugin-search-dir=.",
-			"prettier --check --plugin-search-dir=."
-		],
-		"*.{js,ts}": "eslint"
-	},
 	"type": "module",
 	"main": "dist/index.cjs",
 	"module": "dist/index.js",
@@ -34,8 +27,6 @@
 		"eslint": "^9.14.0",
 		"eslint-config-prettier": "^9.1.0",
 		"globals": "^15.12.0",
-		"husky": "^9.1.6",
-		"lint-staged": "^15.2.10",
 		"prettier": "^3.3.3",
 		"rollup": "^2.60.2",
 		"rollup-plugin-dts": "^4.0.1",

diff --git a/packages/supersearch/.husky/pre-commit b/packages/supersearch/.husky/pre-commit
diff --git a/packages/supersearch/.lintstagedrc b/packages/supersearch/.lintstagedrc
@@ -0,0 +1,7 @@
+{
+	"*.{js,ts,svelte,css,scss,postcss,md,json}": [
+		"prettier --write --plugin-search-dir=.",
+		"prettier --check --plugin-search-dir=."
+	],
+	"*.{js,ts,svelte}": "eslint"
+}
diff --git a/packages/supersearch/package.json b/packages/supersearch/package.json
@@ -14,14 +14,7 @@
 		"test:unit": "vitest",
 		"lint": "eslint . && prettier --check .",
 		"format": "prettier --write .",
-		"prepare": "cd ../../ && husky && cd ./packages/supersearch && npm run package"
-	},
-	"lint-staged": {
-		"*.{js,ts,svelte,css,scss,postcss,md,json}": [
-			"prettier --write --plugin-search-dir=.",
-			"prettier --check --plugin-search-dir=."
-		],
-		"*.{js,ts,svelte}": "eslint"
+		"prepare": "npm run package"
 	},
 	"files": [
 		"dist",
@@ -59,8 +52,6 @@
 		"eslint-plugin-svelte": "^2.36.0",
 		"esm-env": "^1.1.4",
 		"globals": "^15.0.0",
-		"husky": "^9.1.6",
-		"lint-staged": "^15.2.10",
 		"prettier": "^3.3.2",
 		"prettier-plugin-css-order": "^2.1.2",
 		"prettier-plugin-svelte": "^3.2.6",