From 5db9884f04553913d07f26a98de8891415add2b5 Mon Sep 17 00:00:00 2001 From: Arthur Ming Date: Thu, 1 Apr 2021 12:31:26 +0800 Subject: [PATCH 1/2] build: update to husky@6 Upgrade husky from 5.0.1 to 6.0.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 19ce6d6b807ed..8131417be9627 100644 --- a/package.json +++ b/package.json @@ -197,7 +197,7 @@ "glob": "7.1.2", "gulp": "^4.0.2", "gulp-conventional-changelog": "^2.0.35", - "husky": "5.0.1", + "husky": "6.0.0", "inquirer": "^7.3.3", "karma-browserstack-launcher": "^1.3.0", "karma-sauce-launcher": "^2.0.2", diff --git a/yarn.lock b/yarn.lock index 02ea965bfa25b..c438e14caa4a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8652,10 +8652,10 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -husky@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/husky/-/husky-5.0.1.tgz#c1b1f2b0da297399e295b6c204b680e45f26feda" - integrity sha512-ZNfMqtluHyMaW795l1jOLGOGSFAyZ6JC8jZj1QkagBmfuxrSFKX+Wrbb9gR+OD8iNJb8JNDpaMtCpE5XnLdHMw== +husky@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e" + integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ== iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" From f066d9c18922523d3245ffe4ec578a3a1bba7bcd Mon Sep 17 00:00:00 2001 From: Arthur Ming Date: Sat, 3 Apr 2021 07:13:10 +0800 Subject: [PATCH 2/2] build: install husky in `prepare` script instead of `postinstall` With typicode/husky#890, the recommended way to install husky is in the `prepare` script instead of the `postinstall`. This commit moves the husky installation to the `prepare` script to align with the new recommendation. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8131417be9627..ee7428aec673c 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,8 @@ "// 3": "yarn ng-dev --help", "/ ": "", "preinstall": "node tools/yarn/check-yarn.js", - "postinstall": "husky install && node scripts/webdriver-manager-update.js && node --preserve-symlinks --preserve-symlinks-main ./tools/postinstall-patches.js", + "postinstall": "node scripts/webdriver-manager-update.js && node --preserve-symlinks --preserve-symlinks-main ./tools/postinstall-patches.js", + "prepare": "husky install", "test-ivy-aot": "bazelisk test --config=ivy --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot --test_tag_filters=-no-ivy-aot,-fixme-ivy-aot", "test-non-ivy": "bazelisk test --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only", "test-fixme-ivy-aot": "bazelisk test --config=ivy --build_tag_filters=-no-ivy-aot --test_tag_filters=-no-ivy-aot",