Merge remote-tracking branch 'origin/2.x' into dev

nuxt · Oct 9, 2019 · a0ef4a3 · a0ef4a3
2 parents 6f2f13e + c17afa7
commit a0ef4a3
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 36 deletions.
diff --git a/distributions/nuxt-start/package.json b/distributions/nuxt-start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt-start",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "description": "Starts Nuxt.js Application in production mode",
   "keywords": [
     "nuxt",
@@ -55,8 +55,8 @@
   "main": "dist/nuxt-start.js",
   "bin": "bin/nuxt-start.js",
   "dependencies": {
-    "@nuxt/cli": "2.9.2",
-    "@nuxt/core": "2.9.2",
+    "@nuxt/cli": "2.10.0",
+    "@nuxt/core": "2.10.0",
     "node-fetch": "^2.6.0",
     "vue": "^2.6.10",
     "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.9.2",
+  "version": "2.10.0",
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "keywords": [
     "nuxt",
@@ -57,13 +57,13 @@
     "postinstall": "opencollective || exit 0"
   },
   "dependencies": {
-    "@nuxt/builder": "2.9.2",
-    "@nuxt/cli": "2.9.2",
-    "@nuxt/core": "2.9.2",
-    "@nuxt/generator": "2.9.2",
+    "@nuxt/builder": "2.10.0",
+    "@nuxt/cli": "2.10.0",
+    "@nuxt/core": "2.10.0",
+    "@nuxt/generator": "2.10.0",
     "@nuxt/loading-screen": "^1.2.0",
     "@nuxt/opencollective": "^0.3.0",
-    "@nuxt/webpack": "2.9.2"
+    "@nuxt/webpack": "2.10.0"
   },
   "engines": {
     "node": ">=8.9.0",

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

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.9.2",
+  "version": "2.10.0",
   "description": "babel-preset-app for nuxt.js",
   "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.9.2",
+  "version": "2.10.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -9,8 +9,8 @@
   "main": "dist/builder.js",
   "dependencies": {
     "@nuxt/devalue": "^1.2.4",
-    "@nuxt/utils": "2.9.2",
-    "@nuxt/vue-app": "2.9.2",
+    "@nuxt/utils": "2.10.0",
+    "@nuxt/vue-app": "2.10.0",
     "chokidar": "^3.2.1",
     "consola": "^2.10.1",
     "fs-extra": "^8.1.0",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/cli",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -12,8 +12,8 @@
     "nuxt-cli": "bin/nuxt-cli.js"
   },
   "dependencies": {
-    "@nuxt/config": "2.9.2",
-    "@nuxt/utils": "2.9.2",
+    "@nuxt/config": "2.10.0",
+    "@nuxt/utils": "2.10.0",
     "boxen": "^4.1.0",
     "chalk": "^2.4.2",
     "consola": "^2.10.1",

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/config",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -10,7 +10,7 @@
   "main": "dist/config.js",
   "typings": "index.d.ts",
   "dependencies": {
-    "@nuxt/utils": "2.9.2",
+    "@nuxt/utils": "2.10.0",
     "consola": "^2.10.1",
     "std-env": "^2.2.1"
   },

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,18 +1,18 @@
 {
   "name": "@nuxt/core",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
     "dist"
   ],
   "main": "dist/core.js",
   "dependencies": {
-    "@nuxt/config": "2.9.2",
+    "@nuxt/config": "2.10.0",
     "@nuxt/devalue": "^1.2.4",
-    "@nuxt/server": "2.9.2",
-    "@nuxt/utils": "2.9.2",
-    "@nuxt/vue-renderer": "2.9.2",
+    "@nuxt/server": "2.10.0",
+    "@nuxt/utils": "2.10.0",
+    "@nuxt/vue-renderer": "2.10.0",
     "consola": "^2.10.1",
     "debug": "^4.1.1",
     "esm": "^3.2.25",

diff --git a/packages/generator/package.json b/packages/generator/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@nuxt/generator",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
     "dist"
   ],
   "main": "dist/generator.js",
   "dependencies": {
-    "@nuxt/utils": "2.9.2",
+    "@nuxt/utils": "2.10.0",
     "chalk": "^2.4.2",
     "consola": "^2.10.1",
     "fs-extra": "^8.1.0",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,15 +1,15 @@
 {
   "name": "@nuxt/server",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
     "dist"
   ],
   "main": "dist/server.js",
   "dependencies": {
-    "@nuxt/config": "2.9.2",
-    "@nuxt/utils": "2.9.2",
+    "@nuxt/config": "2.10.0",
+    "@nuxt/utils": "2.10.0",
     "@nuxtjs/youch": "^4.2.3",
     "chalk": "^2.4.2",
     "compression": "^1.7.4",

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/utils",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [

diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vue-app",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [

diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vue-renderer",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -9,7 +9,7 @@
   "main": "dist/vue-renderer.js",
   "dependencies": {
     "@nuxt/devalue": "^1.2.4",
-    "@nuxt/utils": "2.9.2",
+    "@nuxt/utils": "2.10.0",
     "consola": "^2.10.1",
     "fs-extra": "^8.1.0",
     "lru-cache": "^5.1.1",

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/webpack",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "repository": "nuxt/nuxt.js",
   "license": "MIT",
   "files": [
@@ -9,9 +9,9 @@
   "main": "dist/webpack.js",
   "dependencies": {
     "@babel/core": "^7.6.3",
-    "@nuxt/babel-preset-app": "2.9.2",
+    "@nuxt/babel-preset-app": "2.10.0",
     "@nuxt/friendly-errors-webpack-plugin": "^2.5.0",
-    "@nuxt/utils": "2.9.2",
+    "@nuxt/utils": "2.10.0",
     "babel-loader": "^8.0.6",
     "cache-loader": "^4.1.0",
     "caniuse-lite": "^1.0.30000999",