fix(angular): set the right defaultBase when migrating an angular cli…

… workspace (#9050)
nrwl · Feb 21, 2022 · dfcc853 · dfcc853
1 parent 5c4b67c
commit dfcc853
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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': '*',