From 8f81e47961678988cb8f2f12ebe4bb1d7c5a139d Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sun, 7 Mar 2021 09:23:39 +0100 Subject: [PATCH] chore: update to husky v5 (#781) --- .husky/.gitignore | 1 + .husky/commit-msg | 4 +++ .husky/pre-commit | 4 +++ package.json | 14 ++++----- yarn.lock | 75 ++++++++++++++++------------------------------- 5 files changed, 40 insertions(+), 58 deletions(-) create mode 100644 .husky/.gitignore create mode 100755 .husky/commit-msg create mode 100755 .husky/pre-commit diff --git a/.husky/.gitignore b/.husky/.gitignore new file mode 100644 index 000000000..31354ec13 --- /dev/null +++ b/.husky/.gitignore @@ -0,0 +1 @@ +_ diff --git a/.husky/commit-msg b/.husky/commit-msg new file mode 100755 index 000000000..d71a03b9f --- /dev/null +++ b/.husky/commit-msg @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +yarn commitlint --edit $1 diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 000000000..d2ae35e84 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +yarn lint-staged diff --git a/package.json b/package.json index 5fcb5b610..f8a8a22a6 100644 --- a/package.json +++ b/package.json @@ -27,13 +27,10 @@ "prettier:write": "prettier --write 'docs/**/*.md' README.md '.github/**' package.json tsconfig.json src/globals.json .yarnrc.yml", "test": "jest", "tools:regenerate-docs": "ts-node -T tools/regenerate-docs", - "typecheck": "tsc -p ." - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged", - "commit-msg": "commitlint -e $HUSKY_GIT_PARAMS" - } + "typecheck": "tsc -p .", + "postinstall": "husky install", + "prepublishOnly": "pinst --disable", + "postpublish": "pinst --enable" }, "commitlint": { "extends": [ @@ -110,10 +107,11 @@ "eslint-plugin-import": "^2.20.2", "eslint-plugin-node": "^11.0.0", "eslint-plugin-prettier": "^3.0.0", - "husky": "^4.2.5", + "husky": "^5.1.3", "jest": "^26.0.1", "jest-runner-eslint": "^0.10.0", "lint-staged": "^10.2.2", + "pinst": "^2.0.0", "prettier": "^2.0.5", "resolve-from": "^5.0.0", "rimraf": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index 7a17848e9..4bb86878c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3564,13 +3564,6 @@ __metadata: languageName: node linkType: hard -"compare-versions@npm:^3.6.0": - version: 3.6.0 - resolution: "compare-versions@npm:3.6.0" - checksum: 09525264502bda1f6667ad2429eaf5520b543d997e79e7a94b66a5896df8921cdc3a97140dfff75af6c9ba1859c872de1921c3cf8a6c48ed807bbf9f582cf093 - languageName: node - linkType: hard - "component-emitter@npm:^1.2.1": version: 1.3.0 resolution: "component-emitter@npm:1.3.0" @@ -4580,10 +4573,11 @@ __metadata: eslint-plugin-import: ^2.20.2 eslint-plugin-node: ^11.0.0 eslint-plugin-prettier: ^3.0.0 - husky: ^4.2.5 + husky: ^5.1.3 jest: ^26.0.1 jest-runner-eslint: ^0.10.0 lint-staged: ^10.2.2 + pinst: ^2.0.0 prettier: ^2.0.5 resolve-from: ^5.0.0 rimraf: ^3.0.0 @@ -5186,6 +5180,13 @@ __metadata: languageName: node linkType: hard +"fromentries@npm:^1.3.2": + version: 1.3.2 + resolution: "fromentries@npm:1.3.2" + checksum: 5cc722e4e3fd333ba75f31dd3ef80b4a6c405d8814e86e343b4676c1483c00f4f29b39aca462d268e918b3316a4fb03cea8022458fd8ad965f251362a129783f + languageName: node + linkType: hard + "fs-extra@npm:^9.0.0": version: 9.1.0 resolution: "fs-extra@npm:9.1.0" @@ -5815,24 +5816,12 @@ __metadata: languageName: node linkType: hard -"husky@npm:^4.2.5": - version: 4.3.8 - resolution: "husky@npm:4.3.8" - dependencies: - chalk: ^4.0.0 - ci-info: ^2.0.0 - compare-versions: ^3.6.0 - cosmiconfig: ^7.0.0 - find-versions: ^4.0.0 - opencollective-postinstall: ^2.0.2 - pkg-dir: ^5.0.0 - please-upgrade-node: ^3.2.0 - slash: ^3.0.0 - which-pm-runs: ^1.0.0 +"husky@npm:^5.1.3": + version: 5.1.3 + resolution: "husky@npm:5.1.3" bin: - husky-run: bin/run.js - husky-upgrade: lib/upgrader/bin.js - checksum: 1ac4fb51ffd93547ec861f185d86bdbfbac8ee24ce60417d531dbe5222e33fc754436e87e4e2b37a44dcefdc78c151f9ba4ac57c05773f5c36377cc4eb73732b + husky: lib/bin.js + checksum: 99baafebe710d3d9008d7e8523a2bba28b73acb71d92c22dfb05cd0fb38160c7d47594b5178ad1979032e1c7334afbc96f6137c3879a5c6c24ee339c74dd972b languageName: node linkType: hard @@ -8888,15 +8877,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: d75b06b80eb426aaf099307ca4398f3119c8c86ff3806a95cfe234b979b80c07080040734fe2dc3c51fed5b15bd98dae88340807980bdc74aa1ebf045c74ef06 - languageName: node - linkType: hard - "opener@npm:^1.5.2": version: 1.5.2 resolution: "opener@npm:1.5.2" @@ -9331,6 +9311,17 @@ __metadata: languageName: node linkType: hard +"pinst@npm:^2.0.0": + version: 2.1.6 + resolution: "pinst@npm:2.1.6" + dependencies: + fromentries: ^1.3.2 + bin: + pinst: bin.js + checksum: ac950620de58cec8a2d601b79186e04f7a166c3df82a7a25fe2ca3c1ea38710fa881640e788fa8f81f13b17f38f646d17360c8266f12ae7682bf0ae420786b61 + languageName: node + linkType: hard + "pirates@npm:^4.0.1": version: 4.0.1 resolution: "pirates@npm:4.0.1" @@ -9368,15 +9359,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: ^5.0.0 - checksum: 86f6ecee1787d8fe1606fd831f823f967c6ea0d760ce714af6afd2fec076ce71fbedcb57b339d93b84edf90ccdd81d4e6e2c10fcde21684ef3ffee5e05fd37dc - languageName: node - linkType: hard - "please-upgrade-node@npm:^3.2.0": version: 3.2.0 resolution: "please-upgrade-node@npm:3.2.0" @@ -11898,13 +11880,6 @@ typescript@^4.0.0: languageName: node linkType: hard -"which-pm-runs@npm:^1.0.0": - version: 1.0.0 - resolution: "which-pm-runs@npm:1.0.0" - checksum: 0bb79a782e98955afec8f35a3ae95c4711fdd3d0743772ee98211da67c2421fdd4c92c95c93532cc0b4dcc085d8e27f3ad2f8a9173cb632692379bd3d2818821 - languageName: node - linkType: hard - "which@npm:^1.2.9, which@npm:^1.3.0, which@npm:^1.3.1": version: 1.3.1 resolution: "which@npm:1.3.1"