Skip to content

Commit aade31c

Browse files
authored
Merge branch 'development' into dependabot/npm_and_yarn/nuxt/types-2.14.0
2 parents c8a5ad3 + 6b5f616 commit aade31c

File tree

2 files changed

+45
-44
lines changed

2 files changed

+45
-44
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
"@nuxtjs/pwa": "^3.0.0-beta.20",
3434
"@types/js-cookie": "^2.2.6",
3535
"@types/jwt-decode": "^2.2.1",
36-
"@types/node": "^14.0.23",
36+
"@types/node": "^14.0.27",
3737
"cookieparser": "^0.1.0",
3838
"core-js": "3.6.5",
3939
"cross-env": "^7.0.2",
4040
"date-fns": "^2.15.0",
41-
"dayjs": "^1.8.29",
41+
"dayjs": "^1.8.31",
4242
"express": "^4.17.1",
4343
"firebase": "7.16.1",
4444
"firebase-admin": "^9.0.0",
@@ -59,7 +59,7 @@
5959
},
6060
"devDependencies": {
6161
"@nuxt/types": "^2.14.0",
62-
"@nuxt/typescript-build": "^2.0.0",
62+
"@nuxt/typescript-build": "^2.0.2",
6363
"@nuxtjs/eslint-config-typescript": "^2.0.0",
6464
"@nuxtjs/stylelint-module": "^4.0.0",
6565
"@nuxtjs/vuetify": "^1.11.2",

yarn.lock

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1993,14 +1993,14 @@
19931993
"@types/webpack-dev-middleware" "^3.7.1"
19941994
"@types/webpack-hot-middleware" "^2.25.3"
19951995

1996-
"@nuxt/typescript-build@^2.0.0":
1997-
version "2.0.0"
1998-
resolved "https://registry.yarnpkg.com/@nuxt/typescript-build/-/typescript-build-2.0.0.tgz#8816a2155246649f604abd45f6ab2c415c46961a"
1999-
integrity sha512-k3M39SZ99Y8KZXmGCmtc+yHz4NXQdgcSCSzCgoXbu30mX0YdfRIUTiCvJRUPbsfH2vVqwhRCzj33uIDdAYA6cg==
1996+
"@nuxt/typescript-build@^2.0.2":
1997+
version "2.0.2"
1998+
resolved "https://registry.yarnpkg.com/@nuxt/typescript-build/-/typescript-build-2.0.2.tgz#2d03e19a681eae045bff9de91f97c84eada712b8"
1999+
integrity sha512-th/jsRrm6r148vRA1FQrWD0BCVrgO8FtAq4Cvm2udilVdrR2Qwo9Z5mD0cqG2S98YykAWoP22FtBPz+Ui46Nww==
20002000
dependencies:
20012001
consola "^2.14.0"
2002-
fork-ts-checker-webpack-plugin "^5.0.6"
2003-
ts-loader "^7.0.5"
2002+
fork-ts-checker-webpack-plugin "^5.0.11"
2003+
ts-loader "^8.0.1"
20042004
typescript "~3.9"
20052005

20062006
"@nuxt/typescript-runtime@^1.0.0":
@@ -2480,6 +2480,11 @@
24802480
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
24812481
integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
24822482

2483+
"@types/json-schema@^7.0.5":
2484+
version "7.0.5"
2485+
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd"
2486+
integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==
2487+
24832488
"@types/jwt-decode@^2.2.1":
24842489
version "2.2.1"
24852490
resolved "https://registry.yarnpkg.com/@types/jwt-decode/-/jwt-decode-2.2.1.tgz#afdf5c527fcfccbd4009b5fd02d1e18241f2d2f2"
@@ -2519,10 +2524,10 @@
25192524
dependencies:
25202525
"@types/node" "*"
25212526

2522-
"@types/node@*", "@types/node@^14.0.23":
2523-
version "14.0.23"
2524-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.23.tgz#676fa0883450ed9da0bb24156213636290892806"
2525-
integrity sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw==
2527+
"@types/node@*", "@types/node@^14.0.27":
2528+
version "14.0.27"
2529+
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.27.tgz#a151873af5a5e851b51b3b065c9e63390a9e0eb1"
2530+
integrity sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g==
25262531

25272532
"@types/node@^10.10.0":
25282533
version "10.17.27"
@@ -4564,12 +4569,7 @@ connect@^3.7.0:
45644569
parseurl "~1.3.3"
45654570
utils-merge "1.0.1"
45664571

4567-
consola@^2.10.0, consola@^2.10.1, consola@^2.11.3, consola@^2.12.1, consola@^2.13.0, consola@^2.3.2, consola@^2.6.0, consola@^2.9.0:
4568-
version "2.13.0"
4569-
resolved "https://registry.yarnpkg.com/consola/-/consola-2.13.0.tgz#5a4dc75e1b1fddbd8b10728e7790a2e54efeeeb7"
4570-
integrity sha512-Jw+8qpL0yrpfqH9m90fWoDRQyn8TYU6Aegpl4UofoP81VYvQLoOWMpFw2vQ3U/cyLRRzTc/CyNC6YYVzZFU8Eg==
4571-
4572-
consola@^2.14.0:
4572+
consola@^2.10.0, consola@^2.10.1, consola@^2.11.3, consola@^2.12.1, consola@^2.13.0, consola@^2.14.0, consola@^2.3.2, consola@^2.6.0, consola@^2.9.0:
45734573
version "2.14.0"
45744574
resolved "https://registry.yarnpkg.com/consola/-/consola-2.14.0.tgz#162ee903b6c9c4de25077d93f34ab902ebcb4dac"
45754575
integrity sha512-A2j1x4u8d6SIVikhZROfpFJxQZie+cZOfQMyI/tu2+hWXe8iAv7R6FW6s6x04/7zBCst94lPddztot/d6GJiuQ==
@@ -5066,10 +5066,10 @@ date-fns@^2.15.0:
50665066
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.15.0.tgz#424de6b3778e4e69d3ff27046ec136af58ae5d5f"
50675067
integrity sha512-ZCPzAMJZn3rNUvvQIMlXhDr4A+Ar07eLeGsGREoWU19a3Pqf5oYa+ccd+B3F6XVtQY6HANMFdOQ8A+ipFnvJdQ==
50685068

5069-
dayjs@^1.8.29:
5070-
version "1.8.29"
5071-
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.29.tgz#5d23e341de6bfbd206c01136d2fb0f01877820f5"
5072-
integrity sha512-Vm6teig8ZWK7rH/lxzVGxZJCljPdmUr6q/3f4fr5F0VWNGVkZEjZOQJsAN8hUHUqn+NK4XHNEpJZS1MwLyDcLw==
5069+
dayjs@^1.8.31:
5070+
version "1.8.31"
5071+
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.31.tgz#0cd1114c2539dd5ad9428be0c38df6d4bb40b9d3"
5072+
integrity sha512-mPh1mslned+5PuIuiUfbw4CikHk6AEAf2Baxih+wP5fssv+wmlVhvgZ7mq+BhLt7Sr/Hc8leWDiwe6YnrpNt3g==
50735073

50745074
de-indent@^1.0.2:
50755075
version "1.0.2"
@@ -6492,20 +6492,21 @@ forever-agent@~0.6.1:
64926492
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
64936493
integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
64946494

6495-
fork-ts-checker-webpack-plugin@^5.0.6:
6496-
version "5.0.7"
6497-
resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.7.tgz#a462bd863bbd654bad14a25518006ab99b7b13a0"
6498-
integrity sha512-X7zHKTx4is5YSKa9bDiXGzv8v5K3bsUrZlZgr3F8DeCVsb3oik/+0Mo+K138Sdjh4mpzoHcuUgsrIgZeLIXovw==
6495+
fork-ts-checker-webpack-plugin@^5.0.11:
6496+
version "5.0.11"
6497+
resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.11.tgz#40a49a45403910c118c6ae7f3415dbdb317e4574"
6498+
integrity sha512-7QFCTfjayFhoX7uxncnHHi3ICWwffUQMoYaHldElA6wYy/9aDTsRIi6QcS8MDAkZa7xdDyv0YKuqcGYjAzboyQ==
64996499
dependencies:
65006500
"@babel/code-frame" "^7.8.3"
6501-
chalk "^2.4.1"
6501+
"@types/json-schema" "^7.0.5"
6502+
chalk "^4.1.0"
65026503
cosmiconfig "^6.0.0"
65036504
deepmerge "^4.2.2"
65046505
fs-extra "^9.0.0"
65056506
memfs "^3.1.2"
65066507
minimatch "^3.0.4"
6507-
schema-utils "1.0.0"
6508-
semver "^5.6.0"
6508+
schema-utils "2.7.0"
6509+
semver "^7.3.2"
65096510
tapable "^1.0.0"
65106511

65116512
form-data@~2.3.2:
@@ -12132,16 +12133,7 @@ saxes@^5.0.0:
1213212133
dependencies:
1213312134
xmlchars "^2.2.0"
1213412135

12135-
[email protected], schema-utils@^1.0.0:
12136-
version "1.0.0"
12137-
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
12138-
integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
12139-
dependencies:
12140-
ajv "^6.1.0"
12141-
ajv-errors "^1.0.0"
12142-
ajv-keywords "^3.1.0"
12143-
12144-
schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
12136+
[email protected], schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
1214512137
version "2.7.0"
1214612138
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
1214712139
integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
@@ -12150,6 +12142,15 @@ schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.1, schema-utils@^2.6
1215012142
ajv "^6.12.2"
1215112143
ajv-keywords "^3.4.1"
1215212144

12145+
schema-utils@^1.0.0:
12146+
version "1.0.0"
12147+
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
12148+
integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
12149+
dependencies:
12150+
ajv "^6.1.0"
12151+
ajv-errors "^1.0.0"
12152+
ajv-keywords "^3.1.0"
12153+
1215312154
semver-compare@^1.0.0:
1215412155
version "1.0.0"
1215512156
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
@@ -13360,10 +13361,10 @@ ts-jest@^26.1.3:
1336013361
semver "7.x"
1336113362
yargs-parser "18.x"
1336213363

13363-
ts-loader@^7.0.5:
13364-
version "7.0.5"
13365-
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-7.0.5.tgz#789338fb01cb5dc0a33c54e50558b34a73c9c4c5"
13366-
integrity sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==
13364+
ts-loader@^8.0.1:
13365+
version "8.0.1"
13366+
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.1.tgz#9670dcbce2a8c8506d01a37fee042350d02c8c21"
13367+
integrity sha512-I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ==
1336713368
dependencies:
1336813369
chalk "^2.3.0"
1336913370
enhanced-resolve "^4.0.0"

0 commit comments

Comments
 (0)