Skip to content

Commit 3fae17d

Browse files
authored
Merge branch 'development' into dependabot/npm_and_yarn/nuxt/typescript-runtime-0.4.10
2 parents 1ff0e11 + 770758e commit 3fae17d

File tree

2 files changed

+47
-54
lines changed

2 files changed

+47
-54
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
"vuex-persistedstate": "^3.0.1"
6161
},
6262
"devDependencies": {
63-
"@nuxt/typescript-build": "^0.6.6",
63+
"@nuxt/typescript-build": "^1.0.3",
6464
"@nuxtjs/eslint-config-typescript": "^2.0.0",
65-
"@nuxtjs/stylelint-module": "^3.2.2",
65+
"@nuxtjs/stylelint-module": "^4.0.0",
6666
"@nuxtjs/vuetify": "^1.11.2",
6767
"@types/jest": "^25.2.3",
6868
"@vue/test-utils": "^1.0.3",

yarn.lock

Lines changed: 45 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,10 +1565,10 @@
15651565
serve-static "^1.14.1"
15661566
server-destroy "^1.0.1"
15671567

1568-
1569-
version "0.7.5"
1570-
resolved "https://registry.yarnpkg.com/@nuxt/types/-/types-0.7.5.tgz#a151372177392167cdf60e9c14f81aac70773bfa"
1571-
integrity sha512-WHPDRX/VSMox1IX33BUooPrAinZjVNjMrz2OYpDY1kja3Nml7xC7pUKvuwt1i0FoFOh+QORNysKin8rBpzQ+aA==
1568+
1569+
version "0.7.7"
1570+
resolved "https://registry.yarnpkg.com/@nuxt/types/-/types-0.7.7.tgz#819bfbb08a27af2eca9c66fefdf87e6ec5c9548b"
1571+
integrity sha512-cfMV7CZJpy0ePOUiqXvMPoxclluWxmY4BEIvrt4f4QaK4uklQRDbfHhYRiuFNFOli+0znEDTSLCK6OHQnOfZ/g==
15721572
dependencies:
15731573
"@types/autoprefixer" "^9.7.2"
15741574
"@types/babel__core" "^7.1.7"
@@ -1578,16 +1578,16 @@
15781578
"@types/file-loader" "^4.2.0"
15791579
"@types/html-minifier" "^3.5.3"
15801580
"@types/less" "^3.0.1"
1581-
"@types/node" "^12.12.37"
1582-
"@types/node-sass" "^4.11.0"
1581+
"@types/node" "^12.12.42"
1582+
"@types/node-sass" "^4.11.1"
15831583
"@types/optimize-css-assets-webpack-plugin" "^5.0.1"
15841584
"@types/pug" "^2.0.4"
1585-
"@types/serve-static" "^1.13.3"
1585+
"@types/serve-static" "^1.13.4"
15861586
"@types/terser-webpack-plugin" "^2.2.0"
1587-
"@types/webpack" "^4.41.12"
1588-
"@types/webpack-bundle-analyzer" "^2.13.3"
1589-
"@types/webpack-dev-middleware" "^3.7.0"
1590-
"@types/webpack-hot-middleware" "^2.25.2"
1587+
"@types/webpack" "^4.41.13"
1588+
"@types/webpack-bundle-analyzer" "^3.8.0"
1589+
"@types/webpack-dev-middleware" "^3.7.1"
1590+
"@types/webpack-hot-middleware" "^2.25.3"
15911591

15921592
15931593
version "0.7.9"
@@ -1613,15 +1613,15 @@
16131613
"@types/webpack-dev-middleware" "^3.7.1"
16141614
"@types/webpack-hot-middleware" "^2.25.3"
16151615

1616-
"@nuxt/typescript-build@^0.6.6":
1617-
version "0.6.6"
1618-
resolved "https://registry.yarnpkg.com/@nuxt/typescript-build/-/typescript-build-0.6.6.tgz#3eb49aa8e7fbd88f8bc802c5e79de1f62439473e"
1619-
integrity sha512-UHSETSCMbZcNyGeIDOThGLEY+f4r/Ps+EBGx7FUQglOwB4fOsRIfSW3X+mJxu4Zj8GnsKhwfozRJB/JFVP4tdQ==
1616+
"@nuxt/typescript-build@^1.0.3":
1617+
version "1.0.3"
1618+
resolved "https://registry.yarnpkg.com/@nuxt/typescript-build/-/typescript-build-1.0.3.tgz#6f74bbeee0f71cb179ef25161fa6ce31c4d65753"
1619+
integrity sha512-m9lt1Mq9wB9S+1i724CdLD2hXvzRULYK95u2n2Qq4AzWZgEVc5O2CINeRtmM6QgpTR+W5jVfvl3pxjH8Ssr0UQ==
16201620
dependencies:
1621-
"@nuxt/types" "0.7.5"
1622-
consola "^2.11.3"
1623-
fork-ts-checker-webpack-plugin "^4.1.3"
1624-
ts-loader "^6.2.2"
1621+
"@nuxt/types" "0.7.9"
1622+
consola "^2.13.0"
1623+
fork-ts-checker-webpack-plugin "^4.1.6"
1624+
ts-loader "^7.0.5"
16251625
typescript "~3.8"
16261626

16271627
"@nuxt/typescript-runtime@^0.4.10":
@@ -1785,13 +1785,13 @@
17851785
jimp-compact "^0.8.0"
17861786
workbox-cdn "^4.3.1"
17871787

1788-
"@nuxtjs/stylelint-module@^3.2.2":
1789-
version "3.2.2"
1790-
resolved "https://registry.yarnpkg.com/@nuxtjs/stylelint-module/-/stylelint-module-3.2.2.tgz#9ba177339c49e97e0df4bb36764bc98352697f9e"
1791-
integrity sha512-VXr0Z4rD5mxHl4YCszwOnPYJyL7pyIoNM2bZ8XRUTnFT/4AfVFnvKu8F+XZMX22IPN920WSp3jWziSGG/mT0og==
1788+
"@nuxtjs/stylelint-module@^4.0.0":
1789+
version "4.0.0"
1790+
resolved "https://registry.yarnpkg.com/@nuxtjs/stylelint-module/-/stylelint-module-4.0.0.tgz#926465bacc3317197906871349c216361f18b4fa"
1791+
integrity sha512-yNVCpbZQH07wr7nOoTdb7dNHSA2PUw/Y9Pw2rOQ3Dp2FSDh6/+o56Pojwnxf/xBON9EUBiCrglTMMO3mWd7YQA==
17921792
dependencies:
1793-
consola "^2.11.3"
1794-
stylelint-webpack-plugin "^1.2.3"
1793+
consola "^2.12.1"
1794+
stylelint-webpack-plugin "^2.0.0"
17951795

17961796
"@nuxtjs/vuetify@^1.11.2":
17971797
version "1.11.2"
@@ -2147,7 +2147,7 @@
21472147
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
21482148
integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
21492149

2150-
"@types/node-sass@^4.11.0", "@types/node-sass@^4.11.1":
2150+
"@types/node-sass@^4.11.1":
21512151
version "4.11.1"
21522152
resolved "https://registry.yarnpkg.com/@types/node-sass/-/node-sass-4.11.1.tgz#bda27c5181cbf7c090c3058e119633dfb2b6504c"
21532153
integrity sha512-wPOmOEEtbwQiPTIgzUuRSQZ3H5YHinsxRGeZzPSDefAm4ylXWnZG9C0adses8ymyplKK0gwv3JkDNO8GGxnWfg==
@@ -2159,7 +2159,7 @@
21592159
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.13.tgz#ee1128e881b874c371374c1f72201893616417c9"
21602160
integrity sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA==
21612161

2162-
"@types/node@^12.12.37":
2162+
"@types/node@^12.12.42":
21632163
version "12.12.42"
21642164
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.42.tgz#d0d1149336bd07540dd1ea576692829d575dec34"
21652165
integrity sha512-R/9QdYFLL9dE9l5cWWzWIZByVGFd7lk7JVOJ7KD+E1SJ4gni7XJRLz9QTjyYQiHIqEAgku9VgxdLjMlhhUaAFg==
@@ -2226,7 +2226,7 @@
22262226
resolved "https://registry.yarnpkg.com/@types/relateurl/-/relateurl-0.2.28.tgz#6bda7db8653fa62643f5ee69e9f69c11a392e3a6"
22272227
integrity sha1-a9p9uGU/piZD9e5p6facEaOS46Y=
22282228

2229-
"@types/serve-static@*", "@types/serve-static@^1.13.3", "@types/serve-static@^1.13.4":
2229+
"@types/serve-static@*", "@types/serve-static@^1.13.4":
22302230
version "1.13.4"
22312231
resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.4.tgz#6662a93583e5a6cabca1b23592eb91e12fa80e7c"
22322232
integrity sha512-jTDt0o/YbpNwZbQmE/+2e+lfjJEJJR0I3OFaKQKPWkASkCoW3i6fsUnqudSMcNAfbtmADGu8f4MV4q+GqULmug==
@@ -2279,21 +2279,14 @@
22792279
resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
22802280
integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
22812281

2282-
"@types/webpack-bundle-analyzer@^2.13.3":
2283-
version "2.13.3"
2284-
resolved "https://registry.yarnpkg.com/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.3.tgz#820c8f734e171f081cbf02d889b9cda687cc89dd"
2285-
integrity sha512-p8EXyKfq311FFFfRuAR9tOHFFTQ9DqGrjRQYXbjjEMfl9pKGaTtRy1zFJtPMyZHfRoqh5rsYPVSVknkl004M7A==
2286-
dependencies:
2287-
"@types/webpack" "*"
2288-
22892282
"@types/webpack-bundle-analyzer@^3.8.0":
22902283
version "3.8.0"
22912284
resolved "https://registry.yarnpkg.com/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz#d1f196f95159254f76a3c2283c4677585bdf354d"
22922285
integrity sha512-Ah6FbkXLAVUNI/ExXHsTS90iRS/Efplh333NySjhGx09oeH9qXf57NMUfl4RADTL5a89hQaq/nbT4eb0LwsQJw==
22932286
dependencies:
22942287
"@types/webpack" "*"
22952288

2296-
"@types/webpack-dev-middleware@^3.7.0", "@types/webpack-dev-middleware@^3.7.1":
2289+
"@types/webpack-dev-middleware@^3.7.1":
22972290
version "3.7.1"
22982291
resolved "https://registry.yarnpkg.com/@types/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz#2d4e7d9abf6eec2988476f9f8f1e9b7acb2a7f82"
22992292
integrity sha512-+U6zP6/jlQ9Mw4zBOiuKOe/delLS4f0kvzAJCVK9wsW00hi4TD9u6TIaE5x5xy6xrkCiXMSf56bsAosORjP3/Q==
@@ -2303,7 +2296,7 @@
23032296
"@types/webpack" "*"
23042297
loglevel "^1.6.2"
23052298

2306-
"@types/webpack-hot-middleware@^2.25.2", "@types/webpack-hot-middleware@^2.25.3":
2299+
"@types/webpack-hot-middleware@^2.25.3":
23072300
version "2.25.3"
23082301
resolved "https://registry.yarnpkg.com/@types/webpack-hot-middleware/-/webpack-hot-middleware-2.25.3.tgz#ba6265ada359cae4f437d8ac08ac5b8c616f7521"
23092302
integrity sha512-zGkTzrwQnhSadIXGYGZLu7tpXQwn4+6y9nGeql+5UeRtW/k54Jp4SnzB0Qw00ednw0ZFoZOvqTFfXSbFXohc5Q==
@@ -2320,7 +2313,7 @@
23202313
"@types/source-list-map" "*"
23212314
source-map "^0.6.1"
23222315

2323-
"@types/webpack@*", "@types/webpack@^4.41.12":
2316+
"@types/webpack@*", "@types/webpack@^4.41.13":
23242317
version "4.41.14"
23252318
resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.14.tgz#39e3a429a4cc7dedaf79d0558f2912a101c9a2de"
23262319
integrity sha512-IRnPKux2B7Qip/cUgen5gUh68fxk9Ao0ovKkkSUNPu+6Zub30pjqk9qFG2xZQUBcpIyLte1QfiYBpyAMwuN7Pw==
@@ -4204,10 +4197,10 @@ connect@^3.7.0:
42044197
parseurl "~1.3.3"
42054198
utils-merge "1.0.1"
42064199

4207-
consola@^2.10.0, consola@^2.10.1, consola@^2.11.3, consola@^2.3.2, consola@^2.6.0, consola@^2.9.0:
4208-
version "2.12.2"
4209-
resolved "https://registry.yarnpkg.com/consola/-/consola-2.12.2.tgz#9610f158e7b0a9ecc8f8bb0c4fc8e7c52bf41d05"
4210-
integrity sha512-c9mzemrAk57s3UIjepn8KKkuEH5fauMdot5kFSJUnqHcnApVS9Db8Rbv5AZ1Iz6lXzaGe9z1crQXhJtGX4h/Og==
4200+
consola@^2.10.0, consola@^2.10.1, consola@^2.11.3, consola@^2.13.0, consola@^2.3.2, consola@^2.6.0, consola@^2.9.0:
4201+
version "2.13.0"
4202+
resolved "https://registry.yarnpkg.com/consola/-/consola-2.13.0.tgz#5a4dc75e1b1fddbd8b10728e7790a2e54efeeeb7"
4203+
integrity sha512-Jw+8qpL0yrpfqH9m90fWoDRQyn8TYU6Aegpl4UofoP81VYvQLoOWMpFw2vQ3U/cyLRRzTc/CyNC6YYVzZFU8Eg==
42114204

42124205
console-browserify@^1.1.0:
42134206
version "1.2.0"
@@ -6122,7 +6115,7 @@ forever-agent@~0.6.1:
61226115
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
61236116
integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
61246117

6125-
fork-ts-checker-webpack-plugin@^4.1.3:
6118+
fork-ts-checker-webpack-plugin@^4.1.6:
61266119
version "4.1.6"
61276120
resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5"
61286121
integrity sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==
@@ -12406,14 +12399,14 @@ stylelint-scss@^3.17.2:
1240612399
postcss-selector-parser "^6.0.2"
1240712400
postcss-value-parser "^4.1.0"
1240812401

12409-
stylelint-webpack-plugin@^1.2.3:
12410-
version "1.2.3"
12411-
resolved "https://registry.yarnpkg.com/stylelint-webpack-plugin/-/stylelint-webpack-plugin-1.2.3.tgz#c1785dbb5a9e7ea2777726c6851c1e4ac6362ad8"
12412-
integrity sha512-XEevZZzlI6k3e0Amp7AtpZ/elgaOdPPwLFY9InNoajw4KNRcZTkK61ZsZdHvIyK32Ej9L9u4fwfXG2QGKW0imA==
12402+
stylelint-webpack-plugin@^2.0.0:
12403+
version "2.0.0"
12404+
resolved "https://registry.yarnpkg.com/stylelint-webpack-plugin/-/stylelint-webpack-plugin-2.0.0.tgz#be949dade1589549c8fcd50ea40bbae3e5b24a20"
12405+
integrity sha512-tN7AnjntcmDnCSxhFgBYctelmth+CQMTSfPeIXpN/9vbkm4747FFaUKOzgWJa4UyAPl98wh8SAhVtqV5Qdxsug==
1241312406
dependencies:
1241412407
arrify "^2.0.1"
1241512408
micromatch "^4.0.2"
12416-
schema-utils "^2.6.1"
12409+
schema-utils "^2.6.6"
1241712410

1241812411
stylelint@^13.3.3:
1241912412
version "13.5.0"
@@ -12852,10 +12845,10 @@ ts-jest@^26.1.0:
1285212845
semver "7.x"
1285312846
yargs-parser "18.x"
1285412847

12855-
ts-loader@^6.2.2:
12856-
version "6.2.2"
12857-
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.2.2.tgz#dffa3879b01a1a1e0a4b85e2b8421dc0dfff1c58"
12858-
integrity sha512-HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ==
12848+
ts-loader@^7.0.5:
12849+
version "7.0.5"
12850+
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-7.0.5.tgz#789338fb01cb5dc0a33c54e50558b34a73c9c4c5"
12851+
integrity sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==
1285912852
dependencies:
1286012853
chalk "^2.3.0"
1286112854
enhanced-resolve "^4.0.0"

0 commit comments

Comments
 (0)