@nx/webpack 20.0.0-rc.0 → 20.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "20.0.0-rc.0",
+  "version": "20.0.1",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -69,8 +69,8 @@
     "webpack-dev-server": "^5.0.4",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "20.0.0-rc.0",
-    "@nx/js": "20.0.0-rc.0"
+    "@nx/devkit": "20.0.1",
+    "@nx/js": "20.0.1"
   },
   "publishConfig": {
     "access": "public"

package/src/utils/module-federation/remotes.js

@@ -13,32 +13,32 @@ const path_1 = require("path");
  */
 function mapRemotes(remotes, remoteEntryExt, determineRemoteUrl, isRemoteGlobal = false) {
     const mappedRemotes = {};
-    for (const remote of remotes) {
-        if (Array.isArray(remote)) {
-            const remoteName = normalizeRemoteName(remote[0]);
-            mappedRemotes[remoteName] = handleArrayRemote(remote, remoteEntryExt, isRemoteGlobal);
+    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, determineRemoteUrl, isRemoteGlobal);
+        else if (typeof nxRemoteProjectName === 'string') {
+            const mfRemoteName = normalizeRemoteName(nxRemoteProjectName);
+            mappedRemotes[mfRemoteName] = handleStringRemote(nxRemoteProjectName, determineRemoteUrl, isRemoteGlobal);
         }
     }
     return mappedRemotes;
 }
 // Helper function to deal with remotes that are arrays
 function handleArrayRemote(remote, remoteEntryExt, isRemoteGlobal) {
-    let [remoteName, remoteLocation] = remote;
-    remoteName = normalizeRemoteName(remoteName);
+    let [nxRemoteProjectName, remoteLocation] = remote;
+    const mfRemoteName = normalizeRemoteName(nxRemoteProjectName);
     const remoteLocationExt = (0, path_1.extname)(remoteLocation);
     // If remote location already has .js or .mjs extension
-    if (['.js', '.mjs'].includes(remoteLocationExt)) {
+    if (['.js', '.mjs', '.json'].includes(remoteLocationExt)) {
         return remoteLocation;
     }
     const baseRemote = remoteLocation.endsWith('/')
         ? remoteLocation.slice(0, -1)
         : 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
     // In that case we should use what the user provides as the remote location
@@ -50,9 +50,11 @@ function handleArrayRemote(remote, remoteEntryExt, isRemoteGlobal) {
     }
 }
 // Helper function to deal with remotes that are strings
-function handleStringRemote(remote, determineRemoteUrl, isRemoteGlobal) {
-    const globalPrefix = isRemoteGlobal ? `${remote.replace(/-/g, '_')}@` : '';
-    return `${globalPrefix}${determineRemoteUrl(remote)}`;
+function handleStringRemote(nxRemoteProjectName, determineRemoteUrl, isRemoteGlobal) {
+    const globalPrefix = isRemoteGlobal
+        ? `${normalizeRemoteName(nxRemoteProjectName)}@`
+        : '';
+    return `${globalPrefix}${determineRemoteUrl(nxRemoteProjectName)}`;
 }
 /**
  * Map remote names to a format that can be understood and used by Module
@@ -66,18 +68,18 @@ function mapRemotesForSSR(remotes, remoteEntryExt, determineRemoteUrl) {
     const mappedRemotes = {};
     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 = (0, path_1.extname)(remoteLocation);
-            mappedRemotes[remoteName] = `${remoteName}@${['.js', '.mjs'].includes(remoteLocationExt)
+            mappedRemotes[mfRemoteName] = `${mfRemoteName}@${['.js', '.mjs', '.json'].includes(remoteLocationExt)
                 ? remoteLocation
                 : `${remoteLocation.endsWith('/')
                     ? remoteLocation.slice(0, -1)
                     : remoteLocation}/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;