fix(angular): fix chalk import and correctly skip invalid projects in…

… ng-add generator
nrwl · Jun 25, 2024 · 589ab2f · 589ab2f
1 parent 47dfdcf
commit 589ab2f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/packages/angular/src/generators/ng-add/migrators/projects/app.migrator.spec.ts b/packages/angular/src/generators/ng-add/migrators/projects/app.migrator.spec.ts
@@ -52,6 +52,18 @@ describe('app migrator', () => {
     jest.clearAllMocks();
   });
 
+  it('should not migrate project when validation fails', async () => {
+    // add project with no root
+    const project = addProject('app1', {} as any);
+    const migrator = new AppMigrator(tree, {}, project);
+
+    await migrator.migrate();
+
+    expect(tree.exists('apps/app1/project.json')).toBe(false);
+    const { projects } = readJson(tree, 'angular.json');
+    expect(projects.app1).toBeDefined();
+  });
+
   describe('validation', () => {
     it('should fail validation when the project root is not specified', async () => {
       const project = addProject('app1', {} as any);

diff --git a/packages/angular/src/generators/ng-add/migrators/projects/app.migrator.ts b/packages/angular/src/generators/ng-add/migrators/projects/app.migrator.ts
@@ -103,12 +103,12 @@ export class AppMigrator extends ProjectMigrator<SupportedTargets> {
   }
 
   override async migrate(): Promise<void> {
+    await super.migrate();
+
     if (this.skipMigration === true) {
       return;
     }
 
-    await super.migrate();
-
     this.updateProjectConfiguration();
 
     await this.e2eMigrator.migrate();

diff --git a/packages/angular/src/generators/ng-add/migrators/projects/lib.migrator.spec.ts b/packages/angular/src/generators/ng-add/migrators/projects/lib.migrator.spec.ts
@@ -50,6 +50,18 @@ describe('lib migrator', () => {
     jest.clearAllMocks();
   });
 
+  it('should not migrate project when validation fails', async () => {
+    // add project with no root
+    const project = addProject('lib1', {} as any);
+    const migrator = new LibMigrator(tree, {}, project);
+
+    await migrator.migrate();
+
+    expect(tree.exists('libs/lib1/project.json')).toBe(false);
+    const { projects } = readJson(tree, 'angular.json');
+    expect(projects.lib1).toBeDefined();
+  });
+
   describe('validation', () => {
     it('should fail validation when the project root is not specified', async () => {
       const project = addProject('lib1', {} as any);

diff --git a/packages/angular/src/generators/ng-add/migrators/projects/lib.migrator.ts b/packages/angular/src/generators/ng-add/migrators/projects/lib.migrator.ts
@@ -41,12 +41,12 @@ export class LibMigrator extends ProjectMigrator {
   }
 
   override async migrate(): Promise<void> {
+    await super.migrate();
+
     if (this.skipMigration === true) {
       return;
     }
 
-    await super.migrate();
-
     await this.updateProjectConfiguration();
     this.moveProjectFiles();
 

diff --git a/packages/angular/src/generators/ng-add/utilities/validation-logging.spec.ts b/packages/angular/src/generators/ng-add/utilities/validation-logging.spec.ts
@@ -1,4 +1,4 @@
-import * as chalk from 'chalk';
+import chalk = require('chalk');
 import {
   arrayToString,
   getProjectValidationResultMessage,

diff --git a/packages/angular/src/generators/ng-add/utilities/validation-logging.ts b/packages/angular/src/generators/ng-add/utilities/validation-logging.ts
@@ -1,4 +1,4 @@
-import * as chalk from 'chalk';
+import chalk = require('chalk');
 import type { ValidationError } from './types';
 
 export function arrayToString(array: string[]): string {