Move ESLint configs to overrides (#24370)

This commit is contained in:
Nick Schonning 2023-04-03 06:41:10 -04:00 committed by GitHub
parent be230be734
commit 373e4a8ff0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 7 deletions

View File

@ -13,7 +13,6 @@ module.exports = {
browser: true, browser: true,
node: true, node: true,
es6: true, es6: true,
jest: true,
}, },
globals: { globals: {
@ -42,9 +41,7 @@ module.exports = {
presets: ['@babel/react', '@babel/env'], presets: ['@babel/react', '@babel/env'],
}, },
}, },
extends: [
'plugin:import/typescript',
],
settings: { settings: {
react: { react: {
version: 'detect', version: 'detect',
@ -203,6 +200,7 @@ module.exports = {
{ {
devDependencies: [ devDependencies: [
'config/webpack/**', 'config/webpack/**',
'app/javascript/mastodon/performance.js',
'app/javascript/mastodon/test_setup.js', 'app/javascript/mastodon/test_setup.js',
'app/javascript/**/__tests__/**', 'app/javascript/**/__tests__/**',
], ],
@ -238,5 +236,35 @@ module.exports = {
sourceType: 'script', sourceType: 'script',
}, },
}, },
{
files: [
'**/*.ts',
'**/*.tsx',
],
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:react/recommended',
'plugin:jsx-a11y/recommended',
'plugin:import/recommended',
'plugin:import/typescript',
'plugin:promise/recommended',
],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
},
},
{
files: [
'**/__tests__/*.js',
'**/__tests__/*.jsx',
],
env: {
jest: true,
},
},
], ],
}; };

View File

@ -12,7 +12,7 @@ if (process.env.NODE_ENV === 'development') {
// See: https://bugzilla.mozilla.org/show_bug.cgi?id=1331135 // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1331135
performance.setResourceTimingBufferSize(Infinity); performance.setResourceTimingBufferSize(Infinity);
} }
// eslint-disable-next-line import/no-extraneous-dependencies
marky = require('marky'); marky = require('marky');
// allows us to easily do e.g. ReactPerf.printWasted() while debugging // allows us to easily do e.g. ReactPerf.printWasted() while debugging
//window.ReactPerf = require('react-addons-perf'); //window.ReactPerf = require('react-addons-perf');

View File

@ -3,7 +3,7 @@
const checkNotificationPromise = () => { const checkNotificationPromise = () => {
try { try {
// eslint-disable-next-line promise/catch-or-return // eslint-disable-next-line promise/valid-params, promise/catch-or-return
Notification.requestPermission().then(); Notification.requestPermission().then();
} catch(e) { } catch(e) {
return false; return false;

View File

@ -17,4 +17,5 @@ function formatPublicPath(host = '', path = '') {
const cdnHost = document.querySelector('meta[name=cdn-host]'); const cdnHost = document.querySelector('meta[name=cdn-host]');
// eslint-disable-next-line no-undef
__webpack_public_path__ = formatPublicPath(cdnHost ? cdnHost.content : '', process.env.PUBLIC_OUTPUT_PATH); __webpack_public_path__ = formatPublicPath(cdnHost ? cdnHost.content : '', process.env.PUBLIC_OUTPUT_PATH);

View File

@ -211,7 +211,7 @@
}, },
"lint-staged": { "lint-staged": {
"*": "prettier --ignore-unknown --write", "*": "prettier --ignore-unknown --write",
"*.{js,jsx}": "eslint --fix", "*.{js,jsx,ts,tsx}": "eslint --fix",
"*.{css,scss}": "stylelint --fix" "*.{css,scss}": "stylelint --fix"
} }
} }