Skip to content

Commit e37089b

Browse files
committed
fix(loader:eslint): support ESLint 6
1 parent 6cf1656 commit e37089b

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

lib/loaders/eslint.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
const WebpackConfig = require('../WebpackConfig'); //eslint-disable-line no-unused-vars
1313
const loaderFeatures = require('../features');
1414
const applyOptionsCallback = require('../utils/apply-options-callback');
15+
const logger = require('../logger');
1516

1617
function isMissingConfigError(e) {
1718
if (!e.message || !e.message.includes('No ESLint configuration found')) {
@@ -35,7 +36,13 @@ module.exports = {
3536
});
3637

3738
try {
38-
engine.config.getConfigHierarchy(webpackConfig.runtimeConfig.context);
39+
if (typeof engine.getConfigForFile === 'function') {
40+
logger.debug('Checking ESLint 6+ configuration...');
41+
engine.getConfigForFile('webpack.config.js');
42+
} else {
43+
logger.debug('Checking ESLint 5 configuration...');
44+
engine.config.getConfigHierarchy(webpackConfig.runtimeConfig.context);
45+
}
3946
} catch (e) {
4047
if (isMissingConfigError(e)) {
4148
const chalk = require('chalk').default;

0 commit comments

Comments
 (0)