Skip to content

Commit

Permalink
fix(module-federation): normalization of existing incorrect remote names
Browse files Browse the repository at this point in the history
  • Loading branch information
@Coly010
Coly010 committed Oct 11, 2024
1 parent fe5cdec commit 9911b96
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 41 deletions.
49 changes: 29 additions & 20 deletions packages/rspack/src/utils/module-federation/remotes.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,19 @@ export function mapRemotes(
): Record<string, string> {
const mappedRemotes = {};

for (const remote of remotes) {
if (Array.isArray(remote)) {
const remoteName = normalizeRemoteName(remote[0]);
mappedRemotes[remoteName] = handleArrayRemote(remote, remoteEntryExt);
} else if (typeof remote === 'string') {
mappedRemotes[remote] = handleStringRemote(remote, determineRemoteUrl);
for (const nxRemoteProjectName of remotes) {
if (Array.isArray(nxRemoteProjectName)) {
const mfRemoteName = normalizeRemoteName(nxRemoteProjectName[0]);
mappedRemotes[mfRemoteName] = handleArrayRemote(
nxRemoteProjectName,
remoteEntryExt
);
} else if (typeof nxRemoteProjectName === 'string') {
const mfRemoteName = normalizeRemoteName(nxRemoteProjectName[0]);
mappedRemotes[mfRemoteName] = handleStringRemote(
nxRemoteProjectName,
determineRemoteUrl
);
}
}

Expand All @@ -33,8 +40,8 @@ function handleArrayRemote(
remote: [string, string],
remoteEntryExt: 'js' | 'mjs'
): string {
let [remoteName, remoteLocation] = remote;
remoteName = normalizeRemoteName(remoteName);
let [nxRemoteProjectName, remoteLocation] = remote;
const mfRemoteName = normalizeRemoteName(nxRemoteProjectName);
const remoteLocationExt = extname(remoteLocation);

// If remote location already has .js or .mjs extension
Expand All @@ -46,7 +53,7 @@ function handleArrayRemote(
? remoteLocation.slice(0, -1)
: remoteLocation;

const globalPrefix = `${remoteName.replace(/-/g, '_')}@`;
const globalPrefix = `${normalizeRemoteName(mfRemoteName)}@`;

// if the remote is defined with anything other than http then we assume it's a promise based remote
// In that case we should use what the user provides as the remote location
Expand All @@ -59,12 +66,12 @@ function handleArrayRemote(

// Helper function to deal with remotes that are strings
function handleStringRemote(
remote: string,
determineRemoteUrl: (remote: string) => string
nxRemoteProjectName: string,
determineRemoteUrl: (nxRemoteProjectName: string) => string
): string {
const globalPrefix = `${remote.replace(/-/g, '_')}@`;
const globalPrefix = `${normalizeRemoteName(nxRemoteProjectName)}@`;

return `${globalPrefix}${determineRemoteUrl(remote)}`;
return `${globalPrefix}${determineRemoteUrl(nxRemoteProjectName)}`;
}

/**
Expand All @@ -84,10 +91,10 @@ export function mapRemotesForSSR(

for (const remote of remotes) {
if (Array.isArray(remote)) {
let [remoteName, remoteLocation] = remote;
remoteName = normalizeRemoteName(remoteName);
let [nxRemoteProjectName, remoteLocation] = remote;
const mfRemoteName = normalizeRemoteName(nxRemoteProjectName);
const remoteLocationExt = extname(remoteLocation);
mappedRemotes[remoteName] = `${remoteName}@${
mappedRemotes[mfRemoteName] = `${mfRemoteName}@${
['.js', '.mjs'].includes(remoteLocationExt)
? remoteLocation
: `${
Expand All @@ -97,14 +104,16 @@ export function mapRemotesForSSR(
}/remoteEntry.${remoteEntryExt}`
}`;
} else if (typeof remote === 'string') {
const remoteName = normalizeRemoteName(remote);
mappedRemotes[remoteName] = `${remoteName}@${determineRemoteUrl(remote)}`;
const mfRemoteName = normalizeRemoteName(remote);
mappedRemotes[mfRemoteName] = `${mfRemoteName}@${determineRemoteUrl(
remote
)}`;
}
}

return mappedRemotes;
}

function normalizeRemoteName(remote: string): string {
return remote.replace(/-/g, '_');
function normalizeRemoteName(nxRemoteProjectName: string): string {
return nxRemoteProjectName.replace(/-/g, '_');
}
46 changes: 25 additions & 21 deletions packages/webpack/src/utils/module-federation/remotes.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ export function mapRemotes(
): Record<string, string> {
const mappedRemotes = {};

for (const remote of remotes) {
if (Array.isArray(remote)) {
const remoteName = normalizeRemoteName(remote[0]);
mappedRemotes[remoteName] = handleArrayRemote(
remote,
for (const nxRemoteProjectName of remotes) {
if (Array.isArray(nxRemoteProjectName)) {
const mfRemoteName = normalizeRemoteName(nxRemoteProjectName[0]);
mappedRemotes[mfRemoteName] = handleArrayRemote(
nxRemoteProjectName,
remoteEntryExt,
isRemoteGlobal
);
} else if (typeof remote === 'string') {
const remoteName = normalizeRemoteName(remote);
mappedRemotes[remoteName] = handleStringRemote(
remoteName,
} else if (typeof nxRemoteProjectName === 'string') {
const mfRemoteName = normalizeRemoteName(nxRemoteProjectName);
mappedRemotes[mfRemoteName] = handleStringRemote(
nxRemoteProjectName,
determineRemoteUrl,
isRemoteGlobal
);
Expand All @@ -44,8 +44,8 @@ function handleArrayRemote(
remoteEntryExt: 'js' | 'mjs',
isRemoteGlobal: boolean
): string {
let [remoteName, remoteLocation] = remote;
remoteName = normalizeRemoteName(remoteName);
let [nxRemoteProjectName, remoteLocation] = remote;
const mfRemoteName = normalizeRemoteName(nxRemoteProjectName);
const remoteLocationExt = extname(remoteLocation);

// If remote location already has .js or .mjs extension
Expand All @@ -58,7 +58,7 @@ function handleArrayRemote(
: remoteLocation;

const globalPrefix = isRemoteGlobal
? `${remoteName.replace(/-/g, '_')}@`
? `${normalizeRemoteName(nxRemoteProjectName)}@`
: '';

// if the remote is defined with anything other than http then we assume it's a promise based remote
Expand All @@ -72,13 +72,15 @@ function handleArrayRemote(

// Helper function to deal with remotes that are strings
function handleStringRemote(
remote: string,
determineRemoteUrl: (remote: string) => string,
nxRemoteProjectName: string,
determineRemoteUrl: (nxRemoteProjectName: string) => string,
isRemoteGlobal: boolean
): string {
const globalPrefix = isRemoteGlobal ? `${remote.replace(/-/g, '_')}@` : '';
const globalPrefix = isRemoteGlobal
? `${normalizeRemoteName(nxRemoteProjectName)}@`
: '';

return `${globalPrefix}${determineRemoteUrl(remote)}`;
return `${globalPrefix}${determineRemoteUrl(nxRemoteProjectName)}`;
}

/**
Expand All @@ -98,10 +100,10 @@ export function mapRemotesForSSR(

for (const remote of remotes) {
if (Array.isArray(remote)) {
let [remoteName, remoteLocation] = remote;
remoteName = normalizeRemoteName(remoteName);
let [nxRemoteProjectName, remoteLocation] = remote;
const mfRemoteName = normalizeRemoteName(nxRemoteProjectName);
const remoteLocationExt = extname(remoteLocation);
mappedRemotes[remoteName] = `${remoteName}@${
mappedRemotes[mfRemoteName] = `${mfRemoteName}@${
['.js', '.mjs'].includes(remoteLocationExt)
? remoteLocation
: `${
Expand All @@ -111,8 +113,10 @@ export function mapRemotesForSSR(
}/remoteEntry.${remoteEntryExt}`
}`;
} else if (typeof remote === 'string') {
const remoteName = normalizeRemoteName(remote);
mappedRemotes[remoteName] = `${remoteName}@${determineRemoteUrl(remote)}`;
const mfRemoteName = normalizeRemoteName(remote);
mappedRemotes[mfRemoteName] = `${mfRemoteName}@${determineRemoteUrl(
remote
)}`;
}
}

Expand Down

0 comments on commit 9911b96

Please sign in to comment.