Skip to content

Commit c41ce59

Browse files
committed
Merge branch 'master' of https://github.com/vuejs/vue-jest into update-jest
2 parents db4967d + da2e575 commit c41ce59

File tree

1 file changed

+20
-22
lines changed

1 file changed

+20
-22
lines changed

yarn.lock

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,13 +1553,6 @@ astral-regex@^1.0.0:
15531553
resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
15541554
integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
15551555

1556-
async@^2.5.0:
1557-
version "2.6.1"
1558-
resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
1559-
integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
1560-
dependencies:
1561-
lodash "^4.17.10"
1562-
15631556
asynckit@^0.4.0:
15641557
version "0.4.0"
15651558
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -2379,10 +2372,10 @@ commander@^2.14.1, commander@^2.9.0:
23792372
resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
23802373
integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
23812374

2382-
commander@~2.17.1:
2383-
version "2.17.1"
2384-
resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
2385-
integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
2375+
commander@~2.20.3:
2376+
version "2.20.3"
2377+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
2378+
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
23862379

23872380
commander@~2.6.0:
23882381
version "2.6.0"
@@ -4177,11 +4170,11 @@ hamljs@^0.6.2:
41774170
integrity sha1-e3EWz22+cnjkKz9u+HJaM+F3yOM=
41784171

41794172
handlebars@^4.0.2:
4180-
version "4.0.12"
4181-
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
4182-
integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
4173+
version "4.5.3"
4174+
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
4175+
integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
41834176
dependencies:
4184-
async "^2.5.0"
4177+
neo-async "^2.6.0"
41854178
optimist "^0.6.1"
41864179
source-map "^0.6.1"
41874180
optionalDependencies:
@@ -6468,9 +6461,9 @@ mississippi@^3.0.0:
64686461
through2 "^2.0.0"
64696462

64706463
mixin-deep@^1.2.0:
6471-
version "1.3.1"
6472-
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
6473-
integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
6464+
version "1.3.2"
6465+
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
6466+
integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
64746467
dependencies:
64756468
for-in "^1.0.2"
64766469
is-extendable "^1.0.1"
@@ -6541,6 +6534,11 @@ natural-compare@^1.4.0:
65416534
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
65426535
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
65436536

6537+
neo-async@^2.6.0:
6538+
version "2.6.1"
6539+
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
6540+
integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
6541+
65446542
nerf-dart@^1.0.0:
65456543
version "1.0.0"
65466544
resolved "https://registry.yarnpkg.com/nerf-dart/-/nerf-dart-1.0.0.tgz#e6dab7febf5ad816ea81cf5c629c5a0ebde72c1a"
@@ -9342,11 +9340,11 @@ uglify-js@^2.4.19, uglify-js@^2.6.1:
93429340
uglify-to-browserify "~1.0.0"
93439341

93449342
uglify-js@^3.1.4:
9345-
version "3.4.9"
9346-
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
9347-
integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
9343+
version "3.7.3"
9344+
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a"
9345+
integrity sha512-7tINm46/3puUA4hCkKYo4Xdts+JDaVC9ZPRcG8Xw9R4nhO/gZgUM3TENq8IF4Vatk8qCig4MzP/c8G4u2BkVQg==
93489346
dependencies:
9349-
commander "~2.17.1"
9347+
commander "~2.20.3"
93509348
source-map "~0.6.1"
93519349

93529350
uglify-js@~2.2.5:

0 commit comments

Comments
 (0)