chore: merge dev

Author: Akryum

docs/config.md

@@ -16,6 +16,9 @@ module.exports = {
   // where to output built files
   outputDir: 'dist',
 
+  // where to put static assets (js/css/img/font/...)
+  assetsDir: '',
+
   // whether to use eslint-loader for lint on save.
   // valid values: true | false | 'error'
   // when set to 'error', lint errors will cause compilation to fail.

packages/@vue/cli-plugin-babel/README.md

@@ -22,6 +22,10 @@ module.exports = {
 
 [cache-loader](https://github.com/webpack-contrib/cache-loader) is enabled by default and cache is stored in `<projectRoot>/node_modules/.cache/babel-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`.
+
 ## Installing in an Already Created Project
 
 ``` sh

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

@@ -1,5 +1,6 @@
 module.exports = (api, options) => {
   const { genCacheConfig } = require('@vue/cli-shared-utils')
+  const useThreads = process.env.NODE_ENV === 'production' && options.parallel
   const cliServicePath = require('path').dirname(require.resolve('@vue/cli-service'))
 
   api.chainWebpack(webpackConfig => {
@@ -29,6 +30,12 @@ module.exports = (api, options) => {
           .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')

packages/@vue/cli-plugin-eslint/README.md

@@ -13,6 +13,8 @@
 
     --format [formatter] specify formatter (default: codeframe)
     --no-fix             do not fix errors
+    --max-errors         specify number of errors to make build failed (default: 0)
+    --max-warnings       specify number of warnings to make build failed (default: Infinity)
   ```
 
   Lints and fixes files. If no specific files are given, it lints all files in `src` and `test`.
@@ -39,5 +41,5 @@ vue add @vue/eslint
 
 ## Injected webpack-chain Rules
 
-- `config.rule('eslint')`
-- `config.rule('eslint').use('eslint-loader')`
+- `config.module.rule('eslint')`
+- `config.module.rule('eslint').use('eslint-loader')`

packages/@vue/cli-plugin-typescript/README.md

@@ -18,6 +18,10 @@ If opted to use [TSLint](https://palantir.github.io/tslint/) during project crea
 
 [cache-loader](https://github.com/webpack-contrib/cache-loader) is enabled by default and cache is stored in `<projectRoot>/node_modules/.cache/ts-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`.
+
 ## Installing in an Already Created Project
 
 ``` sh

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

@@ -26,6 +26,12 @@ module.exports = (api, options) => {
       options: genCacheConfig(api, options, 'ts-loader', 'tsconfig.json')
     })
 
+    if (useThreads) {
+      addLoader({
+        loader: 'thread-loader'
+      })
+    }
+
     if (api.hasPlugin('babel')) {
       addLoader({
         loader: 'babel-loader'

packages/@vue/cli-service/lib/config/base.js

@@ -3,7 +3,6 @@ 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)
@@ -44,29 +43,22 @@ module.exports = (api, options) => {
     // vue-loader --------------------------------------------------------------
 
     const { genCacheConfig } = require('@vue/cli-shared-utils')
+    const vueLoaderCacheConfig = genCacheConfig(api, options, 'vue-loader')
 
-    const vueRule = webpackConfig.module
+    webpackConfig.module
       .rule('vue')
         .test(/\.vue$/)
         .use('cache-loader')
           .loader('cache-loader')
-          .options(genCacheConfig(api, options, 'vue-loader'))
+          .options(vueLoaderCacheConfig)
           .end()
-
-    if (useThreads) {
-      vueRule
-        .use('thread-loader')
-          .loader('thread-loader')
-    }
-
-    vueRule
-      .use('vue-loader')
-        .loader('vue-loader')
-        .options({
-          compilerOptions: {
-            preserveWhitespace: false
-          }
-        })
+        .use('vue-loader')
+          .loader('vue-loader')
+          .options(Object.assign({
+            compilerOptions: {
+              preserveWhitespace: false
+            }
+          }, vueLoaderCacheConfig))
 
     webpackConfig
       .plugin('vue-loader')

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

@@ -59,7 +59,7 @@
     "thread-loader": "^1.1.5",
     "uglifyjs-webpack-plugin": "^1.2.5",
     "url-loader": "^1.0.1",
-    "vue-loader": "^15.1.0",
+    "vue-loader": "^15.2.0",
     "vue-template-compiler": "^2.5.16",
     "webpack": "^4.8.2",
     "webpack-chain": "^4.8.0",

yarn.lock

@@ -11543,9 +11543,9 @@ vue-jest@^2.6.0:
     tsconfig "^7.0.0"
     vue-template-es2015-compiler "^1.6.0"
 
-vue-loader@^15.1.0:
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.1.0.tgz#82a2a5c310951aba17ad5d8680fe016c77d37e80"
+vue-loader@^15.2.0:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.2.0.tgz#5a8138e490a1040942d2f10ae68fa72b5a923364"
   dependencies:
     "@vue/component-compiler-utils" "^1.2.1"
     hash-sum "^1.0.2"