From 8a227766776f14f1744d00bbe479292b138c0766 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Wed, 5 Apr 2023 11:17:33 +0100
Subject: [PATCH] fix(angular): host and remote app generation with directory

---
 packages/angular/src/generators/host/host.ts     | 4 +++-
 packages/angular/src/generators/remote/remote.ts | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/angular/src/generators/host/host.ts b/packages/angular/src/generators/host/host.ts
index 7b9af7b747786..56eed89b0e7f7 100644
--- a/packages/angular/src/generators/host/host.ts
+++ b/packages/angular/src/generators/host/host.ts
@@ -1,4 +1,5 @@
 import {
+  extractLayoutDirectory,
   formatFiles,
   getProjects,
   runTasksInSerial,
@@ -39,7 +40,8 @@ export async function host(tree: Tree, options: Schema) {
     });
   }
 
-  const appName = normalizeProjectName(options.name, options.directory);
+  const { projectDirectory } = extractLayoutDirectory(options.directory);
+  const appName = normalizeProjectName(options.name, projectDirectory);
 
   const appInstallTask = await applicationGenerator(tree, {
     ...options,
diff --git a/packages/angular/src/generators/remote/remote.ts b/packages/angular/src/generators/remote/remote.ts
index 0cccfc7caba55..ef7da862a0091 100644
--- a/packages/angular/src/generators/remote/remote.ts
+++ b/packages/angular/src/generators/remote/remote.ts
@@ -1,4 +1,5 @@
 import {
+  extractLayoutDirectory,
   formatFiles,
   getProjects,
   runTasksInSerial,
@@ -30,7 +31,8 @@ export async function remote(tree: Tree, options: Schema) {
     );
   }
 
-  const appName = normalizeProjectName(options.name, options.directory);
+  const { projectDirectory } = extractLayoutDirectory(options.directory);
+  const appName = normalizeProjectName(options.name, projectDirectory);
   const port = options.port ?? findNextAvailablePort(tree);
 
   const appInstallTask = await applicationGenerator(tree, {