From e244181e5ab95a4982898088da0f797110a9d393 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Mon, 19 Dec 2022 11:16:25 +0000
Subject: [PATCH 1/2] feat(angular): support alternate remoteEntry name in
 dynamic federation #13688

---
 packages/angular/mf/mf.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/angular/mf/mf.ts b/packages/angular/mf/mf.ts
index b045eeef70a20..3ff9a1d6fa8ae 100644
--- a/packages/angular/mf/mf.ts
+++ b/packages/angular/mf/mf.ts
@@ -58,9 +58,14 @@ async function loadRemoteContainer(remoteName: string) {
     ? remoteUrlDefinitions[remoteName]
     : await resolveRemoteUrl(remoteName);
 
-  const containerUrl = `${remoteUrl}${
-    remoteUrl.endsWith('/') ? '' : '/'
-  }remoteEntry.mjs`;
+  const remoteEntryFileName =
+    remoteUrl.endsWith('.mjs') || remoteUrl.endsWith('.js')
+      ? remoteUrl.split('/').pop()
+      : undefined;
+
+  const containerUrl = `${remoteUrl}${remoteUrl.endsWith('/') ? '' : '/'}${
+    remoteEntryFileName ?? 'remoteEntry.mjs'
+  }`;
 
   const container = await loadModule(containerUrl);
   await container.init(__webpack_share_scopes__.default);

From 7f6f5d812c9c419ed229ef99311672b022061705 Mon Sep 17 00:00:00 2001
From: Colum Ferry <cferry09@gmail.com>
Date: Tue, 20 Dec 2022 09:28:43 +0000
Subject: [PATCH 2/2] fix(angular): simplify dyn fed url creation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Leosvel Pérez Espinosa <leosvel.perez.espinosa@gmail.com>
---
 packages/angular/mf/mf.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/angular/mf/mf.ts b/packages/angular/mf/mf.ts
index 3ff9a1d6fa8ae..7c3a9e48b7305 100644
--- a/packages/angular/mf/mf.ts
+++ b/packages/angular/mf/mf.ts
@@ -58,14 +58,12 @@ async function loadRemoteContainer(remoteName: string) {
     ? remoteUrlDefinitions[remoteName]
     : await resolveRemoteUrl(remoteName);
 
-  const remoteEntryFileName =
-    remoteUrl.endsWith('.mjs') || remoteUrl.endsWith('.js')
-      ? remoteUrl.split('/').pop()
-      : undefined;
-
-  const containerUrl = `${remoteUrl}${remoteUrl.endsWith('/') ? '' : '/'}${
-    remoteEntryFileName ?? 'remoteEntry.mjs'
-  }`;
+  let containerUrl = remoteUrl;
+  if (!remoteUrl.endsWith('.mjs') && !remoteUrl.endsWith('.js')) {
+    containerUrl = `${remoteUrl}${
+      remoteUrl.endsWith('/') ? '' : '/'
+    }remoteEntry.mjs`;
+  }
 
   const container = await loadModule(containerUrl);
   await container.init(__webpack_share_scopes__.default);