Skip to content

Commit d0fecca

Browse files
authored
Merge branch 'development' into dependabot/npm_and_yarn/nuxtjs/eslint-config-typescript-3.0.0
2 parents 0b9d272 + 1b29a2f commit d0fecca

File tree

2 files changed

+31
-47
lines changed

2 files changed

+31
-47
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"nuxt-property-decorator": "^2.7.2",
5252
"nuxt-svg-loader": "^1.2.0",
5353
"nuxt-webfontloader": "^1.1.0",
54-
"uuid": "^8.2.0",
54+
"uuid": "^8.3.0",
5555
"vue-property-decorator": "^9.0.0",
5656
"vuex": "^3.5.1",
5757
"vuex-class-component": "2.3.3",
@@ -63,13 +63,13 @@
6363
"@nuxtjs/eslint-config-typescript": "^3.0.0",
6464
"@nuxtjs/stylelint-module": "^4.0.0",
6565
"@nuxtjs/vuetify": "^1.11.2",
66-
"@types/jest": "^26.0.4",
66+
"@types/jest": "^26.0.8",
6767
"@vue/test-utils": "^1.0.3",
6868
"babel-core": "^6.26.3",
6969
"babel-eslint": "^10.1.0",
7070
"babel-jest": "^26.1.0",
7171
"cpx": "^1.5.0",
72-
"eslint": "^7.4.0",
72+
"eslint": "^7.6.0",
7373
"eslint-config-prettier": "^6.11.0",
7474
"eslint-loader": "^4.0.2",
7575
"eslint-plugin-prettier": "^3.1.4",

yarn.lock

Lines changed: 28 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@
22
# yarn lockfile v1
33

44

5-
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1":
6-
version "7.10.1"
7-
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff"
8-
integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==
9-
dependencies:
10-
"@babel/highlight" "^7.10.1"
11-
12-
"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3":
5+
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.8.3":
136
version "7.10.4"
147
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
158
integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
@@ -443,15 +436,6 @@
443436
"@babel/traverse" "^7.10.4"
444437
"@babel/types" "^7.10.4"
445438

446-
"@babel/highlight@^7.10.1":
447-
version "7.10.1"
448-
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0"
449-
integrity sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==
450-
dependencies:
451-
"@babel/helper-validator-identifier" "^7.10.1"
452-
chalk "^2.0.0"
453-
js-tokens "^4.0.0"
454-
455439
"@babel/highlight@^7.10.4":
456440
version "7.10.4"
457441
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
@@ -2462,10 +2446,10 @@
24622446
"@types/istanbul-lib-coverage" "*"
24632447
"@types/istanbul-lib-report" "*"
24642448

2465-
"@types/jest@^26.0.4":
2466-
version "26.0.4"
2467-
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.4.tgz#d2e513e85aca16992816f192582b5e67b0b15efb"
2468-
integrity sha512-4fQNItvelbNA9+sFgU+fhJo8ZFF+AS4Egk3GWwCW2jFtViukXbnztccafAdLhzE/0EiCogljtQQXP8aQ9J7sFg==
2449+
"@types/jest@^26.0.8":
2450+
version "26.0.8"
2451+
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.8.tgz#f5c5559cf25911ce227f7ce30f1f160f24966369"
2452+
integrity sha512-eo3VX9jGASSuv680D4VQ89UmuLZneNxv2MCZjfwlInav05zXVJTzfc//lavdV0GPwSxsXJTy2jALscB7Acqg0g==
24692453
dependencies:
24702454
jest-diff "^25.2.1"
24712455
pretty-format "^25.2.1"
@@ -3092,7 +3076,7 @@ acorn@^7.1.1:
30923076
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe"
30933077
integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==
30943078

3095-
acorn@^7.2.0:
3079+
acorn@^7.3.1:
30963080
version "7.3.1"
30973081
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
30983082
integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
@@ -5855,10 +5839,10 @@ eslint-template-visitor@^2.0.0:
58555839
esquery "^1.3.1"
58565840
multimap "^1.1.0"
58575841

5858-
eslint-utils@^2.0.0:
5859-
version "2.0.0"
5860-
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
5861-
integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==
5842+
eslint-utils@^2.0.0, eslint-utils@^2.1.0:
5843+
version "2.1.0"
5844+
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
5845+
integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
58625846
dependencies:
58635847
eslint-visitor-keys "^1.1.0"
58645848

@@ -5879,10 +5863,10 @@ eslint-visitor-keys@^1.2.0, eslint-visitor-keys@^1.3.0:
58795863
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
58805864
integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
58815865

5882-
eslint@^7.4.0:
5883-
version "7.4.0"
5884-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.4.0.tgz#4e35a2697e6c1972f9d6ef2b690ad319f80f206f"
5885-
integrity sha512-gU+lxhlPHu45H3JkEGgYhWhkR9wLHHEXC9FbWFnTlEkbKyZKWgWRLgf61E8zWmBuI6g5xKBph9ltg3NtZMVF8g==
5866+
eslint@^7.6.0:
5867+
version "7.6.0"
5868+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.6.0.tgz#522d67cfaea09724d96949c70e7a0550614d64d6"
5869+
integrity sha512-QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w==
58865870
dependencies:
58875871
"@babel/code-frame" "^7.0.0"
58885872
ajv "^6.10.0"
@@ -5892,9 +5876,9 @@ eslint@^7.4.0:
58925876
doctrine "^3.0.0"
58935877
enquirer "^2.3.5"
58945878
eslint-scope "^5.1.0"
5895-
eslint-utils "^2.0.0"
5896-
eslint-visitor-keys "^1.2.0"
5897-
espree "^7.1.0"
5879+
eslint-utils "^2.1.0"
5880+
eslint-visitor-keys "^1.3.0"
5881+
espree "^7.2.0"
58985882
esquery "^1.2.0"
58995883
esutils "^2.0.2"
59005884
file-entry-cache "^5.0.1"
@@ -5908,7 +5892,7 @@ eslint@^7.4.0:
59085892
js-yaml "^3.13.1"
59095893
json-stable-stringify-without-jsonify "^1.0.1"
59105894
levn "^0.4.1"
5911-
lodash "^4.17.14"
5895+
lodash "^4.17.19"
59125896
minimatch "^3.0.4"
59135897
natural-compare "^1.4.0"
59145898
optionator "^0.9.1"
@@ -5935,14 +5919,14 @@ espree@^6.2.1:
59355919
acorn-jsx "^5.2.0"
59365920
eslint-visitor-keys "^1.1.0"
59375921

5938-
espree@^7.1.0:
5939-
version "7.1.0"
5940-
resolved "https://registry.yarnpkg.com/espree/-/espree-7.1.0.tgz#a9c7f18a752056735bf1ba14cb1b70adc3a5ce1c"
5941-
integrity sha512-dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw==
5922+
espree@^7.2.0:
5923+
version "7.2.0"
5924+
resolved "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz#1c263d5b513dbad0ac30c4991b93ac354e948d69"
5925+
integrity sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==
59425926
dependencies:
5943-
acorn "^7.2.0"
5927+
acorn "^7.3.1"
59445928
acorn-jsx "^5.2.0"
5945-
eslint-visitor-keys "^1.2.0"
5929+
eslint-visitor-keys "^1.3.0"
59465930

59475931
esprima@^4.0.0, esprima@^4.0.1:
59485932
version "4.0.1"
@@ -13874,10 +13858,10 @@ uuid@^7.0.3:
1387413858
resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
1387513859
integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
1387613860

13877-
uuid@^8.0.0, uuid@^8.2.0:
13878-
version "8.2.0"
13879-
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.2.0.tgz#cb10dd6b118e2dada7d0cd9730ba7417c93d920e"
13880-
integrity sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q==
13861+
uuid@^8.0.0, uuid@^8.3.0:
13862+
version "8.3.0"
13863+
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
13864+
integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
1388113865

1388213866
v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
1388313867
version "2.1.1"

0 commit comments

Comments
 (0)