Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(angular): fix chalk import and correctly skip invalid projects in ng-add generator #26667

Merged
merged 1 commit into from
Jun 25, 2024
Merged

fix(angular): fix chalk import and correctly skip invalid projects in ng-add generator #26667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions packages/angular/src/generators/ng-add/migrators/projects/app.migrator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/src/generators/ng-add/migrators/projects/app.migrator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
12 changes: 12 additions & 0 deletions packages/angular/src/generators/ng-add/migrators/projects/lib.migrator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/src/generators/ng-add/migrators/projects/lib.migrator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/ng-add/utilities/validation-logging.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as chalk from 'chalk';
import chalk = require('chalk');
import {
arrayToString,
getProjectValidationResultMessage,
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/ng-add/utilities/validation-logging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as chalk from 'chalk';
import chalk = require('chalk');
import type { ValidationError } from './types';

export function arrayToString(array: string[]): string {
Expand Down