fix(schematics): esintFix task to run on NPM correctly

AmadeusITGroup · Apr 16, 2024 · c45c35b · c45c35b
1 parent e030189
commit c45c35b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/packages/@o3r/schematics/src/rule-factories/eslint-fix/index.ts b/packages/@o3r/schematics/src/rule-factories/eslint-fix/index.ts
@@ -1,15 +1,20 @@
-import { DirEntry, noop, Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import { DirEntry, noop, Rule, SchematicContext, type TaskId, Tree } from '@angular-devkit/schematics';
 import { dirname, join } from 'node:path';
 import { EslintFixTask, LinterOptions } from '../../tasks/index';
 
+interface ApplyEslintFixOption extends LinterOptions {
+  /** List of task to wait to run the linter */
+  dependencyTaskIds?: TaskId[];
+}
+
 /**
  * Apply EsLint fix
  * @param prootPath Root path
  * @param _prootPath
  * @param extension List of file extensions to lint
  * @param options Linter options
  */
-export function applyEsLintFix(_prootPath = '/', extension: string[] = ['ts'], options?: LinterOptions): Rule {
+export function applyEsLintFix(_prootPath = '/', extension: string[] = ['ts'], options?: ApplyEslintFixOption): Rule {
   try {
     require.resolve('eslint/package.json');
   } catch {
@@ -71,7 +76,8 @@ You can consider to run later the following command to add otter linter rules: n
           undefined,
           eslintFile,
           linterOptions
-        )
+        ),
+        options?.dependencyTaskIds
       );
     }
 

diff --git a/packages/@o3r/schematics/src/tasks/eslint/index.ts b/packages/@o3r/schematics/src/tasks/eslint/index.ts
@@ -1,6 +1,9 @@
 import { TaskConfiguration, TaskConfigurationGenerator } from '@angular-devkit/schematics';
 import { NodePackageName, NodePackageTaskOptions } from '@angular-devkit/schematics/tasks/package-manager/options';
 import { getPackageManager } from '../../utility/package-manager-runner';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { getWorkspaceConfig } from '../../utility';
+import type { WorkspaceSchema } from '../../interfaces';
 
 /**
  * Linter options
@@ -16,19 +19,29 @@ export interface LinterOptions {
    * @default true
    */
   hideWarnings?: boolean;
+
+  /** Workspace configuration file */
+  workspaceConfig?: WorkspaceSchema;
+
+  /** Enforced NPM Package */
+  enforcedNpmManager?: string;
 }
 
-export class EslintFixTask implements TaskConfigurationGenerator<NodePackageTaskOptions> {
+export class EslintFixTask extends NodePackageInstallTask implements TaskConfigurationGenerator<NodePackageTaskOptions> {
   public linterOptions: LinterOptions;
 
   constructor(public files: string[], public workingDirectory?: string, public configFile?: string, options?: LinterOptions) {
+    super({
+      packageManager: getPackageManager(options)
+    });
     this.linterOptions = {
       continueOnError: true,
       hideWarnings: true,
       ...options
     };
   }
 
+  /** @inheritdoc */
   public toConfiguration(): TaskConfiguration<NodePackageTaskOptions> {
     return {
       name: NodePackageName,