Skip to content

Commit 85fca63

Browse files
committed
Merge branch 'master' into refactor/prompt2
2 parents 64c9cc8 + 3b71d40 commit 85fca63

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

@commitlint/config-lerna-scopes/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
> Lint your commits, angular-style
1+
> Lint your lerna project commits
22
33
# @commitlint/config-lerna-scopes
44

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
},
7979
"devDependencies": {
8080
"@lerna/project": "3.21.0",
81-
"@types/jest": "26.0.19",
81+
"@types/jest": "26.0.20",
8282
"@types/node": "12.19.12",
8383
"@typescript-eslint/eslint-plugin": "^4.1.0",
8484
"@typescript-eslint/parser": "^4.1.0",
@@ -87,7 +87,7 @@
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.6",
90+
"husky": "4.3.7",
9191
"jest": "26.6.3",
9292
"lerna": "^3.22.1",
9393
"lerna-v3": "npm:lerna@3",

yarn.lock

+20-20
Original file line numberDiff line numberDiff line change
@@ -2335,10 +2335,10 @@
23352335
dependencies:
23362336
"@types/istanbul-lib-report" "*"
23372337

2338-
"@types/[email protected].19":
2339-
version "26.0.19"
2340-
resolved "https://registry.npmjs.org/@types/jest/-/jest-26.0.19.tgz#e6fa1e3def5842ec85045bd5210e9bb8289de790"
2341-
integrity sha512-jqHoirTG61fee6v6rwbnEuKhpSKih0tuhqeFbCmMmErhtu3BYlOZaXWjffgOstMM4S/3iQD31lI5bGLTrs97yQ==
2338+
"@types/[email protected].20":
2339+
version "26.0.20"
2340+
resolved "https://registry.npmjs.org/@types/jest/-/jest-26.0.20.tgz#cd2f2702ecf69e86b586e1f5223a60e454056307"
2341+
integrity sha512-9zi2Y+5USJRxd0FsahERhBwlcvFh6D2GLQnY2FH2BzK8J9s9omvNHIbvABwIluXa0fD8XVKMLTO0aOEuUfACAA==
23422342
dependencies:
23432343
jest-diff "^26.0.0"
23442344
pretty-format "^26.0.0"
@@ -4988,12 +4988,12 @@ find-up@^5.0.0:
49884988
locate-path "^6.0.0"
49894989
path-exists "^4.0.0"
49904990

4991-
find-versions@^3.2.0:
4992-
version "3.2.0"
4993-
resolved "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e"
4994-
integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==
4991+
find-versions@^4.0.0:
4992+
version "4.0.0"
4993+
resolved "https://registry.npmjs.org/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965"
4994+
integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==
49954995
dependencies:
4996-
semver-regex "^2.0.0"
4996+
semver-regex "^3.1.2"
49974997

49984998
findup-sync@^3.0.0:
49994999
version "3.0.0"
@@ -5655,18 +5655,18 @@ humanize-ms@^1.2.1:
56555655
dependencies:
56565656
ms "^2.0.0"
56575657

5658-
5659-
version "4.3.6"
5660-
resolved "https://registry.npmjs.org/husky/-/husky-4.3.6.tgz#ebd9dd8b9324aa851f1587318db4cccb7665a13c"
5661-
integrity sha512-o6UjVI8xtlWRL5395iWq9LKDyp/9TE7XMOTvIpEVzW638UcGxTmV5cfel6fsk/jbZSTlvfGVJf2svFtybcIZag==
5658+
5659+
version "4.3.7"
5660+
resolved "https://registry.npmjs.org/husky/-/husky-4.3.7.tgz#ca47bbe6213c1aa8b16bbd504530d9600de91e88"
5661+
integrity sha512-0fQlcCDq/xypoyYSJvEuzbDPHFf8ZF9IXKJxlrnvxABTSzK1VPT2RKYQKrcgJ+YD39swgoB6sbzywUqFxUiqjw==
56625662
dependencies:
56635663
chalk "^4.0.0"
56645664
ci-info "^2.0.0"
56655665
compare-versions "^3.6.0"
56665666
cosmiconfig "^7.0.0"
5667-
find-versions "^3.2.0"
5667+
find-versions "^4.0.0"
56685668
opencollective-postinstall "^2.0.2"
5669-
pkg-dir "^4.2.0"
5669+
pkg-dir "^5.0.0"
56705670
please-upgrade-node "^3.2.0"
56715671
slash "^3.0.0"
56725672
which-pm-runs "^1.0.0"
@@ -8298,7 +8298,7 @@ pirates@^4.0.1:
82988298
dependencies:
82998299
node-modules-regexp "^1.0.0"
83008300

8301-
8301+
[email protected], pkg-dir@^5.0.0:
83028302
version "5.0.0"
83038303
resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
83048304
integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
@@ -9121,10 +9121,10 @@ semver-diff@^3.1.1:
91219121
dependencies:
91229122
semver "^6.3.0"
91239123

9124-
semver-regex@^2.0.0:
9125-
version "2.0.0"
9126-
resolved "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
9127-
integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
9124+
semver-regex@^3.1.2:
9125+
version "3.1.2"
9126+
resolved "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.2.tgz#34b4c0d361eef262e07199dbef316d0f2ab11807"
9127+
integrity sha512-bXWyL6EAKOJa81XG1OZ/Yyuq+oT0b2YLlxx7c+mrdYPaPbnj6WgVULXhinMIeZGufuUBu/eVRqXEhiv4imfwxA==
91289128

91299129
"semver@2 || 3 || 4 || 5", "[email protected] || 3.x || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
91309130
version "5.7.1"

0 commit comments

Comments
 (0)