fix: test-int eslint-config and eslint-config-otter

AmadeusITGroup · Nov 22, 2024 · cd54143 · cd54143
1 parent 433f3b7
commit cd54143
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/packages/@o3r/eslint-config-otter/package.json b/packages/@o3r/eslint-config-otter/package.json
@@ -60,7 +60,7 @@
     "@o3r/schematics": "workspace:^",
     "@schematics/angular": "~18.2.0",
     "@stylistic/eslint-plugin-ts": "^2.7.0",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/eslint-plugin": "^7.14.1 || ^8.0.0",
     "@typescript-eslint/parser": "^7.14.1 || ^8.0.0",
     "@typescript-eslint/utils": "^7.14.1 || ^8.0.0",
     "eslint": ">=8.57.0 <9.15.0",
@@ -72,6 +72,14 @@
     "eslint-plugin-unicorn": "^54.0.0 || ^55.0.0",
     "typescript": "~5.5.4"
   },
+  "generatorDependencies": {
+    "@typescript-eslint/eslint-plugin": "^8.0.0",
+    "@typescript-eslint/parser": "~8.12.2",
+    "@typescript-eslint/utils": "~8.12.2",
+    "eslint": "~9.14.0",
+    "eslint-plugin-jsdoc": "~50.2.0",
+    "eslint-plugin-unicorn": "^55.0.0"
+  },
   "devDependencies": {
     "@angular-devkit/core": "~18.2.0",
     "@angular-devkit/schematics": "~18.2.0",

diff --git a/...g/schematics/ng-add/eslint/templates/workspace/eslint.local.config.__extension__.template b/...g/schematics/ng-add/eslint/templates/workspace/eslint.local.config.__extension__.template
@@ -13,7 +13,7 @@ const __dirname = dirname(__filename);
       parserOptions: {
         tsconfigRootDir: __dirname,
         project: [
-<%= detectedTsConfigs.map((tsconfig) => `          '${tsconfig}'`).join(', ') %>
+<%= detectedTsConfigs.map((tsconfig) => `          '${tsconfig}'`).join(',\n') %>
         ]
       }
     }

diff --git a/.../schematics/ng-add/eslint/templates/workspace/eslint.shared.config.__extension__.template b/.../schematics/ng-add/eslint/templates/workspace/eslint.shared.config.__extension__.template
@@ -12,6 +12,19 @@ const o3rTemplate = require('@o3r/eslint-config/template');
     linterOptions: {
       reportUnusedDisableDirectives: 'error'
     }
+  },
+  {
+    name: '<%= packageName %>/settings',
+    settings: {
+      'import/resolver': {
+        node: true,
+        typescript: {
+          project: [
+<%= detectedTsConfigs.map((tsconfig) => `            '${tsconfig}'`).join(',\n') %>
+          ]
+        }
+      }
+    }
   }<% if (extension === 'mjs') { %>,
   {
     name: '<%= packageName %>/eslint-config',

diff --git a/yarn.lock b/yarn.lock
@@ -8664,7 +8664,7 @@ __metadata:
     "@o3r/schematics": "workspace:^"
     "@schematics/angular": ~18.2.0
     "@stylistic/eslint-plugin-ts": ^2.7.0
-    "@typescript-eslint/eslint-plugin": ^7.14.1
+    "@typescript-eslint/eslint-plugin": ^7.14.1 || ^8.0.0
     "@typescript-eslint/parser": ^7.14.1 || ^8.0.0
     "@typescript-eslint/utils": ^7.14.1 || ^8.0.0
     eslint: ">=8.57.0 <9.15.0"