From 1a232038c7d795b45dbfa980449320de5aeb7ad1 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Fri, 25 Nov 2022 12:31:19 +0000
Subject: [PATCH] fix(angular): port should be added to serve-ssr for remote
 (#13399)

---
 packages/angular/src/generators/remote/lib/add-ssr.ts | 10 ++++++++--
 packages/angular/src/generators/remote/remote.ts      |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/angular/src/generators/remote/lib/add-ssr.ts b/packages/angular/src/generators/remote/lib/add-ssr.ts
index dc338f856f18c..a63c1bab165cc 100644
--- a/packages/angular/src/generators/remote/lib/add-ssr.ts
+++ b/packages/angular/src/generators/remote/lib/add-ssr.ts
@@ -6,7 +6,6 @@ import {
   readProjectConfiguration,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
-import type { Schema } from '../schema';
 
 import setupSsr from '../../setup-ssr/setup-ssr';
 import {
@@ -15,7 +14,10 @@ import {
   moduleFederationNodeVersion,
 } from '../../../utils/versions';
 
-export async function addSsr(tree: Tree, options: Schema, appName: string) {
+export async function addSsr(
+  tree: Tree,
+  { appName, port }: { appName: string; port: number }
+) {
   let project = readProjectConfiguration(tree, appName);
 
   await setupSsr(tree, {
@@ -43,6 +45,10 @@ export async function addSsr(tree: Tree, options: Schema, appName: string) {
   project.targets.server.options.customWebpackConfig = {
     path: joinPathFragments(project.root, 'webpack.server.config.js'),
   };
+  project.targets['serve-ssr'].options = {
+    ...(project.targets['serve-ssr'].options ?? {}),
+    port,
+  };
 
   updateProjectConfiguration(tree, appName, project);
 
diff --git a/packages/angular/src/generators/remote/remote.ts b/packages/angular/src/generators/remote/remote.ts
index ca583e11db0a1..39e9cc5bdddcc 100644
--- a/packages/angular/src/generators/remote/remote.ts
+++ b/packages/angular/src/generators/remote/remote.ts
@@ -43,7 +43,7 @@ export async function remote(tree: Tree, options: Schema) {
 
   let installTasks = [appInstallTask];
   if (options.ssr) {
-    let ssrInstallTask = await addSsr(tree, options, appName);
+    let ssrInstallTask = await addSsr(tree, { appName, port });
     installTasks.push(ssrInstallTask);
   }