Skip to content

Commit 2bf6594

Browse files
committed
eslint/vue: tweak config-generator
1 parent c1f6148 commit 2bf6594

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
@@ -372,7 +372,7 @@ class ConfigGenerator {
372372

373373
if (this.webpackConfig.useEslintLoader) {
374374
rules.push(applyRuleConfigurationCallback('eslint', {
375-
test: /\.jsx?$/,
375+
test: eslintLoaderUtil.getTest(this.webpackConfig),
376376
loader: 'eslint-loader',
377377
exclude: /node_modules/,
378378
enforce: 'pre',

test/config-generator.js

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

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

0 commit comments

Comments
 (0)