@o3r/eslint-config 12.3.0-prerelease.9 → 12.4.0-prerelease.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/eslint-config",
-  "version": "12.3.0-prerelease.9",
+  "version": "12.4.0-prerelease.0",
   "publishConfig": {
     "access": "public"
   },
@@ -13,6 +13,9 @@
     ".": {
       "default": "./src/rules/typescript.cjs"
     },
+    "./helpers": {
+      "default": "./src/helpers/index.cjs"
+    },
     "./typescript": {
       "default": "./src/rules/typescript.cjs"
     },
@@ -33,22 +36,25 @@
     "prepare:build:builders": "yarn cpy 'schematics/**/*.json' 'schematics/**/templates/**' dist/schematics && yarn cpy 'collection.json' dist",
     "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest"
   },
+  "dependencies": {
+    "@o3r/schematics": "^12.4.0-prerelease.0"
+  },
   "peerDependencies": {
     "@angular-devkit/core": "^19.0.0",
     "@angular-devkit/schematics": "^19.0.0",
     "@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.9",
-    "@o3r/schematics": "^12.3.0-prerelease.9",
+    "@eslint/js": "^8.57.0 || ^9.22.0",
+    "@o3r/eslint-plugin": "^12.4.0-prerelease.0",
+    "@o3r/schematics": "^12.4.0-prerelease.0",
     "@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",
@@ -63,6 +69,7 @@
     "jest": "^29.7.0",
     "jsonc-eslint-parser": "^2.4.0",
     "ts-node": "^10.9.2",
+    "type-fest": "^4.30.1",
     "typescript": "^5.5.4",
     "typescript-eslint": "^8.15.0"
   },
@@ -71,21 +78,20 @@
     "@angular-devkit/schematics": "~19.2.0",
     "@angular/compiler": "~19.2.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@eslint/js": "~9.23.0",
-    "@nx/eslint-plugin": "~20.7.0",
-    "@o3r/build-helpers": "^12.3.0-prerelease.9",
-    "@o3r/eslint-plugin": "^12.3.0-prerelease.9",
-    "@o3r/schematics": "^12.3.0-prerelease.9",
-    "@o3r/test-helpers": "^12.3.0-prerelease.9",
+    "@eslint/js": "~9.26.0",
+    "@nx/eslint-plugin": "~20.8.0",
+    "@o3r/build-helpers": "^12.4.0-prerelease.0",
+    "@o3r/eslint-plugin": "^12.4.0-prerelease.0",
+    "@o3r/test-helpers": "^12.4.0-prerelease.0",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@types/eslint__js": "^8.42.3",
     "@types/jest": "~29.5.2",
     "@types/node": "^20.0.0",
-    "@typescript-eslint/parser": "~8.29.0",
-    "angular-eslint": "~19.3.0",
+    "@typescript-eslint/parser": "~8.32.0",
+    "angular-eslint": "~19.4.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.23.0",
+    "eslint": "~9.26.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~3.10.0",
     "eslint-plugin-import": "~2.31.0",
@@ -99,7 +105,7 @@
     "jest": "~29.7.0",
     "jest-junit": "~16.0.0",
     "jsonc-eslint-parser": "~2.4.0",
-    "nx": "~20.7.0",
+    "nx": "~20.8.0",
     "pid-from-port": "^1.1.3",
     "rxjs": "^7.8.1",
     "semver": "^7.5.2",
@@ -108,7 +114,7 @@
     "tslib": "^2.6.2",
     "type-fest": "^4.30.1",
     "typescript": "~5.8.2",
-    "typescript-eslint": "~8.29.0"
+    "typescript-eslint": "~8.32.0"
   },
   "peerDependenciesMeta": {
     "@angular-devkit/core": {
@@ -144,6 +150,9 @@
     "jest": {
       "optional": true
     },
+    "type-fest": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     }

package/schematics/ng-add/eslint/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/eslint/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAqCpC;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,EAAE,cAAc,MAAM,KAAG,IA4D3E,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/eslint/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAyCpC;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,UAAU,MAAM,EAAE,cAAc,MAAM,KAAG,IA2D3E,CAAC"}

package/schematics/ng-add/eslint/index.js

@@ -4,12 +4,12 @@ exports.updateEslintConfig = void 0;
 const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const index_1 = require("../tsconfig/index");
-const editAngularJson = (projectName, extension) => async (tree, context) => {
+const editAngularJson = (projectName, extension) => (tree, context) => {
     let workspace = null;
     try {
-        const { getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        workspace = getWorkspaceConfig(tree);
+        workspace = (0, schematics_2.getWorkspaceConfig)(tree);
     }
     catch {
         context.logger.warn(`No @o3r/schematics installed, we could not detect the workspace. The linter task for ${projectName} can not be added.`);
@@ -37,13 +37,12 @@ const editAngularJson = (projectName, extension) => async (tree, context) => {
  * @param rootPath
  * @param projectName
  */
-const updateEslintConfig = (rootPath, projectName) => async (tree, context) => {
-    const { findFilesInTree, getTemplateFolder, getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    const workspace = getWorkspaceConfig(tree);
+const updateEslintConfig = (rootPath, projectName) => (tree, context) => {
+    const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
     const workspaceProject = workspace?.projects[projectName || ''];
     const projectRootPath = workspaceProject?.root || '.';
     const workingDir = tree.getDir(projectRootPath);
-    const eslintConfigFiles = findFilesInTree(workingDir, (file) => /eslint.config.[cm]?js/.test(file));
+    const eslintConfigFiles = (0, schematics_2.findFilesInTree)(workingDir, (file) => /eslint.config.[cm]?js/.test(file));
     if (eslintConfigFiles.length > 1) {
         context.logger.warn('Unable to add the "@o3r/eslint-config" recommendation because several ESLint config file detected.\n'
             + eslintConfigFiles.map((file) => `\t- ${file.path.toString()}`).join('\n'));
@@ -56,7 +55,7 @@ const updateEslintConfig = (rootPath, projectName) => async (tree, context) => {
         oldConfig: '',
         relativePathToRoot: path.posix.relative(projectRootPath, '.'),
         packageName: tree.readJson(workingDir.file((0, core_1.fragment)('package.json'))?.path || 'package.json').name,
-        detectedTsConfigs: findFilesInTree(workingDir, (f) => /tsconfig\..*\.json/.test(f)).map((entry) => path.basename(entry.path)).concat('tsconfig.eslint.json'),
+        detectedTsConfigs: (0, schematics_2.findFilesInTree)(workingDir, (f) => /tsconfig\..*\.json/.test(f)).map((entry) => path.basename(entry.path)).concat('tsconfig.eslint.json'),
         isApp: workspaceProject?.projectType === 'application'
     };
     if (eslintConfigFiles.length === 1) {
@@ -81,7 +80,7 @@ const updateEslintConfig = (rootPath, projectName) => async (tree, context) => {
         projectName ? editAngularJson(projectName, templateOptions.extension) : (0, schematics_1.noop)(),
         (0, schematics_1.applyToSubtree)(projectRootPath, [
             (0, index_1.updateOrAddTsconfigEslint)(rootPath),
-            (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(getTemplateFolder(rootPath, __dirname, `./templates/${projectRootPath === '.' ? 'workspace' : 'project'}`)), [
+            (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname, `./templates/${projectRootPath === '.' ? 'workspace' : 'project'}`)), [
                 (0, schematics_1.template)(templateOptions),
                 (0, schematics_1.renameTemplateFiles)()
             ]), schematics_1.MergeStrategy.Overwrite)

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,31 +1,35 @@
-<% 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: {
       sourceType: 'module',
       parserOptions: {
         tsconfigRootDir: __dirname,
-        project: [
-<%= detectedTsConfigs.map((tsconfig) => `          '${tsconfig}'`).join(',\n') %>
-        ]
+        projectService: true
       }<% if (isApp) { %>,
       globals: {
         ...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/helpers';
+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,22 +1,29 @@
-<% 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);
+<% } else { %>const { defineConfig } = require('eslint/config');
+<% } %>
 
-<% } %><%= codeBeforeConfig %><%= extension === 'mjs' ? 'export default' : 'module.exports =' %> [
+<%= codeBeforeConfig %><%= extension === 'mjs' ? 'export default' : 'module.exports =' %> defineConfig([
   {
     name: '<%= packageName %>/projects',
     languageOptions: {
       sourceType: 'commonjs',
       parserOptions: {
         tsconfigRootDir: __dirname,
-        project: [
-<%= detectedTsConfigs.map((tsconfig) => `          '${tsconfig}'`).join(',\n') %>
-        ]
+        projectService: true
       }
     }
   }
-].concat(<%= oldConfig %>);
+].concat(<%= oldConfig %>));
 <%= codeAfterConfig %>

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

@@ -1,16 +1,29 @@
-<% 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';
+import jsonParser from 'jsonc-eslint-parser';
 
 const __filename = fileURLToPath(import.meta.url);
 // __dirname is not defined in ES module scope
 const __dirname = dirname(__filename);
 <% } else { %>const o3rConfig = require('@o3r/eslint-config');
 const o3rTemplate = require('@o3r/eslint-config/template');
+const { defineConfig, globalIgnores } = require('eslint/config');
+const jsonParser = require('jsonc-eslint-parser');
 <% } %>
 
-<%= extension === 'mjs' ? 'export default' : 'module.exports =' %> [
+<%= extension === 'mjs' ? 'export default' : 'module.exports =' %> defineConfig([
   ...o3rConfig,
   ...o3rTemplate,
   {
@@ -19,9 +32,31 @@ const o3rTemplate = require('@o3r/eslint-config/template');
       reportUnusedDisableDirectives: 'error'
     }
   },
+  globalIgnores(
+    [
+      '**/dist/'
+    ],
+    '<%= packageName %>/ignores'
+  ),
   {
-    name: '<%= packageName %>/ignores',
-    ignores: []
+    name: '<%= packageName %>/parser/json',
+    files: ['**/*.json'],
+    languageOptions: {
+      parser: jsonParser
+    }
+  },
+  {
+    name: '<%= packageName %>/package-json',
+    files: ['**/package.json'],
+    rules: {
+      '@o3r/json-dependency-versions-harmonize': [
+        'error',
+        {
+          alignPeerDependencies: false,
+          alignEngines: true
+        }
+      ]
+    }
   },
   {
     name: '<%= packageName %>/settings',
@@ -29,9 +64,7 @@ const o3rTemplate = require('@o3r/eslint-config/template');
       'import/resolver': {
         node: true,
         typescript: {
-          project: [
-<%= detectedTsConfigs.map((tsconfig) => `            join(__dirname, '${tsconfig}')`).join(',\n') %>
-          ]
+          projectService: true
         }
       }
     }
@@ -48,4 +81,4 @@ const o3rTemplate = require('@o3r/eslint-config/template');
       ]
     }
   }<% } %>
-];
+]);

package/schematics/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAgIlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAKtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,IAAI,EAIV,MAAM,4BAA4B,CAAC;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA2IlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -3,19 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const index_1 = require("./eslint/index");
 const index_2 = require("./vscode/index");
-const reportMissingSchematicsDep = (logger) => (reason) => {
-    logger.error(`[ERROR]: Adding @o3r/eslint-config has failed.
-You need to install '@o3r/schematics' package to be able to use the eslint-config package. Please run 'ng add @o3r/schematics' .`);
-    throw reason;
-};
-const handleOtterEslintErrors = (projectName) => async (tree, context) => {
+const handleOtterEslintErrors = (projectName) => (tree, context) => {
     if (!projectName) {
         return;
     }
-    const { getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    const workspace = getWorkspaceConfig(tree);
+    const workspace = (0, schematics_2.getWorkspaceConfig)(tree);
     if (!workspace) {
         return;
     }
@@ -37,6 +32,30 @@ const handleOtterEslintErrors = (projectName) => async (tree, context) => {
     }
     context.logger.warn('Linter errors may occur and should be fixed by hand or by running the linter with the option `--fix`.');
 };
+/**
+ * Add a harmonize script in package.json
+ */
+const addHarmonizeScript = () => {
+    const rootPackageJsonPath = '/package.json';
+    return (tree, context) => {
+        if (!tree.exists(rootPackageJsonPath)) {
+            throw new schematics_1.SchematicsException('Root package.json does not exist');
+        }
+        const isYarnPackageManager = (0, schematics_2.getPackageManager)() === 'yarn';
+        const extraPostInstall = isYarnPackageManager ? 'yarn harmonize && yarn install --mode=skip-build' : 'npm run harmonize && npm install --ignore-scripts';
+        const rootPackageJsonObject = tree.readJson(rootPackageJsonPath);
+        rootPackageJsonObject.scripts ||= {};
+        if (rootPackageJsonObject.scripts.harmonize) {
+            context.logger.info('A "harmonize" script already exists in the root "package.json". Version harmonize script will not be added.');
+            return tree;
+        }
+        const postInstall = rootPackageJsonObject.scripts.postinstall;
+        rootPackageJsonObject.scripts.harmonize = `eslint '**/package.json' ${isYarnPackageManager ? '.yarnrc.yml ' : ''}--quiet --fix`;
+        rootPackageJsonObject.scripts.postinstall = `${postInstall ? postInstall + ' && ' : ''}${extraPostInstall}`;
+        tree.overwrite(rootPackageJsonPath, JSON.stringify(rootPackageJsonObject, null, 2));
+        return tree;
+    };
+};
 function ngAddFn(options) {
     /* ng add rules */
     return async (tree, context) => {
@@ -74,22 +93,21 @@ function ngAddFn(options) {
             'yaml-eslint-parser',
             ...(options.projectName ? ['@angular-eslint/builder'] : [])
         ];
-        const { getExternalDependenciesVersionRange, setupDependencies, getWorkspaceConfig, getO3rPeerDeps, getProjectNewDependenciesTypes, getPackageInstallConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
-        const depsInfo = getO3rPeerDeps(path.resolve(__dirname, '..', '..', 'package.json'), true, /^@(?:o3r|ama-sdk)/);
-        const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
+        const depsInfo = (0, schematics_2.getO3rPeerDeps)(path.resolve(__dirname, '..', '..', 'package.json'), true, /^@(?:o3r|ama-sdk)/);
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
         const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
             acc[dep] = {
                 inManifest: [{
                         range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
-                        types: getProjectNewDependenciesTypes(workspaceProject)
+                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
                     }],
                 ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
             };
             return acc;
-        }, getPackageInstallConfig(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
-        Object.entries(getExternalDependenciesVersionRange(devDependenciesToInstall, packageJsonPath, context.logger))
+        }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
+        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, packageJsonPath, context.logger))
             .forEach(([dep, range]) => {
             dependencies[dep] = {
                 inManifest: [{
@@ -99,19 +117,21 @@ function ngAddFn(options) {
             };
         });
         return () => (0, schematics_1.chain)([
-            setupDependencies({
+            (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
                 dependencies,
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
             index_2.updateVscode,
             (0, index_1.updateEslintConfig)(__dirname),
+            addHarmonizeScript(),
             options.projectName && workspaceProject?.root
                 ? (0, schematics_1.chain)([
                     (0, index_1.updateEslintConfig)(__dirname, options.projectName),
                     options.fix ? handleOtterEslintErrors(options.projectName) : (0, schematics_1.noop)()
                 ])
-                : (0, schematics_1.noop)()
+                : (0, schematics_1.noop)(),
+            options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEditorConfig)()
         ])(tree, context);
     };
 }
@@ -119,9 +139,6 @@ function ngAddFn(options) {
  * Add Otter eslint-config to an Angular Project
  * @param options Options for the schematic
  */
-const ngAdd = (options) => async (_, { logger }) => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics')).catch(reportMissingSchematicsDep(logger));
-    return createOtterSchematic(ngAddFn)(options);
-};
+const ngAdd = (options) => (0, schematics_2.createOtterSchematic)(ngAddFn)(options);
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

package/schematics/ng-add/schema.d.ts

@@ -6,5 +6,7 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
     exactO3rVersion?: boolean;
     /** Fix known issues with our ESLint config after Otter application or library generation */
     fix?: boolean;
+    /** Skip the linter process which includes EditorConfig rules applying */
+    skipLinter: boolean;
 }
 //# sourceMappingURL=schema.d.ts.map

package/schematics/ng-add/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,4FAA4F;IAC5F,GAAG,CAAC,EAAE,OAAO,CAAC;CACf"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,4FAA4F;IAC5F,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,yEAAyE;IACzE,UAAU,EAAE,OAAO,CAAC;CACrB"}

package/schematics/ng-add/schema.json

@@ -18,6 +18,11 @@
     "fix": {
       "type": "boolean",
       "description": "Fix known issues with our ESLint config after Otter application or library generation"
+    },
+    "skipLinter": {
+      "type": "boolean",
+      "description": "Skip the linter process which includes EditorConfig rules applying",
+      "default": false
     }
   },
   "additionalProperties": true,

package/schematics/ng-add/tsconfig/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/tsconfig/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAEpC;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAI,UAAU,MAAM,EAAE,wBAA4B,KAAG,IAa1F,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/tsconfig/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,KAAK,IAAI,EAGV,MAAM,4BAA4B,CAAC;AAIpC;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,GAAI,UAAU,MAAM,EAAE,wBAA4B,KAAG,IAa1F,CAAC"}

package/schematics/ng-add/tsconfig/index.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateOrAddTsconfigEslint = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 /**
  * Update or add tsconfig.eslint.json file
  * @param rootPath
  * @param projectTsConfig
  */
-const updateOrAddTsconfigEslint = (rootPath, projectTsConfig = 'tsconfig') => async (tree) => {
+const updateOrAddTsconfigEslint = (rootPath, projectTsConfig = 'tsconfig') => (tree) => {
     const tsconfigPath = 'tsconfig.eslint.json';
     if (tree.exists(tsconfigPath)) {
         const tsconfig = tree.readJson(tsconfigPath);
@@ -15,8 +16,7 @@ const updateOrAddTsconfigEslint = (rootPath, projectTsConfig = 'tsconfig') => as
         tree.overwrite(tsconfigPath, JSON.stringify(tsconfig, null, 2));
         return () => tree;
     }
-    const { getTemplateFolder } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return () => (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(getTemplateFolder(rootPath, __dirname)), [
+    return () => (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname)), [
         (0, schematics_1.template)({ projectTsConfig }),
         (0, schematics_1.renameTemplateFiles)()
     ]), schematics_1.MergeStrategy.Overwrite);

package/schematics/ng-add/vscode/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/vscode/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAoCpC;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,IAwB1B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/vscode/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAuCpC;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,IAuB1B,CAAC"}

package/schematics/ng-add/vscode/index.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateVscode = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 /**
  * Update VSCode recommendations and settings
  */
-const updateVscode = async () => {
-    const { addVsCodeRecommendations } = await Promise.resolve().then(() => require('@o3r/schematics'));
+const updateVscode = () => {
     return (0, schematics_1.chain)([
-        addVsCodeRecommendations(['dbaeumer.vscode-eslint']),
+        (0, schematics_2.addVsCodeRecommendations)(['dbaeumer.vscode-eslint']),
         (tree) => {
             const vscodeSettingsPath = '.vscode/settings.json';
             const settings = (tree.exists(vscodeSettingsPath) ? (tree.readJson(vscodeSettingsPath) || {}) : {});

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
+};