From a3773ac6bdc726d87fbbbc233e066730cacff5a2 Mon Sep 17 00:00:00 2001 From: Chen Fengyuan Date: Mon, 25 Feb 2019 09:03:30 +0800 Subject: [PATCH] fix(cli-plugin-eslint): merge lint-staged config --- .../@vue/cli-plugin-eslint/__tests__/eslintGenerator.spec.js | 3 +-- packages/@vue/cli-plugin-eslint/generator/index.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/@vue/cli-plugin-eslint/__tests__/eslintGenerator.spec.js b/packages/@vue/cli-plugin-eslint/__tests__/eslintGenerator.spec.js index 5de49d93e9..2720e6672d 100644 --- a/packages/@vue/cli-plugin-eslint/__tests__/eslintGenerator.spec.js +++ b/packages/@vue/cli-plugin-eslint/__tests__/eslintGenerator.spec.js @@ -129,8 +129,7 @@ test('lint on commit', async () => { expect(pkg.gitHooks['pre-commit']).toBe('lint-staged') expect(pkg.devDependencies).toHaveProperty('lint-staged') expect(pkg['lint-staged']).toEqual({ - '*.js': ['vue-cli-service lint', 'git add'], - '*.vue': ['vue-cli-service lint', 'git add'] + '*.{js,vue}': ['vue-cli-service lint', 'git add'] }) expect(pkg.vue).toEqual({ lintOnSave: false diff --git a/packages/@vue/cli-plugin-eslint/generator/index.js b/packages/@vue/cli-plugin-eslint/generator/index.js index 3b0dff27f9..59f7a72c0f 100644 --- a/packages/@vue/cli-plugin-eslint/generator/index.js +++ b/packages/@vue/cli-plugin-eslint/generator/index.js @@ -77,8 +77,7 @@ module.exports = (api, { config, lintOn = [] }, _, invoking) => { 'pre-commit': 'lint-staged' } pkg['lint-staged'] = { - '*.js': ['vue-cli-service lint', 'git add'], - '*.vue': ['vue-cli-service lint', 'git add'] + '*.{js,vue}': ['vue-cli-service lint', 'git add'] } }