eslint-config-scratch 11.0.52 → 12.0.0

package/.prettierignore

@@ -1 +1,4 @@
 /CHANGELOG.md
+/test/legacy/*
+/test/recommended/*
+/test/__snapshots__/*

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [12.0.0](https://github.com/scratchfoundation/eslint-config-scratch/compare/v11.0.53...v12.0.0) (2025-09-23)
+
+
+### Bug Fixes
+
+* **legacy:** forbid JSX syntax outside of JSX/TSX files ([172074c](https://github.com/scratchfoundation/eslint-config-scratch/commit/172074c289b8e308d7cec90406fd907e93a3f7e1))
+* **legacy:** stop TS support from breaking non-TS projects ([b2c62b2](https://github.com/scratchfoundation/eslint-config-scratch/commit/b2c62b222d5f4a4194379deb4ebc79bcc0ffa01a))
+* **legacy:** use TS rules where possible ([335ccb8](https://github.com/scratchfoundation/eslint-config-scratch/commit/335ccb851acec3184e8e42af722509a4937adc96))
+* replace `config` with `defineConfig` ([3b2c7bd](https://github.com/scratchfoundation/eslint-config-scratch/commit/3b2c7bd69908fb3401732d38fee72b5fc221ada2))
+* use @stylistic/indent to work around ts/eslint bug ([63a0d62](https://github.com/scratchfoundation/eslint-config-scratch/commit/63a0d62e30aceb4088a64a14bb11ddfb0f6a3fd2)), closes [typescript-eslint/typescript-eslint#11455](https://github.com/typescript-eslint/typescript-eslint/issues/11455)
+
+
+### Features
+
+* add minimal TS support to legacy rule sets ([2b4d83e](https://github.com/scratchfoundation/eslint-config-scratch/commit/2b4d83eff525854bd8472ea601f023b2a060c463))
+
+
+### BREAKING CHANGES
+
+* **legacy:** TS rules are no longer active in non-TS files unless
+explicitly added through the user's configuration
+* this rule seems to handle a few cases differently.
+* **legacy:** JSX use outside of JSX/TSX files is now forbidden
+* **legacy:** TS rules are now active even in non-TS files
+* while `defineConfig` is almost the same as `config`,
+there are some cases that differ. See:
+<https://typescript-eslint.io/packages/typescript-eslint/#migrating-to-defineconfig>
+
+## [11.0.53](https://github.com/scratchfoundation/eslint-config-scratch/compare/v11.0.52...v11.0.53) (2025-09-22)
+
+
+### Bug Fixes
+
+* **deps:** update eslint monorepo to v9.36.0 ([#310](https://github.com/scratchfoundation/eslint-config-scratch/issues/310)) ([79f2997](https://github.com/scratchfoundation/eslint-config-scratch/commit/79f2997689f593735d934e51a40e1d093316f967))
+
 ## [11.0.52](https://github.com/scratchfoundation/eslint-config-scratch/compare/v11.0.51...v11.0.52) (2025-09-18)
 
 

package/README.md

@@ -20,7 +20,7 @@ For a TypeScript project, you can add `languageOptions` to enable type checking:
 // myProjectRoot/eslint.config.mjs
 import { eslintConfigScratch } from 'eslint-config-scratch'
 
-export default eslintConfigScratch.config(eslintConfigScratch.recommended, {
+export default eslintConfigScratch.defineConfig(eslintConfigScratch.recommended, {
   languageOptions: {
     parserOptions: {
       projectService: true,
@@ -39,8 +39,8 @@ import { eslintConfigScratch } from 'eslint-config-scratch'
 export default eslintConfigScratch.recommended
 ```
 
-The function `eslintConfigScratch.config` is a re-export of the `config` function from `typescript-eslint`, and helps
-with merging and extending configurations.
+The function `eslintConfigScratch.defineConfig` is a re-export of the `defineConfig` function from `@eslint/config`,
+and helps with merging and extending configurations.
 
 Add `prettier.config.mjs` to your project root as well:
 
@@ -62,8 +62,9 @@ Finally, add scripts like these to your `package.json`:
 
 ## Basic Configuration
 
-The `eslintConfigScratch.config` is a re-export of the `config` function from `typescript-eslint`. Full documentation
-is available here: <https://typescript-eslint.io/packages/typescript-eslint#config>.
+The function `eslintConfigScratch.defineConfig` is a re-export of the `defineConfig` function from `@eslint/config`,
+and helps with merging and extending configurations. Full documentation is available here:
+<https://eslint.org/blog/2025/03/flat-config-extends-define-config-global-ignores/#introducing-defineconfig()-for-eslint>.
 
 The `config` function can be used to add or override rules, plugins, and other configuration options. For example:
 
@@ -73,7 +74,7 @@ import { eslintConfigScratch } from 'eslint-config-scratch'
 import { globalIgnores } from 'eslint/config'
 import globals from 'globals'
 
-export default eslintConfigScratch.config(
+export default eslintConfigScratch.defineConfig(
   eslintConfigScratch.recommended,
   {
     languageOptions: {
@@ -127,7 +128,7 @@ import { eslintConfigScratch } from 'eslint-config-scratch'
 import { globalIgnores } from 'eslint/config'
 import globals from 'globals'
 
-export default eslintConfigScratch.config(
+export default eslintConfigScratch.defineConfig(
   eslintConfigScratch.legacy.base,
   eslintConfigScratch.legacy.es6,
   {

package/eslint.config.mjs

@@ -2,7 +2,7 @@ import { globalIgnores } from 'eslint/config'
 import globals from 'globals'
 import { eslintConfigScratch } from './lib/index.mjs'
 
-export default eslintConfigScratch.config(
+export default eslintConfigScratch.defineConfig(
   eslintConfigScratch.recommended,
   {
     languageOptions: {

package/lib/eslint.mjs

@@ -7,6 +7,7 @@ import jsdoc from 'eslint-plugin-jsdoc'
 import jsxA11y from 'eslint-plugin-jsx-a11y'
 import react from 'eslint-plugin-react'
 import reactHooks from 'eslint-plugin-react-hooks'
+import { defineConfig } from 'eslint/config'
 import tseslint from 'typescript-eslint'
 import eslintComments from '@eslint-community/eslint-plugin-eslint-comments/configs'
 import eslint from '@eslint/js'
@@ -15,12 +16,14 @@ import legacyES6 from './legacy/es6.mjs'
 import legacyBase from './legacy/index.mjs'
 import legacyNode from './legacy/node.mjs'
 import legacyReact from './legacy/react.mjs'
+import legacyTS from './legacy/typescript.mjs'
 
 const legacy = {
   base: legacyBase,
   es6: legacyES6,
   node: legacyNode,
   react: legacyReact,
+  typescript: legacyTS,
 }
 
 // WARNING: eslint rules from `typescript-eslint`, even the "untyped" rules, assume that your code will be run through
@@ -65,7 +68,7 @@ const fileGlobs = {
 /**
  * Rules for specific file types outside of the core JS/TS rule sets.
  */
-const miscFileRules = tseslint.config([
+const miscFileRules = defineConfig([
   // eslint-plugin-html
   {
     name: 'scratch/miscFileRules[eslint-plugin-html]',
@@ -89,7 +92,8 @@ const miscFileRules = tseslint.config([
 /**
  * Rules recommended for all script files, whether or not type information is available or checked.
  */
-const allScriptRules = tseslint.config([
+const allScriptRules = defineConfig([
+  tseslint.configs.base,
   // eslint-plugin-formatjs
   {
     name: 'scratch/allScriptRules[eslint-plugin-formatjs]',
@@ -112,9 +116,20 @@ const allScriptRules = tseslint.config([
   {
     name: 'scratch/allScriptRules[eslint-plugin-jsx-a11y]',
     files: fileGlobs.react,
+    // @ts-expect-error This plugin's recommended rules don't quite match the type `defineConfig` expects.
     extends: [jsxA11y.flatConfigs.recommended],
   },
   // eslint-plugin-react
+  {
+    files: fileGlobs.allScript,
+    plugins: {
+      react,
+    },
+    rules: {
+      // https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules/jsx-filename-extension.md
+      'react/jsx-filename-extension': ['error', { allow: 'as-needed', extensions: ['.jsx', '.tsx'] }],
+    },
+  },
   {
     name: 'scratch/allScriptRules[eslint-plugin-react]',
     files: fileGlobs.react,
@@ -140,9 +155,6 @@ const allScriptRules = tseslint.config([
       // https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules/jsx-equals-spacing.md
       'react/jsx-equals-spacing': ['error'],
 
-      // https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules/jsx-filename-extension.md
-      'react/jsx-filename-extension': ['error', { extensions: ['.jsx', '.tsx'] }],
-
       // https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules/jsx-first-prop-new-line.md
       'react/jsx-first-prop-new-line': ['error', 'multiline'],
 
@@ -184,7 +196,7 @@ const allScriptRules = tseslint.config([
   {
     name: 'scratch/allScriptRules[eslint-plugin-eslint-comments]',
     extends: [
-      // @ts-expect-error This plugin's recommended rules don't quite match the type `tseslint.config` expects.
+      // @ts-expect-error This plugin's recommended rules don't quite match the type `defineConfig` expects.
       eslintComments.recommended,
     ],
     rules: {
@@ -232,7 +244,7 @@ const allScriptRules = tseslint.config([
 /**
  * Additional rules recommended when type information is not available or checked.
  */
-const typeFreeRules = tseslint.config([
+const typeFreeRules = defineConfig([
   {
     name: 'scratch/typeFreeRules[base]',
     extends: [eslint.configs.recommended],
@@ -261,7 +273,7 @@ const typeFreeRules = tseslint.config([
  * These rules require additional configuration.
  * @see https://typescript-eslint.io/getting-started/typed-linting/
  */
-const typeCheckedRules = tseslint.config([
+const typeCheckedRules = defineConfig([
   {
     name: 'scratch/typeCheckedRules[base]',
     extends: [
@@ -318,7 +330,7 @@ const typeCheckedRules = tseslint.config([
 /**
  * Scratch's recommended configuration when type information is not available.
  */
-const recommendedTypeFree = tseslint.config(typeFreeRules, eslintConfigPrettier)
+const recommendedTypeFree = defineConfig(typeFreeRules, eslintConfigPrettier)
 
 /**
  * Scratch's recommended configuration when type information is available.
@@ -326,7 +338,7 @@ const recommendedTypeFree = tseslint.config(typeFreeRules, eslintConfigPrettier)
  * WARNING: These rules do not specify the `files` property.
  * @see https://typescript-eslint.io/getting-started/typed-linting/
  */
-const recommendedTypeChecked = tseslint.config(typeCheckedRules, eslintConfigPrettier)
+const recommendedTypeChecked = defineConfig(typeCheckedRules, eslintConfigPrettier)
 
 /**
  * Scratch's recommended configuration for general use.
@@ -334,7 +346,7 @@ const recommendedTypeChecked = tseslint.config(typeCheckedRules, eslintConfigPre
  * If your project includes such files, you must include additional configuration.
  * @see https://typescript-eslint.io/getting-started/typed-linting/
  */
-const recommended = tseslint.config(
+const recommended = defineConfig(
   {
     name: 'scratch/recommended',
   },
@@ -356,7 +368,7 @@ const recommended = tseslint.config(
 )
 
 // Helper to get type hints while conveniently merging and extending configurations
-export { config } from 'typescript-eslint'
+export { defineConfig } from 'eslint/config'
 
 // Our exported configurations
 export { recommended, recommendedTypeChecked, recommendedTypeFree, miscFileRules, legacy }

package/lib/legacy/es6.mjs

@@ -1,51 +1,49 @@
-/** @type {import('eslint').Linter.Config[]} */
-export default [
-  {
-    languageOptions: {
-      globals: {},
-      ecmaVersion: 2018,
-      sourceType: 'script',
-    },
+import { defineConfig } from 'eslint/config'
+import globals from 'globals'
 
-    rules: {
-      'arrow-body-style': [2, 'as-needed'],
-      'arrow-parens': [2, 'as-needed'],
+export default defineConfig({
+  languageOptions: {
+    globals: globals.browser,
+  },
+  rules: {
+    'arrow-body-style': [2, 'as-needed'],
+    'arrow-parens': [2, 'as-needed'],
 
-      'arrow-spacing': [
-        2,
-        {
-          before: true,
-          after: true,
-        },
-      ],
+    'arrow-spacing': [
+      2,
+      {
+        before: true,
+        after: true,
+      },
+    ],
 
-      'no-prototype-builtins': [2],
-      'no-confusing-arrow': [2],
-      'no-duplicate-imports': [2],
-      'no-return-await': [2],
-      'no-template-curly-in-string': [2],
-      'no-useless-computed-key': [2],
-      'no-useless-constructor': [2],
-      'no-useless-rename': [2],
-      'no-var': [2],
-      'prefer-arrow-callback': [2],
+    'no-prototype-builtins': [2],
+    'no-confusing-arrow': [2],
+    'no-duplicate-imports': [2],
+    'no-return-await': [2],
+    'no-template-curly-in-string': [2],
+    'no-useless-computed-key': [2],
+    'no-useless-constructor': [2],
+    'no-useless-rename': [2],
+    'no-var': [2],
+    'prefer-arrow-callback': [2],
 
-      'prefer-const': [
-        2,
-        {
-          destructuring: 'all',
-        },
-      ],
+    'prefer-const': [
+      2,
+      {
+        destructuring: 'all',
+      },
+    ],
 
-      'prefer-promise-reject-errors': [2],
-      'prefer-rest-params': [2],
-      'prefer-spread': [2],
-      'prefer-template': [2],
-      'require-atomic-updates': [2],
-      'require-await': [2],
-      'rest-spread-spacing': [2, 'never'],
-      'symbol-description': [2],
-      'template-curly-spacing': [2, 'never'],
-    },
+    'no-console': ['error'],
+    'prefer-promise-reject-errors': [2],
+    'prefer-rest-params': [2],
+    'prefer-spread': [2],
+    'prefer-template': [2],
+    'require-atomic-updates': [2],
+    'require-await': [2],
+    'rest-spread-spacing': [2, 'never'],
+    'symbol-description': [2],
+    'template-curly-spacing': [2, 'never'],
   },
-]
+})