chore: merge dev

Guillaume Chau · Guillaume Chau · commit b75efc3a6700 · 2018-05-22T17:05:07.000+02:00
diff --git a/docs/env.md b/docs/env.md
@@ -63,7 +63,7 @@ In addition to `VUE_APP_*` variables, there are also two special variables that
 All resolved env variables will be available inside `public/index.html` via [lodash template interpolation](https://lodash.com/docs/4.17.5#template):
 
 - `<%= VAR %>` for unescaped interpolation;
-- `<%- VAR %>` for HTML-escaped interpolationl;
+- `<%- VAR %>` for HTML-escaped interpolation;
 - `<% expression %>` for JavaScript control flows.
 
 For example, to reference static assets copied from the root of `public`, you will need to use the `BASE_URL` variable:
diff --git a/packages/@vue/cli-plugin-babel/README.md b/packages/@vue/cli-plugin-babel/README.md
@@ -20,11 +20,7 @@ module.exports = {
 
 ## Caching
 
-[cache-loader](https://github.com/webpack-contrib/cache-loader) is enabled by default and cache is stored in `<projectRoot>/node_modules/.cache/cache-loader`.
-
-## Parallelization
-
-[thread-loader](https://github.com/webpack-contrib/thread-loader) is enabled by default when the machine has more than 1 CPU cores. This can be turned off by setting `parallel: false` in `vue.config.js`.
+[cache-loader](https://github.com/webpack-contrib/cache-loader) is enabled by default and cache is stored in `<projectRoot>/node_modules/.cache/babel-loader`.
 
 ## Installing in an Already Created Project
 
@@ -37,4 +33,3 @@ vue add @vue/babel
 - `config.rule('js')`
 - `config.rule('js').use('babel-loader')`
 - `config.rule('js').use('cache-loader')`
-- `config.rule('js').use('thread-loader')`
diff --git a/packages/@vue/cli-plugin-babel/index.js b/packages/@vue/cli-plugin-babel/index.js
@@ -1,9 +1,5 @@
-module.exports = (api, {
-  parallel,
-  transpileDependencies
-}) => {
-  const useThreads = process.env.NODE_ENV === 'production' && parallel
-  const cacheDirectory = api.resolve('node_modules/.cache/cache-loader')
+module.exports = (api, options) => {
+  const { genCacheConfig } = require('@vue/cli-shared-utils')
   const cliServicePath = require('path').dirname(require.resolve('@vue/cli-service'))
 
   api.chainWebpack(webpackConfig => {
@@ -21,7 +17,7 @@ module.exports = (api, {
               return true
             }
             // check if this is something the user explicitly wants to transpile
-            if (transpileDependencies.some(dep => filepath.match(dep))) {
+            if (options.transpileDependencies.some(dep => filepath.match(dep))) {
               return false
             }
             // Don't transpile node_modules
@@ -30,15 +26,9 @@ module.exports = (api, {
           .end()
         .use('cache-loader')
           .loader('cache-loader')
-          .options({ cacheDirectory })
+          .options(genCacheConfig(api, options, 'babel-loader', 'babel.config.js'))
           .end()
 
-    if (useThreads) {
-      jsRule
-        .use('thread-loader')
-          .loader('thread-loader')
-    }
-
     jsRule
       .use('babel-loader')
         .loader('babel-loader')
diff --git a/packages/@vue/cli-plugin-pwa/generator/index.js b/packages/@vue/cli-plugin-pwa/generator/index.js
@@ -4,6 +4,11 @@ module.exports = api => {
       'register-service-worker': '^1.0.0'
     }
   })
-  api.injectImports(`src/main.js`, `import './registerServiceWorker'`)
+  api.injectImports(api.entryFile, `import './registerServiceWorker'`)
   api.render('./template')
+
+  if (api.invoking && api.hasPlugin('typescript')) {
+    const convertFiles = require('@vue/cli-plugin-typescript/generator/convert')
+    convertFiles(api)
+  }
 }
diff --git a/packages/@vue/cli-plugin-typescript/README.md b/packages/@vue/cli-plugin-typescript/README.md
@@ -16,11 +16,7 @@ If opted to use [TSLint](https://palantir.github.io/tslint/) during project crea
 
 ## Caching
 
-[cache-loader](https://github.com/webpack-contrib/cache-loader) is enabled by default and cache is stored in `<projectRoot>/node_modules/.cache/cache-loader`.
-
-## Parallelization
-
-[thread-loader](https://github.com/webpack-contrib/thread-loader) is enabled by default when the machine has more than 1 CPU cores. This can be turned off by setting `parallel: false` in `vue.config.js`.
+[cache-loader](https://github.com/webpack-contrib/cache-loader) is enabled by default and cache is stored in `<projectRoot>/node_modules/.cache/ts-loader`.
 
 ## Installing in an Already Created Project
 
@@ -34,5 +30,4 @@ vue add @vue/typescript
 - `config.rule('ts').use('ts-loader')`
 - `config.rule('ts').use('babel-loader')` (when used alongside `@vue/cli-plugin-babel`)
 - `config.rule('ts').use('cache-loader')`
-- `config.rule('ts').use('thread-loader')`
 - `config.plugin('fork-ts-checker')`
diff --git a/packages/@vue/cli-plugin-typescript/generator/convert.js b/packages/@vue/cli-plugin-typescript/generator/convert.js
@@ -0,0 +1,22 @@
+module.exports = (api, { tsLint = false } = {}) => {
+  // delete all js files that have a ts file of the same name
+  // and simply rename other js files to ts
+  const jsRE = /\.js$/
+  const excludeRE = /^tests\/e2e\/|(\.config|rc)\.js$/
+  const convertLintFlags = require('../lib/convertLintFlags')
+  api.postProcessFiles(files => {
+    for (const file in files) {
+      if (jsRE.test(file) && !excludeRE.test(file)) {
+        const tsFile = file.replace(jsRE, '.ts')
+        if (!files[tsFile]) {
+          let content = files[file]
+          if (tsLint) {
+            content = convertLintFlags(content)
+          }
+          files[tsFile] = content
+        }
+        delete files[file]
+      }
+    }
+  })
+}
diff --git a/packages/@vue/cli-plugin-typescript/generator/index.js b/packages/@vue/cli-plugin-typescript/generator/index.js
@@ -79,24 +79,5 @@ module.exports = (api, {
     hasJest
   })
 
-  // delete all js files that have a ts file of the same name
-  // and simply rename other js files to ts
-  const jsRE = /\.js$/
-  const excludeRE = /^tests\/e2e\/|(\.config|rc)\.js$/
-  const convertLintFlags = require('../lib/convertLintFlags')
-  api.postProcessFiles(files => {
-    for (const file in files) {
-      if (jsRE.test(file) && !excludeRE.test(file)) {
-        const tsFile = file.replace(jsRE, '.ts')
-        if (!files[tsFile]) {
-          let content = files[file]
-          if (tsLint) {
-            content = convertLintFlags(content)
-          }
-          files[tsFile] = content
-        }
-        delete files[file]
-      }
-    }
-  })
+  require('./convert')(api, { tsLint })
 }
diff --git a/packages/@vue/cli-plugin-typescript/index.js b/packages/@vue/cli-plugin-typescript/index.js
@@ -1,10 +1,7 @@
-module.exports = (api, {
-  parallel,
-  lintOnSave
-}) => {
+module.exports = (api, options) => {
   const fs = require('fs')
-  const useThreads = process.env.NODE_ENV === 'production' && parallel
-  const cacheDirectory = api.resolve('node_modules/.cache/cache-loader')
+  const { genCacheConfig } = require('@vue/cli-shared-utils')
+  const useThreads = process.env.NODE_ENV === 'production' && options.parallel
 
   api.chainWebpack(config => {
     config.entry('app')
@@ -26,13 +23,8 @@ module.exports = (api, {
 
     addLoader({
       loader: 'cache-loader',
-      options: { cacheDirectory }
+      options: genCacheConfig(api, options, 'ts-loader', 'tsconfig.json')
     })
-    if (useThreads) {
-      addLoader({
-        loader: 'thread-loader'
-      })
-    }
 
     if (api.hasPlugin('babel')) {
       addLoader({
@@ -60,7 +52,7 @@ module.exports = (api, {
       .plugin('fork-ts-checker')
         .use(require('fork-ts-checker-webpack-plugin'), [{
           vue: true,
-          tslint: lintOnSave !== false && fs.existsSync(api.resolve('tslint.json')),
+          tslint: options.lintOnSave !== false && fs.existsSync(api.resolve('tslint.json')),
           formatter: 'codeframe',
           // https://github.com/TypeStrong/ts-loader#happypackmode-boolean-defaultfalse
           checkSyntacticErrors: useThreads
diff --git a/packages/@vue/cli-service/generator/router/index.js b/packages/@vue/cli-service/generator/router/index.js
@@ -1,14 +1,14 @@
 module.exports = (api, options) => {
-  api.injectImports(`src/main.js`, `import router from './router'`)
-  api.injectRootOptions(`src/main.js`, `router`)
+  api.injectImports(api.entryFile, `import router from './router'`)
+  api.injectRootOptions(api.entryFile, `router`)
   api.extendPackage({
     dependencies: {
       'vue-router': '^3.0.1'
     }
   })
   api.render('./template')
 
-  if (options.invoking) {
+  if (api.invoking) {
     api.postProcessFiles(files => {
       const appFile = files[`src/App.vue`]
       if (appFile) {
@@ -26,5 +26,10 @@ module.exports = (api, options) => {
         console.log(files[`src/App.vue`])
       }
     })
+
+    if (api.hasPlugin('typescript')) {
+      const convertFiles = require('@vue/cli-plugin-typescript/generator/convert')
+      convertFiles(api)
+    }
   }
 }
diff --git a/packages/@vue/cli-service/generator/vuex/index.js b/packages/@vue/cli-service/generator/vuex/index.js
@@ -1,10 +1,15 @@
 module.exports = (api, options) => {
-  api.injectImports(`src/main.js`, `import store from './store'`)
-  api.injectRootOptions(`src/main.js`, `store`)
+  api.injectImports(api.entryFile, `import store from './store'`)
+  api.injectRootOptions(api.entryFile, `store`)
   api.extendPackage({
     dependencies: {
       vuex: '^3.0.1'
     }
   })
   api.render('./template')
+
+  if (api.invoking && api.hasPlugin('typescript')) {
+    const convertFiles = require('@vue/cli-plugin-typescript/generator/convert')
+    convertFiles(api)
+  }
 }
diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js
@@ -3,6 +3,7 @@ module.exports = (api, options) => {
     const resolveLocal = require('../util/resolveLocal')
     const getAssetPath = require('../util/getAssetPath')
     const inlineLimit = 10000
+    const useThreads = process.env.NODE_ENV === 'production' && options.parallel
 
     webpackConfig
       .context(api.service.context)
@@ -42,16 +43,30 @@ module.exports = (api, options) => {
 
     // vue-loader --------------------------------------------------------------
 
-    webpackConfig.module
+    const { genCacheConfig } = require('@vue/cli-shared-utils')
+
+    const vueRule = webpackConfig.module
       .rule('vue')
         .test(/\.vue$/)
-        .use('vue-loader')
-          .loader('vue-loader')
-          .options({
-            compilerOptions: {
-              preserveWhitespace: false
-            }
-          })
+        .use('cache-loader')
+          .loader('cache-loader')
+          .options(genCacheConfig(api, options, 'vue-loader'))
+          .end()
+
+    if (useThreads) {
+      vueRule
+        .use('thread-loader')
+          .loader('thread-loader')
+    }
+
+    vueRule
+      .use('vue-loader')
+        .loader('vue-loader')
+        .options({
+          compilerOptions: {
+            preserveWhitespace: false
+          }
+        })
 
     webpackConfig
       .plugin('vue-loader')
diff --git a/packages/@vue/cli-shared-utils/index.js b/packages/@vue/cli-shared-utils/index.js
@@ -2,6 +2,7 @@
   'env',
   'exit',
   'ipc',
+  'cache',
   'logger',
   'openBrowser',
   'pluginResolution',
diff --git a/packages/@vue/cli-shared-utils/lib/cache.js b/packages/@vue/cli-shared-utils/lib/cache.js
@@ -0,0 +1,25 @@
+const fs = require('fs')
+const path = require('path')
+
+exports.genCacheConfig = (api, options, id, configFile) => {
+  const cacheDirectory = process.env.VUE_CLI_TEST
+    ? path.resolve(__dirname, `../../../../node_modules/.cache/${id}`)
+    : api.resolve(`node_modules/.cache/${id}`)
+
+  const variables = {
+    [id]: require(`${id}/package.json`).version,
+    'cache-loader': require('cache-loader/package.json').version,
+    env: process.env.NODE_ENV,
+    test: !!process.env.VUE_CLI_TEST,
+    config: (options.chainWebpack || '').toString() + (options.configureWebpack || '').toString()
+  }
+  if (configFile) {
+    const file = api.resolve(configFile)
+    if (fs.existsSync(file)) {
+      variables.configFile = fs.readFileSync(configFile, 'utf-8')
+    }
+  }
+  const cacheIdentifier = JSON.stringify(variables)
+
+  return { cacheDirectory, cacheIdentifier }
+}
diff --git a/packages/@vue/cli/__tests__/Generator.spec.js b/packages/@vue/cli/__tests__/Generator.spec.js
@@ -453,14 +453,8 @@ test('api: addEntryImport & addEntryInjection', async () => {
   ] })
 
   await generator.generate()
-  expect(fs.readFileSync('/main.js', 'utf-8')).toMatch(`import foo from 'foo'\nimport bar from 'bar'`)
-  expect(fs.readFileSync('/main.js', 'utf-8')).toMatch(
-    `new Vue({
-  foo,
-  bar,
-  render: h => h(App)
-})`
-  )
+  expect(fs.readFileSync('/main.js', 'utf-8')).toMatch(/import foo from 'foo'\s+import bar from 'bar'/)
+  expect(fs.readFileSync('/main.js', 'utf-8')).toMatch(/new Vue\({\s+foo,\s+bar,\s+render: h => h\(App\)\s+}\)/)
 })
 
 test('extract config files', async () => {
diff --git a/packages/@vue/cli/lib/Generator.js b/packages/@vue/cli/lib/Generator.js
@@ -22,7 +22,8 @@ module.exports = class Generator {
     pkg = {},
     plugins = [],
     completeCbs = [],
-    files = {}
+    files = {},
+    invoking = false
   } = {}) {
     this.context = context
     this.plugins = plugins
@@ -31,6 +32,7 @@ module.exports = class Generator {
     this.imports = {}
     this.rootOptions = {}
     this.completeCbs = completeCbs
+    this.invoking = invoking
 
     // for conflict resolution
     this.depSources = {}
diff --git a/packages/@vue/cli/lib/GeneratorAPI.js b/packages/@vue/cli/lib/GeneratorAPI.js
@@ -33,6 +33,8 @@ class GeneratorAPI {
         name: toShortPluginId(id),
         link: getPluginLink(id)
       }))
+
+    this._entryFile = undefined
   }
 
   /**
@@ -225,6 +227,25 @@ class GeneratorAPI {
       _options.add(opt)
     })
   }
+
+  /**
+   * Get the entry file taking into account typescript.
+   *
+   * @readonly
+   */
+  get entryFile () {
+    if (this._entryFile) return this._entryFile
+    return (this._entryFile = fs.existsSync(this.resolve('src/main.ts')) ? 'src/main.ts' : 'src/main.js')
+  }
+
+  /**
+   * Is the plugin being invoked?
+   *
+   * @readonly
+   */
+  get invoking () {
+    return this.generator.invoking
+  }
 }
 
 function extractCallDir () {
diff --git a/packages/@vue/cli/lib/add.js b/packages/@vue/cli/lib/add.js
diff --git a/packages/@vue/cli/lib/invoke.js b/packages/@vue/cli/lib/invoke.js

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,11 @@ module.exports = api => {`
`4`	`4`	`'register-service-worker': '^1.0.0'`
`5`	`5`	`}`
`6`	`6`	`})`
`7`		- api.injectImports(`src/main.js`, `import './registerServiceWorker'`)
	`7`	+ api.injectImports(api.entryFile, `import './registerServiceWorker'`)
`8`	`8`	`api.render('./template')`
	`9`	`+`
	`10`	`+ if (api.invoking && api.hasPlugin('typescript')) {`
	`11`	`+ const convertFiles = require('@vue/cli-plugin-typescript/generator/convert')`
	`12`	`+ convertFiles(api)`
	`13`	`+ }`
`9`	`14`	`}`