eslint-config-beslogic 6.0.2 → 6.0.3

package/CHANGELOG.md

@@ -1,7 +1,16 @@
 # Changelog
 
+## 6.0.3
+
+- Fixed `angular-file-naming` plugin on ESLint v10 by using `fixupPluginRules`
+- Pinned `eslint-plugin-no-relative-import-paths` to `^1.6` + `fixupPluginRules` rather than patched github repo
+- Updated `eslint-plugin-prefer-arrow-functions` to `^3.10`
+- Reverted the 6.0.2 `languageOptions.parserOptions.projectService.allowDefaultProject` change
+- `eslint-rule-composer` and `eslint-plugin-react` are now patched at runtime (in-memory, when `base.mjs`/`react.mjs` are imported) instead of at install time, so `node_modules` is never written to
+
 ## 6.0.2
 
+- ~~Added `languageOptions.parserOptions.projectService.allowDefaultProject: ["*.config.{[cm]js,js}"]` for `"files": ["*.config.{[cm][jt]s,[jt]s}"]`~~
 - Explicitly disabled the following rules in `.html` in Angular preset, as they don't parse:
   - `unicorn/prefer-string-raw`
   - `sonarjs/code-eval`

package/angular.mjs

@@ -2,6 +2,7 @@
 // Copyright 2026 Beslogic Inc.
 
 import { ASTUtils } from "@angular-eslint/utils"
+import { fixupPluginRules } from "@eslint/compat"
 import { disableAutofix } from "@morev/eslint-disable-autofix"
 import angular from "angular-eslint"
 import { defineConfig } from "eslint/config"
@@ -122,7 +123,7 @@ export default disableAutofix(defineConfig(
     "processor": angular.processInlineTemplates,
     "plugins": {
       "rxjs-angular": rxjsAngular,
-      "angular-file-naming": angularFileNaming
+      "angular-file-naming": fixupPluginRules(angularFileNaming)
     },
     "languageOptions": {
       "parserOptions": {

package/base.mjs

@@ -11,7 +11,6 @@ import { defineConfig } from "eslint/config"
 import { builtinRules } from "eslint/use-at-your-own-risk"
 import gitignore from "eslint-config-flat-gitignore"
 import { createTypeScriptImportResolver } from "eslint-import-resolver-typescript"
-import autofix from "eslint-plugin-autofix"
 import extraRules from "eslint-plugin-extra-rules"
 import { importX } from "eslint-plugin-import-x"
 import noRelativeImportPaths from "eslint-plugin-no-relative-import-paths"
@@ -24,7 +23,13 @@ import globals from "globals"
 import tseslint from "typescript-eslint"
 
 import beslogicJest from "./jest.mjs"
-import { cloneRule, getModuleVersion, idLengthConfig, jestFilePatterns, jestNoRestrictedSyntax } from "./lib/utils.mjs"
+import { patchEslintRuleComposer } from "./lib/runtime-patch.mjs"
+import { cloneRule, getModuleVersion, idLengthConfig, jestFilePatterns, jestNoRestrictedSyntax, nodeRequire } from "./lib/utils.mjs"
+
+// Must patch before eslint-plugin-autofix (which requires eslint-rule-composer) is loaded,
+// hence requiring it here instead of a static import. See lib/patch-dependencies.mjs.
+patchEslintRuleComposer()
+const autofix = nodeRequire("eslint-plugin-autofix")
 
 // Version deduplication across peer-dependencies makes targetting this a bit weird
 const tsEslintGlobalsVersion = Math.min(
@@ -306,7 +311,8 @@ export default disableAutofix(defineConfig(
       // TODO: consider https://github.com/jonaskello/eslint-plugin-functional/blob/HEAD/docs/rules/prefer-tacit.md
       "extra-rules": fixupPluginRules(extraRules),
       autofix,
-      "no-relative-import-paths": noRelativeImportPaths,
+      // https://github.com/MelvinVermeer/eslint-plugin-no-relative-import-paths/pull/47
+      "no-relative-import-paths": fixupPluginRules(noRelativeImportPaths),
       "prefer-arrow-functions": preferArrowFunctions,
       "simple-import-sort": simpleImportSort
     },
@@ -1222,16 +1228,6 @@ export default disableAutofix(defineConfig(
   {
     "name": "beslogic/base/configs",
     "files": ["*.config.{[cm][jt]s,[jt]s}"],
-    "languageOptions": {
-      "parserOptions": {
-        "projectService": {
-          // Don't force users to include this file in their tsconfig.json,
-          // because it can lead to tons of type errors
-          // They may still have to configure this if they have nested tsconfig.json
-          "allowDefaultProject": ["*.config.{[cm]js,js}"]
-        }
-      }
-    },
     "rules": {
       // Direct anonymous exports in config files is perfectly acceptable
       "import-x/no-anonymous-default-export": "off",

package/lib/patch-dependencies.mjs

@@ -1,7 +1,7 @@
 import { readFileSync, writeFileSync } from "node:fs"
-import { dirname, join } from "node:path"
+import { join } from "node:path"
 
-import { getModuleVersion, resolveModuleLocation } from "./utils.mjs"
+import { getPackageBase } from "./utils.mjs"
 
 // ANSI color chart: https://en.m.wikipedia.org/wiki/ANSI_escape_code#Colors
 
@@ -29,51 +29,6 @@ const searchAndReplace = async (
   }
 }
 
-const getPackageBase = (/** @type {string} */ packageName) => {
-  const location = resolveModuleLocation(`${packageName}/package.json`)
-  if (!location) {
-    console.info(
-      `\n\u001B[36m${packageName} not found in node_modules, no need to patch.\u001B[0m`
-    )
-
-    return
-  }
-
-  return dirname(location)
-}
-
-// Broader regexes intentional: cover any caller object (context, contextOrFilename, etc.)
-const eslint10 = {
-  "getSourceCode": {
-    "from": /(\w+)\.getSourceCode\(\)/gu,
-    "to": "($1.sourceCode ?? $1.getSourceCode())"
-  },
-  "getFilename": {
-    "from": /(\w+)\.getFilename\(\)/gu,
-    "to": "$1.filename ?? $1.getFilename()"
-  },
-  "isSpaceBetweenTokens": {
-    "from": /\.isSpaceBetweenTokens\(/gu,
-    "to": ".isSpaceBetween("
-  }
-}
-
-const shouldPatchForESLintVersion = (/** @type {string} */ packageName) => {
-  const eslintVersion = getModuleVersion("eslint", 0)
-  if (eslintVersion === 0) {
-    console.info(
-      `\nCould not find ESLint version, assuming v9, not patching ${packageName}.`
-    )
-    return false
-  }
-  if (eslintVersion < 10) {
-    console.info(`\nESLint v${eslintVersion} detected, no need to patch ${packageName}.`)
-    return false
-  }
-
-  return true
-}
-
 const patches = [
   async () => {
     const packageName = "@angular/material"
@@ -90,8 +45,7 @@ const patches = [
     )
 
     return packageName
-  },
-
+  }
   // TODO: Fix nx patching
   // async () => {
   //   const packageName = "@nx/angular"
@@ -183,63 +137,7 @@ const patches = [
   //   )
 
   //   return packageName
-  // },
-  // ESLint 10 removed context.getFilename()/getSourceCode();
-  // eslint-rule-composer (unmaintained) still calls them.
-  // Patch with ?? fallback.
-  async () => {
-    const packageName = "eslint-rule-composer"
-    if (!shouldPatchForESLintVersion(packageName)) return
-    const base = getPackageBase(packageName)
-    if (!base) return
-    await searchAndReplace(
-      join(base, "lib", "rule-composer.js"),
-      [
-        eslint10.getFilename,
-        eslint10.getSourceCode
-      ]
-    )
-
-    return packageName
-  },
-  // ESLint 10 removed context.getFilename()/getSourceCode()/isSpaceBetweenTokens();
-  // eslint-plugin-react 7.x still calls them. Patch with ?? fallback / renamed methods.
-  async () => {
-    const packageName = "eslint-plugin-react"
-    if (!shouldPatchForESLintVersion(packageName)) return
-    const base = getPackageBase(packageName)
-    if (!base) return
-    await Promise.all([
-      searchAndReplace(
-        join(base, "lib", "util", "version.js"),
-        [eslint10.getFilename]
-      ),
-      searchAndReplace(
-        join(base, "lib", "rules", "jsx-filename-extension.js"),
-        [eslint10.getFilename]
-      ),
-      searchAndReplace(
-        join(base, "lib", "rules", "forward-ref-uses-ref.js"),
-        [eslint10.getSourceCode]
-      ),
-      ...[
-        "jsx-curly-spacing.js",
-        "jsx-one-expression-per-line.js",
-        "jsx-tag-spacing.js",
-        "jsx-equals-spacing.js",
-        "jsx-space-before-closing.js"
-      ]
-        .map(file =>
-          searchAndReplace(
-            join(base, "lib", "rules", file),
-            [eslint10.isSpaceBetweenTokens]
-          )
-          // eslint-disable-next-line @stylistic/function-paren-newline -- See note this can't be fully consistent with dprint
-        )
-    ])
-
-    return packageName
-  }
+  // }
 ].map(
   patch =>
     patch().then(

package/lib/runtime-patch.mjs

@@ -0,0 +1,146 @@
+import { readFileSync } from "node:fs"
+import Module from "node:module"
+import { join } from "node:path"
+
+import { getModuleVersion, getPackageBase } from "./utils.mjs"
+
+// Broader regexes intentional: cover any caller object (context, contextOrFilename, etc.)
+const eslint10 = {
+  "getSourceCode": {
+    "from": /(\w+)\.getSourceCode\(\)/gu,
+    "to": "($1.sourceCode ?? $1.getSourceCode())"
+  },
+  "getFilename": {
+    "from": /(\w+)\.getFilename\(\)/gu,
+    "to": "$1.filename ?? $1.getFilename()"
+  },
+  "isSpaceBetweenTokens": {
+    "from": /\.isSpaceBetweenTokens\(/gu,
+    "to": ".isSpaceBetween("
+  }
+}
+
+const shouldPatchForESLintVersion = (/** @type {string} */ packageName) => {
+  const eslintVersion = getModuleVersion("eslint", 0)
+  if (eslintVersion === 0 && packageName) {
+    console.info(
+      `\n[36mCould not find ESLint version, assuming v9, not patching ${packageName}.[0m`
+    )
+    return false
+  }
+  // eslint-disable-next-line sonarjs/prefer-single-boolean-return -- Could add log back
+  if (eslintVersion < 10) {
+    // console.info(`\n[36mESLint v${eslintVersion} detected, no need to patch ${packageName}.[0m`)
+    return false
+  }
+
+  return true
+}
+
+/*
+ * Runtime patching: instead of rewriting files inside node_modules on disk (which doesn't play
+ * well with content-addressable stores like pnpm's, read-only node_modules, or CI caches),
+ * we intercept Node's CommonJS loader and rewrite the source of specific files in-memory,
+ * the moment they get `require`d. Callers must trigger the patch (and only then dynamically
+ * `import()` the package that needs it) so the hook is installed before the target file is
+ * first loaded - see base.mjs and react.mjs.
+ */
+// _extensions/_cache are undocumented CommonJS loader internals, absent from @types/node.
+const ModuleInternals = /** @type {any} */ (Module)
+
+/** @type {Map<string, {from: string | RegExp, to: string}[]>} */
+const patchedSources = new Map()
+let isRuntimePatchHookInstalled = false
+
+const installRuntimePatchHook = () => {
+  if (isRuntimePatchHookInstalled) return
+  isRuntimePatchHookInstalled = true
+
+  const originalJsLoader = ModuleInternals._extensions[".js"]
+  ModuleInternals._extensions[".js"] = (
+    /** @type {{ _compile: (source: string, filename: string) => unknown }} */ module,
+    /** @type {string} */ filename
+  ) => {
+    const replacements = patchedSources.get(filename)
+    if (!replacements) {
+      originalJsLoader(module, filename)
+      return
+    }
+
+    try {
+      // eslint-disable-next-line n/no-sync -- CommonJS module loading is inherently synchronous
+      let source = readFileSync(filename, "utf8")
+      for (const replacement of replacements) {
+        source = source.replaceAll(replacement.from, replacement.to)
+      }
+      module._compile(source, filename)
+    } catch (error) {
+      console.error(
+        "\n\u001B[31m"
+          // eslint-disable-next-line @stylistic/indent-binary-ops -- dprint incompatibility
+          + `eslint-config-beslogic failed to patch ${filename} at runtime, falling back to the original file. `
+          + "Please contact samuel.therrien@beslogic.com with the package version and the full error to get it fixed."
+          + "\u001B[0m"
+      )
+      console.error(error)
+      originalJsLoader(module, filename)
+    }
+  }
+}
+
+const patchAtRuntime = (
+  /** @type {string} */ absoluteFilePath,
+  /** @type {{from: string | RegExp, to: string}[]} */ replacements
+) => {
+  installRuntimePatchHook()
+  patchedSources.set(absoluteFilePath, replacements)
+  // In the unlikely case something already required this file in this process,
+  // evict it so the next require() picks up the patched source.
+  Reflect.deleteProperty(ModuleInternals._cache, absoluteFilePath)
+}
+
+// ESLint 10 removed context.getFilename()/getSourceCode();
+// eslint-rule-composer (unmaintained) still calls them.
+// Patch with ?? fallback.
+export const patchEslintRuleComposer = () => {
+  const packageName = "eslint-rule-composer"
+  if (!shouldPatchForESLintVersion(packageName)) return
+  const base = getPackageBase(packageName)
+  if (!base) return
+
+  patchAtRuntime(
+    join(base, "lib", "rule-composer.js"),
+    [
+      eslint10.getFilename,
+      eslint10.getSourceCode
+    ]
+  )
+
+  console.info(`\u001B[32m${packageName} patched at runtime to support ESLint v10!\u001B[0m`)
+}
+
+// ESLint 10 removed context.getFilename()/getSourceCode()/isSpaceBetweenTokens();
+// eslint-plugin-react 7.x still calls them. Patch with ?? fallback / renamed methods.
+export const patchEslintPluginReact = () => {
+  const packageName = "eslint-plugin-react"
+  if (!shouldPatchForESLintVersion(packageName)) return
+  const base = getPackageBase(packageName)
+  if (!base) return
+
+  patchAtRuntime(join(base, "lib", "util", "version.js"), [eslint10.getFilename])
+  patchAtRuntime(join(base, "lib", "rules", "jsx-filename-extension.js"), [eslint10.getFilename])
+  patchAtRuntime(join(base, "lib", "rules", "forward-ref-uses-ref.js"), [eslint10.getSourceCode])
+  for (
+    const file of [
+      "jsx-curly-spacing.js",
+      "jsx-one-expression-per-line.js",
+      "jsx-tag-spacing.js",
+      "jsx-equals-spacing.js",
+      "jsx-space-before-closing.js"
+    ]
+  ) {
+    patchAtRuntime(join(base, "lib", "rules", file), [eslint10.isSpaceBetweenTokens])
+  }
+
+  console.info(`\u001B[32m${packageName} patched at runtime to support ESLint v10!\u001B[0m`)
+}

package/lib/utils.mjs

@@ -1,7 +1,12 @@
 import { createRequire } from "node:module"
+import { dirname } from "node:path"
 
 const require = createRequire(import.meta.url)
 
+// Exposed so callers can synchronously `require()` a CommonJS package right after triggering
+// a runtime patch for it (see lib/patch-dependencies.mjs), without introducing top-level await.
+export const nodeRequire = require
+
 export const getModuleVersion = (
   /** @type {string} */ nodeModule,
   /** @type {number} */ fallbackVersion
@@ -30,6 +35,19 @@ export const resolveModuleLocation = (/** @type {string} */ nodeModule) => {
   }
 }
 
+export const getPackageBase = (/** @type {string} */ packageName) => {
+  const location = resolveModuleLocation(`${packageName}/package.json`)
+  if (!location) {
+    console.info(
+      `\n\u001B[36m${packageName} not found in node_modules, no need to patch.\u001B[0m`
+    )
+
+    return
+  }
+
+  return dirname(location)
+}
+
 export const jestNoRestrictedSyntax = (
   /** @type {readonly (string | {readonly selector: string})[]} */ noRestrictedSyntax
 ) => /** @type {import('@eslint/core').RuleConfig} */ ([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-beslogic",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "ESLint rules, plugins and configs used at Beslogic",
   "main": "index.js",
   "type": "module",
@@ -46,7 +46,6 @@
   },
   "// dependencies": "Not using peerDependencies because I want Yarn to automatically install them without the end user having to specify everything",
   "// globals": "See this issue that prevented linting https://github.com/sindresorhus/globals/releases/tag/v13.12.1",
-  "// eslint-plugin-no-relative-import-paths": "https://github.com/MelvinVermeer/eslint-plugin-no-relative-import-paths/pull/47",
   "// eslint-plugin-unicorn": "v65 supports eslint@10, v66 forces it. Keeping it at 65 for now makes package resolution easier",
   "// eslint-plugin-unicorn (cont)": "AND I can deal with learning all the new rules another time.",
   "dependencies": {
@@ -62,8 +61,8 @@
     "eslint-plugin-extra-rules": "^0.0.0-development",
     "eslint-plugin-import-x": "^4.15.1",
     "eslint-plugin-jest": "^28.8.3 || ^29.0.1",
-    "eslint-plugin-no-relative-import-paths": "github:MelvinVermeer/eslint-plugin-no-relative-import-paths#908b2d101e43a0268bcb557f2d6a3be2ccc5bb71",
-    "eslint-plugin-prefer-arrow-functions": "github:SamuelT-Beslogic/eslint-plugin-prefer-arrow-functions#1cf8ac41159095e088380faf1f103e8a1bad9b7b",
+    "eslint-plugin-no-relative-import-paths": "^1.6",
+    "eslint-plugin-prefer-arrow-functions": "^3.10",
     "eslint-plugin-regexp": "^2.3",
     "eslint-plugin-simple-import-sort": ">=12.0",
     "eslint-plugin-sonarjs": "^3.0.2 || ^4.0.3",

package/react.mjs

@@ -4,14 +4,19 @@
 import { disableAutofix } from "@morev/eslint-disable-autofix"
 import { defineConfig } from "eslint/config"
 import jsxA11y from "eslint-plugin-jsx-a11y"
-import react from "eslint-plugin-react"
 import reactHooks from "eslint-plugin-react-hooks"
 import preferFunctionComponent from "eslint-plugin-react-prefer-function-component/config"
 import testingLibrary from "eslint-plugin-testing-library"
 import globals from "globals"
 
 import beslogicBase, { autofixPreferArrowFunctionsConfig, noAutofixPreferArrowFunctionsConfig, PREVENT_ABBREVIATION_KEY, preventAbbreviationsConfig as preventAbbreviationsConfigJS } from "./base.mjs"
-import { jestFilePatterns, jsxSortPropsConfig } from "./lib/utils.mjs"
+import { patchEslintPluginReact } from "./lib/runtime-patch.mjs"
+import { jestFilePatterns, jsxSortPropsConfig, nodeRequire } from "./lib/utils.mjs"
+
+// Must patch before eslint-plugin-react is loaded, hence requiring it here instead of a
+// static import. See lib/patch-dependencies.mjs.
+patchEslintPluginReact()
+const react = nodeRequire("eslint-plugin-react")
 
 const typeDeclarationOverride = beslogicBase.find(
   config => config.name === "beslogic/base/type-declaration"

package/stylistic.mjs

@@ -3,10 +3,20 @@
 
 import stylistic from "@stylistic/eslint-plugin"
 import { defineConfig } from "eslint/config"
-import autofix from "eslint-plugin-autofix"
-import react from "eslint-plugin-react"
 import eslintPluginUnicorn from "eslint-plugin-unicorn"
 
+import { patchEslintPluginReact, patchEslintRuleComposer } from "./lib/runtime-patch.mjs"
+import { nodeRequire } from "./lib/utils.mjs"
+
+// Must patch before eslint-plugin-autofix (which requires eslint-rule-composer) is loaded,
+// hence requiring it here instead of a static import. See lib/patch-dependencies.mjs.
+patchEslintRuleComposer()
+const autofix = nodeRequire("eslint-plugin-autofix")
+// Must patch before eslint-plugin-react is loaded, hence requiring it here instead of a
+// static import. See lib/patch-dependencies.mjs.
+patchEslintPluginReact()
+const react = nodeRequire("eslint-plugin-react")
+
 const commaDangleDefault = "always-multiline"
 
 export default defineConfig(