Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade @enonic/eslint-config to ESLint 9 #1171

Merged
merged 6 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
18 changes: 16 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
module.exports = {
extends: ['airbnb-base', 'prettier'],
plugins: ['prettier'],
extends: [
'airbnb-base',
'prettier',
'plugin:import/errors',
'plugin:import/warnings',
'plugin:import/typescript',
],
plugins: ['prettier', 'import'],
rules: {
'spaced-comment': ['error', 'always', { exceptions: ['-', '+'] }],
'no-restricted-syntax': ['off'],
Expand All @@ -26,4 +32,12 @@ module.exports = {
node: true,
jest: true,
},
settings: {
'import/resolver': {
typescript: {
extensions: ['.js', '.jsx', '.ts', '.tsx', '.d.ts'],
},
},
},
// ...
};
174 changes: 137 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"test:enonic-admin-artifacts": "jest packages/enonic-admin-artifacts",
"test:enonic-dependencies-resolver": "npm run test --prefix packages/enonic-dependencies-resolver",
"test:error-logger-webpack-plugin": "jest packages/error-logger-webpack-plugin",
"test:eslint-config": "jest packages/eslint-config",
"cover": "jest --coverage",
"report": "jest --coverage --coverageReporters=text-lcov | coveralls",
"precommit": "npm run build && lint-staged",
Expand All @@ -41,7 +40,8 @@
"eslint": "^8.45.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.26.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.30.0",
Expand Down
8 changes: 6 additions & 2 deletions packages/eslint-config/browser.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
const globals = require('globals');

module.exports = {
env: {
browser: true,
languageOptions: {
globals: {
...globals.browser,
},
},
};
13 changes: 3 additions & 10 deletions packages/eslint-config/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
const path = require('path');
const vanillaConfig = require('./vanilla');
const tsConfig = require('./typescript');

module.exports = {
extends: path.join(__dirname, './vanilla.js'),
overrides: [
{
files: ['*.ts', '*.tsx'],
extends: path.join(__dirname, './typescript.js'),
},
],
};
module.exports = [...vanillaConfig, ...tsConfig];
Loading