Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
env: {
node: true
},
extends: ['enact', 'plugin:prettier/recommended'],
extends: ['enact', 'plugin:prettier/recommended', 'prettier'],
plugins: ['import'],
rules: {
'import/no-unresolved': ['error', {commonjs: true, caseSensitive: true}],
Expand Down
2 changes: 1 addition & 1 deletion commands/lint.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function eslint({strict = false, local = false, fix = false, eslintArgs = []} =
}
return new Promise((resolve, reject) => {
const opts = {env: process.env, cwd: process.cwd()};
const child = cp.fork(require.resolve('eslint/bin/eslint'), args, opts);
const child = cp.fork(path.join(require.resolve('eslint'), '..', '..', 'bin', 'eslint'), args, opts);
child.on('close', code => {
if (code !== 0) {
reject();
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"dotenv": "^16.0.0",
"dotenv-expand": "^8.0.3",
"enzyme": "3.11.0",
"eslint": "7.32.0",
"eslint": "^8.11.0",
"eslint-config-enact": "^3.1.3",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-enact": "^0.2.3",
Expand Down