chore: merge branch 'dev' into docs

Author: haoqunjiang

CHANGELOG.md

@@ -1,3 +1,96 @@
+# [3.4.0](https://github.com/vuejs/vue-cli/compare/v3.3.0...v3.4.0) (2019-01-31)
+
+## babel-preset-app
+
+#### Features
+
+* **babel:** include es6.object.assign by default ([#3281](https://github.com/vuejs/vue-cli/issues/3281)) ([8dcfc18](https://github.com/vuejs/vue-cli/commit/8dcfc18))
+* expose `absoluteRuntime` option, closes [#2807](https://github.com/vuejs/vue-cli/issues/2807) ([d5ed280](https://github.com/vuejs/vue-cli/commit/d5ed280))
+
+## cli
+
+#### Bug Fixes
+
+* fix injectImports when there's no pre-existing import declarations ([108d801](https://github.com/vuejs/vue-cli/commit/108d801)), closes [#2925](https://github.com/vuejs/vue-cli/issues/2925)
+* should check yarn when no pacakage manager specified ([6a75056](https://github.com/vuejs/vue-cli/commit/6a75056)), closes [#3393](https://github.com/vuejs/vue-cli/issues/3393)
+
+## cli-plugin-babel
+
+#### Bug Fixes
+
+* add webpack to plugins' dependencies, fix yarn peer dep warnings ([6e5e117](https://github.com/vuejs/vue-cli/commit/6e5e117))
+* **cli-plugin-babel:** transpileDependencies should only match packages inside `node_modules`, close [#3057](https://github.com/vuejs/vue-cli/issues/3057) ([#3229](https://github.com/vuejs/vue-cli/issues/3229)) ([fb71653](https://github.com/vuejs/vue-cli/commit/fb71653))
+* take all env variables into account in `genCacheConfig` ([047872c](https://github.com/vuejs/vue-cli/commit/047872c)), closes [#3275](https://github.com/vuejs/vue-cli/issues/3275)
+
+## cli-plugin-eslint
+
+#### Bug Fixes
+
+* only add custom ignorePattern when no .eslintignore exists ([#3325](https://github.com/vuejs/vue-cli/issues/3325)) ([febd386](https://github.com/vuejs/vue-cli/commit/febd386)), closes [#3243](https://github.com/vuejs/vue-cli/issues/3243)
+#### Features
+
+* add `--no-fix-warnings` option ([#3307](https://github.com/vuejs/vue-cli/issues/3307)) ([2b6dba3](https://github.com/vuejs/vue-cli/commit/2b6dba3))
+
+## cli-plugin-typescript
+
+#### Bug Fixes
+
+* fix linting of tsx script in .vue file ([#3097](https://github.com/vuejs/vue-cli/issues/3097)) ([f3fe8b3](https://github.com/vuejs/vue-cli/commit/f3fe8b3))
+#### Features
+
+* support yml, yaml and json tslint configuration files ([#3305](https://github.com/vuejs/vue-cli/issues/3305)) ([596a49d](https://github.com/vuejs/vue-cli/commit/596a49d))
+
+## cli-plugin-unit-mocha
+
+#### Bug Fixes
+
+* apply a workaround for the prettier / jsdom-global bug ([bca6edc](https://github.com/vuejs/vue-cli/commit/bca6edc))
+
+## cli-service
+
+#### Bug Fixes
+
+* add [@vue](https://github.com/vue)/component-compiler-utils to dependencies, fix yarn pnp compatibility ([3d6eab9](https://github.com/vuejs/vue-cli/commit/3d6eab9))
+* copy `publicPath` option to `baseUrl`, fix plugin compatibility ([27ffd28](https://github.com/vuejs/vue-cli/commit/27ffd28))
+* do not add link tag to demo page when css extract is false ([#3351](https://github.com/vuejs/vue-cli/issues/3351)) ([9029ad1](https://github.com/vuejs/vue-cli/commit/9029ad1))
+* fix reference of friendly-errors-webpack-plugin in config ([486a921](https://github.com/vuejs/vue-cli/commit/486a921))
+* genCacheConfig return different result because linebreak ([#3372](https://github.com/vuejs/vue-cli/issues/3372)) ([ab13dfe](https://github.com/vuejs/vue-cli/commit/ab13dfe))
+* pin webpack version, fixes [#3335](https://github.com/vuejs/vue-cli/issues/3335) ([0a0a65f](https://github.com/vuejs/vue-cli/commit/0a0a65f))
+* should respect root `parallel` option in terser plugin ([702a2c9](https://github.com/vuejs/vue-cli/commit/702a2c9))
+* use a custom fork of friendly-errors-webpack-plugin ([28933c8](https://github.com/vuejs/vue-cli/commit/28933c8)), closes [/github.com/geowarin/friendly-errors-webpack-plugin/pull/82#issuecomment-454808535](https://github.com//github.com/geowarin/friendly-errors-webpack-plugin/pull/82/issues/issuecomment-454808535) [#2244](https://github.com/vuejs/vue-cli/issues/2244) [#3003](https://github.com/vuejs/vue-cli/issues/3003)
+* use the correct size unit (KiB) ([1553757](https://github.com/vuejs/vue-cli/commit/1553757)), closes [#3283](https://github.com/vuejs/vue-cli/issues/3283)
+#### Features
+
+* add typings for vue.config.js options ([#3387](https://github.com/vuejs/vue-cli/issues/3387)) ([b61ea45](https://github.com/vuejs/vue-cli/commit/b61ea45))
+* support dart-sass as default sass implementation ([#3321](https://github.com/vuejs/vue-cli/issues/3321)) ([9c1e797](https://github.com/vuejs/vue-cli/commit/9c1e797))
+* support use -h show detailed usage of command ([67cff95](https://github.com/vuejs/vue-cli/commit/67cff95))
+
+## cli-shared-utils
+
+#### Bug Fixes
+
+* add timeout for requests ([09be0f2](https://github.com/vuejs/vue-cli/commit/09be0f2)), closes [#3076](https://github.com/vuejs/vue-cli/issues/3076)
+
+## cli-ui
+
+#### Bug Fixes
+
+* **cli-ui:** folder list when root windows ([#3331](https://github.com/vuejs/vue-cli/issues/3331)) ([d047aca](https://github.com/vuejs/vue-cli/commit/d047aca))
+#### Features
+
+* **ui:** enforce package.json npm rules ([#3232](https://github.com/vuejs/vue-cli/issues/3232)) ([11d17d9](https://github.com/vuejs/vue-cli/commit/11d17d9))
+
+## eslint-config-typescript
+
+#### Bug Fixes
+
+* force enable `jsx` in parserOptions, fixes [#3268](https://github.com/vuejs/vue-cli/issues/3268) ([85c5973](https://github.com/vuejs/vue-cli/commit/85c5973))
+#### Features
+
+* update eslint-config-typescript to use [@typescript-eslint](https://github.com/typescript-eslint) ([#3359](https://github.com/vuejs/vue-cli/issues/3359)) ([189ea54](https://github.com/vuejs/vue-cli/commit/189ea54))
+
+
+
 # [3.3.0](https://github.com/vuejs/vue-cli/compare/v3.2.3...v3.3.0) (2019-01-08)
 
 ## babel-preset-app

docs/zh/dev-guide/ui-api.md

@@ -1338,7 +1338,7 @@ api.getProject()
 
 你可能需要在 cli-ui 内建的 HTTP 服务器上暴露一些静态文件 (通常是为自定义视图指定图标)。
 
-在插件包跟目录里可选的放置一个 `ui-public` 文件夹，这个文件夹里的任何文件都会暴露至 `/_plugin/:id/*` 的 HTTP 路由。
+在插件包根目录里可选的放置一个 `ui-public` 文件夹，这个文件夹里的任何文件都会暴露至 `/_plugin/:id/*` 的 HTTP 路由。
 
 例如，如果你将 `my-logo.png` 文件放置到 `vue-cli-plugin-hello/ui-public/` 文件夹，那么 cli-ui 加载插件的时候可以通过 `/_plugin/vue-cli-plugin-hello/my-logo.png` 这个 URL 来访问它。
 

lerna.json

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

package.json

@@ -54,7 +54,7 @@
     "eslint-plugin-vue": "^5.0.0",
     "eslint-plugin-vue-libs": "^3.0.0",
     "execa": "^1.0.0",
-    "globby": "^8.0.1",
+    "globby": "^9.0.0",
     "http-server": "^0.11.1",
     "inquirer": "^6.0.0",
     "jest": "^23.1.0",
@@ -76,8 +76,8 @@
     "@babel/preset-env": "^7.0.0",
     "babel-core": "7.0.0-bridge.0",
     "ps-tree": "^1.1.1",
-    "vue": "2.5.21",
-    "vue-template-compiler": "2.5.21",
-    "vue-server-renderer": "2.5.21"
+    "vue": "^2.5.22",
+    "vue-template-compiler": "^2.5.22",
+    "vue-server-renderer": "^2.5.22"
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/babel-preset-app",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "babel-preset-app for vue-cli",
   "main": "index.js",
   "publishConfig": {
@@ -31,6 +31,6 @@
     "@babel/runtime-corejs2": "^7.2.0",
     "@vue/babel-preset-jsx": "^1.0.0-beta.2",
     "babel-plugin-dynamic-import-node": "^2.2.0",
-    "core-js": "^2.6.1"
+    "core-js": "^2.6.3"
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-init",
-  "version": "3.3.0",
+  "version": "3.4.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.3.0",
+  "version": "3.4.0",
   "description": "error overlay & dev server middleware for vue-cli",
   "main": "dist/client.js",
   "files": [

packages/@vue/cli-plugin-babel/__tests__/transpileDependencies.spec.js

@@ -40,6 +40,7 @@ beforeAll(async () => {
 
   $packageJson = JSON.parse($packageJson)
   $packageJson.dependencies['external-dep'] = '1.0.0'
+  $packageJson.dependencies['@scope/external-dep'] = '1.0.0'
   $packageJson = JSON.stringify($packageJson)
 
   await project.write(
@@ -70,10 +71,23 @@ test('dep from node_modules should not been transpiled', async () => {
 test('dep from node_modules should been transpiled', async () => {
   await project.write(
     'vue.config.js',
-    `module.exports = { transpileDependencies: ['external-dep'] }`
+    `module.exports = { transpileDependencies: ['external-dep', '@scope/external-dep'] }`
   )
   await project.run('vue-cli-service build')
   expect(await readVendorFile()).toMatch('return "__TEST__"')
 
   expect(await readVendorFile()).toMatch('return "__SCOPE_TEST__"')
 })
+
+// https://github.com/vuejs/vue-cli/issues/3057
+test('only transpile package with same name specified in transpileDependencies', async () => {
+  await project.write(
+    'vue.config.js',
+    `module.exports = { transpileDependencies: ['babel-transpile-deps'] }`
+  )
+  try {
+    await project.run('vue-cli-service build')
+  } catch (e) {}
+  expect(await readVendorFile()).toMatch('() => "__TEST__"')
+  expect(await readVendorFile()).toMatch('() => "__SCOPE_TEST__"')
+})

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

@@ -1,8 +1,24 @@
 const path = require('path')
+const { isWindows } = require('@vue/cli-shared-utils')
+
+function genTranspileDepRegex (transpileDependencies) {
+  const deps = transpileDependencies.map(dep => {
+    if (typeof dep === 'string') {
+      const depPath = path.join('node_modules', dep, '/')
+      return isWindows
+        ? depPath.replace(/\\/g, '\\\\') // double escape for windows style path
+        : depPath
+    } else if (dep instanceof RegExp) {
+      return dep.source
+    }
+  })
+  return deps.length ? new RegExp(deps.join('|')) : null
+}
 
 module.exports = (api, options) => {
   const useThreads = process.env.NODE_ENV === 'production' && options.parallel
   const cliServicePath = require('path').dirname(require.resolve('@vue/cli-service'))
+  const transpileDepRegex = genTranspileDepRegex(options.transpileDependencies)
 
   api.chainWebpack(webpackConfig => {
     webpackConfig.resolveLoader.modules.prepend(path.join(__dirname, 'node_modules'))
@@ -21,13 +37,7 @@ module.exports = (api, options) => {
               return true
             }
             // check if this is something the user explicitly wants to transpile
-            if (options.transpileDependencies.some(dep => {
-              if (typeof dep === 'string') {
-                return filepath.includes(path.normalize(dep))
-              } else {
-                return filepath.match(dep)
-              }
-            })) {
+            if (transpileDepRegex && transpileDepRegex.test(filepath)) {
               return false
             }
             // Don't transpile node_modules
@@ -40,6 +50,7 @@ module.exports = (api, options) => {
             '@babel/core': require('@babel/core/package.json').version,
             '@vue/babel-preset-app': require('@vue/babel-preset-app/package.json').version,
             'babel-loader': require('babel-loader/package.json').version,
+            modern: !!process.env.VUE_CLI_MODERN_BUILD,
             browserslist: api.service.pkg.browserslist
           }, [
             'babel.config.js',

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-babel",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "babel plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -20,8 +20,10 @@
   "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.3.0",
-    "babel-loader": "^8.0.4"
+    "@vue/babel-preset-app": "^3.4.0",
+    "@vue/cli-shared-utils": "^3.4.0",
+    "babel-loader": "^8.0.5",
+    "webpack": ">=4 < 4.29"
   },
   "publishConfig": {
     "access": "public"

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-e2e-nightwatch",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "e2e-nightwatch plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -22,9 +22,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^3.3.0",
+    "@vue/cli-shared-utils": "^3.4.0",
     "chromedriver": "^2.45.0",
-    "deepmerge": "^3.0.0",
+    "deepmerge": "^3.1.0",
     "execa": "^1.0.0",
     "nightwatch": "^0.9.21",
     "selenium-server": "^3.141.59"

packages/@vue/cli-plugin-eslint/generator/index.js

@@ -117,7 +117,7 @@ const applyTS = module.exports.applyTS = api => {
       }
     },
     devDependencies: {
-      '@vue/eslint-config-typescript': '^3.2.0'
+      '@vue/eslint-config-typescript': '^4.0.0'
     }
   })
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-eslint",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "eslint plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -22,11 +22,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^3.3.0",
+    "@vue/cli-shared-utils": "^3.4.0",
     "babel-eslint": "^10.0.1",
     "eslint": "^4.19.1",
     "eslint-loader": "^2.1.1",
     "eslint-plugin-vue": "^4.7.1",
-    "globby": "^8.0.1"
+    "globby": "^9.0.0",
+    "webpack": ">=4 < 4.29"
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@vue/cli-plugin-pwa",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "pwa plugin for vue-cli",
   "main": "index.js",
   "repository": {
@@ -22,7 +22,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue/cli-shared-utils": "^3.3.0",
+    "@vue/cli-shared-utils": "^3.4.0",
+    "webpack": ">=4 < 4.29",
     "workbox-webpack-plugin": "^3.6.3"
   },
   "devDependencies": {

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

@@ -30,7 +30,8 @@ module.exports = (api, options) => {
       loader: 'cache-loader',
       options: api.genCacheConfig('ts-loader', {
         'ts-loader': require('ts-loader/package.json').version,
-        'typescript': require('typescript/package.json').version
+        'typescript': require('typescript/package.json').version,
+        modern: !!process.env.VUE_CLI_MODERN_BUILD
       }, 'tsconfig.json')
     })
 

packages/@vue/cli-plugin-typescript/lib/tslint.js

@@ -49,7 +49,7 @@ module.exports = function lint (args = {}, api, silent) {
         before: content.slice(0, script.start),
         after: content.slice(script.end)
       })
-      return script.content
+      return script
     }
   }
 
@@ -61,8 +61,9 @@ module.exports = function lint (args = {}, api, silent) {
     const getSourceFile = program.getSourceFile
     program.getSourceFile = function (file, languageVersion, onError) {
       if (isVueFile(file)) {
-        const script = parseTSFromVueFile(file) || ''
-        return ts.createSourceFile(file, script, languageVersion, true)
+        const { content, lang = 'js' } = parseTSFromVueFile(file) || { content: '', lang: 'js' }
+        const contentLang = ts.ScriptKind[lang.toUpperCase()];
+        return ts.createSourceFile(file, content, languageVersion, true, contentLang)
       } else {
         return getSourceFile.call(this, file, languageVersion, onError)
       }