fix(module-federation): normalize kebab-cased names to snake_cased

nrwl · Oct 2, 2024 · 639498a · 639498a
1 parent b82ca22
commit 639498a
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 16 deletions.
diff --git a/packages/angular/src/utils/mf/with-module-federation-ssr.ts b/packages/angular/src/utils/mf/with-module-federation-ssr.ts
@@ -40,7 +40,7 @@ export async function withModuleFederationForSSR(
         ...(config.plugins ?? []),
         new (require('@module-federation/enhanced').ModuleFederationPlugin)(
           {
-            name: options.name,
+            name: options.name.replace(/-/g, '_'),
             filename: 'remoteEntry.js',
             exposes: options.exposes,
             remotes: mappedRemotes,

diff --git a/packages/angular/src/utils/mf/with-module-federation.ts b/packages/angular/src/utils/mf/with-module-federation.ts
@@ -42,7 +42,7 @@ export async function withModuleFederation(
       plugins: [
         ...(config.plugins ?? []),
         new ModuleFederationPlugin({
-          name: options.name,
+          name: options.name.replace(/-/g, '_'),
           filename: 'remoteEntry.mjs',
           exposes: options.exposes,
           remotes: mappedRemotes,

diff --git a/packages/react/src/module-federation/with-module-federation-ssr.ts b/packages/react/src/module-federation/with-module-federation-ssr.ts
@@ -28,7 +28,7 @@ export async function withModuleFederationForSSR(
     config.plugins.push(
       new (require('@module-federation/enhanced').ModuleFederationPlugin)(
         {
-          name: options.name,
+          name: options.name.replace(/-/g, '_'),
           filename: 'remoteEntry.js',
           exposes: options.exposes,
           remotes: mappedRemotes,

diff --git a/packages/react/src/module-federation/with-module-federation.ts b/packages/react/src/module-federation/with-module-federation.ts
@@ -41,7 +41,7 @@ export async function withModuleFederation(
 
     config.plugins.push(
       new ModuleFederationPlugin({
-        name: options.name,
+        name: options.name.replace(/-/g, '_'),
         filename: 'remoteEntry.js',
         exposes: options.exposes,
         remotes: mappedRemotes,

diff --git a/packages/rspack/src/utils/module-federation/remotes.ts b/packages/rspack/src/utils/module-federation/remotes.ts
@@ -18,7 +18,8 @@ export function mapRemotes(
 
   for (const remote of remotes) {
     if (Array.isArray(remote)) {
-      mappedRemotes[remote[0]] = handleArrayRemote(remote, remoteEntryExt);
+      const remoteName = normalizeRemoteName(remote[0]);
+      mappedRemotes[remoteName] = handleArrayRemote(remote, remoteEntryExt);
     } else if (typeof remote === 'string') {
       mappedRemotes[remote] = handleStringRemote(remote, determineRemoteUrl);
     }
@@ -32,7 +33,8 @@ function handleArrayRemote(
   remote: [string, string],
   remoteEntryExt: 'js' | 'mjs'
 ): string {
-  const [remoteName, remoteLocation] = remote;
+  let [remoteName, remoteLocation] = remote;
+  remoteName = normalizeRemoteName(remoteName);
   const remoteLocationExt = extname(remoteLocation);
 
   // If remote location already has .js or .mjs extension
@@ -82,7 +84,8 @@ export function mapRemotesForSSR(
 
   for (const remote of remotes) {
     if (Array.isArray(remote)) {
-      const [remoteName, remoteLocation] = remote;
+      let [remoteName, remoteLocation] = remote;
+      remoteName = normalizeRemoteName(remoteName);
       const remoteLocationExt = extname(remoteLocation);
       mappedRemotes[remoteName] = `${remoteName}@${
         ['.js', '.mjs'].includes(remoteLocationExt)
@@ -94,9 +97,14 @@ export function mapRemotesForSSR(
             }/remoteEntry.${remoteEntryExt}`
       }`;
     } else if (typeof remote === 'string') {
-      mappedRemotes[remote] = `${remote}@${determineRemoteUrl(remote)}`;
+      const remoteName = normalizeRemoteName(remote);
+      mappedRemotes[remoteName] = `${remoteName}@${determineRemoteUrl(remote)}`;
     }
   }
 
   return mappedRemotes;
 }
+
+function normalizeRemoteName(remote: string): string {
+  return remote.replace(/-/g, '_');
+}
diff --git a/...s/rspack/src/utils/module-federation/with-module-federation/with-module-federation-ssr.ts b/...s/rspack/src/utils/module-federation/with-module-federation/with-module-federation-ssr.ts
@@ -31,7 +31,7 @@ export async function withModuleFederationForSSR(
       // eslint-disable-next-line @typescript-eslint/no-var-requires
       new (require('@module-federation/enhanced/rspack').ModuleFederationPlugin)(
         {
-          name: options.name,
+          name: options.name.replace(/-/g, '_'),
           filename: 'remoteEntry.js',
           exposes: options.exposes,
           remotes: mappedRemotes,

diff --git a/packages/rspack/src/utils/module-federation/with-module-federation/with-module-federation.ts b/packages/rspack/src/utils/module-federation/with-module-federation/with-module-federation.ts
@@ -55,7 +55,7 @@ export async function withModuleFederation(
 
     config.plugins.push(
       new ModuleFederationPlugin({
-        name: options.name,
+        name: options.name.replace(/-/g, '_'),
         filename: 'remoteEntry.js',
         exposes: options.exposes,
         remotes: mappedRemotes,

diff --git a/packages/webpack/src/utils/module-federation/remotes.ts b/packages/webpack/src/utils/module-federation/remotes.ts
@@ -19,14 +19,16 @@ export function mapRemotes(
 
   for (const remote of remotes) {
     if (Array.isArray(remote)) {
-      mappedRemotes[remote[0]] = handleArrayRemote(
+      const remoteName = normalizeRemoteName(remote[0]);
+      mappedRemotes[remoteName] = handleArrayRemote(
         remote,
         remoteEntryExt,
         isRemoteGlobal
       );
     } else if (typeof remote === 'string') {
-      mappedRemotes[remote] = handleStringRemote(
-        remote,
+      const remoteName = normalizeRemoteName(remote);
+      mappedRemotes[remoteName] = handleStringRemote(
+        remoteName,
         determineRemoteUrl,
         isRemoteGlobal
       );
@@ -42,7 +44,8 @@ function handleArrayRemote(
   remoteEntryExt: 'js' | 'mjs',
   isRemoteGlobal: boolean
 ): string {
-  const [remoteName, remoteLocation] = remote;
+  let [remoteName, remoteLocation] = remote;
+  remoteName = normalizeRemoteName(remoteName);
   const remoteLocationExt = extname(remoteLocation);
 
   // If remote location already has .js or .mjs extension
@@ -95,7 +98,8 @@ export function mapRemotesForSSR(
 
   for (const remote of remotes) {
     if (Array.isArray(remote)) {
-      const [remoteName, remoteLocation] = remote;
+      let [remoteName, remoteLocation] = remote;
+      remoteName = normalizeRemoteName(remoteName);
       const remoteLocationExt = extname(remoteLocation);
       mappedRemotes[remoteName] = `${remoteName}@${
         ['.js', '.mjs'].includes(remoteLocationExt)
@@ -107,9 +111,14 @@ export function mapRemotesForSSR(
             }/remoteEntry.${remoteEntryExt}`
       }`;
     } else if (typeof remote === 'string') {
-      mappedRemotes[remote] = `${remote}@${determineRemoteUrl(remote)}`;
+      const remoteName = normalizeRemoteName(remote);
+      mappedRemotes[remoteName] = `${remoteName}@${determineRemoteUrl(remote)}`;
     }
   }
 
   return mappedRemotes;
 }
+
+function normalizeRemoteName(remote: string) {
+  return remote.replace(/-/g, '_');
+}