From f99acc6961f4c33262ed906c977e6ce87ff7e97a Mon Sep 17 00:00:00 2001
From: JGhignatti <ghignatti.joao@gmail.com>
Date: Thu, 16 Oct 2025 20:39:39 -0300
Subject: [PATCH 1/2] feat(nf): forward serve port for native federation lib

Closes #939
---
 libs/native-federation/src/builders/build/builder.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/native-federation/src/builders/build/builder.ts b/libs/native-federation/src/builders/build/builder.ts
index 2b2f5c22..b5db0ce9 100644
--- a/libs/native-federation/src/builders/build/builder.ts
+++ b/libs/native-federation/src/builders/build/builder.ts
@@ -118,7 +118,10 @@ export async function* runBuilder(
   }
 
   let options = (await context.validateOptions(
-    targetOptions,
+    {
+      ...targetOptions,
+      port: nfOptions.port || targetOptions['port'],
+    },
     builder
   )) as JsonObject & ApplicationBuilderOptions;
 

From 683b24cd170eeb373195b7764214157a62346218 Mon Sep 17 00:00:00 2001
From: JGhignatti <ghignatti.joao@gmail.com>
Date: Thu, 16 Oct 2025 21:06:14 -0300
Subject: [PATCH 2/2] fix(nf): only forward serve port when serving

---
 .../src/builders/build/builder.ts              | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/libs/native-federation/src/builders/build/builder.ts b/libs/native-federation/src/builders/build/builder.ts
index b5db0ce9..334ef1d1 100644
--- a/libs/native-federation/src/builders/build/builder.ts
+++ b/libs/native-federation/src/builders/build/builder.ts
@@ -117,14 +117,6 @@ export async function* runBuilder(
     return;
   }
 
-  let options = (await context.validateOptions(
-    {
-      ...targetOptions,
-      port: nfOptions.port || targetOptions['port'],
-    },
-    builder
-  )) as JsonObject & ApplicationBuilderOptions;
-
   /**
    * Explicitly defined as devServer or if the target contains "serve"
    */
@@ -133,6 +125,16 @@ export async function* runBuilder(
       ? !!nfOptions.devServer
       : target.target.includes('serve');
 
+  let options = (await context.validateOptions(
+    runServer
+      ? {
+          ...targetOptions,
+          port: nfOptions.port || targetOptions['port'],
+        }
+      : targetOptions,
+    builder
+  )) as JsonObject & ApplicationBuilderOptions;
+
   let serverOptions = null;
 
   const write = true;