Skip to content

Commit 5ff782c

Browse files
committed
Update eslint to v10
Replace eslint-plugin-import and dependency with equivalent eslint-plugin-import-x linting fixes from eslint update and fixes to dead code in oopsy and raidboss config
1 parent ca5de61 commit 5ff782c

39 files changed

Lines changed: 213 additions & 637 deletions

eslint.config.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import js from '@eslint/js';
22
import stylisticPlugin from '@stylistic/eslint-plugin';
33
import { defineConfig } from 'eslint/config';
4-
import importPlugin from 'eslint-plugin-import';
4+
import importPlugin, { flatConfigs as importPluginConfig } from 'eslint-plugin-import-x';
55
import preferArrowFunctionsPlugin from 'eslint-plugin-prefer-arrow-functions';
66
import unicornPlugin from 'eslint-plugin-unicorn';
77
import globals from 'globals';
@@ -162,19 +162,19 @@ const rules: Config['rules'] = {
162162
],
163163
'eqeqeq': 'error',
164164
'guard-for-in': 'off',
165-
'import/export': 'error',
166-
'import/no-duplicates': 'error',
167-
'import/no-mutable-exports': 'error',
168-
'import/no-named-as-default': 'error',
169-
'import/no-named-as-default-member': 'error',
170-
'import/no-unresolved': [
165+
'import-x/export': 'error',
166+
'import-x/no-duplicates': 'error',
167+
'import-x/no-mutable-exports': 'error',
168+
'import-x/no-named-as-default': 'error',
169+
'import-x/no-named-as-default-member': 'error',
170+
'import-x/no-unresolved': [
171171
'error',
172172
{
173173
'caseSensitive': true,
174174
},
175175
],
176-
'import/no-useless-path-segments': 'error',
177-
'import/no-webpack-loader-syntax': 'error',
176+
'import-x/no-useless-path-segments': 'error',
177+
'import-x/no-webpack-loader-syntax': 'error',
178178
// Handled by dprint.
179179
'indent': 'off',
180180
'linebreak-style': [
@@ -306,7 +306,7 @@ export default defineConfig(
306306
// Google configs for eslint, deprecated
307307
fixedGoogleConfig,
308308
// import plugin default
309-
importPlugin.flatConfigs.recommended,
309+
importPluginConfig.recommended,
310310
// cactbot default
311311
{
312312
'ignores': cactbotGlobalIgnores,
@@ -331,7 +331,7 @@ export default defineConfig(
331331
'cactbot': cactbotLintPlugin,
332332
},
333333
'settings': {
334-
'import/resolver': {
334+
'import-x/resolver': {
335335
'node': {
336336
'extensions': ['.d.ts', '.ts', '.js'],
337337
},
@@ -406,7 +406,7 @@ export default defineConfig(
406406
'allowNullableNumber': true,
407407
}],
408408
'func-style': ['error', 'expression', { 'allowArrowFunctions': true }],
409-
'import/order': [
409+
'import-x/order': [
410410
'error',
411411
{
412412
'alphabetize': { 'caseInsensitive': true, 'order': 'asc' },

eslint/cactbot-locale-order.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const ruleModule = {
7171
const validList = generateValidList(orderList, properties);
7272

7373
if (validList.length >= 1) {
74-
const sourceCode = context.getSourceCode();
74+
const sourceCode = context.sourceCode;
7575
validList.forEach((valid) => {
7676
context.report({
7777
node,

eslint/cactbot-party-member-property-access.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ module.exports = {
1212
schema: [],
1313
},
1414

15+
/**
16+
* @param {@} context
17+
*/
1518
create(context) {
1619
return {
1720
'Property[key.name=/(timelineTriggers|triggers)/] > ArrayExpression > ObjectExpression': (
@@ -20,7 +23,7 @@ module.exports = {
2023
// Look for any use of data.party.member().[property],
2124
const matchRegex = /data\.party\.member\(([^)]+)\)\.\w+/;
2225

23-
const trigger = context.getSourceCode().getText(node);
26+
const trigger = context.sourceCode.getText(node);
2427
const lines = trigger.split('\n').map((l) => l.trim());
2528
lines.forEach((line) => {
2629
const match = matchRegex.exec(line);

eslint/cactbot-trigger-property-order.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ module.exports = {
8383
const validList = generateValidList(orderList, properties);
8484

8585
if (validList.length >= 1) {
86-
const sourceCode = context.getSourceCode();
86+
const sourceCode = context.sourceCode;
8787
validList.forEach((valid) => {
8888
context.report({
8989
node,

eslint/cactbot-triggerset-property-order.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ module.exports = {
6565
const validList = generateValidList(orderList, properties);
6666

6767
if (validList.length >= 1) {
68-
const sourceCode = context.getSourceCode();
68+
const sourceCode = context.sourceCode;
6969
validList.forEach((valid) => {
7070
context.report({
7171
node,

0 commit comments

Comments
 (0)