@nx/rspack 20.0.0 → 20.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/rspack",
   "description": "The Nx Plugin for Rspack contains executors and generators that support building applications using Rspack.",
-  "version": "20.0.0",
+  "version": "20.0.1",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,9 +24,9 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "20.0.0",
-    "@nx/devkit": "20.0.0",
-    "@nx/eslint": "20.0.0",
+    "@nx/js": "20.0.1",
+    "@nx/devkit": "20.0.1",
+    "@nx/eslint": "20.0.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "^4.0.2",

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

@@ -13,30 +13,31 @@ const path_1 = require("path");
  */
 function mapRemotes(remotes, remoteEntryExt, determineRemoteUrl) {
     const mappedRemotes = {};
-    for (const remote of remotes) {
-        if (Array.isArray(remote)) {
-            const remoteName = normalizeRemoteName(remote[0]);
-            mappedRemotes[remoteName] = handleArrayRemote(remote, remoteEntryExt);
+    for (const nxRemoteProjectName of remotes) {
+        if (Array.isArray(nxRemoteProjectName)) {
+            const mfRemoteName = normalizeRemoteName(nxRemoteProjectName[0]);
+            mappedRemotes[mfRemoteName] = handleArrayRemote(nxRemoteProjectName, remoteEntryExt);
         }
-        else if (typeof remote === 'string') {
-            mappedRemotes[remote] = handleStringRemote(remote, determineRemoteUrl);
+        else if (typeof nxRemoteProjectName === 'string') {
+            const mfRemoteName = normalizeRemoteName(nxRemoteProjectName);
+            mappedRemotes[mfRemoteName] = handleStringRemote(nxRemoteProjectName, determineRemoteUrl);
         }
     }
     return mappedRemotes;
 }
 // Helper function to deal with remotes that are arrays
 function handleArrayRemote(remote, remoteEntryExt) {
-    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 = `${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
     if (!remoteLocation.startsWith('promise new Promise')) {
@@ -47,9 +48,9 @@ function handleArrayRemote(remote, remoteEntryExt) {
     }
 }
 // Helper function to deal with remotes that are strings
-function handleStringRemote(remote, determineRemoteUrl) {
-    const globalPrefix = `${remote.replace(/-/g, '_')}@`;
-    return `${globalPrefix}${determineRemoteUrl(remote)}`;
+function handleStringRemote(nxRemoteProjectName, determineRemoteUrl) {
+    const globalPrefix = `${normalizeRemoteName(nxRemoteProjectName)}@`;
+    return `${globalPrefix}${determineRemoteUrl(nxRemoteProjectName)}`;
 }
 /**
  * Map remote names to a format that can be understood and used by Module
@@ -63,22 +64,22 @@ 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'].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;
 }
-function normalizeRemoteName(remote) {
-    return remote.replace(/-/g, '_');
+function normalizeRemoteName(nxRemoteProjectName) {
+    return nxRemoteProjectName.replace(/-/g, '_');
 }

package/src/utils/with-nx.js

@@ -118,6 +118,10 @@ function withNx(_opts = {}) {
                 ...(config.devServer ?? {}),
                 port: config.devServer?.port ?? 4200,
                 hot: config.devServer?.hot ?? true,
+                devMiddleware: {
+                    ...(config.devServer?.devMiddleware ?? {}),
+                    stats: true,
+                },
             },
             module: {
                 rules: [