chore: workaround for unicorn-x with ESLint v8 compatibility

Author: JounQin

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
         if: ${{ matrix.eslint < 9 }}
         run: |
           yarn add -D eslint@${{ matrix.eslint }} @types/eslint@9
-          yarn set resolution eslint-plugin-unicorn@npm:^58.0.0 npm:^56
+          yarn set resolution eslint-plugin-unicorn-x@npm:eslint-plugin-unicorn@^59.0.1 npm:npm:eslint-plugin-unicorn@^56
 
       - name: Build, Lint and Test
         run: |

eslint.config.js

@@ -16,13 +16,12 @@ export default config([
       '@typescript-eslint/no-unnecessary-condition': 'off',
       'sonarjs/fixme-tag': 'off',
       'sonarjs/todo-tag': 'off',
-      'unicorn-x/prefer-export-from': [
+      'unicorn/prefer-export-from': [
         'error',
         {
           ignoreUsedVariables: true,
         },
       ],
-      'unicorn-x/template-indent': 'off',
     },
   },
   {

package.json

@@ -61,6 +61,7 @@
   "resolutions": {
     "eslint-mdx": "link:packages/eslint-mdx",
     "eslint-plugin-mdx": "link:packages/eslint-plugin-mdx",
+    "eslint-plugin-unicorn-x": "npm:eslint-plugin-unicorn@^59.0.1",
     "prettier": "^3.5.3",
     "synckit": "^0.11.2"
   },

packages/eslint-mdx/src/helpers.ts

@@ -11,7 +11,7 @@ export const arrayify = <T, R = T extends Array<infer S> ? S : T>(
   ...args: T[]
 ) =>
   args.reduce<R[]>((arr, curr) => {
-    // eslint-disable-next-line sonarjs/no-nested-conditional, unicorn-x/no-nested-ternary
+    // eslint-disable-next-line sonarjs/no-nested-conditional
     arr.push(...(Array.isArray(curr) ? curr : curr == null ? [] : [curr]))
     return arr
   }, [])

packages/eslint-mdx/src/worker.ts

@@ -1,4 +1,4 @@
-/* eslint-disable unicorn-x/no-await-expression-member */
+/* eslint-disable unicorn/no-await-expression-member */
 
 import path from 'node:path'
 import { pathToFileURL } from 'node:url'

packages/eslint-plugin-mdx/src/processors/options.ts

@@ -41,7 +41,7 @@ ESLinter.prototype.verify = function (
   /* istanbul ignore next */
   const settings = ((
     config.extractConfig?.(
-      // eslint-disable-next-line unicorn-x/no-typeof-undefined
+      // eslint-disable-next-line unicorn/no-typeof-undefined
       typeof options === 'undefined' || typeof options === 'string'
         ? options
         : options.filename,

packages/eslint-plugin-mdx/src/rules/remark.ts

@@ -71,7 +71,7 @@ export const remark: Rule.RuleModule = {
         } of messages) {
           // https://github.com/remarkjs/remark-lint/issues/65#issuecomment-220800231
           /* istanbul ignore next */
-          // eslint-disable-next-line sonarjs/no-nested-conditional, unicorn-x/no-nested-ternary
+          // eslint-disable-next-line sonarjs/no-nested-conditional
           const severity = fatal ? 2 : fatal == null ? 0 : 1
           /* istanbul ignore if */
           if (!severity) {

patches/@1stg+eslint-config+10.1.0.patch

@@ -0,0 +1,80 @@
+diff --git a/node_modules/@1stg/eslint-config/base.js b/node_modules/@1stg/eslint-config/base.js
+index 8e0b6f5..68a5e50 100644
+--- a/node_modules/@1stg/eslint-config/base.js
++++ b/node_modules/@1stg/eslint-config/base.js
+@@ -34,7 +34,7 @@ export const base = tseslint.config([
+   promise.configs['flat/recommended'],
+   regexp.configs['flat/recommended'],
+   sonarjs.configs.recommended,
+-  unicornX.configs.recommended,
++  unicornX.configs['flat/recommended'],
+   prettierExtends,
+   isEslintNodeDepsEnabled && isPkgAvailable('eslint-plugin-node-dependencies')
+     ? [
+@@ -131,7 +131,7 @@ export const base = tseslint.config([
+         },
+       ],
+       'no-negated-condition': 2,
+-      'no-process-exit': 0, // suspended by unicorn-x/no-process-exit
++      'no-process-exit': 0, // suspended by unicorn/no-process-exit
+ 
+       // The following rules are duplicate with `eslint-plugin-import-x`
+       'n/no-extraneous-import': 0,
+@@ -146,15 +146,15 @@ export const base = tseslint.config([
+       'prefer-const': [2, { destructuring: 'all' }],
+       'prefer-object-spread': 2,
+       'simple-import-sort/exports': 2,
+-      'unicorn-x/catch-error-name': [
++      'unicorn/catch-error-name': [
+         2,
+         {
+           name: 'error',
+           ignore: ['^e(rr)?$'],
+         },
+       ],
+-      'unicorn-x/consistent-function-scoping': 0,
+-      'unicorn-x/filename-case': [
++      'unicorn/consistent-function-scoping': 0,
++      'unicorn/filename-case': [
+         2,
+         {
+           cases: {
+@@ -165,13 +165,13 @@ export const base = tseslint.config([
+           ignore: [/^[A-Z](([\dA-Z]+_)*[\dA-Z]+)?\.(mdx?|ya?ml)$/],
+         },
+       ],
+-      'unicorn-x/no-array-reduce': 0,
+-      'unicorn-x/no-null': 0,
+-      'unicorn-x/no-unreadable-array-destructuring': 0, // conflict with `no-unused-vars`
+-      'unicorn-x/prefer-module': 0,
+-      'unicorn-x/prefer-object-from-entries': 0,
+-      'unicorn-x/prevent-abbreviations': 0,
+-      'unicorn-x/prefer-export-from': [2, { ignoreUsedVariables: true }],
++      'unicorn/no-array-reduce': 0,
++      'unicorn/no-null': 0,
++      'unicorn/no-unreadable-array-destructuring': 0, // conflict with `no-unused-vars`
++      'unicorn/prefer-module': 0,
++      'unicorn/prefer-object-from-entries': 0,
++      'unicorn/prevent-abbreviations': 0,
++      'unicorn/prefer-export-from': [2, { ignoreUsedVariables: true }],
+     },
+   },
+   {
+diff --git a/node_modules/@1stg/eslint-config/ts-base.js b/node_modules/@1stg/eslint-config/ts-base.js
+index 18bb9f2..214471d 100644
+--- a/node_modules/@1stg/eslint-config/ts-base.js
++++ b/node_modules/@1stg/eslint-config/ts-base.js
+@@ -129,10 +129,10 @@ export const tsBase = tseslint.config({
+     'promise/always-return': 0,
+     'promise/catch-or-return': 0,
+     // ts itself has guaranteed it
+-    'unicorn-x/no-array-callback-reference': 0,
++    'unicorn/no-array-callback-reference': 0,
+     // covered by @typescript-eslint/no-extraneous-class
+-    'unicorn-x/no-static-only-class': 0,
++    'unicorn/no-static-only-class': 0,
+     // covered by @typescript-eslint/no-this-alias
+-    'unicorn-x/no-this-assignment': 0,
++    'unicorn/no-this-assignment': 0,
+   },
+ })

test/__snapshots__/fixtures.test.ts.snap

@@ -48,25 +48,7 @@ exports[`fixtures lint code blocks should work as expected: code-blocks/278.md 1
     "message": "Prefer \`Array#flat()\` over \`[].concat()\` to flatten an array.",
     "messageId": "prefer-array-flat",
     "nodeType": "CallExpression",
-    "ruleId": "unicorn-x/prefer-array-flat",
-    "severity": 2,
-  },
-  {
-    "column": 21,
-    "endColumn": 27,
-    "endLine": 12,
-    "fix": {
-      "range": [
-        141,
-        152,
-      ],
-      "text": "a]",
-    },
-    "line": 12,
-    "message": "Prefer the spread operator over \`Array#concat(…)\`.",
-    "messageId": "array-concat",
-    "nodeType": "Identifier",
-    "ruleId": "unicorn-x/prefer-spread",
+    "ruleId": "unicorn/prefer-array-flat",
     "severity": 2,
   },
   {
@@ -239,7 +221,7 @@ exports[`fixtures lint code blocks should work as expected: code-blocks/455.mdx
     "message": "Prefer \`.at(…)\` over \`[….length - index]\`.",
     "messageId": "negative-index",
     "nodeType": "BinaryExpression",
-    "ruleId": "unicorn-x/prefer-at",
+    "ruleId": "unicorn/prefer-at",
     "severity": 2,
   },
 ]
@@ -472,7 +454,7 @@ exports[`fixtures should match all snapshots: 380.mdx 1`] = `
     "message": "The variable \`num\` should be named \`number_\`. A more descriptive name will do too.",
     "messageId": "replace",
     "nodeType": "Identifier",
-    "ruleId": "unicorn-x/prevent-abbreviations",
+    "ruleId": "unicorn/prevent-abbreviations",
     "severity": 2,
   },
   {
@@ -483,10 +465,11 @@ exports[`fixtures should match all snapshots: 380.mdx 1`] = `
     "message": "Prefer the spread operator over \`Array#concat(…)\`.",
     "messageId": "array-concat",
     "nodeType": "Identifier",
-    "ruleId": "unicorn-x/prefer-spread",
+    "ruleId": "unicorn/prefer-spread",
     "severity": 2,
     "suggestions": [
       {
+        "data": {},
         "desc": "First argument is an \`array\`.",
         "fix": {
           "range": [
@@ -500,6 +483,7 @@ exports[`fixtures should match all snapshots: 380.mdx 1`] = `
         "messageId": "argument-is-spreadable",
       },
       {
+        "data": {},
         "desc": "First argument is not an \`array\`.",
         "fix": {
           "range": [
@@ -529,7 +513,7 @@ exports[`fixtures should match all snapshots: 380.mdx 1`] = `
     "message": "The variable \`i\` should be named \`index\`. A more descriptive name will do too.",
     "messageId": "replace",
     "nodeType": "Identifier",
-    "ruleId": "unicorn-x/prevent-abbreviations",
+    "ruleId": "unicorn/prevent-abbreviations",
     "severity": 2,
   },
   {
@@ -547,7 +531,7 @@ exports[`fixtures should match all snapshots: 380.mdx 1`] = `
     "message": "Prefer \`.at(…)\` over \`[….length - index]\`.",
     "messageId": "negative-index",
     "nodeType": "BinaryExpression",
-    "ruleId": "unicorn-x/prefer-at",
+    "ruleId": "unicorn/prefer-at",
     "severity": 2,
   },
 ]

test/fixtures.test.ts

@@ -17,15 +17,11 @@ const getCli = (lintCodeBlocks = false, fix?: boolean) =>
     overrideConfig: config(
       eslintJs.configs.recommended,
       ...configs.recommended,
-      unicornX.configs.recommended,
+      // eslint-disable-next-line sonarjs/deprecation -- for ESLint v8 compatibility
+      unicornX.configs['flat/recommended'],
       mdx.configs.flat,
       mdx.configs.flatCodeBlocks,
       prettierRecommended,
-      {
-        rules: {
-          'unicorn-x/template-indent': 'off',
-        },
-      },
       {
         files: ['**/*.{js,jsx,md,mdx,ts,tsx}'],
         extends: [react.configs.flat.recommended],