@nx/rspack 20.0.0 → 20.0.2

package/README.md

@@ -66,52 +66,3 @@ npx nx@latest init
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
 width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
 
-
-<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
-
-<hr>
-
-# Nx: Smart, Fast and Extensible Build System
-
-Nx is a next generation build system with first class monorepo support and powerful integrations.
-
-This package is a Rspack plugin for Nx.
-
-## Getting Started
-
-Use `--preset=@nx/rspack` when creating new workspace.
-
-e.g.
-
-```bash
-npx create-nx-workspace@latest rspack-demo --preset=@nx/rspack
-```
-
-Now, you can go into the `rspack-demo` folder and start development.
-
-```bash
-cd rspack-demo
-npm start
-```
-
-You can also run lint, test, and e2e scripts for the project.
-
-```bash
-npm run lint
-npm run test
-npm run e2e
-```
-
-## Existing workspaces
-
-You can add Rspack to any existing Nx workspace.
-
-First, install the plugin:
-
-```bash
-npm install --save-dev @nx/rspack
-```
-
-Then, r
-
-**Note:** You must restart the server if you make any changes to your library.

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.2",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,19 +24,25 @@
   "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.2",
+    "@nx/devkit": "20.0.2",
+    "@nx/web": "20.0.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
+    "enquirer": "~2.3.6",
+    "express": "^4.19.2",
+    "http-proxy-middleware": "^3.0.0",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "^4.0.2",
     "sass-loader": "^12.2.0",
     "stylus-loader": "^7.1.0",
     "postcss-loader": "^8.1.1",
     "@rspack/core": "^1.0.4",
+    "@rspack/dev-server": "^1.0.4",
     "@rspack/plugin-react-refresh": "^1.0.0",
-    "@rspack/plugin-minify": "^0.7.5",
-    "chalk": "~4.1.0"
+    "chalk": "~4.1.0",
+    "tsconfig-paths": "^4.1.2",
+    "tslib": "^2.3.0",
+    "webpack-sources": "^3.2.3"
   },
   "peerDependencies": {
     "@module-federation/enhanced": "~0.6.0",

package/src/executors/dev-server/dev-server.impl.js

@@ -24,9 +24,8 @@ async function* runExecutor(options, context) {
     devServerConfig = {
         ...devServerConfig,
         ...firstCompiler.options.devServer,
-        port: devServerConfig.port,
     };
-    const baseUrl = `http://localhost:${options.port ?? 4200}`;
+    const baseUrl = `http://localhost:${devServerConfig.port ?? 4200}`;
     return yield* (0, async_iterable_1.createAsyncIterable)(({ next }) => {
         const server = new dev_server_1.RspackDevServer({
             ...devServerConfig,

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/resolve-user-defined-rspack-config.js

@@ -23,7 +23,7 @@ reload = false) {
     const maybeCustomRspackConfig = require(path);
     cleanupTranspiler();
     // If the user provides a configuration in TS file
-    // then there are 3 cases for exporing an object. The first one is:
+    // then there are 3 cases for exploring an object. The first one is:
     // `module.exports = { ... }`. And the second one is:
     // `export default { ... }`. The ESM format is compiled into:
     // `{ default: { ... } }`

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: [

package/src/utils/with-web.js

@@ -97,8 +97,8 @@ function withWeb(opts = {}) {
                         ? path.join(context.root, options.indexHtml)
                         : path.join(projectRoot, 'src/index.html'),
                 }),
-                new core_1.rspack.DefinePlugin({
-                    'process.env.NODE_ENV': isProd ? "'production'" : "'development'",
+                new core_1.rspack.EnvironmentPlugin({
+                    NODE_ENV: 'development',
                 }),
             ],
         };