Skip to content

Commit eb85b24

Browse files
committed
eslint/vue: tweak config-generator
1 parent aa782df commit eb85b24

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

lib/config-generator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ class ConfigGenerator {
393393

394394
if (this.webpackConfig.useEslintLoader) {
395395
rules.push(applyRuleConfigurationCallback('eslint', {
396-
test: /\.jsx?$/,
396+
test: eslintLoaderUtil.getTest(this.webpackConfig),
397397
loader: 'eslint-loader',
398398
exclude: /node_modules/,
399399
enforce: 'pre',

test/config-generator.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,22 @@ describe('The config-generator function', () => {
416416
expect(JSON.stringify(actualConfig.module.rules)).to.contain('eslint-loader');
417417
expect(JSON.stringify(actualConfig.module.rules)).to.contain('extends-name');
418418
});
419+
420+
it('enableEslintLoader(() => {}, {lintVue: true})', () => {
421+
const config = createConfig();
422+
config.addEntry('main', './main');
423+
config.publicPath = '/';
424+
config.outputPath = '/tmp';
425+
config.enableEslintLoader(() => {}, {
426+
lintVue: true,
427+
});
428+
429+
const actualConfig = configGenerator(config);
430+
expect(JSON.stringify(actualConfig.module.rules)).to.contain('eslint-loader');
431+
432+
const eslintRule = findRule(/\.(jsx?|vue)$/, actualConfig.module.rules);
433+
expect(eslintRule.test.toString()).to.equal(/\.(jsx?|vue)$/.toString());
434+
});
419435
});
420436

421437
describe('addLoader() adds a custom loader', () => {

0 commit comments

Comments
 (0)