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 index 308f9691c2..9e8c57d752 100644 --- 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 index 67ac6f8072..6ae84c83e3 100644 --- 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 index 124ef738ad..307cfd9aad 100644 --- 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 index 8c000da93f..8d92a6a7fc 100644 --- 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 index 1651d37cd1..c633cc4a05 100644 --- a/packages/webpack/src/utils/module-federation/remotes.ts +++ b/packages/webpack/src/utils/module-federation/remotes.ts @@ -28,7 +28,7 @@ export function mapRemotes( } else if (typeof remote === 'string') { const remoteName = normalizeRemoteName(remote); mappedRemotes[remoteName] = handleStringRemote( - remoteName, + remote, determineRemoteUrl, isRemoteGlobal ); @@ -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('/')