Skip to content

Commit b8d29f0

Browse files
authored
Merge branch 'development' into dependabot/npm_and_yarn/eslint-7.3.1
2 parents 8a831af + a5e379b commit b8d29f0

File tree

2 files changed

+79
-43
lines changed

2 files changed

+79
-43
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"@vue/test-utils": "^1.0.3",
6969
"babel-core": "^6.26.3",
7070
"babel-eslint": "^10.1.0",
71-
"babel-jest": "^26.0.1",
71+
"babel-jest": "^26.1.0",
7272
"cpx": "^1.5.0",
7373
"eslint": "^7.3.1",
7474
"eslint-config-prettier": "^6.11.0",

yarn.lock

Lines changed: 78 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,21 +1384,21 @@
13841384
jest-runner "^26.0.1"
13851385
jest-runtime "^26.0.1"
13861386

1387-
"@jest/transform@^26.0.1":
1388-
version "26.0.1"
1389-
resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.0.1.tgz#0e3ecbb34a11cd4b2080ed0a9c4856cf0ceb0639"
1390-
integrity sha512-pPRkVkAQ91drKGbzCfDOoHN838+FSbYaEAvBXvKuWeeRRUD8FjwXkqfUNUZL6Ke48aA/1cqq/Ni7kVMCoqagWA==
1387+
"@jest/transform@^26.0.1", "@jest/transform@^26.1.0":
1388+
version "26.1.0"
1389+
resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.1.0.tgz#697f48898c2a2787c9b4cb71d09d7e617464e509"
1390+
integrity sha512-ICPm6sUXmZJieq45ix28k0s+d/z2E8CHDsq+WwtWI6kW8m7I8kPqarSEcUN86entHQ570ZBRci5OWaKL0wlAWw==
13911391
dependencies:
13921392
"@babel/core" "^7.1.0"
1393-
"@jest/types" "^26.0.1"
1393+
"@jest/types" "^26.1.0"
13941394
babel-plugin-istanbul "^6.0.0"
13951395
chalk "^4.0.0"
13961396
convert-source-map "^1.4.0"
13971397
fast-json-stable-stringify "^2.0.0"
13981398
graceful-fs "^4.2.4"
1399-
jest-haste-map "^26.0.1"
1399+
jest-haste-map "^26.1.0"
14001400
jest-regex-util "^26.0.0"
1401-
jest-util "^26.0.1"
1401+
jest-util "^26.1.0"
14021402
micromatch "^4.0.2"
14031403
pirates "^4.0.1"
14041404
slash "^3.0.0"
@@ -1415,10 +1415,10 @@
14151415
"@types/yargs" "^15.0.0"
14161416
chalk "^3.0.0"
14171417

1418-
"@jest/types@^26.0.1":
1419-
version "26.0.1"
1420-
resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.0.1.tgz#b78333fbd113fa7aec8d39de24f88de8686dac67"
1421-
integrity sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==
1418+
"@jest/types@^26.0.1", "@jest/types@^26.1.0":
1419+
version "26.1.0"
1420+
resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.1.0.tgz#f8afaaaeeb23b5cad49dd1f7779689941dcb6057"
1421+
integrity sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ==
14221422
dependencies:
14231423
"@types/istanbul-lib-coverage" "^2.0.0"
14241424
"@types/istanbul-reports" "^1.1.1"
@@ -1998,21 +1998,10 @@
19981998
"@types/browserslist" "*"
19991999
postcss "7.x.x"
20002000

2001-
"@types/babel__core@^7.1.7":
2002-
version "7.1.7"
2003-
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
2004-
integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
2005-
dependencies:
2006-
"@babel/parser" "^7.1.0"
2007-
"@babel/types" "^7.0.0"
2008-
"@types/babel__generator" "*"
2009-
"@types/babel__template" "*"
2010-
"@types/babel__traverse" "*"
2011-
2012-
"@types/babel__core@^7.1.8":
2013-
version "7.1.8"
2014-
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.8.tgz#057f725aca3641f49fc11c7a87a9de5ec588a5d7"
2015-
integrity sha512-KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ==
2001+
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7", "@types/babel__core@^7.1.8":
2002+
version "7.1.9"
2003+
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz#77e59d438522a6fb898fa43dc3455c6e72f3963d"
2004+
integrity sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==
20162005
dependencies:
20172006
"@babel/parser" "^7.1.0"
20182007
"@babel/types" "^7.0.0"
@@ -3191,16 +3180,16 @@ babel-helpers@^6.24.1:
31913180
babel-runtime "^6.22.0"
31923181
babel-template "^6.24.1"
31933182

3194-
babel-jest@^26.0.1:
3195-
version "26.0.1"
3196-
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.0.1.tgz#450139ce4b6c17174b136425bda91885c397bc46"
3197-
integrity sha512-Z4GGmSNQ8pX3WS1O+6v3fo41YItJJZsVxG5gIQ+HuB/iuAQBJxMTHTwz292vuYws1LnHfwSRgoqI+nxdy/pcvw==
3183+
babel-jest@^26.0.1, babel-jest@^26.1.0:
3184+
version "26.1.0"
3185+
resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.1.0.tgz#b20751185fc7569a0f135730584044d1cb934328"
3186+
integrity sha512-Nkqgtfe7j6PxLO6TnCQQlkMm8wdTdnIF8xrdpooHCuD5hXRzVEPbPneTJKknH5Dsv3L8ip9unHDAp48YQ54Dkg==
31983187
dependencies:
3199-
"@jest/transform" "^26.0.1"
3200-
"@jest/types" "^26.0.1"
3188+
"@jest/transform" "^26.1.0"
3189+
"@jest/types" "^26.1.0"
32013190
"@types/babel__core" "^7.1.7"
32023191
babel-plugin-istanbul "^6.0.0"
3203-
babel-preset-jest "^26.0.0"
3192+
babel-preset-jest "^26.1.0"
32043193
chalk "^4.0.0"
32053194
graceful-fs "^4.2.4"
32063195
slash "^3.0.0"
@@ -3241,13 +3230,14 @@ babel-plugin-istanbul@^6.0.0:
32413230
istanbul-lib-instrument "^4.0.0"
32423231
test-exclude "^6.0.0"
32433232

3244-
babel-plugin-jest-hoist@^26.0.0:
3245-
version "26.0.0"
3246-
resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.0.0.tgz#fd1d35f95cf8849fc65cb01b5e58aedd710b34a8"
3247-
integrity sha512-+AuoehOrjt9irZL7DOt2+4ZaTM6dlu1s5TTS46JBa0/qem4dy7VNW3tMb96qeEqcIh20LD73TVNtmVEeymTG7w==
3233+
babel-plugin-jest-hoist@^26.1.0:
3234+
version "26.1.0"
3235+
resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.1.0.tgz#c6a774da08247a28285620a64dfadbd05dd5233a"
3236+
integrity sha512-qhqLVkkSlqmC83bdMhM8WW4Z9tB+JkjqAqlbbohS9sJLT5Ha2vfzuKqg5yenXrAjOPG2YC0WiXdH3a9PvB+YYw==
32483237
dependencies:
32493238
"@babel/template" "^7.3.3"
32503239
"@babel/types" "^7.3.3"
3240+
"@types/babel__core" "^7.0.0"
32513241
"@types/babel__traverse" "^7.0.6"
32523242

32533243
babel-plugin-transform-es2015-modules-commonjs@^6.26.0:
@@ -3284,12 +3274,12 @@ babel-preset-current-node-syntax@^0.1.2:
32843274
"@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
32853275
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
32863276

3287-
babel-preset-jest@^26.0.0:
3288-
version "26.0.0"
3289-
resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.0.0.tgz#1eac82f513ad36c4db2e9263d7c485c825b1faa6"
3290-
integrity sha512-9ce+DatAa31DpR4Uir8g4Ahxs5K4W4L8refzt+qHWQANb6LhGcAEfIFgLUwk67oya2cCUd6t4eUMtO/z64ocNw==
3277+
babel-preset-jest@^26.1.0:
3278+
version "26.1.0"
3279+
resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.1.0.tgz#612f714e5b457394acfd863793c564cbcdb7d1c1"
3280+
integrity sha512-na9qCqFksknlEj5iSdw1ehMVR06LCCTkZLGKeEtxDDdhg8xpUF09m29Kvh1pRbZ07h7AQ5ttLYUwpXL4tO6w7w==
32913281
dependencies:
3292-
babel-plugin-jest-hoist "^26.0.0"
3282+
babel-plugin-jest-hoist "^26.1.0"
32933283
babel-preset-current-node-syntax "^0.1.2"
32943284

32953285
babel-register@^6.26.0:
@@ -7990,6 +7980,26 @@ jest-haste-map@^26.0.1:
79907980
optionalDependencies:
79917981
fsevents "^2.1.2"
79927982

7983+
jest-haste-map@^26.1.0:
7984+
version "26.1.0"
7985+
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.1.0.tgz#ef31209be73f09b0d9445e7d213e1b53d0d1476a"
7986+
integrity sha512-WeBS54xCIz9twzkEdm6+vJBXgRBQfdbbXD0dk8lJh7gLihopABlJmIQFdWSDDtuDe4PRiObsjZSUjbJ1uhWEpA==
7987+
dependencies:
7988+
"@jest/types" "^26.1.0"
7989+
"@types/graceful-fs" "^4.1.2"
7990+
anymatch "^3.0.3"
7991+
fb-watchman "^2.0.0"
7992+
graceful-fs "^4.2.4"
7993+
jest-serializer "^26.1.0"
7994+
jest-util "^26.1.0"
7995+
jest-worker "^26.1.0"
7996+
micromatch "^4.0.2"
7997+
sane "^4.0.3"
7998+
walker "^1.0.7"
7999+
which "^2.0.2"
8000+
optionalDependencies:
8001+
fsevents "^2.1.2"
8002+
79938003
jest-jasmine2@^26.0.1:
79948004
version "26.0.1"
79958005
resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.0.1.tgz#947c40ee816636ba23112af3206d6fa7b23c1c1c"
@@ -8149,6 +8159,13 @@ jest-serializer@^26.0.0:
81498159
dependencies:
81508160
graceful-fs "^4.2.4"
81518161

8162+
jest-serializer@^26.1.0:
8163+
version "26.1.0"
8164+
resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.1.0.tgz#72a394531fc9b08e173dc7d297440ac610d95022"
8165+
integrity sha512-eqZOQG/0+MHmr25b2Z86g7+Kzd5dG9dhCiUoyUNJPgiqi38DqbDEOlHcNijyfZoj74soGBohKBZuJFS18YTJ5w==
8166+
dependencies:
8167+
graceful-fs "^4.2.4"
8168+
81528169
jest-snapshot@^26.0.1:
81538170
version "26.0.1"
81548171
resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.0.1.tgz#1baa942bd83d47b837a84af7fcf5fd4a236da399"
@@ -8181,6 +8198,17 @@ jest-util@^26.0.1:
81818198
is-ci "^2.0.0"
81828199
make-dir "^3.0.0"
81838200

8201+
jest-util@^26.1.0:
8202+
version "26.1.0"
8203+
resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.1.0.tgz#80e85d4ba820decacf41a691c2042d5276e5d8d8"
8204+
integrity sha512-rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg==
8205+
dependencies:
8206+
"@jest/types" "^26.1.0"
8207+
chalk "^4.0.0"
8208+
graceful-fs "^4.2.4"
8209+
is-ci "^2.0.0"
8210+
micromatch "^4.0.2"
8211+
81848212
jest-validate@^26.0.1:
81858213
version "26.0.1"
81868214
resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.0.1.tgz#a62987e1da5b7f724130f904725e22f4e5b2e23c"
@@ -8221,6 +8249,14 @@ jest-worker@^26.0.0:
82218249
merge-stream "^2.0.0"
82228250
supports-color "^7.0.0"
82238251

8252+
jest-worker@^26.1.0:
8253+
version "26.1.0"
8254+
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.1.0.tgz#65d5641af74e08ccd561c240e7db61284f82f33d"
8255+
integrity sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ==
8256+
dependencies:
8257+
merge-stream "^2.0.0"
8258+
supports-color "^7.0.0"
8259+
82248260
jest@^26.0.1:
82258261
version "26.0.1"
82268262
resolved "https://registry.yarnpkg.com/jest/-/jest-26.0.1.tgz#5c51a2e58dff7525b65f169721767173bf832694"

0 commit comments

Comments
 (0)