Skip to content

Commit 6e32253

Browse files
josephperrottalan-agius4
authored andcommitted
build: update to husky@5
Update to husky version 5.0.1 to better support windows usage. (cherry picked from commit 32711f8)
1 parent 26b1cec commit 6e32253

File tree

5 files changed

+16
-63
lines changed

5 files changed

+16
-63
lines changed

.husky/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

.husky/commit-msg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname $0)/_/husky.sh"
3+
4+
yarn -s ng-dev commit-message pre-commit-validate --file $1;

.husky/prepare-commit-msg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname $0)/_/husky.sh"
3+
4+
yarn -s ng-dev commit-message restore-commit-message-draft $1 $2;

package.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"templates": "node ./bin/devkit-admin templates",
3434
"validate": "node ./bin/devkit-admin validate",
3535
"preinstall": "node ./tools/yarn/check-yarn.js",
36-
"postinstall": "yarn webdriver-update && yarn ngcc",
36+
"postinstall": "yarn webdriver-update && yarn ngcc && yarn husky install",
3737
"//webdriver-update-README": "ChromeDriver version must match Puppeteer Chromium version, see https://github.com/GoogleChrome/puppeteer/releases http://chromedriver.chromium.org/downloads",
3838
"webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 87.0.4280.20",
3939
"ngcc": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points"
@@ -155,7 +155,7 @@
155155
"git-raw-commits": "^2.0.0",
156156
"glob": "7.1.6",
157157
"http-proxy": "^1.18.1",
158-
"husky": "^4.0.10",
158+
"husky": "5.0.1",
159159
"inquirer": "7.3.3",
160160
"jasmine": "^3.3.1",
161161
"jasmine-core": "~3.6.0",
@@ -238,11 +238,5 @@
238238
"webpack-subresource-integrity": "1.5.1",
239239
"worker-plugin": "5.0.0",
240240
"zone.js": "^0.10.2"
241-
},
242-
"husky": {
243-
"hooks": {
244-
"commit-msg": "yarn -s ng-dev commit-message pre-commit-validate --file-env-variable HUSKY_GIT_PARAMS",
245-
"prepare-commit-msg": "yarn -s ng-dev commit-message restore-commit-message-draft --file-env-variable HUSKY_GIT_PARAMS"
246-
}
247241
}
248242
}

yarn.lock

Lines changed: 5 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3332,11 +3332,6 @@ chrome-trace-event@^1.0.2:
33323332
dependencies:
33333333
tslib "^1.9.0"
33343334

3335-
ci-info@^2.0.0:
3336-
version "2.0.0"
3337-
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
3338-
integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
3339-
33403335
cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
33413336
version "1.0.4"
33423337
resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -3593,11 +3588,6 @@ compare-func@^2.0.0:
35933588
array-ify "^1.0.0"
35943589
dot-prop "^5.1.0"
35953590

3596-
compare-versions@^3.6.0:
3597-
version "3.6.0"
3598-
resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
3599-
integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
3600-
36013591
component-bind@1.0.0:
36023592
version "1.0.0"
36033593
resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
@@ -5401,13 +5391,6 @@ find-up@^4.0.0, find-up@^4.1.0:
54015391
locate-path "^5.0.0"
54025392
path-exists "^4.0.0"
54035393

5404-
find-versions@^3.2.0:
5405-
version "3.2.0"
5406-
resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e"
5407-
integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==
5408-
dependencies:
5409-
semver-regex "^2.0.0"
5410-
54115394
flatted@^2.0.0, flatted@^2.0.1:
54125395
version "2.0.2"
54135396
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
@@ -6193,21 +6176,10 @@ humanize-ms@^1.2.1:
61936176
dependencies:
61946177
ms "^2.0.0"
61956178

6196-
husky@^4.0.10:
6197-
version "4.3.0"
6198-
resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.0.tgz#0b2ec1d66424e9219d359e26a51c58ec5278f0de"
6199-
integrity sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==
6200-
dependencies:
6201-
chalk "^4.0.0"
6202-
ci-info "^2.0.0"
6203-
compare-versions "^3.6.0"
6204-
cosmiconfig "^7.0.0"
6205-
find-versions "^3.2.0"
6206-
opencollective-postinstall "^2.0.2"
6207-
pkg-dir "^4.2.0"
6208-
please-upgrade-node "^3.2.0"
6209-
slash "^3.0.0"
6210-
which-pm-runs "^1.0.0"
6179+
husky@5.0.1:
6180+
version "5.0.1"
6181+
resolved "https://registry.yarnpkg.com/husky/-/husky-5.0.1.tgz#c1b1f2b0da297399e295b6c204b680e45f26feda"
6182+
integrity sha512-ZNfMqtluHyMaW795l1jOLGOGSFAyZ6JC8jZj1QkagBmfuxrSFKX+Wrbb9gR+OD8iNJb8JNDpaMtCpE5XnLdHMw==
62116183

62126184
iconv-lite@0.4.24, iconv-lite@^0.4.24:
62136185
version "0.4.24"
@@ -8778,7 +8750,7 @@ open@7.3.0:
87788750
is-docker "^2.0.0"
87798751
is-wsl "^2.1.1"
87808752

8781-
opencollective-postinstall@^2.0.0, opencollective-postinstall@^2.0.2:
8753+
opencollective-postinstall@^2.0.0:
87828754
version "2.0.3"
87838755
resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
87848756
integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
@@ -9326,13 +9298,6 @@ pkginfo@0.4.1:
93269298
resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
93279299
integrity sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=
93289300

9329-
please-upgrade-node@^3.2.0:
9330-
version "3.2.0"
9331-
resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
9332-
integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
9333-
dependencies:
9334-
semver-compare "^1.0.0"
9335-
93369301
pluralize@^7.0.0:
93379302
version "7.0.0"
93389303
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -10800,11 +10765,6 @@ selfsigned@^1.10.7:
1080010765
dependencies:
1080110766
node-forge "^0.10.0"
1080210767

10803-
semver-compare@^1.0.0:
10804-
version "1.0.0"
10805-
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
10806-
integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
10807-
1080810768
semver-dsl@^1.0.1:
1080910769
version "1.0.1"
1081010770
resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
@@ -10819,11 +10779,6 @@ semver-intersect@1.4.0:
1081910779
dependencies:
1082010780
semver "^5.0.0"
1082110781

10822-
semver-regex@^2.0.0:
10823-
version "2.0.0"
10824-
resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
10825-
integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
10826-
1082710782
"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
1082810783
version "5.7.1"
1082910784
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -12924,11 +12879,6 @@ which-module@^2.0.0:
1292412879
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
1292512880
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
1292612881

12927-
which-pm-runs@^1.0.0:
12928-
version "1.0.0"
12929-
resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
12930-
integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
12931-
1293212882
which@^1.2.1, which@^1.2.9, which@^1.3.1:
1293312883
version "1.3.1"
1293412884
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"

0 commit comments

Comments
 (0)