Skip to content

Commit dfbe6aa

Browse files
committed
Lint compatibility update
1 parent ad3c420 commit dfbe6aa

File tree

2 files changed

+27
-21
lines changed

2 files changed

+27
-21
lines changed

bin/lint.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
const path = require('path');
1010
const stylelint = require('stylelint');
11-
const eslint = require('eslint').CLIEngine;
11+
const { ESLint } = require('eslint');
1212

1313
const cnsl = require(`${__dirname}/util/console`);
1414
const resolve = require(`${__dirname}/util/resolve`);
@@ -42,7 +42,7 @@ const args = require(`${__dirname}/util/args`).args;
4242
*/
4343
const es = async (file = GLOBS.find(g => g.includes(EXT_ES))) => {
4444
try {
45-
let eslinter = new eslint(config.eslint).executeOnFiles([file]);
45+
let eslinter = new ESLint(config.eslint).lintFiles([file]);
4646

4747
if (eslinter.errorCount || eslinter.warningCount) {
4848
eslinter.results.forEach((item) => {
@@ -95,7 +95,9 @@ const style = async (file = GLOBS.find(g => g.includes(EXT_STYLE))) => {
9595

9696
item.warnings.forEach(warning => {
9797
let capture = /\(([^)]+)\)/;
98-
let ruleId = capture.exec(warning.text)[1];
98+
let ruleId = capture.exec(warning.text)
99+
100+
ruleId = (ruleId) ? ruleId[1] : 'rule id not available';
99101

100102
cnsl.lint([
101103
alerts.str.comment(warning.line + ':' + warning.column),

config/lint.js

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,25 @@ module.exports = {
1313
* @type {Object}
1414
*/
1515
eslint: {
16-
extends: 'google',
17-
env: {
18-
browser: true,
19-
es6: true
20-
},
21-
parserOptions: {
22-
ecmaVersion: 6,
23-
sourceType: 'module'
24-
},
25-
rules: {
26-
'no-console': 1,
27-
'one-var': 0,
28-
'comma-dangle': 0,
29-
'curly': [
30-
'error',
31-
'multi'
32-
]
16+
overrideConfig: {
17+
extends: 'google',
18+
env: {
19+
browser: true,
20+
es6: true
21+
},
22+
parserOptions: {
23+
ecmaVersion: 6,
24+
sourceType: 'module'
25+
},
26+
rules: {
27+
'no-console': 1,
28+
'one-var': 0,
29+
'comma-dangle': 0,
30+
'curly': [
31+
'error',
32+
'multi'
33+
]
34+
}
3335
}
3436
},
3537

@@ -41,12 +43,14 @@ module.exports = {
4143
* @type {Object}
4244
*/
4345
stylelint: {
46+
customSyntax: 'postcss-scss',
4447
extends: 'stylelint-config-standard',
4548
rules: {
4649
'color-hex-case': 'upper',
50+
'string-quotes': 'single',
4751
'no-missing-end-of-source-newline': null,
4852
'at-rule-no-unknown': [true, {
49-
'ignoreAtRules': ['use', 'forward', 'tailwind']
53+
'ignoreAtRules': ['use', 'forward', 'tailwind', 'function', 'return', 'mixin']
5054
}]
5155
}
5256
}

0 commit comments

Comments
 (0)