fix(module-federation): ensure mf-manifest supported and tspaths are …

…added with snake_case
nrwl · Oct 2, 2024 · 37b05cd · 37b05cd
1 parent 5a41154
commit 37b05cd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts b/packages/angular/src/generators/setup-mf/lib/add-remote-to-host.ts
@@ -166,8 +166,11 @@ function addLazyLoadedRouteToHostAppModule(
     : 'RemoteEntryModule';
   const routeToAdd =
     hostFederationType === 'dynamic'
-      ? `loadRemoteModule('${options.appName}', './${routePathName}')`
-      : `import('${options.appName}/${routePathName}')`;
+      ? `loadRemoteModule('${options.appName.replace(
+          /-/g,
+          '_'
+        )}', './${routePathName}')`
+      : `import('${options.appName.replace(/-/g, '_')}/${routePathName}')`;
 
   addRoute(
     tree,

diff --git a/packages/angular/src/generators/setup-mf/lib/setup-tspath-for-remote.ts b/packages/angular/src/generators/setup-mf/lib/setup-tspath-for-remote.ts
@@ -12,7 +12,7 @@ export function setupTspathForRemote(tree: Tree, options: Schema) {
 
   const exportName = options.standalone ? 'Routes' : 'Module';
 
-  addTsConfigPath(tree, `${options.appName}/${exportName}`, [
+  addTsConfigPath(tree, `${options.appName.replace(/-/g, '_')}/${exportName}`, [
     joinPathFragments(project.root, exportPath),
   ]);
 }
diff --git a/packages/react/src/generators/remote/lib/setup-tspath-for-remote.ts b/packages/react/src/generators/remote/lib/setup-tspath-for-remote.ts
@@ -11,7 +11,9 @@ export function setupTspathForRemote(tree: Tree, options: NormalizedSchema) {
 
   const exportName = 'Module';
 
-  addTsConfigPath(tree, `${options.projectName}/${exportName}`, [
-    joinPathFragments(project.root, exportPath),
-  ]);
+  addTsConfigPath(
+    tree,
+    `${options.projectName.replace(/-/g, '_')}/${exportName}`,
+    [joinPathFragments(project.root, exportPath)]
+  );
 }
diff --git a/packages/rspack/src/utils/module-federation/remotes.ts b/packages/rspack/src/utils/module-federation/remotes.ts
@@ -38,7 +38,7 @@ function handleArrayRemote(
   const remoteLocationExt = extname(remoteLocation);
 
   // If remote location already has .js or .mjs extension
-  if (['.js', '.mjs'].includes(remoteLocationExt)) {
+  if (['.js', '.mjs', '.json'].includes(remoteLocationExt)) {
     return remoteLocation;
   }
 

diff --git a/packages/webpack/src/utils/module-federation/remotes.ts b/packages/webpack/src/utils/module-federation/remotes.ts
@@ -49,7 +49,7 @@ function handleArrayRemote(
   const remoteLocationExt = extname(remoteLocation);
 
   // If remote location already has .js or .mjs extension
-  if (['.js', '.mjs'].includes(remoteLocationExt)) {
+  if (['.js', '.mjs', '.json'].includes(remoteLocationExt)) {
     return remoteLocation;
   }
 
@@ -102,7 +102,7 @@ export function mapRemotesForSSR(
       remoteName = normalizeRemoteName(remoteName);
       const remoteLocationExt = extname(remoteLocation);
       mappedRemotes[remoteName] = `${remoteName}@${
-        ['.js', '.mjs'].includes(remoteLocationExt)
+        ['.js', '.mjs', '.json'].includes(remoteLocationExt)
           ? remoteLocation
           : `${
               remoteLocation.endsWith('/')