From 33c9ca98ae6940befb8e1132cb2263adb99ce5bc 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 12:00:34 +0000
Subject: [PATCH] fix(angular): change --preserveAngularCLILayout to
 --preserve-angular-cli-layout (#9051)

---
 docs/shared/migration/migration-angular.md          | 4 ++--
 e2e/angular-core/src/ng-add.test.ts                 | 5 ++---
 packages/workspace/src/generators/init/init.spec.ts | 6 +++---
 packages/workspace/src/generators/init/init.ts      | 2 +-
 packages/workspace/src/generators/init/schema.d.ts  | 2 +-
 packages/workspace/src/generators/init/schema.json  | 4 ++--
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/docs/shared/migration/migration-angular.md b/docs/shared/migration/migration-angular.md
index 84bf565440298..c2dcbb73ca3ae 100644
--- a/docs/shared/migration/migration-angular.md
+++ b/docs/shared/migration/migration-angular.md
@@ -10,10 +10,10 @@ using a monorepo approach. If you are currently using an Angular CLI workspace,
 
 ## Using ng add and preserving your existing structure
 
-To add Nx to an existing Angular CLI workspace to an Nx workspace, with keeping your existing file structure in place, use the `ng add` command with the `--preserveAngularCLILayout` option:
+To add Nx to an existing Angular CLI workspace to an Nx workspace, with keeping your existing file structure in place, use the `ng add` command with the `--preserve-angular-cli-layout` option:
 
 ```bash
-ng add @nrwl/workspace --preserveAngularCLILayout
+ng add @nrwl/workspace --preserve-angular-cli-layout
 ```
 
 This installs the `@nrwl/workspace` package into your workspace and applies the following changes to your workspace:
diff --git a/e2e/angular-core/src/ng-add.test.ts b/e2e/angular-core/src/ng-add.test.ts
index f4a94b16340c6..4ec3b2e31f0b6 100644
--- a/e2e/angular-core/src/ng-add.test.ts
+++ b/e2e/angular-core/src/ng-add.test.ts
@@ -288,9 +288,8 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {
     // runCommand('mv src-bak src');
   });
 
-  it('should support preserveAngularCLILayout', () => {
-    // TODO: rename this arg so it doesn't split the CLI letters
-    runNgAdd('--preserve-angular-c-l-i-layout');
+  it('should support preserveAngularCliLayout', () => {
+    runNgAdd('--preserve-angular-cli-layout');
 
     const updatedAngularCLIJson = readJson('angular.json');
     expect(updatedAngularCLIJson.projects[project].root).toEqual('');
diff --git a/packages/workspace/src/generators/init/init.spec.ts b/packages/workspace/src/generators/init/init.spec.ts
index 43d4fa4bfc71a..c58a034cc5ea1 100644
--- a/packages/workspace/src/generators/init/init.spec.ts
+++ b/packages/workspace/src/generators/init/init.spec.ts
@@ -408,7 +408,7 @@ describe('workspace', () => {
     it('should update package.json', async () => {
       await initGenerator(tree, {
         name: 'myApp',
-        preserveAngularCLILayout: true,
+        preserveAngularCliLayout: true,
       });
 
       const d = readJson(tree, '/package.json').devDependencies;
@@ -419,7 +419,7 @@ describe('workspace', () => {
     it('should create nx.json', async () => {
       await initGenerator(tree, {
         name: 'myApp',
-        preserveAngularCLILayout: true,
+        preserveAngularCliLayout: true,
       });
 
       const nxJson = readJson(tree, '/nx.json');
@@ -429,7 +429,7 @@ describe('workspace', () => {
     it('should create decorate-angular-cli.js', async () => {
       await initGenerator(tree, {
         name: 'myApp',
-        preserveAngularCLILayout: true,
+        preserveAngularCliLayout: true,
       });
       const s = readJson(tree, '/package.json').scripts;
 
diff --git a/packages/workspace/src/generators/init/init.ts b/packages/workspace/src/generators/init/init.ts
index 99dc935b46f7f..01afb52db871d 100755
--- a/packages/workspace/src/generators/init/init.ts
+++ b/packages/workspace/src/generators/init/init.ts
@@ -629,7 +629,7 @@ function renameDirSyncInTree(tree: Tree, from: string, to: string) {
 }
 
 export async function initGenerator(tree: Tree, schema: Schema) {
-  if (schema.preserveAngularCLILayout) {
+  if (schema.preserveAngularCliLayout) {
     addDependenciesToPackageJson(tree, {}, { '@nrwl/workspace': nxVersion });
     createNxJson(tree);
     decorateAngularClI(tree);
diff --git a/packages/workspace/src/generators/init/schema.d.ts b/packages/workspace/src/generators/init/schema.d.ts
index 0c3ec4048b530..4b839c9eae448 100644
--- a/packages/workspace/src/generators/init/schema.d.ts
+++ b/packages/workspace/src/generators/init/schema.d.ts
@@ -2,6 +2,6 @@ export interface Schema {
   name: string;
   skipInstall?: boolean;
   npmScope?: string;
-  preserveAngularCLILayout?: boolean;
+  preserveAngularCliLayout?: boolean;
   defaultBase?: string;
 }
diff --git a/packages/workspace/src/generators/init/schema.json b/packages/workspace/src/generators/init/schema.json
index cc8c62fcd0620..d34ec116694f5 100644
--- a/packages/workspace/src/generators/init/schema.json
+++ b/packages/workspace/src/generators/init/schema.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "SchematicsNxNgAdd",
   "title": "Init Workspace",
-  "cli": true,
+  "cli": "ng",
   "description": "NOTE: Does not work in the --dry-run mode",
   "type": "object",
   "properties": {
@@ -19,7 +19,7 @@
       "description": "Skip installing after adding @nrwl/workspace",
       "default": false
     },
-    "preserveAngularCLILayout": {
+    "preserveAngularCliLayout": {
       "type": "boolean",
       "description": "Preserve the Angular CLI layout instead of moving the app into apps.",
       "default": false