feat(angular): support alternate remote entry filenames nrwl#10206

Coly010 · May 23, 2022 · 5ba58b7 · 5ba58b7
1 parent e439718
commit 5ba58b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/angular/src/utils/mfe/with-module-federation.ts b/packages/angular/src/utils/mfe/with-module-federation.ts
@@ -142,12 +142,14 @@ function mapRemotes(remotes: MFERemotes) {
 
   for (const remote of remotes) {
     if (Array.isArray(remote)) {
-      const remoteLocation = remote[1].match(/remoteEntry\.(js|mjs)/)
-        ? remote[1]
+      const [remoteName, remoteLocation] = remote;
+      mappedRemotes[remoteName] = remoteLocation.match(/([^\/]+(\.(js|mjs)))*/)
+        ? remoteLocation
         : `${
-            remote[1].endsWith('/') ? remote[1].slice(0, -1) : remote[1]
+            remoteLocation.endsWith('/')
+              ? remoteLocation.slice(0, -1)
+              : remoteLocation
           }/remoteEntry.mjs`;
-      mappedRemotes[remote[0]] = remoteLocation;
     } else if (typeof remote === 'string') {
       mappedRemotes[remote] = determineRemoteUrl(remote);
     }

diff --git a/packages/react/src/module-federation/with-module-federation.ts b/packages/react/src/module-federation/with-module-federation.ts
@@ -23,8 +23,8 @@ import {
   SharedFunction,
   SharedLibraryConfig,
 } from './models';
-import ModuleFederationPlugin = require('webpack/lib/container/ModuleFederationPlugin');
 import { readRootPackageJson } from './package-json';
+import ModuleFederationPlugin = require('webpack/lib/container/ModuleFederationPlugin');
 
 function collectDependencies(
   projectGraph: ProjectGraph,
@@ -131,7 +131,7 @@ function mapRemotes(remotes: Remotes) {
   for (const remote of remotes) {
     if (Array.isArray(remote)) {
       let [remoteName, remoteLocation] = remote;
-      if (!remoteLocation.match(/remoteEntry\.(js|mjs)$/)) {
+      if (!remoteLocation.match(/([^\/]+(\.(js|mjs)))*/)) {
         remoteLocation = `${
           remoteLocation.endsWith('/')
             ? remoteLocation.slice(0, -1)