diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100644 index 000000000000..36c4e990898b --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,7 @@ +if [ -z "$SKIP_STORYBOOK_GIT_HOOKS" ]; then + cd code + yarn lint-staged + + cd ../scripts + yarn lint-staged +fi diff --git a/code/package.json b/code/package.json index af71ef0f7fce..6c4632b16858 100644 --- a/code/package.json +++ b/code/package.json @@ -43,11 +43,6 @@ "test": "NODE_OPTIONS=--max_old_space_size=4096 vitest run", "test:watch": "NODE_OPTIONS=--max_old_space_size=4096 vitest watch" }, - "husky": { - "hooks": { - "pre-commit": "if [ -z \"$SKIP_STORYBOOK_GIT_HOOKS\" ]; then yarn lint-staged; fi" - } - }, "lint-staged": { "*.{html,js,json,jsx,mjs,ts,tsx}": [ "yarn lint:js:cmd --fix" @@ -134,7 +129,6 @@ "eslint": "^8.57.1", "happy-dom": "^17.6.3", "http-server": "^14.1.1", - "husky": "^4.3.7", "knip": "^5.70.2", "lint-staged": "^16.2.7", "mock-require": "^3.0.3", diff --git a/package.json b/package.json index f4873d84f2e8..8b0f35427773 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,8 @@ "upload-bench": "cd scripts; yarn upload-bench", "vite-ecosystem-ci:before-test": "./scripts/ecosystem-ci/before-test.sh react-vite/default-ts", "vite-ecosystem-ci:build": "./scripts/ecosystem-ci/build.sh react-vite/default-ts", - "vite-ecosystem-ci:test": "./scripts/ecosystem-ci/test.sh react-vite/default-ts" + "vite-ecosystem-ci:test": "./scripts/ecosystem-ci/test.sh react-vite/default-ts", + "prepare": "husky" }, "resolutions": { "@babel/runtime": "latest", @@ -62,6 +63,7 @@ "@playwright/test": "^1.52.0", "@types/kill-port": "^2.0.3", "http-server": "^14.1.1", + "husky": "^9.1.7", "jiti": "^2.6.1", "kill-port": "^2.0.1", "nx": "^22.1.3", diff --git a/scripts/package.json b/scripts/package.json index 146c7b85e203..e5db1e082858 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -42,11 +42,6 @@ "upgrade": "jiti ./task.ts", "upload-bench": "jiti ./upload-bench.ts" }, - "husky": { - "hooks": { - "pre-commit": "yarn lint-staged" - } - }, "lint-staged": { "*.{html,js,json,jsx,mjs,ts,tsx}": [ "yarn lint:js:cmd --fix" @@ -130,7 +125,6 @@ "glob": "^10.5.0", "globby": "^14.1.0", "http-server": "^14.1.1", - "husky": "^4.3.7", "jiti": "^2.6.1", "json5": "^2.2.3", "junit-xml": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index e0c21f031788..32cf0f4c44cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7974,7 +7974,6 @@ __metadata: eslint: "npm:^8.57.1" happy-dom: "npm:^17.6.3" http-server: "npm:^14.1.1" - husky: "npm:^4.3.7" knip: "npm:^5.70.2" lint-staged: "npm:^16.2.7" mock-require: "npm:^3.0.3" @@ -8457,6 +8456,7 @@ __metadata: "@playwright/test": "npm:^1.52.0" "@types/kill-port": "npm:^2.0.3" http-server: "npm:^14.1.1" + husky: "npm:^9.1.7" jiti: "npm:^2.6.1" kill-port: "npm:^2.0.1" nx: "npm:^22.1.3" @@ -8543,7 +8543,6 @@ __metadata: glob: "npm:^10.5.0" globby: "npm:^14.1.0" http-server: "npm:^14.1.1" - husky: "npm:^4.3.7" jiti: "npm:^2.6.1" json5: "npm:^2.2.3" junit-xml: "npm:^1.2.0" @@ -13428,13 +13427,6 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^2.0.0": - version: 2.0.0 - resolution: "ci-info@npm:2.0.0" - checksum: 10c0/8c5fa3830a2bcee2b53c2e5018226f0141db9ec9f7b1e27a5c57db5512332cde8a0beb769bcbaf0d8775a78afbf2bb841928feca4ea6219638a5b088f9884b46 - languageName: node - linkType: hard - "ci-info@npm:^3.2.0": version: 3.9.0 resolution: "ci-info@npm:3.9.0" @@ -13813,13 +13805,6 @@ __metadata: languageName: node linkType: hard -"compare-versions@npm:^3.6.0": - version: 3.6.0 - resolution: "compare-versions@npm:3.6.0" - checksum: 10c0/11d4cad6f8da9e246d1d7b02912fdd38f33c7167257c1860defbe8a0ea846f774c1e17da081afb277c54549ba5cb2bef4e4350449ba2749f7b721f0203ba0cc7 - languageName: node - linkType: hard - "compressible@npm:~2.0.18": version: 2.0.18 resolution: "compressible@npm:2.0.18" @@ -17471,15 +17456,6 @@ __metadata: languageName: node linkType: hard -"find-versions@npm:^4.0.0": - version: 4.0.0 - resolution: "find-versions@npm:4.0.0" - dependencies: - semver-regex: "npm:^3.1.2" - checksum: 10c0/4ed736f0604e9249104fb8679850ad8bfb9262142e79f86bc88e1e731e6958616a1dd6b0d6814634e993e7a59efaa1546a92e0d47a22534c6e79ec382ea60950 - languageName: node - linkType: hard - "fixturify-project@npm:^1.10.0": version: 1.10.0 resolution: "fixturify-project@npm:1.10.0" @@ -19184,24 +19160,12 @@ __metadata: languageName: node linkType: hard -"husky@npm:^4.3.7": - version: 4.3.8 - resolution: "husky@npm:4.3.8" - dependencies: - chalk: "npm:^4.0.0" - ci-info: "npm:^2.0.0" - compare-versions: "npm:^3.6.0" - cosmiconfig: "npm:^7.0.0" - find-versions: "npm:^4.0.0" - opencollective-postinstall: "npm:^2.0.2" - pkg-dir: "npm:^5.0.0" - please-upgrade-node: "npm:^3.2.0" - slash: "npm:^3.0.0" - which-pm-runs: "npm:^1.0.0" +"husky@npm:^9.1.7": + version: 9.1.7 + resolution: "husky@npm:9.1.7" bin: - husky-run: bin/run.js - husky-upgrade: lib/upgrader/bin.js - checksum: 10c0/c7aa15edf35ba8f1451be2bc73fffbdecaf6fea06516e45603d89457463b5e43454bb1f5952a9f0c905d700f4d8912052c9d4c6b8eb8186a55df46e792c17fcb + husky: bin.js + checksum: 10c0/35bb110a71086c48906aa7cd3ed4913fb913823715359d65e32e0b964cb1e255593b0ae8014a5005c66a68e6fa66c38dcfa8056dbbdfb8b0187c0ffe7ee3a58f languageName: node linkType: hard @@ -23619,15 +23583,6 @@ __metadata: languageName: node linkType: hard -"opencollective-postinstall@npm:^2.0.2": - version: 2.0.3 - resolution: "opencollective-postinstall@npm:2.0.3" - bin: - opencollective-postinstall: index.js - checksum: 10c0/8a0104a218bc1afaae943f0af378461eeb2836f9848bad872bbd067ec5d1d9791636f307454ab77d0746f10341366f295384656a340ebdb87a2585058e8567e5 - languageName: node - linkType: hard - "opener@npm:^1.5.1": version: 1.5.2 resolution: "opener@npm:1.5.2" @@ -24610,15 +24565,6 @@ __metadata: languageName: node linkType: hard -"pkg-dir@npm:^5.0.0": - version: 5.0.0 - resolution: "pkg-dir@npm:5.0.0" - dependencies: - find-up: "npm:^5.0.0" - checksum: 10c0/793a496d685dc55bbbdbbb22d884535c3b29241e48e3e8d37e448113a71b9e42f5481a61fdc672d7322de12fbb2c584dd3a68bf89b18fffce5c48a390f911bc5 - languageName: node - linkType: hard - "pkg-dir@npm:^7.0.0": version: 7.0.0 resolution: "pkg-dir@npm:7.0.0" @@ -24668,15 +24614,6 @@ __metadata: languageName: node linkType: hard -"please-upgrade-node@npm:^3.2.0": - version: 3.2.0 - resolution: "please-upgrade-node@npm:3.2.0" - dependencies: - semver-compare: "npm:^1.0.0" - checksum: 10c0/222514d2841022be4b843f38d415beadcc6409c0545d6d153778d71c601bba7bbf1cd5827d650c7fae6a9a2ba7cf00f4b6729b40d015a3a5ba2937e57bc1c435 - languageName: node - linkType: hard - "pngjs@npm:^7.0.0": version: 7.0.0 resolution: "pngjs@npm:7.0.0" @@ -27401,20 +27338,6 @@ __metadata: languageName: node linkType: hard -"semver-compare@npm:^1.0.0": - version: 1.0.0 - resolution: "semver-compare@npm:1.0.0" - checksum: 10c0/9ef4d8b81847556f0865f46ddc4d276bace118c7cb46811867af82e837b7fc473911981d5a0abc561fa2db487065572217e5b06e18701c4281bcdd2a1affaff1 - languageName: node - linkType: hard - -"semver-regex@npm:^3.1.2": - version: 3.1.4 - resolution: "semver-regex@npm:3.1.4" - checksum: 10c0/17bb7742b280e113c7850ce40b274341c74f61077a0712babd84782ea11b5bc343cde5b4e6d06721b29a2a4a17a42c5b8d1559efd9fd3de799997e83d361162c - languageName: node - linkType: hard - "semver@npm:2 >=2.2.1 || 3.x || 4 || 5, semver@npm:2 || 3 || 4 || 5, semver@npm:^5.3.0, semver@npm:^5.5.0, semver@npm:^5.6.0": version: 5.7.2 resolution: "semver@npm:5.7.2" @@ -31559,13 +31482,6 @@ __metadata: languageName: node linkType: hard -"which-pm-runs@npm:^1.0.0": - version: 1.1.0 - resolution: "which-pm-runs@npm:1.1.0" - checksum: 10c0/b8f2f230aa49babe21cb93f169f5da13937f940b8cc7a47d2078d9d200950c0dba5ac5659bc01bdbe401e6db3adec6a97b6115215a4ca8e87fd714aebd0cabc6 - languageName: node - linkType: hard - "which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.16, which-typed-array@npm:^1.1.19, which-typed-array@npm:^1.1.2": version: 1.1.19 resolution: "which-typed-array@npm:1.1.19"