Merge branch 'dev' into feat/build-dir-nuxtrc

nuxt · May 12, 2021 · a897837 · a897837
2 parents 6b0880d + a53fd32
commit a897837
Show file tree

Hide file tree

Showing 18 changed files with 67 additions and 61 deletions.
diff --git a/distributions/nuxt-start/package.json b/distributions/nuxt-start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt-start",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "description": "Starts Nuxt Application in production mode",
   "keywords": [
     "nuxt",
@@ -26,13 +26,13 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/cli": "2.15.5",
-    "@nuxt/config": "2.15.5",
-    "@nuxt/core": "2.15.5",
-    "@nuxt/server": "2.15.5",
+    "@nuxt/cli": "2.15.6",
+    "@nuxt/config": "2.15.6",
+    "@nuxt/core": "2.15.6",
+    "@nuxt/server": "2.15.6",
     "@nuxt/telemetry": "^1.3.3",
-    "@nuxt/utils": "2.15.5",
-    "@nuxt/vue-renderer": "2.15.5",
+    "@nuxt/utils": "2.15.6",
+    "@nuxt/vue-renderer": "2.15.6",
     "node-fetch": "^2.6.1",
     "vue": "^2.6.12",
     "vue-client-only": "^2.0.0",

diff --git a/distributions/nuxt/package.json b/distributions/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "keywords": [
     "nuxt",
@@ -31,21 +31,21 @@
     "postinstall": "opencollective || exit 0"
   },
   "dependencies": {
-    "@nuxt/babel-preset-app": "2.15.5",
-    "@nuxt/builder": "2.15.5",
-    "@nuxt/cli": "2.15.5",
+    "@nuxt/babel-preset-app": "2.15.6",
+    "@nuxt/builder": "2.15.6",
+    "@nuxt/cli": "2.15.6",
     "@nuxt/components": "^2.1.8",
-    "@nuxt/config": "2.15.5",
-    "@nuxt/core": "2.15.5",
-    "@nuxt/generator": "2.15.5",
+    "@nuxt/config": "2.15.6",
+    "@nuxt/core": "2.15.6",
+    "@nuxt/generator": "2.15.6",
     "@nuxt/loading-screen": "^2.0.3",
     "@nuxt/opencollective": "^0.3.2",
-    "@nuxt/server": "2.15.5",
+    "@nuxt/server": "2.15.6",
     "@nuxt/telemetry": "^1.3.3",
-    "@nuxt/utils": "2.15.5",
-    "@nuxt/vue-app": "2.15.5",
-    "@nuxt/vue-renderer": "2.15.5",
-    "@nuxt/webpack": "2.15.5"
+    "@nuxt/utils": "2.15.6",
+    "@nuxt/vue-app": "2.15.6",
+    "@nuxt/vue-renderer": "2.15.6",
+    "@nuxt/webpack": "2.15.6"
   },
   "collective": {
     "url": "https://opencollective.com/nuxtjs",

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.15.5",
+  "version": "2.15.6",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "conventionalCommits": true,

diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "got": "^11.8.2",
     "improved-yarn-audit": "^2.3.2",
     "jest": "^26.6.3",
-    "jiti": "^1.9.1",
+    "jiti": "^1.9.2",
     "jsdom": "^16.5.3",
     "jsonfile": "^6.1.0",
     "klaw-sync": "^6.0.0",

diff --git a/packages/babel-preset-app/package.json b/packages/babel-preset-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/babel-preset-app",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "description": "babel-preset-app for nuxt",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",

diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/builder",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/builder.js",
@@ -9,9 +9,9 @@
   ],
   "dependencies": {
     "@nuxt/devalue": "^1.2.5",
-    "@nuxt/utils": "2.15.5",
-    "@nuxt/vue-app": "2.15.5",
-    "@nuxt/webpack": "2.15.5",
+    "@nuxt/utils": "2.15.6",
+    "@nuxt/vue-app": "2.15.6",
+    "@nuxt/webpack": "2.15.6",
     "chalk": "^4.1.1",
     "chokidar": "^3.5.1",
     "consola": "^2.15.3",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/cli",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/cli.js",
@@ -12,8 +12,8 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/config": "2.15.5",
-    "@nuxt/utils": "2.15.5",
+    "@nuxt/config": "2.15.6",
+    "@nuxt/utils": "2.15.6",
     "boxen": "^5.0.1",
     "chalk": "^4.1.1",
     "compression": "^1.7.4",

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/config",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/config.js",
@@ -10,15 +10,15 @@
     "index.d.ts"
   ],
   "dependencies": {
-    "@nuxt/utils": "2.15.5",
+    "@nuxt/utils": "2.15.6",
     "consola": "^2.15.3",
     "defu": "^4.0.1",
     "destr": "^1.1.0",
     "dotenv": "^9.0.2",
     "lodash": "^4.17.21",
     "rc9": "^1.2.0",
     "std-env": "^2.3.0",
-    "ufo": "^0.7.2"
+    "ufo": "^0.7.4"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,16 +1,16 @@
 {
   "name": "@nuxt/core",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/core.js",
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@nuxt/config": "2.15.5",
-    "@nuxt/server": "2.15.5",
-    "@nuxt/utils": "2.15.5",
+    "@nuxt/config": "2.15.6",
+    "@nuxt/server": "2.15.6",
+    "@nuxt/utils": "2.15.6",
     "consola": "^2.15.3",
     "fs-extra": "^9.1.0",
     "hable": "^3.0.0",

diff --git a/packages/generator/package.json b/packages/generator/package.json
@@ -1,22 +1,22 @@
 {
   "name": "@nuxt/generator",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/generator.js",
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@nuxt/utils": "2.15.5",
+    "@nuxt/utils": "2.15.6",
     "chalk": "^4.1.1",
     "consola": "^2.15.3",
     "defu": "^4.0.1",
     "devalue": "^2.0.1",
     "fs-extra": "^9.1.0",
     "html-minifier": "^4.0.0",
     "node-html-parser": "^3.2.0",
-    "ufo": "^0.7.2"
+    "ufo": "^0.7.4"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@nuxt/server",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/server.js",
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@nuxt/utils": "2.15.5",
-    "@nuxt/vue-renderer": "2.15.5",
+    "@nuxt/utils": "2.15.6",
+    "@nuxt/vue-renderer": "2.15.6",
     "@nuxtjs/youch": "^4.2.3",
     "compression": "^1.7.4",
     "connect": "^3.7.0",
@@ -24,7 +24,7 @@
     "serve-placeholder": "^1.2.3",
     "serve-static": "^1.14.1",
     "server-destroy": "^1.0.1",
-    "ufo": "^0.7.2"
+    "ufo": "^0.7.4"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/types",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "description": "Nuxt types",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/utils",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/utils.js",
@@ -12,14 +12,14 @@
     "create-require": "^1.1.1",
     "fs-extra": "^9.1.0",
     "hash-sum": "^2.0.0",
-    "jiti": "^1.9.1",
+    "jiti": "^1.9.2",
     "lodash": "^4.17.21",
     "proper-lockfile": "^4.1.2",
     "semver": "^7.3.5",
     "serialize-javascript": "^5.0.1",
     "signal-exit": "^3.0.3",
     "ua-parser-js": "^0.7.28",
-    "ufo": "^0.7.2"
+    "ufo": "^0.7.4"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vue-app",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/vue-app.js",
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "node-fetch": "^2.6.1",
-    "ufo": "^0.7.2",
+    "ufo": "^0.7.4",
     "unfetch": "^4.2.0",
     "vue": "^2.6.12",
     "vue-client-only": "^2.0.0",

diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vue-renderer",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/vue-renderer.js",
@@ -9,13 +9,13 @@
   ],
   "dependencies": {
     "@nuxt/devalue": "^1.2.5",
-    "@nuxt/utils": "2.15.5",
+    "@nuxt/utils": "2.15.6",
     "consola": "^2.15.3",
     "defu": "^4.0.1",
     "fs-extra": "^9.1.0",
     "lodash": "^4.17.21",
     "lru-cache": "^5.1.1",
-    "ufo": "^0.7.2",
+    "ufo": "^0.7.4",
     "vue": "^2.6.12",
     "vue-meta": "^2.4.0",
     "vue-server-renderer": "^2.6.12"

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/webpack",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "main": "dist/webpack.js",
@@ -9,9 +9,9 @@
   ],
   "dependencies": {
     "@babel/core": "^7.14.0",
-    "@nuxt/babel-preset-app": "2.15.5",
+    "@nuxt/babel-preset-app": "2.15.6",
     "@nuxt/friendly-errors-webpack-plugin": "^2.5.1",
-    "@nuxt/utils": "2.15.5",
+    "@nuxt/utils": "2.15.6",
     "babel-loader": "^8.2.2",
     "cache-loader": "^4.1.0",
     "caniuse-lite": "^1.0.30001228",
@@ -42,7 +42,7 @@
     "terser-webpack-plugin": "^4.2.3",
     "thread-loader": "^3.0.4",
     "time-fix-plugin": "^2.0.7",
-    "ufo": "^0.7.2",
+    "ufo": "^0.7.4",
     "url-loader": "^4.1.1",
     "vue-loader": "^15.9.7",
     "vue-style-loader": "^4.1.3",

diff --git a/renovate.json b/renovate.json
@@ -16,6 +16,7 @@
     "npm",
     "html-webpack-plugin",
     "terser-webpack-plugin",
+    "@types/webpack-dev-middleware",
     "@types/terser-webpack-plugin",
     "@types/webpack-bundle-analyzer",
     "wrap-ansi"

diff --git a/yarn.lock b/yarn.lock
@@ -8008,11 +8008,16 @@ jest@^26.6.3:
     import-local "^3.0.2"
     jest-cli "^26.6.3"
 
-jiti@^1.3.0, jiti@^1.9.1:
+jiti@^1.3.0:
   version "1.9.1"
   resolved "https://registry.npmjs.org/jiti/-/jiti-1.9.1.tgz#d9e267fa050ddc52191f17d8af815d49a38ebafd"
   integrity sha512-AhYrAxJ/IW2257nHkJasUjtxHhmYIUEHEjsofJtGYsPWk8pTjqjbPFlJfOwfY+WX8YBiKHM1l0ViDC/mye2SWg==
 
+jiti@^1.9.2:
+  version "1.9.2"
+  resolved "https://registry.npmjs.org/jiti/-/jiti-1.9.2.tgz#2ee44830883dbb1b2e222adc053c3052d0bf3b61"
+  integrity sha512-wymUBR/YGGVNVRAxX52yvFoZdUAYKEGjk0sYrz6gXLCvMblnRvJAmDUnMvQiH4tUHDBtbKHnZ4GT3R+m3Hc39A==
+
 js-beautify@^1.6.12:
   version "1.13.13"
   resolved "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.13.tgz#756907d1728f329f2b84c42efd56ad17514620bf"
@@ -12909,10 +12914,10 @@ ua-parser-js@^0.7.28:
   resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
   integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
 
-ufo@^0.7.2:
-  version "0.7.2"
-  resolved "https://registry.npmjs.org/ufo/-/ufo-0.7.2.tgz#a0e3c9f1b1d9b55f60e068d17afd6ffbdc4fbd62"
-  integrity sha512-cfxpkL4g79LrCXa1RyvhM/obxunKRjHApD4Ml4UG0CZcKvfodfKH0YTmnm6ofKKUnLzBMdfXSZzlgyQmj6b3sw==
+ufo@^0.7.4:
+  version "0.7.4"
+  resolved "https://registry.npmjs.org/ufo/-/ufo-0.7.4.tgz#06e971738bea098b95056755ba006a6b73a63f97"
+  integrity sha512-qFCjO4/IAaejZ6QKVBdM7FZkjhd8zQmBmE6i2bcSwBRrctPVtKXFojJa2flaqNUd7YWQoCFwd44MpOt1g94ekQ==
 
 uglify-js@^3.1.4, uglify-js@^3.5.1:
   version "3.13.6"