chore: merge branch 'dev' into docs

Author: haoqunjiang

CHANGELOG.md

@@ -1,3 +1,70 @@
+# [3.5.0](https://github.com/vuejs/vue-cli/compare/v3.4.1...v3.5.0) (2019-03-08)
+
+## babel-preset-app
+
+#### Bug Fixes
+
+* use an environment variable to determine the entry files to inject default polyfills ([#3565](https://github.com/vuejs/vue-cli/issues/3565)) ([93f57ac](https://github.com/vuejs/vue-cli/commit/93f57ac)), closes [#2983](https://github.com/vuejs/vue-cli/issues/2983)
+#### Features
+
+* add `entryFiles` option, allowing explicit polyfill injection to specified files ([#3470](https://github.com/vuejs/vue-cli/issues/3470)) ([7df0c58](https://github.com/vuejs/vue-cli/commit/7df0c58))
+
+## cli
+
+#### Bug Fixes
+
+* add missing package keys to the sort array (issue [#3509](https://github.com/vuejs/vue-cli/issues/3509)) ([#3510](https://github.com/vuejs/vue-cli/issues/3510)) ([6e9ba9b](https://github.com/vuejs/vue-cli/commit/6e9ba9b))
+
+## cli-plugin-babel
+
+#### Features
+
+* add .mjs files as transpileable files ([#3485](https://github.com/vuejs/vue-cli/issues/3485)) ([8562d3e](https://github.com/vuejs/vue-cli/commit/8562d3e))
+
+## cli-plugin-e2e-nightwatch
+
+#### Bug Fixes
+
+* setting env by `-e` in e2e tests ([#3583](https://github.com/vuejs/vue-cli/issues/3583)) ([9aff29d](https://github.com/vuejs/vue-cli/commit/9aff29d))
+
+## cli-plugin-typescript
+
+#### Features
+
+* loosen the restriction of typescript version ([#3542](https://github.com/vuejs/vue-cli/issues/3542)) ([873ad84](https://github.com/vuejs/vue-cli/commit/873ad84))
+
+## cli-plugin-unit-jest
+
+#### Bug Fixes
+
+* lock `[@vue](https://github.com/vue)/test-utils` version as it's still in beta and may introduce breaking changes ([266090d](https://github.com/vuejs/vue-cli/commit/266090d))
+
+## cli-service
+
+#### Bug Fixes
+
+* fix modern mode in monorepo by resolving in the package scope ([14b2c6e](https://github.com/vuejs/vue-cli/commit/14b2c6e)), closes [/github.com/vuejs/vue-cli/pull/3477#issuecomment-466926461](https://github.com//github.com/vuejs/vue-cli/pull/3477/issues/issuecomment-466926461)
+* **cli-service:** inspect --rules (close [#3334](https://github.com/vuejs/vue-cli/issues/3334)) ([#3378](https://github.com/vuejs/vue-cli/issues/3378)) ([6f93bfe](https://github.com/vuejs/vue-cli/commit/6f93bfe))
+* proxy should warn when array is passed. ([#3525](https://github.com/vuejs/vue-cli/issues/3525)) ([bb4f349](https://github.com/vuejs/vue-cli/commit/bb4f349)), closes [#3524](https://github.com/vuejs/vue-cli/issues/3524)
+#### Features
+
+* allow vue.config.js to return a function ([#3499](https://github.com/vuejs/vue-cli/issues/3499)) ([f5b174f](https://github.com/vuejs/vue-cli/commit/f5b174f)), closes [#3213](https://github.com/vuejs/vue-cli/issues/3213)
+* support environment variable expansion ([#3534](https://github.com/vuejs/vue-cli/issues/3534)) ([bd57f15](https://github.com/vuejs/vue-cli/commit/bd57f15))
+
+## cli-service-global
+
+#### Features
+
+* warn if run instant prototyping in a project directory ([#3508](https://github.com/vuejs/vue-cli/issues/3508)) ([2de215e](https://github.com/vuejs/vue-cli/commit/2de215e)), closes [#2473](https://github.com/vuejs/vue-cli/issues/2473)
+
+## docs
+
+#### Bug Fixes
+
+* **cli-service:** catch exception if "copy to clipboard" fails (issue [#3476](https://github.com/vuejs/vue-cli/issues/3476)) ([#3503](https://github.com/vuejs/vue-cli/issues/3503)) ([fec38f5](https://github.com/vuejs/vue-cli/commit/fec38f5))
+
+
+
 # [3.4.1](https://github.com/vuejs/vue-cli/compare/v3.4.0...v3.4.1) (2019-02-20)
 
 ## cli-plugin-babel

docs/guide/cli-service.md

@@ -52,6 +52,11 @@ Options:
   --https   use https (default: false)
 ```
 
+::: tip --copy
+Copying to clipboard might not work on a few platforms.  
+If copying was successful, `(copied to clipboard)` is displayed next to the local dev server URL.
+:::
+
 The `vue-cli-service serve` command starts a dev server (based on [webpack-dev-server](https://github.com/webpack/webpack-dev-server)) that comes with Hot-Module-Replacement (HMR) working out of the box.
 
 In addition to the command line flags, you can also configure the dev server using the [devServer](../config/#devserver) field in `vue.config.js`.

docs/guide/css.md

@@ -121,7 +121,7 @@ module.exports = {
       sass: {
         // @/ is an alias to src/
         // so this assumes you have a file named `src/variables.scss`
-        data: `@import "@/variables.scss";`
+        data: `@import "~@/variables.scss";`
       },
       // pass Less.js Options to less-loader
       less:{

docs/guide/mode-and-env.md

@@ -46,7 +46,7 @@ FOO=bar
 VUE_APP_SECRET=secret
 ```
 
-For more detailed env parsing rules, please refer to [the documentation of `dotenv`](https://github.com/motdotla/dotenv#rules).
+For more detailed env parsing rules, please refer to [the documentation of `dotenv`](https://github.com/motdotla/dotenv#rules). We also use [dotenv-expand](https://github.com/motdotla/dotenv-expand) for variable expansion (available in Vue CLI 3.5+).
 
 Loaded variables will become available to all `vue-cli-service` commands, plugins and dependencies.
 

lerna.json

@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": false,
-  "version": "3.4.1",
+  "version": "3.5.0",
   "packages": [
     "packages/@vue/babel-preset-app",
     "packages/@vue/cli*"

package.json

@@ -10,7 +10,7 @@
     "pretest": "yarn clean",
     "lint": "eslint --fix packages/**/*.js packages/**/bin/*",
     "check-links": "node scripts/checkLinks.js",
-    "clean": "rimraf packages/test/*",
+    "clean": "rimraf packages/test/* packages/**/temp/*",
     "sync": "node scripts/syncDeps.js",
     "boot": "node scripts/bootstrap.js",
     "release": "yarn --pure-lockfile && yarn clean && node scripts/release.js",
@@ -46,38 +46,41 @@
     "@vue/conventional-changelog": "^0.1.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.0.1",
-    "conventional-changelog": "^3.0.5",
+    "conventional-changelog": "^3.0.6",
     "debug": "^4.1.0",
-    "eslint": "^5.0.0",
-    "eslint-plugin-graphql": "^3.0.1",
+    "eslint": "^5.14.1",
+    "eslint-plugin-graphql": "^3.0.3",
     "eslint-plugin-node": "^8.0.0",
-    "eslint-plugin-vue": "^5.0.0",
+    "eslint-plugin-vue": "^5.2.2",
     "eslint-plugin-vue-libs": "^3.0.0",
     "execa": "^1.0.0",
     "globby": "^9.0.0",
+    "graphql": "^14.0.2",
     "http-server": "^0.11.1",
     "inquirer": "^6.0.0",
     "jest": "^23.1.0",
-    "lerna": "^3.4.3",
-    "lint-staged": "^8.1.0",
-    "memfs": "^2.8.0",
+    "lerna": "^3.13.0",
+    "lint-staged": "^8.1.4",
+    "memfs": "^2.15.2",
     "minimist": "^1.2.0",
-    "puppeteer": "^1.0.0",
     "request": "^2.83.0",
-    "request-promise-native": "^1.0.5",
+    "request-promise-native": "^1.0.7",
     "rimraf": "^2.6.2",
     "semver": "^5.5.0",
-    "vuepress": "^0.14.1",
+    "typescript": "^3.3.3333",
+    "vuepress": "^0.14.9",
     "vuepress-theme-vue": "^1.1.0",
+    "webpack": ">=4 < 4.29",
     "yorkie": "^2.0.0"
   },
   "resolutions": {
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "babel-core": "7.0.0-bridge.0",
     "ps-tree": "^1.1.1",
-    "vue": "^2.5.22",
-    "vue-template-compiler": "^2.5.22",
-    "vue-server-renderer": "^2.5.22"
+    "puppeteer": "1.11.0",
+    "vue": "^2.6.7",
+    "vue-template-compiler": "^2.6.7",
+    "vue-server-renderer": "^2.6.7"
   }
 }

packages/@vue/babel-preset-app/README.md

@@ -18,7 +18,7 @@ This is the default Babel preset used in all Vue CLI projects. **Note: this pres
 
 ### Stage 3 or Below
 
-Only the following stage 3 or below features are supported (object reset spread is supported as part of `preset-env`):
+Only the following stage 3 or below features are supported (object rest spread is supported as part of `preset-env`):
 
 - [Dynamic Import Syntax](https://github.com/tc39/proposal-dynamic-import)
 - [Proposal Class Properties](https://babeljs.io/docs/en/next/babel-plugin-proposal-class-properties.html)
@@ -97,3 +97,9 @@ Set to `false` to disable JSX support.
 - Default: `false`.
 
 Setting this to `true` will generate code that is more performant but less spec-compliant.
+
+### entryFiles
+
+- Default: `[]`
+
+Multi page repo use `entryFiles` to ensure inject polyfills to all entry file.

packages/@vue/babel-preset-app/__tests__/babel-preset.spec.js

@@ -1,20 +1,27 @@
+const path = require('path')
 const babel = require('@babel/core')
 const preset = require('../index')
 const defaultOptions = {
   babelrc: false,
-  presets: [preset]
+  presets: [preset],
+  filename: 'test-entry-file.js'
 }
 
+beforeEach(() => {
+  process.env.VUE_CLI_ENTRY_FILES = JSON.stringify([path.join(process.cwd(), 'test-entry-file.js')])
+})
+
 test('polyfill detection', () => {
   let { code } = babel.transformSync(`
     const a = new Map()
   `.trim(), {
     babelrc: false,
     presets: [[preset, {
       targets: { node: 'current' }
-    }]]
+    }]],
+    filename: 'test-entry-file.js'
   })
-  // default i  ncludes
+  // default includes
   expect(code).not.toMatch(`import "core-js/modules/es6.promise"`)
   // usage-based detection
   expect(code).not.toMatch(`import "core-js/modules/es6.map"`)
@@ -25,7 +32,8 @@ test('polyfill detection', () => {
     babelrc: false,
     presets: [[preset, {
       targets: { ie: 9 }
-    }]]
+    }]],
+    filename: 'test-entry-file.js'
   }))
   // default includes
   expect(code).toMatch(`import "core-js/modules/es6.promise"`)
@@ -44,7 +52,8 @@ test('modern mode always skips polyfills', () => {
     presets: [[preset, {
       targets: { ie: 9 },
       useBuiltIns: 'usage'
-    }]]
+    }]],
+    filename: 'test-entry-file.js'
   })
   // default includes
   expect(code).not.toMatch(`import "core-js/modules/es6.promise"`)
@@ -58,7 +67,8 @@ test('modern mode always skips polyfills', () => {
     presets: [[preset, {
       targets: { ie: 9 },
       useBuiltIns: 'entry'
-    }]]
+    }]],
+    filename: 'test-entry-file.js'
   }))
   // default includes
   expect(code).not.toMatch(`import "core-js/modules/es6.promise"`)
@@ -133,7 +143,8 @@ test('disable absoluteRuntime', () => {
     babelrc: false,
     presets: [[preset, {
       absoluteRuntime: false
-    }]]
+    }]],
+    filename: 'test-entry-file.js'
   })
 
   expect(code).toMatch('import _toConsumableArray from "@babel/runtime-corejs2/helpers/esm/toConsumableArray"')

packages/@vue/babel-preset-app/index.js

@@ -30,6 +30,7 @@ function getPolyfills (targets, includes, { ignoreBrowserslistConfig, configPath
 module.exports = (context, options = {}) => {
   const presets = []
   const plugins = []
+  const defaultEntryFiles = JSON.parse(process.env.VUE_CLI_ENTRY_FILES || '[]')
 
   // JSX
   if (options.jsx !== false) {
@@ -52,6 +53,8 @@ module.exports = (context, options = {}) => {
     forceAllTransforms,
     decoratorsBeforeExport,
     decoratorsLegacy,
+    // entry file list
+    entryFiles = defaultEntryFiles,
 
     // Undocumented option of @babel/plugin-transform-runtime.
     // When enabled, an absolute path is used when importing a runtime helper atfer tranforming.
@@ -103,7 +106,7 @@ module.exports = (context, options = {}) => {
       ignoreBrowserslistConfig,
       configPath
     })
-    plugins.push([require('./polyfillsPlugin'), { polyfills }])
+    plugins.push([require('./polyfillsPlugin'), { polyfills, entryFiles }])
   } else {
     polyfills = []
   }

packages/@vue/babel-preset-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/babel-preset-app",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "description": "babel-preset-app for vue-cli",
   "main": "index.js",
   "publishConfig": {

packages/@vue/babel-preset-app/polyfillsPlugin.js

@@ -1,13 +1,10 @@
 // add polyfill imports to the first file encountered.
-module.exports = ({ types }) => {
-  let entryFile
+module.exports = ({ types }, { entryFiles = [] }) => {
   return {
     name: 'vue-cli-inject-polyfills',
     visitor: {
       Program (path, state) {
-        if (!entryFile) {
-          entryFile = state.filename
-        } else if (state.filename !== entryFile) {
+        if (!entryFiles.includes(state.filename)) {
           return
         }
 

packages/@vue/cli-init/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "description": "init addon for vue-cli",
   "main": "index.js",
   "publishConfig": {

packages/@vue/cli-overlay/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-overlay",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "description": "error overlay & dev server middleware for vue-cli",
   "main": "dist/client.js",
   "files": [

packages/@vue/cli-plugin-babel/index.js

@@ -25,7 +25,7 @@ module.exports = (api, options) => {
 
     const jsRule = webpackConfig.module
       .rule('js')
-        .test(/\.jsx?$/)
+        .test(/\.m?jsx?$/)
         .exclude
           .add(filepath => {
             // always transpile js in vue files

packages/@vue/cli-plugin-babel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-babel",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "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.0.0",
-    "@vue/babel-preset-app": "^3.4.1",
-    "@vue/cli-shared-utils": "^3.4.1",
+    "@vue/babel-preset-app": "^3.5.0",
+    "@vue/cli-shared-utils": "^3.5.0",
     "babel-loader": "^8.0.5",
     "webpack": ">=4 < 4.29"
   },

packages/@vue/cli-plugin-e2e-cypress/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-e2e-cypress",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "description": "e2e-cypress plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -23,8 +23,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^3.4.1",
+    "@vue/cli-shared-utils": "^3.5.0",
     "cypress": "^3.1.5",
-    "eslint-plugin-cypress": "^2.2.0"
+    "eslint-plugin-cypress": "^2.2.1"
   }
 }

packages/@vue/cli-plugin-e2e-nightwatch/index.js

@@ -37,7 +37,7 @@ module.exports = (api, options) => {
         rawArgs.push('--config', require.resolve('./nightwatch.config.js'))
       }
 
-      if (rawArgs.indexOf('--env') === -1) {
+      if (rawArgs.indexOf('--env') === -1 && rawArgs.indexOf('-e') === -1) {
         rawArgs.push('--env', 'chrome')
       }