v4.0.0-rc.7

haoqunjiang · haoqunjiang · commit 58592fed4e33 · 2019-10-01T23:35:39.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,15 @@
 
+## 4.0.0-rc.7 (2019-10-01)
+
+#### :bug: Bug Fix
+* `@vue/cli-service`
+  * [#4637](https://github.com/vuejs/vue-cli/pull/4637) fix: avoid accidentally overriding sass config with scss configs ([@sodatea](https://github.com/sodatea))
+
+#### Committers: 1
+- Haoqun Jiang ([@sodatea](https://github.com/sodatea))
+
+
+
 ## 4.0.0-rc.6 (2019-09-30)
 
 #### :rocket: New Features
diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "packages": [
     "packages/@vue/babel-preset-app",
     "packages/@vue/cli*",
diff --git a/packages/@vue/babel-preset-app/package.json b/packages/@vue/babel-preset-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/babel-preset-app",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "babel-preset-app for vue-cli",
   "main": "index.js",
   "publishConfig": {
diff --git a/packages/@vue/cli-init/package.json b/packages/@vue/cli-init/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "init addon for vue-cli",
   "main": "index.js",
   "publishConfig": {
diff --git a/packages/@vue/cli-overlay/package.json b/packages/@vue/cli-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-overlay",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "error overlay & dev server middleware for vue-cli",
   "main": "dist/client.js",
   "files": [
diff --git a/packages/@vue/cli-plugin-babel/package.json b/packages/@vue/cli-plugin-babel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-babel",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "babel plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -21,8 +21,8 @@
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-babel#readme",
   "dependencies": {
     "@babel/core": "^7.4.5",
-    "@vue/babel-preset-app": "^4.0.0-rc.6",
-    "@vue/cli-shared-utils": "^4.0.0-rc.6",
+    "@vue/babel-preset-app": "^4.0.0-rc.7",
+    "@vue/cli-shared-utils": "^4.0.0-rc.7",
     "babel-loader": "^8.0.6",
     "webpack": "^4.0.0"
   },
diff --git a/packages/@vue/cli-plugin-e2e-cypress/package.json b/packages/@vue/cli-plugin-e2e-cypress/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-e2e-cypress",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.0.0-rc.6",
+    "@vue/cli-shared-utils": "^4.0.0-rc.7",
     "cypress": "^3.3.1",
     "eslint-plugin-cypress": "^2.2.1"
   },
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/package.json b/packages/@vue/cli-plugin-e2e-nightwatch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-e2e-nightwatch",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "e2e-nightwatch plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.0.0-rc.6",
+    "@vue/cli-shared-utils": "^4.0.0-rc.7",
     "deepmerge": "^3.2.0",
     "execa": "^1.0.0",
     "nightwatch": "^1.2.2"
diff --git a/packages/@vue/cli-plugin-eslint/package.json b/packages/@vue/cli-plugin-eslint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-eslint",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.0.0-rc.6",
+    "@vue/cli-shared-utils": "^4.0.0-rc.7",
     "eslint-loader": "^2.1.2",
     "globby": "^9.2.0",
     "webpack": "^4.0.0",
diff --git a/packages/@vue/cli-plugin-pwa/package.json b/packages/@vue/cli-plugin-pwa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-pwa",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.0.0-rc.6",
+    "@vue/cli-shared-utils": "^4.0.0-rc.7",
     "webpack": "^4.0.0",
     "workbox-webpack-plugin": "^4.3.1"
   },
diff --git a/packages/@vue/cli-plugin-router/package.json b/packages/@vue/cli-plugin-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-router",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "router plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,10 +23,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.0.0-rc.6"
+    "@vue/cli-shared-utils": "^4.0.0-rc.7"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^4.0.0-rc.6"
+    "@vue/cli-test-utils": "^4.0.0-rc.7"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0-0"
diff --git a/packages/@vue/cli-plugin-typescript/package.json b/packages/@vue/cli-plugin-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-typescript",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "typescript plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@types/webpack-env": "^1.13.9",
-    "@vue/cli-shared-utils": "^4.0.0-rc.6",
+    "@vue/cli-shared-utils": "^4.0.0-rc.7",
     "fork-ts-checker-webpack-plugin": "^1.3.4",
     "globby": "^9.2.0",
     "ts-loader": "^6.0.1",
diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-unit-jest",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "unit-jest plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -26,7 +26,7 @@
     "@babel/core": "^7.0.0",
     "@babel/plugin-transform-modules-commonjs": "^7.4.4",
     "@types/jest": "^24.0.18",
-    "@vue/cli-shared-utils": "^4.0.0-rc.6",
+    "@vue/cli-shared-utils": "^4.0.0-rc.7",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^24.9.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
diff --git a/packages/@vue/cli-plugin-unit-mocha/package.json b/packages/@vue/cli-plugin-unit-mocha/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-unit-mocha",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "mocha unit testing plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-plugin-unit-mocha#readme",
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.0.0-rc.6",
+    "@vue/cli-shared-utils": "^4.0.0-rc.7",
     "jsdom": "^15.1.0",
     "jsdom-global": "^3.0.2",
     "mocha": "^6.1.4",
diff --git a/packages/@vue/cli-plugin-vuex/package.json b/packages/@vue/cli-plugin-vuex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-vuex",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "Vuex plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@vue/cli-test-utils": "^4.0.0-rc.6"
+    "@vue/cli-test-utils": "^4.0.0-rc.7"
   },
   "peerDependencies": {
     "@vue/cli-service": "^3.0.0 || ^4.0.0-0"
diff --git a/packages/@vue/cli-service-global/package.json b/packages/@vue/cli-service-global/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service-global",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "vue-cli-service global addon for vue-cli",
   "main": "index.js",
   "publishConfig": {
@@ -22,10 +22,10 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/tree/dev/packages/@vue/cli-build#readme",
   "dependencies": {
-    "@vue/babel-preset-app": "^4.0.0-rc.6",
-    "@vue/cli-plugin-babel": "^4.0.0-rc.6",
-    "@vue/cli-plugin-eslint": "^4.0.0-rc.6",
-    "@vue/cli-service": "^4.0.0-rc.6",
+    "@vue/babel-preset-app": "^4.0.0-rc.7",
+    "@vue/cli-plugin-babel": "^4.0.0-rc.7",
+    "@vue/cli-plugin-eslint": "^4.0.0-rc.7",
+    "@vue/cli-service": "^4.0.0-rc.7",
     "babel-eslint": "^10.0.1",
     "chalk": "^2.4.2",
     "core-js": "^3.1.2",
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-service",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "local service for vue-cli projects",
   "main": "lib/Service.js",
   "typings": "types/index.d.ts",
@@ -25,8 +25,8 @@
   "dependencies": {
     "@intervolga/optimize-cssnano-plugin": "^1.0.5",
     "@soda/friendly-errors-webpack-plugin": "^1.7.1",
-    "@vue/cli-overlay": "^4.0.0-rc.6",
-    "@vue/cli-shared-utils": "^4.0.0-rc.6",
+    "@vue/cli-overlay": "^4.0.0-rc.7",
+    "@vue/cli-shared-utils": "^4.0.0-rc.7",
     "@vue/component-compiler-utils": "^3.0.0",
     "@vue/preload-webpack-plugin": "^1.1.0",
     "@vue/web-component-wrapper": "^1.2.0",
diff --git a/packages/@vue/cli-shared-utils/package.json b/packages/@vue/cli-shared-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-shared-utils",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "shared utilities for vue-cli packages",
   "main": "index.js",
   "repository": {
diff --git a/packages/@vue/cli-test-utils/package.json b/packages/@vue/cli-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-test-utils",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "test utilities for vue-cli packages",
   "repository": {
     "type": "git",
diff --git a/packages/@vue/cli-ui-addon-webpack/package.json b/packages/@vue/cli-ui-addon-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui-addon-webpack",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -18,9 +18,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.0.0-rc.6",
-    "@vue/cli-plugin-eslint": "^4.0.0-rc.6",
-    "@vue/cli-service": "^4.0.0-rc.6",
+    "@vue/cli-plugin-babel": "^4.0.0-rc.7",
+    "@vue/cli-plugin-eslint": "^4.0.0-rc.7",
+    "@vue/cli-service": "^4.0.0-rc.7",
     "@vue/eslint-config-standard": "^4.0.0",
     "core-js": "^3.1.2",
     "eslint": "^5.16.0",
diff --git a/packages/@vue/cli-ui-addon-widgets/package.json b/packages/@vue/cli-ui-addon-widgets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui-addon-widgets",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -18,9 +18,9 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.0.0-rc.6",
-    "@vue/cli-plugin-eslint": "^4.0.0-rc.6",
-    "@vue/cli-service": "^4.0.0-rc.6",
+    "@vue/cli-plugin-babel": "^4.0.0-rc.7",
+    "@vue/cli-plugin-eslint": "^4.0.0-rc.7",
+    "@vue/cli-service": "^4.0.0-rc.7",
     "@vue/eslint-config-standard": "^4.0.0",
     "core-js": "^3.1.2",
     "eslint": "^5.16.0",
diff --git a/packages/@vue/cli-ui/package.json b/packages/@vue/cli-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-ui",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vuejs/vue-cli.git",
@@ -34,7 +34,7 @@
   ],
   "dependencies": {
     "@akryum/winattr": "^3.0.0",
-    "@vue/cli-shared-utils": "^4.0.0-rc.6",
+    "@vue/cli-shared-utils": "^4.0.0-rc.7",
     "chalk": "^2.4.1",
     "clone": "^2.1.1",
     "deepmerge": "^3.2.0",
@@ -65,10 +65,10 @@
     "watch": "^1.0.2"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.0.0-rc.6",
-    "@vue/cli-plugin-e2e-cypress": "^4.0.0-rc.6",
-    "@vue/cli-plugin-eslint": "^4.0.0-rc.6",
-    "@vue/cli-service": "^4.0.0-rc.6",
+    "@vue/cli-plugin-babel": "^4.0.0-rc.7",
+    "@vue/cli-plugin-e2e-cypress": "^4.0.0-rc.7",
+    "@vue/cli-plugin-eslint": "^4.0.0-rc.7",
+    "@vue/cli-service": "^4.0.0-rc.7",
     "@vue/eslint-config-standard": "^4.0.0",
     "@vue/ui": "^0.9.2",
     "ansi_up": "^3.0.0",
diff --git a/packages/@vue/cli/package.json b/packages/@vue/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "Command line interface for rapid Vue.js development",
   "bin": {
     "vue": "bin/vue.js"
@@ -24,10 +24,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^4.0.0-rc.6",
-    "@vue/cli-ui": "^4.0.0-rc.6",
-    "@vue/cli-ui-addon-webpack": "^4.0.0-rc.6",
-    "@vue/cli-ui-addon-widgets": "^4.0.0-rc.6",
+    "@vue/cli-shared-utils": "^4.0.0-rc.7",
+    "@vue/cli-ui": "^4.0.0-rc.7",
+    "@vue/cli-ui-addon-webpack": "^4.0.0-rc.7",
+    "@vue/cli-ui-addon-widgets": "^4.0.0-rc.7",
     "chalk": "^2.4.1",
     "cmd-shim": "^2.0.2",
     "commander": "^2.20.0",
diff --git a/packages/vue-cli-version-marker/package.json b/packages/vue-cli-version-marker/package.json
@@ -1,11 +1,11 @@
 {
   "name": "vue-cli-version-marker",
-  "version": "4.0.0-rc.6",
+  "version": "4.0.0-rc.7",
   "description": "version marker for @vue/cli",
   "author": "Evan You",
   "license": "MIT",
   "main": "package.json",
   "devDependencies": {
-    "@vue/cli": "^4.0.0-rc.6"
+    "@vue/cli": "^4.0.0-rc.7"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"npmClient": "yarn",`
`3`	`3`	`"useWorkspaces": true,`
`4`		`- "version": "4.0.0-rc.6",`
	`4`	`+ "version": "4.0.0-rc.7",`
`5`	`5`	`"packages": [`
`6`	`6`	`"packages/@vue/babel-preset-app",`
`7`	`7`	`"packages/@vue/cli*",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@vue/babel-preset-app",`
`3`		`- "version": "4.0.0-rc.6",`
	`3`	`+ "version": "4.0.0-rc.7",`
`4`	`4`	`"description": "babel-preset-app for vue-cli",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"publishConfig": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@vue/cli-init",`
`3`		`- "version": "4.0.0-rc.6",`
	`3`	`+ "version": "4.0.0-rc.7",`
`4`	`4`	`"description": "init addon for vue-cli",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"publishConfig": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@vue/cli-overlay",`
`3`		`- "version": "4.0.0-rc.6",`
	`3`	`+ "version": "4.0.0-rc.7",`
`4`	`4`	`"description": "error overlay & dev server middleware for vue-cli",`
`5`	`5`	`"main": "dist/client.js",`
`6`	`6`	`"files": [`