From 59a6a9e10adbafd353b26fa0d5dac5c766f9e002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leosvel=20P=C3=A9rez=20Espinosa?=
 <leosvel.perez.espinosa@gmail.com>
Date: Thu, 1 Dec 2022 16:02:53 +0000
Subject: [PATCH] fix(angular): don't set the workspaceLayout when migrating an
 angular cli workspace to nx (#13546)

---
 .../migrate-from-angular-cli.spec.ts.snap              |  8 --------
 .../src/generators/ng-add/migrate-from-angular-cli.ts  |  2 +-
 .../src/generators/ng-add/utilities/workspace.ts       | 10 +---------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap b/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap
index 0c5064ea186e0..112e0191c8bcc 100644
--- a/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap
+++ b/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap
@@ -36,10 +36,6 @@ Object {
       "runner": "nx/tasks-runners/default",
     },
   },
-  "workspaceLayout": Object {
-    "appsDir": "",
-    "libsDir": "",
-  },
 }
 `;
 
@@ -97,10 +93,6 @@ Object {
       "runner": "nx/tasks-runners/default",
     },
   },
-  "workspaceLayout": Object {
-    "appsDir": "projects",
-    "libsDir": "projects",
-  },
 }
 `;
 
diff --git a/packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts b/packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts
index f2b20858f6172..3ece4978c2f85 100755
--- a/packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts
+++ b/packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts
@@ -52,7 +52,7 @@ export async function migrateFromAngularCli(
         prettier: prettierVersion,
       }
     );
-    createNxJson(tree, options, true);
+    createNxJson(tree, options);
     decorateAngularCli(tree);
     updateVsCodeRecommendedExtensions(tree);
     await updatePrettierConfig(tree);
diff --git a/packages/angular/src/generators/ng-add/utilities/workspace.ts b/packages/angular/src/generators/ng-add/utilities/workspace.ts
index 3eada06687ea3..bda274b8c58f6 100644
--- a/packages/angular/src/generators/ng-add/utilities/workspace.ts
+++ b/packages/angular/src/generators/ng-add/utilities/workspace.ts
@@ -43,12 +43,7 @@ export function validateWorkspace(tree: Tree): void {
   - ${errors.join('\n  ')}`);
 }
 
-export function createNxJson(
-  tree: Tree,
-  options: GeneratorOptions,
-  setWorkspaceLayoutAsNewProjectRoot: boolean = false
-): void {
-  const { newProjectRoot = '' } = readJson(tree, 'angular.json');
+export function createNxJson(tree: Tree, options: GeneratorOptions): void {
   const { npmScope } = options;
 
   const targets = getWorkspaceCommonTargets(tree);
@@ -107,9 +102,6 @@ export function createNxJson(
           }
         : undefined,
     },
-    workspaceLayout: setWorkspaceLayoutAsNewProjectRoot
-      ? { appsDir: newProjectRoot, libsDir: newProjectRoot }
-      : undefined,
   });
 }