Skip to content

Commit 87baaeb

Browse files
Update to latest @angular/dev-infra-private and husky@5 (#21080)
* build: update dev-infra-private version Update to the latest version of @angular/dev-infra-private * fixup! build: update dev-infra-private version * build: update to husky@5 Update to latest version of husky, which better supports windows
1 parent 00357e3 commit 87baaeb

File tree

6 files changed

+27
-81
lines changed

6 files changed

+27
-81
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@
342342

343343
# Misc
344344
/.github/** @angular/dev-infra-components
345+
/.husky/** @angular/dev-infra-components
345346
/.github/CODEOWNERS @angular/dev-infra-components @jelbourn
346347
/.github/ISSUE_TEMPLATE/** @andrewseguin @jelbourn
347348
/.vscode/** @angular/dev-infra-components @mmalerba

.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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
# commit-msg git hook, see https://typicode.github.io/husky/#/ for more on how husky works.
3+
. "$(dirname $0)/_/husky.sh"
4+
5+
# Ahead of creating the commit, validate the commit message.
6+
yarn -s ng-dev commit-message pre-commit-validate --file $1;

.husky/prepare-commit-msg

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/sh
2+
# prepare-commit-msg git hook, see https://typicode.github.io/husky/#/ for more on how husky works.
3+
. "$(dirname $0)/_/husky.sh"
4+
5+
# When a commit is started, restore the previous commit message draft if it exists.
6+
yarn -s ng-dev commit-message restore-commit-message-draft $1 $2;

package.json

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"yarn": ">= 1.0.0"
1414
},
1515
"scripts": {
16-
"postinstall": "node tools/postinstall/apply-patches.js && ngcc --properties module main --create-ivy-entry-points && node tools/postinstall/update-ngcc-main-fields.js",
16+
"postinstall": "husky install && node tools/postinstall/apply-patches.js && ngcc --properties module main --create-ivy-entry-points && node tools/postinstall/update-ngcc-main-fields.js",
1717
"build": "node ./scripts/build-packages-dist.js",
1818
"build-docs-content": "node ./scripts/build-docs-content.js",
1919
"dev-app": "ibazel run //src/dev-app:devserver",
@@ -38,8 +38,8 @@
3838
"tslint": "tslint -c tslint.json --project ./tsconfig.json",
3939
"stylelint": "stylelint \"src/**/*.+(css|scss)\" --config .stylelintrc.json --syntax scss",
4040
"resync-caretaker-app": "ts-node --project scripts/tsconfig.json scripts/caretaking/resync-caretaker-app-prs.ts",
41-
"ts-circular-deps:check": "yarn -s ts-circular-deps check --config ./src/circular-deps-test.conf.js",
42-
"ts-circular-deps:approve": "yarn -s ts-circular-deps approve --config ./src/circular-deps-test.conf.js",
41+
"ts-circular-deps:check": "yarn -s ng-dev ts-circular-deps check --config ./src/circular-deps-test.conf.js",
42+
"ts-circular-deps:approve": "yarn -s ng-dev ts-circular-deps approve --config ./src/circular-deps-test.conf.js",
4343
"merge": "ng-dev pr merge",
4444
"approve-api": "node ./scripts/approve-api-golden.js",
4545
"approve-size-tests": "node ./scripts/approve-size-golden.js",
@@ -76,7 +76,7 @@
7676
"@angular/bazel": "^11.1.0-next.2",
7777
"@angular/benchpress": "0.2.1",
7878
"@angular/compiler-cli": "^11.1.0-next.2",
79-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#f8bc880d554d45ca8bf881b8a776f00f61b918fb",
79+
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#62d6227d822b26b60919950dbbbd399f287956e5",
8080
"@angular/platform-browser-dynamic": "^11.1.0-next.2",
8181
"@angular/platform-server": "^11.1.0-next.2",
8282
"@angular/router": "^11.1.0-next.2",
@@ -125,7 +125,7 @@
125125
"gulp-cli": "^2.3.0",
126126
"gulp-sass": "^4.0.2",
127127
"highlight.js": "^10.4.0",
128-
"husky": "^4.3.0",
128+
"husky": "5.0.1",
129129
"inquirer": "^7.1.0",
130130
"jasmine": "^3.5.0",
131131
"jasmine-core": "^3.5.0",
@@ -174,11 +174,5 @@
174174
},
175175
"resolutions": {
176176
"dgeni-packages/typescript": "4.1.2"
177-
},
178-
"husky": {
179-
"hooks": {
180-
"commit-msg": "yarn -s ng-dev commit-message pre-commit-validate --file-env-variable HUSKY_GIT_PARAMS",
181-
"prepare-commit-msg": "yarn -s ng-dev commit-message restore-commit-message-draft --file-env-variable HUSKY_GIT_PARAMS"
182-
}
183177
}
184178
}

yarn.lock

Lines changed: 8 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@
116116
dependencies:
117117
tslib "^2.0.0"
118118

119-
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#f8bc880d554d45ca8bf881b8a776f00f61b918fb":
119+
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#62d6227d822b26b60919950dbbbd399f287956e5":
120120
version "0.0.0"
121-
resolved "https://github.com/angular/dev-infra-private-builds.git#f8bc880d554d45ca8bf881b8a776f00f61b918fb"
121+
resolved "https://github.com/angular/dev-infra-private-builds.git#62d6227d822b26b60919950dbbbd399f287956e5"
122122
dependencies:
123123
"@angular/benchpress" "0.2.1"
124124
"@bazel/buildifier" "^0.29.0"
@@ -144,9 +144,9 @@
144144
ts-node "^8.6.2"
145145
tslib "^2.0.0"
146146
typed-graphqlify "^2.3.0"
147-
typescript "~4.0.2"
147+
typescript "~4.1.2"
148148
yaml "^1.10.0"
149-
yargs "^15.4.1"
149+
yargs "^16.1.1"
150150

151151
"@angular/elements@^11.1.0-next.2":
152152
version "11.1.0-next.2"
@@ -3898,11 +3898,6 @@ compare-semver@^1.0.0:
38983898
dependencies:
38993899
semver "^5.0.1"
39003900

3901-
compare-versions@^3.6.0:
3902-
version "3.6.0"
3903-
resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
3904-
integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
3905-
39063901
component-bind@1.0.0:
39073902
version "1.0.0"
39083903
resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
@@ -5663,13 +5658,6 @@ find-up@^4.0.0, find-up@^4.1.0:
56635658
locate-path "^5.0.0"
56645659
path-exists "^4.0.0"
56655660

5666-
find-versions@^3.2.0:
5667-
version "3.2.0"
5668-
resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e"
5669-
integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==
5670-
dependencies:
5671-
semver-regex "^2.0.0"
5672-
56735661
find@^0.3.0:
56745662
version "0.3.0"
56755663
resolved "https://registry.yarnpkg.com/find/-/find-0.3.0.tgz#4082e8fc8d8320f1a382b5e4f521b9bc50775cb8"
@@ -6880,21 +6868,10 @@ https-proxy-agent@^5.0.0:
68806868
agent-base "6"
68816869
debug "4"
68826870

6883-
husky@^4.3.0:
6884-
version "4.3.6"
6885-
resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.6.tgz#ebd9dd8b9324aa851f1587318db4cccb7665a13c"
6886-
integrity sha512-o6UjVI8xtlWRL5395iWq9LKDyp/9TE7XMOTvIpEVzW638UcGxTmV5cfel6fsk/jbZSTlvfGVJf2svFtybcIZag==
6887-
dependencies:
6888-
chalk "^4.0.0"
6889-
ci-info "^2.0.0"
6890-
compare-versions "^3.6.0"
6891-
cosmiconfig "^7.0.0"
6892-
find-versions "^3.2.0"
6893-
opencollective-postinstall "^2.0.2"
6894-
pkg-dir "^4.2.0"
6895-
please-upgrade-node "^3.2.0"
6896-
slash "^3.0.0"
6897-
which-pm-runs "^1.0.0"
6871+
husky@5.0.1:
6872+
version "5.0.1"
6873+
resolved "https://registry.yarnpkg.com/husky/-/husky-5.0.1.tgz#c1b1f2b0da297399e295b6c204b680e45f26feda"
6874+
integrity sha512-ZNfMqtluHyMaW795l1jOLGOGSFAyZ6JC8jZj1QkagBmfuxrSFKX+Wrbb9gR+OD8iNJb8JNDpaMtCpE5XnLdHMw==
68986875

68996876
iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.11:
69006877
version "0.4.24"
@@ -9614,11 +9591,6 @@ openapi3-ts@^1.2.0:
96149591
resolved "https://registry.yarnpkg.com/openapi3-ts/-/openapi3-ts-1.4.0.tgz#679d5a24be0efc36f5de4fc2c4b8513663e16f65"
96159592
integrity sha512-8DmE2oKayvSkIR3XSZ4+pRliBsx19bSNeIzkTPswY8r4wvjX86bMxsORdqwAwMxE8PefOcSAT2auvi/0TZe9yA==
96169593

9617-
opencollective-postinstall@^2.0.2:
9618-
version "2.0.3"
9619-
resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
9620-
integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
9621-
96229594
openurl@1.1.1:
96239595
version "1.1.1"
96249596
resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387"
@@ -10093,20 +10065,6 @@ pinkie@^2.0.0:
1009310065
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
1009410066
integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
1009510067

10096-
pkg-dir@^4.2.0:
10097-
version "4.2.0"
10098-
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
10099-
integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
10100-
dependencies:
10101-
find-up "^4.0.0"
10102-
10103-
please-upgrade-node@^3.2.0:
10104-
version "3.2.0"
10105-
resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
10106-
integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
10107-
dependencies:
10108-
semver-compare "^1.0.0"
10109-
1011010068
plist@^3.0.1:
1011110069
version "3.0.1"
1011210070
resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"
@@ -11368,11 +11326,6 @@ selenium-webdriver@^4.0.0-alpha.1:
1136811326
tmp "0.0.30"
1136911327
xml2js "^0.4.17"
1137011328

11371-
semver-compare@^1.0.0:
11372-
version "1.0.0"
11373-
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
11374-
integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
11375-
1137611329
semver-diff@^3.1.1:
1137711330
version "3.1.1"
1137811331
resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
@@ -11394,11 +11347,6 @@ semver-greatest-satisfied-range@^1.1.0:
1139411347
dependencies:
1139511348
sver-compat "^1.5.0"
1139611349

11397-
semver-regex@^2.0.0:
11398-
version "2.0.0"
11399-
resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
11400-
integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
11401-
1140211350
"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.2.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
1140311351
version "5.7.1"
1140411352
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
@@ -12855,11 +12803,6 @@ typescript@~3.7.2:
1285512803
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
1285612804
integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
1285712805

12858-
typescript@~4.0.2:
12859-
version "4.0.5"
12860-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"
12861-
integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==
12862-
1286312806
ua-parser-js@^0.7.18:
1286412807
version "0.7.23"
1286512808
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.23.tgz#704d67f951e13195fbcd3d78818577f5bc1d547b"
@@ -13402,11 +13345,6 @@ which-module@^2.0.0:
1340213345
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
1340313346
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
1340413347

13405-
which-pm-runs@^1.0.0:
13406-
version "1.0.0"
13407-
resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
13408-
integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
13409-
1341013348
which@1, which@^1.1.1, which@^1.2.1, which@^1.2.14, which@^1.2.9, which@^1.3.1:
1341113349
version "1.3.1"
1341213350
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"

0 commit comments

Comments
 (0)