From dfcc853b50890e42e80a4ba59e0cba55d340be5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leosvel=20P=C3=A9rez=20Espinosa?= Date: Mon, 21 Feb 2022 10:59:48 +0000 Subject: [PATCH] fix(angular): set the right defaultBase when migrating an angular cli workspace (#9050) --- e2e/angular-core/src/ng-add.test.ts | 2 +- packages/workspace/src/generators/init/init.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/e2e/angular-core/src/ng-add.test.ts b/e2e/angular-core/src/ng-add.test.ts index 9d1afdae01c74..f4a94b16340c6 100644 --- a/e2e/angular-core/src/ng-add.test.ts +++ b/e2e/angular-core/src/ng-add.test.ts @@ -147,7 +147,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => { const nxJson = readJson('nx.json'); expect(nxJson).toEqual({ npmScope: 'projscope', - affected: { defaultBase: 'undefined' }, + affected: { defaultBase: 'main' }, implicitDependencies: { 'angular.json': '*', 'package.json': '*', diff --git a/packages/workspace/src/generators/init/init.ts b/packages/workspace/src/generators/init/init.ts index cf7bc2f829851..99dc935b46f7f 100755 --- a/packages/workspace/src/generators/init/init.ts +++ b/packages/workspace/src/generators/init/init.ts @@ -424,7 +424,9 @@ async function createAdditionalFiles(host: Tree, options: Schema) { const nxJson: NxJsonConfiguration = { npmScope: options.npmScope, affected: { - defaultBase: `${options.defaultBase}` || deduceDefaultBase(), + defaultBase: options.defaultBase + ? `${options.defaultBase}` + : deduceDefaultBase(), }, implicitDependencies: { 'angular.json': '*',