Skip to content

Commit d10f51f

Browse files
authored
Merge branch 'development' into dependabot/npm_and_yarn/nuxtjs/axios-5.11.0
2 parents 7dcc66e + 3023b61 commit d10f51f

File tree

2 files changed

+39
-82
lines changed

2 files changed

+39
-82
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@
7070
"babel-eslint": "^10.1.0",
7171
"babel-jest": "^26.0.1",
7272
"cpx": "^1.5.0",
73-
"eslint": "^7.0.0",
73+
"eslint": "^7.2.0",
7474
"eslint-config-prettier": "^6.11.0",
7575
"eslint-loader": "^4.0.2",
7676
"eslint-plugin-prettier": "^3.1.3",
7777
"eslint-plugin-tsdoc": "^0.2.4",
7878
"husky": "^4.2.5",
7979
"jest": "^26.0.1",
80-
"lint-staged": "^10.2.2",
80+
"lint-staged": "^10.2.10",
8181
"nodemon": "^2.0.3",
8282
"prettier": "^1.19.1",
8383
"rimraf": "^3.0.2",

yarn.lock

Lines changed: 37 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,13 +1867,6 @@
18671867
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
18681868
integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
18691869

1870-
"@samverschueren/stream-to-observable@^0.3.0":
1871-
version "0.3.0"
1872-
resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
1873-
integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
1874-
dependencies:
1875-
any-observable "^0.3.0"
1876-
18771870
"@sindresorhus/is@^0.14.0":
18781871
version "0.14.0"
18791872
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -2675,6 +2668,11 @@ acorn@^7.1.1:
26752668
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe"
26762669
integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==
26772670

2671+
acorn@^7.2.0:
2672+
version "7.3.1"
2673+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"
2674+
integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==
2675+
26782676
agent-base@6:
26792677
version "6.0.0"
26802678
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a"
@@ -2789,11 +2787,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
27892787
"@types/color-name" "^1.1.1"
27902788
color-convert "^2.0.1"
27912789

2792-
any-observable@^0.3.0:
2793-
version "0.3.0"
2794-
resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
2795-
integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
2796-
27972790
anymatch@^1.3.0:
27982791
version "1.3.2"
27992792
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -3985,11 +3978,6 @@ [email protected]:
39853978
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
39863979
integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
39873980

3988-
clone@^1.0.2:
3989-
version "1.0.4"
3990-
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
3991-
integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
3992-
39933981
co@^4.6.0:
39943982
version "4.6.0"
39953983
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -4783,13 +4771,6 @@ deepmerge@^4.2.2:
47834771
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
47844772
integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
47854773

4786-
defaults@^1.0.3:
4787-
version "1.0.3"
4788-
resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
4789-
integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
4790-
dependencies:
4791-
clone "^1.0.2"
4792-
47934774
defer-to-connect@^1.0.1:
47944775
version "1.1.3"
47954776
resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
@@ -5091,11 +5072,6 @@ electron-to-chromium@^1.3.413:
50915072
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.454.tgz#9bf7db2cfa90b48a64a1f13111d667bacfcae618"
50925073
integrity sha512-2ODSCBwHsdB8T6csLaAbXIMYtrhu8oN1c5gS+/C2OqdfF35aXhDsnu8p+d7crbOpVXZnUza8I/Xl31mzkfnxGg==
50935074

5094-
elegant-spinner@^2.0.0:
5095-
version "2.0.0"
5096-
resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-2.0.0.tgz#f236378985ecd16da75488d166be4b688fd5af94"
5097-
integrity sha512-5YRYHhvhYzV/FC4AiMdeSIg3jAYGq9xFvbhZMpPlJoBsfYgrw2DSCYeXfat6tYBu45PWiyRr3+flaCPPmviPaA==
5098-
50995075
elliptic@^6.0.0, elliptic@^6.5.2:
51005076
version "6.5.2"
51015077
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
@@ -5428,10 +5404,10 @@ eslint-scope@^4.0.3:
54285404
esrecurse "^4.1.0"
54295405
estraverse "^4.1.1"
54305406

5431-
eslint-scope@^5.0.0:
5432-
version "5.0.0"
5433-
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
5434-
integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
5407+
eslint-scope@^5.0.0, eslint-scope@^5.1.0:
5408+
version "5.1.0"
5409+
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
5410+
integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
54355411
dependencies:
54365412
esrecurse "^4.1.0"
54375413
estraverse "^4.1.1"
@@ -5452,26 +5428,26 @@ eslint-utils@^2.0.0:
54525428
dependencies:
54535429
eslint-visitor-keys "^1.1.0"
54545430

5455-
eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
5456-
version "1.1.0"
5457-
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
5458-
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
5431+
eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.2.0:
5432+
version "1.2.0"
5433+
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.2.0.tgz#74415ac884874495f78ec2a97349525344c981fa"
5434+
integrity sha512-WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ==
54595435

5460-
eslint@^7.0.0:
5461-
version "7.1.0"
5462-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.1.0.tgz#d9a1df25e5b7859b0a3d86bb05f0940ab676a851"
5463-
integrity sha512-DfS3b8iHMK5z/YLSme8K5cge168I8j8o1uiVmFCgnnjxZQbCGyraF8bMl7Ju4yfBmCuxD7shOF7eqGkcuIHfsA==
5436+
eslint@^7.2.0:
5437+
version "7.2.0"
5438+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.2.0.tgz#d41b2e47804b30dbabb093a967fb283d560082e6"
5439+
integrity sha512-B3BtEyaDKC5MlfDa2Ha8/D6DsS4fju95zs0hjS3HdGazw+LNayai38A25qMppK37wWGWNYSPOR6oYzlz5MHsRQ==
54645440
dependencies:
54655441
"@babel/code-frame" "^7.0.0"
54665442
ajv "^6.10.0"
54675443
chalk "^4.0.0"
54685444
cross-spawn "^7.0.2"
54695445
debug "^4.0.1"
54705446
doctrine "^3.0.0"
5471-
eslint-scope "^5.0.0"
5447+
eslint-scope "^5.1.0"
54725448
eslint-utils "^2.0.0"
5473-
eslint-visitor-keys "^1.1.0"
5474-
espree "^7.0.0"
5449+
eslint-visitor-keys "^1.2.0"
5450+
espree "^7.1.0"
54755451
esquery "^1.2.0"
54765452
esutils "^2.0.2"
54775453
file-entry-cache "^5.0.1"
@@ -5513,14 +5489,14 @@ espree@^6.1.1, espree@^6.2.1:
55135489
acorn-jsx "^5.2.0"
55145490
eslint-visitor-keys "^1.1.0"
55155491

5516-
espree@^7.0.0:
5517-
version "7.0.0"
5518-
resolved "https://registry.yarnpkg.com/espree/-/espree-7.0.0.tgz#8a7a60f218e69f120a842dc24c5a88aa7748a74e"
5519-
integrity sha512-/r2XEx5Mw4pgKdyb7GNLQNsu++asx/dltf/CI8RFi9oGHxmQFgvLbc5Op4U6i8Oaj+kdslhJtVlEZeAqH5qOTw==
5492+
espree@^7.1.0:
5493+
version "7.1.0"
5494+
resolved "https://registry.yarnpkg.com/espree/-/espree-7.1.0.tgz#a9c7f18a752056735bf1ba14cb1b70adc3a5ce1c"
5495+
integrity sha512-dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw==
55205496
dependencies:
5521-
acorn "^7.1.1"
5497+
acorn "^7.2.0"
55225498
acorn-jsx "^5.2.0"
5523-
eslint-visitor-keys "^1.1.0"
5499+
eslint-visitor-keys "^1.2.0"
55245500

55255501
esprima@^4.0.0, esprima@^4.0.1:
55265502
version "4.0.1"
@@ -8422,45 +8398,40 @@ lines-and-columns@^1.1.6:
84228398
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
84238399
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
84248400

8425-
lint-staged@^10.2.2:
8426-
version "10.2.7"
8427-
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.2.7.tgz#6e47860af3d86a6a01849cbf8ba80f7754aae6eb"
8428-
integrity sha512-srod2bTpF8riaLz+Bgr6v0mI/nSntE8M9jbh4WwAhoosx0G7RKEUIG7mI5Nu5SMbTF9o8GROPgK0Lhf5cDnUUw==
8401+
lint-staged@^10.2.10:
8402+
version "10.2.10"
8403+
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.2.10.tgz#f0f78bf8786bbe90e1775a0dc540f7f12b6a79b2"
8404+
integrity sha512-dgelFaNH6puUGAcU+OVMgbfpKSerNYsPSn6+nlbRDjovL0KigpsVpCu0PFZG6BJxX8gnHJqaZlR9krZamQsb0w==
84298405
dependencies:
84308406
chalk "^4.0.0"
84318407
cli-truncate "2.1.0"
84328408
commander "^5.1.0"
84338409
cosmiconfig "^6.0.0"
84348410
debug "^4.1.1"
84358411
dedent "^0.7.0"
8412+
enquirer "^2.3.5"
84368413
execa "^4.0.1"
8437-
listr2 "^2.0.2"
8414+
listr2 "^2.1.0"
84388415
log-symbols "^4.0.0"
84398416
micromatch "^4.0.2"
84408417
normalize-path "^3.0.0"
84418418
please-upgrade-node "^3.2.0"
84428419
string-argv "0.3.1"
84438420
stringify-object "^3.3.0"
84448421

8445-
listr2@^2.0.2:
8446-
version "2.0.4"
8447-
resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.0.4.tgz#b39100b0a227ec5659dcf76ddc516211fc168d61"
8448-
integrity sha512-oJaAcplPsa72rKW0eg4P4LbEJjhH+UO2I8uqR/I2wzHrVg16ohSfUy0SlcHS21zfYXxtsUpL8YXGHjyfWMR0cg==
8422+
listr2@^2.1.0:
8423+
version "2.1.7"
8424+
resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.1.7.tgz#8107c12c699bac778f1567739298052d8ebb9c27"
8425+
integrity sha512-XCC1sWLkBFFIMIRwG/LedgHUzN2XLEo02ZqXn6fwuP0GlXGE5BCuL6EAbQFb4vZB+++YEonzEXDPWQe+jCoF6Q==
84498426
dependencies:
8450-
"@samverschueren/stream-to-observable" "^0.3.0"
84518427
chalk "^4.0.0"
8452-
cli-cursor "^3.1.0"
84538428
cli-truncate "^2.1.0"
8454-
elegant-spinner "^2.0.0"
8455-
enquirer "^2.3.5"
84568429
figures "^3.2.0"
84578430
indent-string "^4.0.0"
84588431
log-update "^4.0.0"
84598432
p-map "^4.0.0"
8460-
pad "^3.2.0"
84618433
rxjs "^6.5.5"
84628434
through "^2.3.8"
8463-
uuid "^7.0.2"
84648435

84658436
load-json-file@^2.0.0:
84668437
version "2.0.0"
@@ -9742,13 +9713,6 @@ package-json@^6.3.0:
97429713
registry-url "^5.0.0"
97439714
semver "^6.2.0"
97449715

9745-
pad@^3.2.0:
9746-
version "3.2.0"
9747-
resolved "https://registry.yarnpkg.com/pad/-/pad-3.2.0.tgz#be7a1d1cb6757049b4ad5b70e71977158fea95d1"
9748-
integrity sha512-2u0TrjcGbOjBTJpyewEl4hBO3OeX5wWue7eIFPzQTg6wFSvoaHcBTTUY5m+n0hd04gmTCPuY0kCpVIVuw5etwg==
9749-
dependencies:
9750-
wcwidth "^1.0.1"
9751-
97529716
pako@~1.0.5:
97539717
version "1.0.11"
97549718
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
@@ -13306,7 +13270,7 @@ uuid@^3.3.2:
1330613270
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
1330713271
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
1330813272

13309-
uuid@^7.0.0, uuid@^7.0.2, uuid@^7.0.3:
13273+
uuid@^7.0.0, uuid@^7.0.3:
1331013274
version "7.0.3"
1331113275
resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
1331213276
integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
@@ -13592,13 +13556,6 @@ watchpack@^1.6.1:
1359213556
chokidar "^3.4.0"
1359313557
watchpack-chokidar2 "^2.0.0"
1359413558

13595-
wcwidth@^1.0.1:
13596-
version "1.0.1"
13597-
resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
13598-
integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
13599-
dependencies:
13600-
defaults "^1.0.3"
13601-
1360213559
webfontloader@^1.6.28:
1360313560
version "1.6.28"
1360413561
resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae"

0 commit comments

Comments
 (0)