eslint-config-scratch 11.0.53 → 12.0.0

package/lib/legacy/index.mjs

@@ -1,10 +1,12 @@
 import jsdoc from 'eslint-plugin-jsdoc'
+import react from 'eslint-plugin-react'
+import { defineConfig } from 'eslint/config'
 import globals from 'globals'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
-import babelParser from '@babel/eslint-parser'
 import { FlatCompat } from '@eslint/eslintrc'
 import js from '@eslint/js'
+import stylistic from '@stylistic/eslint-plugin'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -14,180 +16,188 @@ const compat = new FlatCompat({
   allConfig: js.configs.all,
 })
 
-/** @type {import('eslint').Linter.Config[]} */
-export default [
-  ...compat.extends('eslint:recommended'),
-  jsdoc.configs['flat/recommended'],
-  {
-    languageOptions: {
-      globals: {
-        ...globals.commonjs,
+export default defineConfig(...compat.extends('eslint:recommended'), jsdoc.configs['flat/recommended'], {
+  languageOptions: {
+    globals: {
+      ...globals.commonjs,
+    },
+
+    parserOptions: {
+      requireConfigFile: false,
+    },
+  },
+
+  linterOptions: {
+    reportUnusedDisableDirectives: 'warn',
+  },
+
+  plugins: {
+    react,
+    '@stylistic': stylistic,
+  },
+
+  rules: {
+    'array-callback-return': [2],
+    'block-scoped-var': [2],
+    curly: [2, 'multi-line'],
+    'dot-location': [2, 'property'],
+    'dot-notation': [2],
+    eqeqeq: [2],
+    'no-alert': [2],
+    'no-div-regex': [2],
+    'no-else-return': [2],
+    'no-eq-null': [2],
+    'no-eval': [2],
+    'no-extend-native': [2],
+    'no-extra-bind': [2],
+    'no-global-assign': [2],
+    'no-implied-eval': [2],
+    'no-invalid-this': [2],
+    'no-iterator': [2],
+    'no-lone-blocks': [2],
+    'no-loop-func': [2],
+    'no-multi-spaces': [2],
+    'no-multi-str': [2],
+    'no-new': [2],
+    'no-proto': [2],
+    'no-return-assign': [2],
+    'no-script-url': [2],
+    'no-self-compare': [2],
+    'no-sequences': [2],
+    'no-throw-literal': [2],
+    'no-unmodified-loop-condition': [2],
+    'no-unused-expressions': [2],
+    'no-useless-call': [2],
+    'no-useless-concat': [2],
+    'no-useless-escape': [2],
+    'no-warning-comments': [0],
+    'no-with': [2],
+    radix: [2],
+    'wrap-iife': [2],
+    yoda: [2],
+
+    'no-unused-vars': [
+      2,
+      {
+        args: 'after-used',
+        varsIgnorePattern: '^_',
+      },
+    ],
+
+    'no-catch-shadow': [2],
+    'no-shadow': [2],
+    'no-undefined': [2],
+    'no-use-before-define': [2],
+    strict: [2, 'never'],
+    'array-bracket-spacing': [2, 'never'],
+    'block-spacing': [2, 'always'],
+    'brace-style': [2],
+
+    camelcase: [
+      2,
+      {
+        properties: 'never',
+      },
+    ],
+
+    'comma-dangle': [2, 'never'],
+    'comma-spacing': [2],
+    'comma-style': [2],
+    'eol-last': [2, 'always'],
+    'func-call-spacing': [2, 'never'],
+    'func-style': [2, 'expression'],
+    '@stylistic/indent': [2, 4, { SwitchCase: 0 }],
+    'jsx-quotes': [2, 'prefer-double'],
+
+    'key-spacing': [
+      2,
+      {
+        beforeColon: false,
+        afterColon: true,
+        mode: 'strict',
+      },
+    ],
+
+    'keyword-spacing': [
+      2,
+      {
+        before: true,
+        after: true,
       },
+    ],
 
-      parser: babelParser,
-      ecmaVersion: 6,
-      sourceType: 'script',
+    'linebreak-style': [2, 'unix'],
 
-      parserOptions: {
-        requireConfigFile: false,
+    'max-len': [
+      2,
+      {
+        code: 120,
+        tabWidth: 4,
+        ignoreUrls: true,
       },
-    },
+    ],
+
+    'new-parens': [2],
+    'newline-per-chained-call': [2],
+    'no-lonely-if': [2],
+    'no-mixed-operators': [2],
+
+    'no-multiple-empty-lines': [
+      2,
+      {
+        max: 2,
+        maxBOF: 0,
+        maxEOF: 0,
+      },
+    ],
 
-    rules: {
-      'array-callback-return': [2],
-      'block-scoped-var': [2],
-      curly: [2, 'multi-line'],
-      'dot-location': [2, 'property'],
-      'dot-notation': [2],
-      eqeqeq: [2],
-      'no-alert': [2],
-      'no-div-regex': [2],
-      'no-else-return': [2],
-      'no-eq-null': [2],
-      'no-eval': [2],
-      'no-extend-native': [2],
-      'no-extra-bind': [2],
-      'no-global-assign': [2],
-      'no-implied-eval': [2],
-      'no-invalid-this': [2],
-      'no-iterator': [2],
-      'no-lone-blocks': [2],
-      'no-loop-func': [2],
-      'no-multi-spaces': [2],
-      'no-multi-str': [2],
-      'no-new': [2],
-      'no-proto': [2],
-      'no-return-assign': [2],
-      'no-script-url': [2],
-      'no-self-compare': [2],
-      'no-sequences': [2],
-      'no-throw-literal': [2],
-      'no-unmodified-loop-condition': [2],
-      'no-unused-expressions': [2],
-      'no-useless-call': [2],
-      'no-useless-concat': [2],
-      'no-useless-escape': [2],
-      'no-warning-comments': [0],
-      'no-with': [2],
-      radix: [2],
-      'wrap-iife': [2],
-      yoda: [2],
-
-      'no-unused-vars': [
-        2,
-        {
-          args: 'after-used',
-          varsIgnorePattern: '^_',
-        },
-      ],
-
-      'no-catch-shadow': [2],
-      'no-shadow': [2],
-      'no-undefined': [2],
-      'no-use-before-define': [2],
-      strict: [2, 'never'],
-      'array-bracket-spacing': [2, 'never'],
-      'block-spacing': [2, 'always'],
-      'brace-style': [2],
-
-      camelcase: [
-        2,
-        {
-          properties: 'never',
-        },
-      ],
-
-      'comma-dangle': [2, 'never'],
-      'comma-spacing': [2],
-      'comma-style': [2],
-      'eol-last': [2, 'always'],
-      'func-call-spacing': [2, 'never'],
-      'func-style': [2, 'expression'],
-      indent: [2, 4],
-      'jsx-quotes': [2, 'prefer-double'],
-
-      'key-spacing': [
-        2,
-        {
-          beforeColon: false,
-          afterColon: true,
-          mode: 'strict',
-        },
-      ],
-
-      'keyword-spacing': [
-        2,
-        {
-          before: true,
-          after: true,
-        },
-      ],
-
-      'linebreak-style': [2, 'unix'],
-
-      'max-len': [
-        2,
-        {
-          code: 120,
-          tabWidth: 4,
-          ignoreUrls: true,
-        },
-      ],
-
-      'new-parens': [2],
-      'newline-per-chained-call': [2],
-      'no-lonely-if': [2],
-      'no-mixed-operators': [2],
-
-      'no-multiple-empty-lines': [
-        2,
-        {
-          max: 2,
-          maxBOF: 0,
-          maxEOF: 0,
-        },
-      ],
-
-      'no-negated-condition': [2],
-      'no-tabs': [2],
-
-      'no-trailing-spaces': [
-        2,
-        {
-          skipBlankLines: true,
-        },
-      ],
-
-      'no-unneeded-ternary': [2],
-      'object-curly-spacing': [2],
-
-      'object-property-newline': [
-        2,
-        {
-          allowMultiplePropertiesPerLine: true,
-        },
-      ],
-
-      'one-var': [2, 'never'],
-      'operator-linebreak': [2, 'after'],
-      'quote-props': [2, 'consistent-as-needed'],
-
-      quotes: [
-        2,
-        'single',
-        {
-          allowTemplateLiterals: true,
-          avoidEscape: true,
-        },
-      ],
-
-      semi: [2, 'always'],
-      'semi-spacing': [2],
-      'space-before-function-paren': [2, 'always'],
-      'space-in-parens': [2],
-      'space-infix-ops': [2],
-      'space-unary-ops': [2],
-      'spaced-comment': [2],
-    },
+    'no-negated-condition': [2],
+    'no-tabs': [2],
+
+    'no-trailing-spaces': [
+      2,
+      {
+        skipBlankLines: true,
+      },
+    ],
+
+    'no-unneeded-ternary': [2],
+    'object-curly-spacing': [2],
+
+    'object-property-newline': [
+      2,
+      {
+        allowMultiplePropertiesPerLine: true,
+      },
+    ],
+
+    'one-var': [2, 'never'],
+    'operator-linebreak': [2, 'after'],
+    'quote-props': [2, 'consistent-as-needed'],
+
+    quotes: [
+      2,
+      'single',
+      {
+        allowTemplateLiterals: true,
+        avoidEscape: true,
+      },
+    ],
+
+    semi: [2, 'always'],
+    'semi-spacing': [2],
+    'space-before-function-paren': [2, 'always'],
+    'space-in-parens': [2],
+    'space-infix-ops': [2],
+    'space-unary-ops': [2],
+    'spaced-comment': [2],
+
+    'react/jsx-filename-extension': [
+      'error',
+      {
+        allow: 'always', // TODO: use 'as-needed' for non-legacy code
+        extensions: ['.jsx', '.tsx'],
+      },
+    ],
   },
-]
+})

package/lib/legacy/node.mjs

@@ -1,20 +1,16 @@
+import { defineConfig } from 'eslint/config'
 import globals from 'globals'
 
-/** @type {import('eslint').Linter.Config[]} */
-export default [
-  {
-    languageOptions: {
-      globals: {
-        ...globals.node,
-      },
-    },
+export default defineConfig({
+  languageOptions: {
+    globals: globals.node,
+  },
 
-    rules: {
-      'global-require': [2],
-      'handle-callback-err': [2],
-      'no-mixed-requires': [2],
-      'no-new-require': [2],
-      'no-path-concat': [2],
-    },
+  rules: {
+    'global-require': [2],
+    'handle-callback-err': [2],
+    'no-mixed-requires': [2],
+    'no-new-require': [2],
+    'no-path-concat': [2],
   },
-]
+})

package/lib/legacy/react.mjs

@@ -1,4 +1,5 @@
 import react from 'eslint-plugin-react'
+import { defineConfig } from 'eslint/config'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { FlatCompat } from '@eslint/eslintrc'
@@ -12,90 +13,86 @@ const compat = new FlatCompat({
   allConfig: js.configs.all,
 })
 
-/** @type {import('eslint').Linter.Config[]} */
-export default [
-  ...compat.extends('plugin:react/recommended'),
-  {
-    plugins: {
-      react,
-    },
+export default defineConfig(...compat.extends('plugin:react/recommended'), {
+  plugins: {
+    react,
+  },
 
-    rules: {
-      'react/display-name': [2],
-      'react/forbid-prop-types': [2],
-      'react/no-children-prop': [2],
-      'react/no-danger': [2],
-      'react/no-danger-with-children': [2],
-      'react/no-deprecated': [2],
-      'react/no-did-mount-set-state': [2],
-      'react/no-did-update-set-state': [2],
-      'react/no-direct-mutation-state': [2],
-      'react/no-find-dom-node': [2],
-      'react/no-is-mounted': [2],
+  rules: {
+    'react/display-name': [2],
+    'react/forbid-prop-types': [2],
+    'react/no-children-prop': [2],
+    'react/no-danger': [2],
+    'react/no-danger-with-children': [2],
+    'react/no-deprecated': [2],
+    'react/no-did-mount-set-state': [2],
+    'react/no-did-update-set-state': [2],
+    'react/no-direct-mutation-state': [2],
+    'react/no-find-dom-node': [2],
+    'react/no-is-mounted': [2],
 
-      'react/no-multi-comp': [
-        2,
-        {
-          ignoreStateless: true,
-        },
-      ],
+    'react/no-multi-comp': [
+      2,
+      {
+        ignoreStateless: true,
+      },
+    ],
 
-      'react/no-render-return-value': [2],
-      'react/no-set-state': [0],
-      'react/no-string-refs': [2],
-      'react/no-unescaped-entities': [2],
-      'react/no-unknown-property': [2],
-      'react/no-unused-prop-types': [2],
-      'react/prefer-es6-class': [2],
-      'react/prefer-stateless-function': [2],
-      'react/prop-types': [2],
-      'react/react-in-jsx-scope': [2],
-      'react/require-optimization': [0],
-      'react/require-render-return': [2],
-      'react/self-closing-comp': [2],
-      'react/sort-comp': [2],
-      'react/style-prop-object': [2],
-      'react/jsx-boolean-value': [2, 'never'],
-      'react/jsx-closing-bracket-location': [2, 'line-aligned'],
-      'react/jsx-curly-spacing': [2],
-      'react/jsx-equals-spacing': [2],
-      'react/jsx-filename-extension': [2],
-      'react/jsx-first-prop-new-line': [2, 'multiline'],
-      'react/jsx-handler-names': [2],
-      'react/jsx-indent': [2],
-      'react/jsx-indent-props': [2],
-      'react/jsx-key': [2],
+    'react/no-render-return-value': [2],
+    'react/no-set-state': [0],
+    'react/no-string-refs': [2],
+    'react/no-unescaped-entities': [2],
+    'react/no-unknown-property': [2],
+    'react/no-unused-prop-types': [2],
+    'react/prefer-es6-class': [2],
+    'react/prefer-stateless-function': [2],
+    'react/prop-types': [2],
+    'react/react-in-jsx-scope': [2],
+    'react/require-optimization': [0],
+    'react/require-render-return': [2],
+    'react/self-closing-comp': [2],
+    'react/sort-comp': [2],
+    'react/style-prop-object': [2],
+    'react/jsx-boolean-value': [2, 'never'],
+    'react/jsx-closing-bracket-location': [2, 'line-aligned'],
+    'react/jsx-curly-spacing': [2],
+    'react/jsx-equals-spacing': [2],
+    'react/jsx-filename-extension': [2],
+    'react/jsx-first-prop-new-line': [2, 'multiline'],
+    'react/jsx-handler-names': [2],
+    'react/jsx-indent': [2],
+    'react/jsx-indent-props': [2],
+    'react/jsx-key': [2],
 
-      'react/jsx-max-props-per-line': [
-        2,
-        {
-          maximum: 1,
-        },
-      ],
+    'react/jsx-max-props-per-line': [
+      2,
+      {
+        maximum: 1,
+      },
+    ],
 
-      'react/jsx-no-bind': [
-        2,
-        {
-          ignoreRefs: true,
-        },
-      ],
+    'react/jsx-no-bind': [
+      2,
+      {
+        ignoreRefs: true,
+      },
+    ],
 
-      'react/jsx-no-comment-textnodes': [2],
-      'react/jsx-no-duplicate-props': [2],
-      'react/jsx-no-target-blank': [2],
-      'react/jsx-no-undef': [2],
+    'react/jsx-no-comment-textnodes': [2],
+    'react/jsx-no-duplicate-props': [2],
+    'react/jsx-no-target-blank': [2],
+    'react/jsx-no-undef': [2],
 
-      'react/jsx-pascal-case': [
-        2,
-        {
-          allowAllCaps: true,
-        },
-      ],
+    'react/jsx-pascal-case': [
+      2,
+      {
+        allowAllCaps: true,
+      },
+    ],
 
-      'react/jsx-tag-spacing': [2],
-      'react/jsx-uses-react': [2],
-      'react/jsx-uses-vars': [2],
-      'react/jsx-wrap-multilines': [2],
-    },
+    'react/jsx-tag-spacing': [2],
+    'react/jsx-uses-react': [2],
+    'react/jsx-uses-vars': [2],
+    'react/jsx-wrap-multilines': [2],
   },
-]
+})

package/lib/legacy/typescript.mjs

@@ -0,0 +1,59 @@
+import { defineConfig } from 'eslint/config'
+import tseslint from 'typescript-eslint'
+
+export default defineConfig(tseslint.configs.base, {
+  languageOptions: {
+    parserOptions: {
+      projectService: true,
+    },
+  },
+  rules: {
+    '@typescript-eslint/no-inferrable-types': ['error'],
+
+    // Replace core rules with TS equivalents
+    'dot-notation': ['off'],
+    '@typescript-eslint/dot-notation': ['error'],
+
+    'no-implied-eval': ['off'],
+    '@typescript-eslint/no-implied-eval': ['error'],
+
+    'no-invalid-this': ['off'],
+    '@typescript-eslint/no-invalid-this': ['error'],
+
+    'no-loop-func': ['off'],
+    '@typescript-eslint/no-loop-func': ['error'],
+
+    'no-redeclare': ['off'],
+    '@typescript-eslint/no-redeclare': ['error'],
+
+    'no-return-await': ['off'],
+    '@typescript-eslint/return-await': ['error'],
+
+    'no-shadow': ['off'],
+    '@typescript-eslint/no-shadow': ['error'],
+
+    'no-unused-expressions': ['off'],
+    '@typescript-eslint/no-unused-expressions': ['error'],
+
+    'no-unused-vars': ['off'],
+    '@typescript-eslint/no-unused-vars': [
+      2,
+      {
+        args: 'after-used',
+        varsIgnorePattern: '^_',
+      },
+    ],
+
+    'no-use-before-define': ['off'],
+    '@typescript-eslint/no-use-before-define': ['error'],
+
+    'no-useless-constructor': ['off'],
+    '@typescript-eslint/no-useless-constructor': ['error'],
+
+    'prefer-promise-reject-errors': ['off'],
+    '@typescript-eslint/prefer-promise-reject-errors': ['error'],
+
+    'require-await': ['off'],
+    '@typescript-eslint/require-await': ['error'],
+  },
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-scratch",
-  "version": "11.0.53",
+  "version": "12.0.0",
   "description": "Shareable ESLint config for Scratch",
   "main": "./lib/index.mjs",
   "scripts": {
@@ -35,6 +35,7 @@
     "@eslint/eslintrc": "3.3.1",
     "@eslint/js": "9.36.0",
     "@eslint/markdown": "6.6.0",
+    "@stylistic/eslint-plugin": "^5.3.1",
     "@trivago/prettier-plugin-sort-imports": "5.2.2",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-formatjs": "5.4.0",
@@ -55,7 +56,7 @@
     "eslint": "9.36.0",
     "husky": "8.0.3",
     "scratch-semantic-release-config": "3.0.0",
-    "semantic-release": "24.2.8",
+    "semantic-release": "24.2.9",
     "vitest": "3.2.4"
   },
   "config": {