Skip to content

Commit beb2ec0

Browse files
committed
Merge remote-tracking branch 'upstream/master' into refactor/prompt2
2 parents b3d0302 + 7edef12 commit beb2ec0

File tree

3 files changed

+65
-65
lines changed

3 files changed

+65
-65
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Husky V4:
114114
Husky V5
115115

116116
```
117-
# .husky/pre-commit
117+
# .husky/commit-msg
118118
# ...
119119
npx --no-install commitlint --edit $1
120120
# or

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,22 @@
7979
"devDependencies": {
8080
"@lerna/project": "3.21.0",
8181
"@types/jest": "26.0.19",
82-
"@types/node": "12.19.8",
82+
"@types/node": "12.19.9",
8383
"@typescript-eslint/eslint-plugin": "^4.1.0",
8484
"@typescript-eslint/parser": "^4.1.0",
8585
"docsify-cli": "^4.4.0",
8686
"eslint": "^7.0.0",
8787
"eslint-config-prettier": "^7.0.0",
8888
"eslint-plugin-import": "^2.20.1",
8989
"eslint-plugin-jest": "^24.0.0",
90-
"husky": "4.3.5",
90+
"husky": "4.3.6",
9191
"jest": "25.1.0",
9292
"lerna": "^3.22.1",
9393
"lerna-v3": "npm:lerna@3",
9494
"lint-staged": "10.5.3",
9595
"prettier": "^2.0.5",
9696
"ts-jest": "26.4.4",
97-
"typescript": "4.1.2"
97+
"typescript": "4.1.3"
9898
},
9999
"husky": {
100100
"hooks": {

yarn.lock

+61-61
Original file line numberDiff line numberDiff line change
@@ -2339,10 +2339,10 @@
23392339
resolved "https://registry.npmjs.org/@types/node/-/node-12.12.26.tgz#213e153babac0ed169d44a6d919501e68f59dea9"
23402340
integrity sha512-UmUm94/QZvU5xLcUlNR8hA7Ac+fGpO1EG/a8bcWVz0P0LqtxFmun9Y2bbtuckwGboWJIT70DoWq1r3hb56n3DA==
23412341

2342-
"@types/[email protected].8":
2343-
version "12.19.8"
2344-
resolved "https://registry.npmjs.org/@types/node/-/node-12.19.8.tgz#efd6d1a90525519fc608c9db16c8a78f7693a978"
2345-
integrity sha512-D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg==
2342+
"@types/[email protected].9":
2343+
version "12.19.9"
2344+
resolved "https://registry.npmjs.org/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679"
2345+
integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q==
23462346

23472347
"@types/normalize-package-data@^2.4.0":
23482348
version "2.4.0"
@@ -2396,27 +2396,27 @@
23962396
"@types/yargs-parser" "*"
23972397

23982398
"@typescript-eslint/eslint-plugin@^4.1.0":
2399-
version "4.9.1"
2400-
resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.9.1.tgz#66758cbe129b965fe9c63b04b405d0cf5280868b"
2401-
integrity sha512-QRLDSvIPeI1pz5tVuurD+cStNR4sle4avtHhxA+2uyixWGFjKzJ+EaFVRW6dA/jOgjV5DTAjOxboQkRDE8cRlQ==
2399+
version "4.10.0"
2400+
resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.10.0.tgz#19ed3baf4bc4232c5a7fcd32eaca75c3a5baf9f3"
2401+
integrity sha512-h6/V46o6aXpKRlarP1AiJEXuCJ7cMQdlpfMDrcllIgX3dFkLwEBTXAoNP98ZoOmqd1xvymMVRAI4e7yVvlzWEg==
24022402
dependencies:
2403-
"@typescript-eslint/experimental-utils" "4.9.1"
2404-
"@typescript-eslint/scope-manager" "4.9.1"
2403+
"@typescript-eslint/experimental-utils" "4.10.0"
2404+
"@typescript-eslint/scope-manager" "4.10.0"
24052405
debug "^4.1.1"
24062406
functional-red-black-tree "^1.0.1"
24072407
regexpp "^3.0.0"
24082408
semver "^7.3.2"
24092409
tsutils "^3.17.1"
24102410

2411-
"@typescript-eslint/experimental-utils@4.9.1":
2412-
version "4.9.1"
2413-
resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.9.1.tgz#86633e8395191d65786a808dc3df030a55267ae2"
2414-
integrity sha512-c3k/xJqk0exLFs+cWSJxIjqLYwdHCuLWhnpnikmPQD2+NGAx9KjLYlBDcSI81EArh9FDYSL6dslAUSwILeWOxg==
2411+
"@typescript-eslint/experimental-utils@4.10.0":
2412+
version "4.10.0"
2413+
resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.10.0.tgz#dbf5d0f89802d5feaf7d11e5b32df29bbc2f3a0e"
2414+
integrity sha512-opX+7ai1sdWBOIoBgpVJrH5e89ra1KoLrJTz0UtWAa4IekkKmqDosk5r6xqRaNJfCXEfteW4HXQAwMdx+jjEmw==
24152415
dependencies:
24162416
"@types/json-schema" "^7.0.3"
2417-
"@typescript-eslint/scope-manager" "4.9.1"
2418-
"@typescript-eslint/types" "4.9.1"
2419-
"@typescript-eslint/typescript-estree" "4.9.1"
2417+
"@typescript-eslint/scope-manager" "4.10.0"
2418+
"@typescript-eslint/types" "4.10.0"
2419+
"@typescript-eslint/typescript-estree" "4.10.0"
24202420
eslint-scope "^5.0.0"
24212421
eslint-utils "^2.0.0"
24222422

@@ -2433,15 +2433,23 @@
24332433
eslint-utils "^2.0.0"
24342434

24352435
"@typescript-eslint/parser@^4.1.0":
2436-
version "4.9.1"
2437-
resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.9.1.tgz#2d74c4db5dd5117379a9659081a4d1ec02629055"
2438-
integrity sha512-Gv2VpqiomvQ2v4UL+dXlQcZ8zCX4eTkoIW+1aGVWT6yTO+6jbxsw7yQl2z2pPl/4B9qa5JXeIbhJpONKjXIy3g==
2436+
version "4.10.0"
2437+
resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.10.0.tgz#1a622b0847b765b2d8f0ede6f0cdd85f03d76031"
2438+
integrity sha512-amBvUUGBMadzCW6c/qaZmfr3t9PyevcSWw7hY2FuevdZVp5QPw/K76VSQ5Sw3BxlgYCHZcK6DjIhSZK0PQNsQg==
24392439
dependencies:
2440-
"@typescript-eslint/scope-manager" "4.9.1"
2441-
"@typescript-eslint/types" "4.9.1"
2442-
"@typescript-eslint/typescript-estree" "4.9.1"
2440+
"@typescript-eslint/scope-manager" "4.10.0"
2441+
"@typescript-eslint/types" "4.10.0"
2442+
"@typescript-eslint/typescript-estree" "4.10.0"
24432443
debug "^4.1.1"
24442444

2445+
"@typescript-eslint/[email protected]":
2446+
version "4.10.0"
2447+
resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.10.0.tgz#dbd7e1fc63d7363e3aaff742a6f2b8afdbac9d27"
2448+
integrity sha512-WAPVw35P+fcnOa8DEic0tQUhoJJsgt+g6DEcz257G7vHFMwmag58EfowdVbiNcdfcV27EFR0tUBVXkDoIvfisQ==
2449+
dependencies:
2450+
"@typescript-eslint/types" "4.10.0"
2451+
"@typescript-eslint/visitor-keys" "4.10.0"
2452+
24452453
"@typescript-eslint/[email protected]":
24462454
version "4.7.0"
24472455
resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.7.0.tgz#2115526085fb72723ccdc1eeae75dec7126220ed"
@@ -2450,23 +2458,29 @@
24502458
"@typescript-eslint/types" "4.7.0"
24512459
"@typescript-eslint/visitor-keys" "4.7.0"
24522460

2453-
"@typescript-eslint/[email protected]":
2454-
version "4.9.1"
2455-
resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.9.1.tgz#cc2fde310b3f3deafe8436a924e784eaab265103"
2456-
integrity sha512-sa4L9yUfD/1sg9Kl8OxPxvpUcqxKXRjBeZxBuZSSV1v13hjfEJkn84n0An2hN8oLQ1PmEl2uA6FkI07idXeFgQ==
2457-
dependencies:
2458-
"@typescript-eslint/types" "4.9.1"
2459-
"@typescript-eslint/visitor-keys" "4.9.1"
2461+
"@typescript-eslint/[email protected]":
2462+
version "4.10.0"
2463+
resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.10.0.tgz#12f983750ebad867f0c806e705c1953cd6415789"
2464+
integrity sha512-+dt5w1+Lqyd7wIPMa4XhJxUuE8+YF+vxQ6zxHyhLGHJjHiunPf0wSV8LtQwkpmAsRi1lEOoOIR30FG5S2HS33g==
24602465

24612466
"@typescript-eslint/[email protected]":
24622467
version "4.7.0"
24632468
resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.7.0.tgz#5e95ef5c740f43d942542b35811f87b62fccca69"
24642469
integrity sha512-uLszFe0wExJc+I7q0Z/+BnP7wao/kzX0hB5vJn4LIgrfrMLgnB2UXoReV19lkJQS1a1mHWGGODSxnBx6JQC3Sg==
24652470

2466-
"@typescript-eslint/[email protected]":
2467-
version "4.9.1"
2468-
resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.9.1.tgz#a1a7dd80e4e5ac2c593bc458d75dd1edaf77faa2"
2469-
integrity sha512-fjkT+tXR13ks6Le7JiEdagnwEFc49IkOyys7ueWQ4O8k4quKPwPJudrwlVOJCUQhXo45PrfIvIarcrEjFTNwUA==
2471+
"@typescript-eslint/[email protected]":
2472+
version "4.10.0"
2473+
resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.10.0.tgz#1e62e45fd57866afd42daf5e9fb6bd4e8dbcfa75"
2474+
integrity sha512-mGK0YRp9TOk6ZqZ98F++bW6X5kMTzCRROJkGXH62d2azhghmq+1LNLylkGe6uGUOQzD452NOAEth5VAF6PDo5g==
2475+
dependencies:
2476+
"@typescript-eslint/types" "4.10.0"
2477+
"@typescript-eslint/visitor-keys" "4.10.0"
2478+
debug "^4.1.1"
2479+
globby "^11.0.1"
2480+
is-glob "^4.0.1"
2481+
lodash "^4.17.15"
2482+
semver "^7.3.2"
2483+
tsutils "^3.17.1"
24702484

24712485
"@typescript-eslint/[email protected]":
24722486
version "4.7.0"
@@ -2482,19 +2496,13 @@
24822496
semver "^7.3.2"
24832497
tsutils "^3.17.1"
24842498

2485-
"@typescript-eslint/typescript-estree@4.9.1":
2486-
version "4.9.1"
2487-
resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.9.1.tgz#6e5b86ff5a5f66809e1f347469fadeec69ac50bf"
2488-
integrity sha512-bzP8vqwX6Vgmvs81bPtCkLtM/Skh36NE6unu6tsDeU/ZFoYthlTXbBmpIrvosgiDKlWTfb2ZpPELHH89aQjeQw==
2499+
"@typescript-eslint/visitor-keys@4.10.0":
2500+
version "4.10.0"
2501+
resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.10.0.tgz#9478822329a9bc8ebcc80623d7f79a01da5ee451"
2502+
integrity sha512-hPyz5qmDMuZWFtHZkjcCpkAKHX8vdu1G3YsCLEd25ryZgnJfj6FQuJ5/O7R+dB1ueszilJmAFMtlU4CA6se3Jg==
24892503
dependencies:
2490-
"@typescript-eslint/types" "4.9.1"
2491-
"@typescript-eslint/visitor-keys" "4.9.1"
2492-
debug "^4.1.1"
2493-
globby "^11.0.1"
2494-
is-glob "^4.0.1"
2495-
lodash "^4.17.15"
2496-
semver "^7.3.2"
2497-
tsutils "^3.17.1"
2504+
"@typescript-eslint/types" "4.10.0"
2505+
eslint-visitor-keys "^2.0.0"
24982506

24992507
"@typescript-eslint/[email protected]":
25002508
version "4.7.0"
@@ -2504,14 +2512,6 @@
25042512
"@typescript-eslint/types" "4.7.0"
25052513
eslint-visitor-keys "^2.0.0"
25062514

2507-
"@typescript-eslint/[email protected]":
2508-
version "4.9.1"
2509-
resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.9.1.tgz#d76374a58c4ead9e92b454d186fea63487b25ae1"
2510-
integrity sha512-9gspzc6UqLQHd7lXQS7oWs+hrYggspv/rk6zzEMhCbYwPE/sF7oxo7GAjkS35Tdlt7wguIG+ViWCPtVZHz/ybQ==
2511-
dependencies:
2512-
"@typescript-eslint/types" "4.9.1"
2513-
eslint-visitor-keys "^2.0.0"
2514-
25152515
"@zkochan/cmd-shim@^3.1.0":
25162516
version "3.1.0"
25172517
resolved "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz#2ab8ed81f5bb5452a85f25758eb9b8681982fd2e"
@@ -5617,10 +5617,10 @@ humanize-ms@^1.2.1:
56175617
dependencies:
56185618
ms "^2.0.0"
56195619

5620-
5621-
version "4.3.5"
5622-
resolved "https://registry.npmjs.org/husky/-/husky-4.3.5.tgz#ab8d2a0eb6b62fef2853ee3d442c927d89290902"
5623-
integrity sha512-E5S/1HMoDDaqsH8kDF5zeKEQbYqe3wL9zJDyqyYqc8I4vHBtAoxkDBGXox0lZ9RI+k5GyB728vZdmnM4bYap+g==
5620+
5621+
version "4.3.6"
5622+
resolved "https://registry.npmjs.org/husky/-/husky-4.3.6.tgz#ebd9dd8b9324aa851f1587318db4cccb7665a13c"
5623+
integrity sha512-o6UjVI8xtlWRL5395iWq9LKDyp/9TE7XMOTvIpEVzW638UcGxTmV5cfel6fsk/jbZSTlvfGVJf2svFtybcIZag==
56245624
dependencies:
56255625
chalk "^4.0.0"
56265626
ci-info "^2.0.0"
@@ -10081,10 +10081,10 @@ typedarray@^0.0.6:
1008110081
resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
1008210082
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
1008310083

10084-
10085-
version "4.1.2"
10086-
resolved "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9"
10087-
integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ==
10084+
10085+
version "4.1.3"
10086+
resolved "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
10087+
integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
1008810088

1008910089
uglify-js@^3.1.4:
1009010090
version "3.7.3"

0 commit comments

Comments
 (0)