chore: merge dev

Author: Guillaume Chau

packages/@vue/cli-plugin-eslint/__tests__/eslintGenerator.spec.js

@@ -8,9 +8,11 @@ test('base', async () => {
   })
 
   expect(pkg.scripts.lint).toBeTruthy()
-  expect(pkg.eslintConfig).toEqual({
-    root: true,
-    extends: ['plugin:vue/essential', 'eslint:recommended']
+  expect(pkg.eslintConfig.extends).toEqual([
+    'plugin:vue/essential', 'eslint:recommended'
+  ])
+  expect(pkg.eslintConfig.parserOptions).toEqual({
+    parser: 'babel-eslint'
   })
 })
 
@@ -24,9 +26,12 @@ test('airbnb', async () => {
   })
 
   expect(pkg.scripts.lint).toBeTruthy()
-  expect(pkg.eslintConfig).toEqual({
-    root: true,
-    extends: ['plugin:vue/essential', '@vue/airbnb']
+  expect(pkg.eslintConfig.extends).toEqual([
+    'plugin:vue/essential',
+    '@vue/airbnb'
+  ])
+  expect(pkg.eslintConfig.parserOptions).toEqual({
+    parser: 'babel-eslint'
   })
   expect(pkg.devDependencies).toHaveProperty('@vue/eslint-config-airbnb')
 })
@@ -41,9 +46,12 @@ test('standard', async () => {
   })
 
   expect(pkg.scripts.lint).toBeTruthy()
-  expect(pkg.eslintConfig).toEqual({
-    root: true,
-    extends: ['plugin:vue/essential', '@vue/standard']
+  expect(pkg.eslintConfig.extends).toEqual([
+    'plugin:vue/essential',
+    '@vue/standard'
+  ])
+  expect(pkg.eslintConfig.parserOptions).toEqual({
+    parser: 'babel-eslint'
   })
   expect(pkg.devDependencies).toHaveProperty('@vue/eslint-config-standard')
 })
@@ -58,9 +66,12 @@ test('prettier', async () => {
   })
 
   expect(pkg.scripts.lint).toBeTruthy()
-  expect(pkg.eslintConfig).toEqual({
-    root: true,
-    extends: ['plugin:vue/essential', '@vue/prettier']
+  expect(pkg.eslintConfig.extends).toEqual([
+    'plugin:vue/essential',
+    '@vue/prettier'
+  ])
+  expect(pkg.eslintConfig.parserOptions).toEqual({
+    parser: 'babel-eslint'
   })
   expect(pkg.devDependencies).toHaveProperty('@vue/eslint-config-prettier')
 })
@@ -82,10 +93,12 @@ test('typescript', async () => {
   ])
 
   expect(pkg.scripts.lint).toBeTruthy()
-  expect(pkg.eslintConfig).toEqual({
-    root: true,
-    extends: ['plugin:vue/essential', '@vue/prettier', '@vue/typescript']
-  })
+  expect(pkg.eslintConfig.extends).toEqual([
+    'plugin:vue/essential',
+    '@vue/prettier',
+    '@vue/typescript'
+  ])
+  expect(pkg.eslintConfig).not.toHaveProperty('parserOptions')
   expect(pkg.devDependencies).toHaveProperty('@vue/eslint-config-prettier')
   expect(pkg.devDependencies).toHaveProperty('@vue/eslint-config-typescript')
 })

packages/@vue/cli-plugin-eslint/eslintOptions.js

@@ -1,20 +1,30 @@
-module.exports = api => {
-  const options = {
-    extensions: ['.js', '.vue'],
-    envs: ['node'],
+exports.config = api => {
+  const config = {
+    root: true,
+    env: { node: true },
+    extends: ['plugin:vue/essential'],
     rules: {
-      'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-      'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+      'no-console': makeJSOnlyValue(`process.env.NODE_ENV === 'production' ? 'error' : 'off'`),
+      'no-debugger': makeJSOnlyValue(`process.env.NODE_ENV === 'production' ? 'error' : 'off'`)
     }
   }
-
-  if (api.hasPlugin('typescript')) {
-    options.extensions.push('.ts')
-  } else {
-    options.parserOptions = {
-      parser: require.resolve('babel-eslint')
+  if (!api.hasPlugin('typescript')) {
+    config.parserOptions = {
+      parser: 'babel-eslint'
     }
   }
+  return config
+}
 
-  return options
+// __expression is a special flag that allows us to customize stringification
+// output when extracting configs into standalone files
+function makeJSOnlyValue (str) {
+  const fn = () => {}
+  fn.__expression = str
+  return fn
 }
+
+const baseExtensions = ['.js', '.jsx', '.vue']
+exports.extensions = api => api.hasPlugin('typescript')
+  ? baseExtensions.concat('.ts', '.tsx')
+  : baseExtensions

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

@@ -3,40 +3,39 @@ module.exports = (api, { config, lintOn = [] }) => {
     lintOn = lintOn.split(',')
   }
 
+  const eslintConfig = require('./eslintOptions').config(api)
+
   const pkg = {
     scripts: {
       lint: 'vue-cli-service lint'
     },
-    eslintConfig: {
-      root: true,
-      extends: ['plugin:vue/essential']
-    },
+    eslintConfig,
     devDependencies: {}
   }
 
   if (config === 'airbnb') {
-    pkg.eslintConfig.extends.push('@vue/airbnb')
+    eslintConfig.extends.push('@vue/airbnb')
     Object.assign(pkg.devDependencies, {
       '@vue/eslint-config-airbnb': '^3.0.0-beta.10'
     })
   } else if (config === 'standard') {
-    pkg.eslintConfig.extends.push('@vue/standard')
+    eslintConfig.extends.push('@vue/standard')
     Object.assign(pkg.devDependencies, {
       '@vue/eslint-config-standard': '^3.0.0-beta.10'
     })
   } else if (config === 'prettier') {
-    pkg.eslintConfig.extends.push('@vue/prettier')
+    eslintConfig.extends.push('@vue/prettier')
     Object.assign(pkg.devDependencies, {
       '@vue/eslint-config-prettier': '^3.0.0-beta.10'
     })
   } else {
     // default
-    pkg.eslintConfig.extends.push('eslint:recommended')
+    eslintConfig.extends.push('eslint:recommended')
   }
 
   // typescript support
   if (api.hasPlugin('typescript')) {
-    pkg.eslintConfig.extends.push('@vue/typescript')
+    eslintConfig.extends.push('@vue/typescript')
     Object.assign(pkg.devDependencies, {
       '@vue/eslint-config-typescript': '^3.0.0-beta.10'
     })

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

@@ -1,6 +1,6 @@
 module.exports = (api, { lintOnSave }) => {
   if (lintOnSave) {
-    const options = require('./eslintOptions')(api)
+    const extensions = require('./eslintOptions').extensions(api)
     api.chainWebpack(webpackConfig => {
       webpackConfig.module
         .rule('eslint')
@@ -12,10 +12,11 @@ module.exports = (api, { lintOnSave }) => {
           .test(/\.(vue|(j|t)sx?)$/)
           .use('eslint-loader')
             .loader('eslint-loader')
-            .options(Object.assign(options, {
+            .options({
+              extensions,
               emitWarning: lintOnSave !== 'error',
               formatter: require('eslint/lib/formatters/codeframe')
-            }))
+            })
     })
   }
 
@@ -24,7 +25,9 @@ module.exports = (api, { lintOnSave }) => {
     usage: 'vue-cli-service lint [options] [...files]',
     options: {
       '--format [formatter]': 'specify formatter (default: codeframe)',
-      '--no-fix': 'do not fix errors'
+      '--no-fix': 'do not fix errors',
+      '--max-errors [limit]': 'specify number of errors to make build failed (default: 0)',
+      '--max-warnings [limit]': 'specify number of warnings to make build failed (default: Infinity)'
     },
     details: 'For more options, see https://eslint.org/docs/user-guide/command-line-interface#options'
   }, args => {

packages/@vue/cli-plugin-eslint/lint.js

@@ -1,16 +1,35 @@
+const renamedArrayArgs = {
+  ext: 'extensions',
+  env: 'envs',
+  global: 'globals',
+  rulesdir: 'rulePaths',
+  plugin: 'plugins',
+  'ignore-pattern': 'ignorePattern'
+}
+
+const renamedArgs = {
+  'inline-config': 'allowInlineConfig',
+  rule: 'rules',
+  eslintrc: 'useEslintrc',
+  c: 'configFile',
+  config: 'configFile'
+}
+
 module.exports = function lint (args = {}, api) {
   const path = require('path')
   const chalk = require('chalk')
   const cwd = api.resolve('.')
   const { CLIEngine } = require('eslint')
-  const options = require('./eslintOptions')(api)
   const { log, done, exit } = require('@vue/cli-shared-utils')
 
   const files = args._ && args._.length ? args._ : ['src', 'tests', '*.js']
-  const config = Object.assign({}, options, {
+  const extensions = require('./eslintOptions').extensions(api)
+  const argsConfig = normalizeConfig(args)
+  const config = Object.assign({
+    extensions,
     fix: true,
     cwd
-  }, normalizeConfig(args))
+  }, argsConfig)
   const engine = new CLIEngine(config)
   const report = engine.executeOnFiles(files)
   const formatter = engine.getFormatter(args.format || 'codeframe')
@@ -19,7 +38,12 @@ module.exports = function lint (args = {}, api) {
     CLIEngine.outputFixes(report)
   }
 
-  if (!report.errorCount) {
+  const maxErrors = argsConfig.maxErrors || 0
+  const maxWarnings = typeof argsConfig.maxWarnings === 'number' ? argsConfig.maxWarnings : Infinity
+  const isErrorsExceeded = report.errorCount > maxErrors
+  const isWarningsExceeded = report.warningCount > maxWarnings
+
+  if (!isErrorsExceeded && !isWarningsExceeded) {
     if (!args.silent) {
       const hasFixed = report.results.some(f => f.output)
       if (hasFixed) {
@@ -32,22 +56,32 @@ module.exports = function lint (args = {}, api) {
         })
         log()
       }
-      if (report.warningCount) {
+      if (report.warningCount || report.errorCount) {
         console.log(formatter(report.results))
       } else {
         done(hasFixed ? `All lint errors auto-fixed.` : `No lint errors found!`)
       }
     }
   } else {
     console.log(formatter(report.results))
+    if (isErrorsExceeded && typeof argsConfig.maxErrors === 'number') {
+      log(`Eslint found too many errors (maximum: ${argsConfig.maxErrors}).`)
+    }
+    if (isWarningsExceeded) {
+      log(`Eslint found too many warnings (maximum: ${argsConfig.maxWarnings}).`)
+    }
     exit(1)
   }
 }
 
 function normalizeConfig (args) {
   const config = {}
   for (const key in args) {
-    if (key !== '_') {
+    if (renamedArrayArgs[key]) {
+      config[renamedArrayArgs[key]] = args[key].split(',')
+    } else if (renamedArgs[key]) {
+      config[renamedArgs[key]] = args[key]
+    } else if (key !== '_') {
       config[camelize(key)] = args[key]
     }
   }

packages/@vue/cli-service/lib/commands/inspect.js

@@ -36,7 +36,7 @@ module.exports = (api, options) => {
       res = config
     }
 
-    const output = toString(config, { verbose })
+    const output = toString(res, { verbose })
     console.log(output)
   })
 }

packages/@vue/cli/__tests__/Generator.spec.js

@@ -4,7 +4,7 @@ const fs = require('fs-extra')
 const path = require('path')
 const Generator = require('../lib/Generator')
 const { logs } = require('@vue/cli-shared-utils')
-const stringifyJS = require('javascript-stringify')
+const stringifyJS = require('../util/stringifyJS')
 
 // prepare template fixtures
 const templateDir = path.resolve(__dirname, 'template')

packages/@vue/cli/__tests__/invoke.spec.js

@@ -11,6 +11,15 @@ const parseJS = file => {
   return res.exports
 }
 
+const baseESLintConfig = Object.assign({}, require('@vue/cli-plugin-eslint/eslintOptions').config({
+  hasPlugin: () => false
+}), {
+  rules: {
+    'no-console': 'off',
+    'no-debugger': 'off'
+  }
+})
+
 async function createAndInstall (name) {
   const project = await create(name, {
     plugins: {
@@ -33,10 +42,9 @@ async function assertUpdates (project) {
   })
 
   const eslintrc = parseJS(await project.read('.eslintrc.js'))
-  expect(eslintrc).toEqual({
-    root: true,
+  expect(eslintrc).toEqual(Object.assign({}, baseESLintConfig, {
     extends: ['plugin:vue/essential', '@vue/airbnb']
-  })
+  }))
 
   const lintedMain = await project.read('src/main.js')
   expect(lintedMain).toMatch(';') // should've been linted in post-generate hook
@@ -85,10 +93,9 @@ test('invoke with existing files', async () => {
   await project.write('vue.config.js', `module.exports = { lintOnSave: true }`)
 
   const eslintrc = parseJS(await project.read('.eslintrc.js'))
-  expect(eslintrc).toEqual({
-    root: true,
+  expect(eslintrc).toEqual(Object.assign({}, baseESLintConfig, {
     extends: ['plugin:vue/essential', 'eslint:recommended']
-  })
+  }))
 
   await project.run(`${require.resolve('../bin/vue')} invoke eslint --config airbnb --lintOn commit`)
 
@@ -111,10 +118,9 @@ test('invoke with existing files (yaml)', async () => {
   await project.write('package.json', JSON.stringify(pkg, null, 2))
 
   const eslintrc = parseJS(await project.read('.eslintrc.js'))
-  expect(eslintrc).toEqual({
-    root: true,
+  expect(eslintrc).toEqual(Object.assign({}, baseESLintConfig, {
     extends: ['plugin:vue/essential', 'eslint:recommended']
-  })
+  }))
 
   await project.rm(`.eslintrc.js`)
   await project.write(`.eslintrc.yml`, `
@@ -128,10 +134,9 @@ extends:
 
   const updated = await project.read('.eslintrc.yml')
   expect(updated).toMatch(`
-root: true
 extends:
   - 'plugin:vue/essential'
-  - '@vue/airbnb'
+  - 'eslint:recommended'
 `.trim())
 })
 

packages/@vue/cli/lib/GeneratorAPI.js

@@ -7,7 +7,7 @@ const resolve = require('resolve')
 const isBinary = require('isbinaryfile')
 const yaml = require('yaml-front-matter')
 const mergeDeps = require('./util/mergeDeps')
-const stringifyJS = require('javascript-stringify')
+const stringifyJS = require('./util/stringifyJS')
 const { getPluginLink, toShortPluginId } = require('@vue/cli-shared-utils')
 
 const isString = val => typeof val === 'string'

packages/@vue/cli/lib/util/configTransforms.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 const extendJSConfig = require('./extendJSConfig')
-const stringifyJS = require('javascript-stringify')
+const stringifyJS = require('./stringifyJS')
 
 function makeJSTransform (filename) {
   return function transformToJS (value, checkExisting, context) {