From ebaf8f646c4c644ef907e036c7b1d6ffd2e0eb8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leosvel=20P=C3=A9rez=20Espinosa?=
 <leosvel.perez.espinosa@gmail.com>
Date: Mon, 21 Feb 2022 17:43:51 +0000
Subject: [PATCH] fix(angular): improve angular cli migration when using
 --preserve-angular-cli-layout (#9064)

---
 packages/workspace/src/generators/init/init.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/workspace/src/generators/init/init.ts b/packages/workspace/src/generators/init/init.ts
index 01afb52db871d..2b3cf91011526 100755
--- a/packages/workspace/src/generators/init/init.ts
+++ b/packages/workspace/src/generators/init/init.ts
@@ -540,12 +540,12 @@ function createNxJson(host: Tree) {
   writeJson<NxJsonConfiguration>(host, 'nx.json', {
     npmScope: name,
     implicitDependencies: {
-      'angular.json': '*',
-      'package.json': '*',
+      'package.json': {
+        dependencies: '*',
+        devDependencies: '*',
+      },
       [tsConfigPath]: '*',
-      'tslint.json': '*',
       '.eslintrc.json': '*',
-      'nx.json': '*',
     },
     tasksRunnerOptions: {
       default: {
@@ -630,6 +630,12 @@ function renameDirSyncInTree(tree: Tree, from: string, to: string) {
 
 export async function initGenerator(tree: Tree, schema: Schema) {
   if (schema.preserveAngularCliLayout) {
+    updateJson(tree, 'package.json', (json) => {
+      if (json.dependencies?.['@nrwl/workspace']) {
+        delete json.dependencies['@nrwl/workspace'];
+      }
+      return json;
+    });
     addDependenciesToPackageJson(tree, {}, { '@nrwl/workspace': nxVersion });
     createNxJson(tree);
     decorateAngularClI(tree);