@o3r/eslint-config 12.3.0-prerelease.18 → 12.3.0-prerelease.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/eslint-config",
-  "version": "12.3.0-prerelease.18",
+  "version": "12.3.0-prerelease.22",
   "publishConfig": {
     "access": "public"
   },
@@ -13,6 +13,9 @@
     ".": {
       "default": "./src/rules/typescript.cjs"
     },
+    "./helpers": {
+      "default": "./src/helpers/index.cjs"
+    },
     "./typescript": {
       "default": "./src/rules/typescript.cjs"
     },
@@ -39,16 +42,16 @@
     "@angular-eslint/builder": "^19.0.0",
     "@angular/compiler": "^19.0.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@eslint/js": "^8.57.0 || ^9.16.0",
-    "@o3r/eslint-plugin": "^12.3.0-prerelease.18",
-    "@o3r/schematics": "^12.3.0-prerelease.18",
+    "@eslint/js": "^8.57.0 || ^9.22.0",
+    "@o3r/eslint-plugin": "^12.3.0-prerelease.22",
+    "@o3r/schematics": "^12.3.0-prerelease.22",
     "@schematics/angular": "^19.0.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@typescript-eslint/parser": "^8.15.0",
     "@typescript-eslint/types": "^8.15.0",
     "@typescript-eslint/utils": "^8.15.0",
     "angular-eslint": "^19.0.0",
-    "eslint": "^8.57.0 || ^9.16.0",
+    "eslint": "^8.57.0 || ^9.22.0",
     "eslint-import-resolver-node": "^0.3.4",
     "eslint-import-resolver-typescript": "^3.6.3",
     "eslint-plugin-import": "^2.31.0",
@@ -73,10 +76,10 @@
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@eslint/js": "~9.24.0",
     "@nx/eslint-plugin": "~20.7.0",
-    "@o3r/build-helpers": "^12.3.0-prerelease.18",
-    "@o3r/eslint-plugin": "^12.3.0-prerelease.18",
-    "@o3r/schematics": "^12.3.0-prerelease.18",
-    "@o3r/test-helpers": "^12.3.0-prerelease.18",
+    "@o3r/build-helpers": "^12.3.0-prerelease.22",
+    "@o3r/eslint-plugin": "^12.3.0-prerelease.22",
+    "@o3r/schematics": "^12.3.0-prerelease.22",
+    "@o3r/test-helpers": "^12.3.0-prerelease.22",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@types/eslint__js": "^8.42.3",

package/schematics/ng-add/eslint/templates/project/eslint.config.__extension__.template

@@ -1,10 +1,14 @@
-<% if (extension === 'mjs') { %>import local from './eslint.local.config.mjs';
+<% if (extension === 'mjs') { %>import {
+  defineConfig,
+} from 'eslint/config';
+import local from './eslint.local.config.mjs';
 import shared from '<%= relativePathToRoot %>/eslint.shared.config.mjs';
-<% } else { %>const local = require('./eslint.local.config.<%= extension %>');
+<% } else { %>const { defineConfig } = require('eslint/config');
+const local = require('./eslint.local.config.<%= extension %>');
 const shared = require('<%= relativePathToRoot %>/eslint.shared.config.<%= extension %>');
 <% } %>
 
-<%= extension === 'mjs' ? 'export default' : 'module.exports =' %> [
+<%= extension === 'mjs' ? 'export default' : 'module.exports =' %> defineConfig([
   ...shared,
   ...local
-];
+]);

package/schematics/ng-add/eslint/templates/project/eslint.local.config.__extension__.template

@@ -1,14 +1,23 @@
-<% if (extension === 'mjs') { %>import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+<% if (extension === 'mjs') { %>import {
+  defineConfig,
+} from 'eslint/config';
+import {
+  dirname,
+} from 'node:path';
+import {
+  fileURLToPath,
+} from 'node:url';
 <% if (isApp) {
   %>import globals from 'globals';<%
 } %>
 const __filename = fileURLToPath(import.meta.url);
 // __dirname is not defined in ES module scope
 const __dirname = dirname(__filename);
-<% } else if (isApp) { %>const globals = require('globals');
+<% } else { %>const { defineConfig } = require('eslint/config');
+<% if (isApp) { %>const globals = require('globals');
 <% } %>
-<%= extension === 'mjs' ? 'export default' : 'module.exports =' %> [
+<% } %>
+<%= extension === 'mjs' ? 'export default' : 'module.exports =' %> defineConfig([
   {
     name: '<%= packageName %>/projects',
     languageOptions: {
@@ -23,9 +32,5 @@ const __dirname = dirname(__filename);
         ...globals.browser
       }<% } %>
     }
-  },
-  {
-    name: '<%= packageName %>/ignores',
-    ignores: []
   }
-];
+]);

package/schematics/ng-add/eslint/templates/workspace/eslint.config.__extension__.template

@@ -1,66 +1,20 @@
 <% if (extension === 'mjs') { %>import {
+  mergeESLintFlatConfigs,
+} from '@o3r/eslint-config';
+import {
   dirname,
-  posix,
-  relative,
-  sep
 } from 'node:path';
 import {
   fileURLToPath,
-  pathToFileURL
 } from 'node:url';
 import shared from './eslint.shared.config.mjs';
-import {
-  sync
-} from 'globby';
 
 const __filename = fileURLToPath(import.meta.url);
 // __dirname is not defined in ES module scope
 const __dirname = dirname(__filename);
 <% } else { %>
-const { dirname, posix, relative, sep } = require('node:path');
-const { sync } = require('globby');
+const { mergeESLintFlatConfigs } = require('@o3r/eslint-config/helpers');
 const shared = require('./eslint.shared.config.<%= extension %>');
 <% } %>
 
-/**
- * Add a prefix to a path glob
- * @param {string} prefix
- * @param {string | undefined} pathGlob
- * @returns {string}
- */
-const addPrefix = (prefix, pathGlob = '**/*') => pathGlob.replace(/^(!?)(\.?\/)?/, `$1${prefix}/`).replaceAll(sep, posix.sep).replace(/^\//, '');
-
-/**
- * Merge ESLint config
- * @param {string | string[]} globs List of globs to find ESLint config path
- * @returns {Promise<import('@typescript-eslint/utils').TSESLint.FlatConfig.ConfigArray>}
- */
-const mergeESLintConfigs = async (globs) => {
-  const localConfigFiles = sync(globs, { absolute: true });
-  /** @type {import('@typescript-eslint/utils').TSESLint.FlatConfig.ConfigArray} */
-  let localConfigs = [];
-  for (const localConfigFile of localConfigFiles) {
-    const module = await import(pathToFileURL(localConfigFile));
-    const moduleConfig = await (module.default ?? module);
-    /** @type {import('@typescript-eslint/utils').TSESLint.FlatConfig.ConfigArray} */
-    const configArray = Array.isArray(moduleConfig) ? moduleConfig : [moduleConfig];
-    const directory = relative(__dirname, dirname(localConfigFile));
-    localConfigs = localConfigs.concat(
-      configArray.map((config) => ({
-        ...config,
-        ...(
-          config.ignores
-            ? { ignores: config.ignores.map((pathGlob) => addPrefix(directory, pathGlob)) }
-            : { files: (config.files || ['**/*']).flat().map((pathGlob) => addPrefix(directory, pathGlob)) }
-        )
-      }))
-    );
-  }
-
-  return [
-    ...shared,
-    ...localConfigs
-  ];
-};
-
-<%= extension === 'mjs' ? 'export default' : 'module.exports =' %> mergeESLintConfigs('**/eslint.local.config.mjs');
+<%= extension === 'mjs' ? 'export default' : 'module.exports =' %> mergeESLintFlatConfigs(__dirname, '**/eslint.local.config.mjs', shared);

package/schematics/ng-add/eslint/templates/workspace/eslint.local.config.__extension__.template

@@ -1,11 +1,19 @@
-<% if (extension === 'mjs') { %>import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+<% if (extension === 'mjs') { %>import {
+  defineConfig,
+} from 'eslint/config';
+import {
+  dirname,
+} from 'node:path';
+import {
+  fileURLToPath,
+} from 'node:url';
 
 const __filename = fileURLToPath(import.meta.url);
 // __dirname is not defined in ES module scope
 const __dirname = dirname(__filename);
-
-<% } %><%= codeBeforeConfig %><%= extension === 'mjs' ? 'export default' : 'module.exports =' %> [
+<% } else { %>const { defineConfig } = require('eslint/config');
+<% } %>
+<%= codeBeforeConfig %><%= extension === 'mjs' ? 'export default' : 'module.exports =' %> defineConfig([
   {
     name: '<%= packageName %>/projects',
     languageOptions: {
@@ -18,5 +26,5 @@ const __dirname = dirname(__filename);
       }
     }
   }
-].concat(<%= oldConfig %>);
+].concat(<%= oldConfig %>));
 <%= codeAfterConfig %>

package/schematics/ng-add/eslint/templates/workspace/eslint.shared.config.__extension__.template

@@ -1,5 +1,15 @@
-<% if (extension === 'mjs') { %>import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
+<% if (extension === 'mjs') { %>
+import {
+  defineConfig,
+  globalIgnores,
+} from 'eslint/config';
+import {
+  dirname,
+  join,
+} from 'node:path';
+import {
+  fileURLToPath,
+} from 'node:url';
 import o3rConfig from '@o3r/eslint-config';
 import o3rTemplate from '@o3r/eslint-config/template';
 
@@ -8,9 +18,10 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 <% } else { %>const o3rConfig = require('@o3r/eslint-config');
 const o3rTemplate = require('@o3r/eslint-config/template');
+const { defineConfig, globalIgnores } = require('eslint/config');
 <% } %>
 
-<%= extension === 'mjs' ? 'export default' : 'module.exports =' %> [
+<%= extension === 'mjs' ? 'export default' : 'module.exports =' %> defineConfig([
   ...o3rConfig,
   ...o3rTemplate,
   {
@@ -19,10 +30,12 @@ const o3rTemplate = require('@o3r/eslint-config/template');
       reportUnusedDisableDirectives: 'error'
     }
   },
-  {
-    name: '<%= packageName %>/ignores',
-    ignores: []
-  },
+  globalIgnores(
+    [
+      '**/dist/'
+    ],
+    '<%= packageName %>/ignores'
+  ),
   {
     name: '<%= packageName %>/settings',
     settings: {
@@ -48,4 +61,4 @@ const o3rTemplate = require('@o3r/eslint-config/template');
       ]
     }
   }<% } %>
-];
+]);

package/src/helpers/index.cjs

@@ -0,0 +1,55 @@
+'use strict';
+const { dirname, posix, relative, sep } = require('node:path');
+const { pathToFileURL } = require('node:url');
+const { defineConfig } = require('eslint/config');
+const { sync } = require('globby');
+
+/**
+ * Add a prefix to a path glob
+ * @param {string} prefix
+ * @param {string | undefined} pathGlob
+ * @returns {string}
+ */
+const addPrefix = (prefix, pathGlob = '**/*') => pathGlob.replace(/^(!?)(\.?\/)?/, `$1${prefix}/`).replaceAll(sep, posix.sep).replace(/^\//, '');
+
+/**
+ * Merge ESLint flat config
+ * @param {string} localDirname The directory name of the current module
+ * @param {string | string[]} globs List of globs to find ESLint config path
+ * @param {import('@typescript-eslint/utils').TSESLint.FlatConfig.ConfigArray[]} additionalConfigs List of additional config to apply first
+ * @returns {Promise<import('@typescript-eslint/utils').TSESLint.FlatConfig.ConfigArray>}
+ */
+const mergeESLintFlatConfigs = async (localDirname, globs, ...additionalConfigs) => {
+  const localConfigFiles = sync(globs, { absolute: true });
+  /** @type {import('@typescript-eslint/utils').TSESLint.FlatConfig.ConfigArray} */
+  let configs = [];
+  for (const localConfigFile of localConfigFiles) {
+    const module = await import(pathToFileURL(localConfigFile));
+    const moduleConfig = await (module.default ?? module);
+    /** @type {import('@typescript-eslint/utils').TSESLint.FlatConfig.ConfigArray} */
+    const configArray = Array.isArray(moduleConfig) ? moduleConfig : [moduleConfig];
+    const directory = relative(localDirname, dirname(localConfigFile));
+    configs = configs.concat(
+      configArray.map((config) => ({
+        ...config,
+        ...(
+          config.ignores
+            ? {
+              ignores: config.ignores.map((pathGlob) => addPrefix(directory, pathGlob)),
+              ...config.files && config.files.flat().map((pathGlob) => addPrefix(directory, pathGlob))
+            }
+            : { files: (config.files || ['**/*']).flat().map((pathGlob) => addPrefix(directory, pathGlob)) }
+        )
+      }))
+    );
+  }
+
+  return defineConfig([
+    ...additionalConfigs,
+    ...configs
+  ]);
+};
+
+module.exports = {
+  mergeESLintFlatConfigs
+};