@nx/rspack 0.0.0-pr-30565-ba2942e → 0.0.0-pr-29464-73fdcbb

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": "0.0.0-pr-30565-ba2942e",
+  "version": "0.0.0-pr-29464-73fdcbb",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,10 +24,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "0.0.0-pr-30565-ba2942e",
-    "@nx/devkit": "0.0.0-pr-30565-ba2942e",
-    "@nx/web": "0.0.0-pr-30565-ba2942e",
-    "@nx/module-federation": "0.0.0-pr-30565-ba2942e",
+    "@nx/js": "0.0.0-pr-29464-73fdcbb",
+    "@nx/devkit": "0.0.0-pr-29464-73fdcbb",
+    "@nx/web": "0.0.0-pr-29464-73fdcbb",
+    "@nx/module-federation": "0.0.0-pr-29464-73fdcbb",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@rspack/core": "^1.1.5",
     "@rspack/dev-server": "^1.0.9",

package/src/executors/dev-server/lib/get-dev-server-config.js

@@ -31,8 +31,7 @@ function getDevServerOptions(root, serveOptions, buildOptions) {
             htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
         },
         onListening(server) {
-            const isHttps = server.options.https ||
-                server.options.server?.type === 'https';
+            const isHttps = server.options.server?.type === 'https';
             devkit_1.logger.info(`NX Web Development Server is listening at ${isHttps ? 'https' : 'http'}://${server.options.host}:${server.options.port}${(0, serve_path_1.buildServePath)(buildOptions)}`);
         },
         open: false,

package/src/generators/convert-webpack/convert-webpack.js

@@ -57,6 +57,29 @@ async function default_1(tree, options) {
         transformConfigFile(tree, rspackConfigPath);
     }
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson.plugins !== undefined && nxJson.plugins.length > 0) {
+        const nonRspackPlugins = nxJson.plugins.filter((plugin) => (typeof plugin !== 'string' && plugin.plugin !== '@nx/rspack/plugin') ||
+            (typeof plugin === 'string' && plugin !== '@nx/rspack/plugin'));
+        let rspackPlugins = nxJson.plugins.filter((plugin) => (typeof plugin !== 'string' && plugin.plugin === '@nx/rspack/plugin') ||
+            (typeof plugin === 'string' && plugin === '@nx/rspack/plugin'));
+        if (rspackPlugins.length === 0) {
+            rspackPlugins = rspackPlugins.map((plugin) => {
+                if (typeof plugin === 'string') {
+                    return {
+                        plugin: plugin,
+                        exclude: [`${project.root}/*`],
+                    };
+                }
+                return {
+                    ...plugin,
+                    exclude: [...(plugin.exclude ?? []), `${project.root}/*`],
+                };
+            });
+            nxJson.plugins = [...nonRspackPlugins, ...rspackPlugins];
+            (0, devkit_1.updateNxJson)(tree, nxJson);
+        }
+    }
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@rspack/core': versions_1.rspackCoreVersion,
         '@rspack/dev-server': versions_1.rspackDevServerVersion,

package/src/generators/init/init.js

@@ -57,7 +57,6 @@ async function rspackInitGenerator(tree, schema) {
     const devDependencies = {
         '@rspack/core': versions_1.rspackCoreVersion,
         '@rspack/cli': versions_1.rspackCoreVersion,
-        '@rspack/plugin-minify': versions_1.rspackPluginMinifyVersion,
         '@rspack/plugin-react-refresh': versions_1.rspackPluginReactRefreshVersion,
         'react-refresh': versions_1.reactRefreshVersion,
     };

package/src/index.d.ts

@@ -4,4 +4,5 @@ export * from './utils/config';
 export * from './utils/with-nx';
 export * from './utils/with-react';
 export * from './utils/with-web';
+export * from './utils/e2e-web-server-info-utils';
 export * from './plugins/use-legacy-nx-plugin/use-legacy-nx-plugin';

package/src/index.js

@@ -7,4 +7,5 @@ tslib_1.__exportStar(require("./utils/config"), exports);
 tslib_1.__exportStar(require("./utils/with-nx"), exports);
 tslib_1.__exportStar(require("./utils/with-react"), exports);
 tslib_1.__exportStar(require("./utils/with-web"), exports);
+tslib_1.__exportStar(require("./utils/e2e-web-server-info-utils"), exports);
 tslib_1.__exportStar(require("./plugins/use-legacy-nx-plugin/use-legacy-nx-plugin"), exports);

package/src/plugins/nx-app-rspack-plugin/nx-app-rspack-plugin.js

@@ -27,6 +27,16 @@ class NxAppRspackPlugin {
         if (typeof target === 'string') {
             this.options.target = target;
         }
+        if (compiler.options.entry &&
+            compiler.options.entry['main'] &&
+            typeof compiler.options.entry['main'] === 'object' &&
+            Object.keys(compiler.options.entry['main']).length === 0) {
+            compiler.options.entry = {};
+        }
+        // Prefer `clean` option from Rspack config over our own.
+        if (typeof compiler.options.output.clean !== 'undefined') {
+            this.options.deleteOutputPath = false;
+        }
         (0, apply_base_config_1.applyBaseConfig)(this.options, compiler.options, {
             useNormalizedEntry: true,
         });

package/src/plugins/plugin.js

@@ -101,6 +101,7 @@ async function createRspackTargets(configFilePath, projectRoot, options, context
             ...(existingValue ? JSON.parse(existingValue) : {}),
             module: 'CommonJS',
             moduleResolution: 'Node10',
+            customConditions: null,
         });
     }
     targets[options.buildTargetName] = {
@@ -130,7 +131,6 @@ async function createRspackTargets(configFilePath, projectRoot, options, context
         outputs,
     };
     targets[options.serveTargetName] = {
-        continuous: true,
         command: `rspack serve`,
         options: {
             cwd: projectRoot,
@@ -139,7 +139,6 @@ async function createRspackTargets(configFilePath, projectRoot, options, context
         },
     };
     targets[options.previewTargetName] = {
-        continuous: true,
         command: `rspack serve`,
         options: {
             cwd: projectRoot,
@@ -148,7 +147,6 @@ async function createRspackTargets(configFilePath, projectRoot, options, context
         },
     };
     targets[options.serveStaticTargetName] = {
-        continuous: true,
         executor: '@nx/web:file-server',
         options: {
             buildTarget: options.buildTargetName,

package/src/plugins/utils/apply-base-config.js

@@ -42,7 +42,7 @@ function applyNxIndependentConfig(options, config) {
     config.node = false;
     config.mode =
         // When the target is Node avoid any optimizations, such as replacing `process.env.NODE_ENV` with build time value.
-        config.target === 'node'
+        config.target === 'node' || config.target === 'async-node'
             ? 'none'
             : // Otherwise, make sure it matches `process.env.NODE_ENV`.
                 // When mode is development or production, rspack will automatically
@@ -59,13 +59,20 @@ function applyNxIndependentConfig(options, config) {
                         : 'none');
     // When target is Node, the Webpack mode will be set to 'none' which disables in memory caching and causes a full rebuild on every change.
     // So to mitigate this we enable in memory caching when target is Node and in watch mode.
-    config.cache = options.target === 'node' && options.watch ? true : undefined;
+    config.cache =
+        (options.target === 'node' || options.target === 'async-node') &&
+            options.watch
+            ? true
+            : undefined;
     config.devtool =
         options.sourceMap === true ? 'source-map' : options.sourceMap;
     config.output = {
         ...(config.output ?? {}),
-        libraryTarget: config.output?.libraryTarget ??
-            (options.target === 'node' ? 'commonjs' : undefined),
+        libraryTarget: options.target === 'node'
+            ? 'commonjs'
+            : options.target === 'async-node'
+                ? 'commonjs-module'
+                : undefined,
         path: config.output?.path ??
             (options.outputPath
                 ? // If path is relative, it is relative from project root (aka cwd).
@@ -81,7 +88,7 @@ function applyNxIndependentConfig(options, config) {
         hashFunction: config.output?.hashFunction ?? 'xxhash64',
         // Disabled for performance
         pathinfo: config.output?.pathinfo ?? false,
-        clean: options.deleteOutputPath,
+        clean: config.output?.clean ?? options.deleteOutputPath,
     };
     config.watch = options.watch;
     config.watchOptions = {
@@ -177,8 +184,11 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
     if (options.useTsconfigPaths) {
         plugins.push(new nx_tsconfig_paths_rspack_plugin_1.NxTsconfigPathsRspackPlugin({ ...options, tsConfig }));
     }
-    // New TS Solution already has a typecheck target
-    if (!options?.skipTypeChecking && !isUsingTsSolution) {
+    // New TS Solution already has a typecheck target but allow it to run during serve
+    if ((!options?.skipTypeChecking && !isUsingTsSolution) ||
+        (isUsingTsSolution &&
+            options?.skipTypeChecking === false &&
+            process.env['WEBPACK_SERVE'])) {
         const { TsCheckerRspackPlugin } = require('ts-checker-rspack-plugin');
         plugins.push(new TsCheckerRspackPlugin({
             typescript: {
@@ -263,7 +273,8 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
         plugins.push(new stats_json_plugin_1.StatsJsonPlugin());
     }
     const externals = [];
-    if (options.target === 'node' && options.externalDependencies === 'all') {
+    if ((options.target === 'node' || options.target === 'async-node') &&
+        options.externalDependencies === 'all') {
         const modulesDir = `${options.root}/node_modules`;
         externals.push(nodeExternals({ modulesDir }));
     }

package/src/plugins/utils/loaders/stylesheet-loaders.js

@@ -99,7 +99,7 @@ function postcssOptionsCreator(options, { includePaths, forCssModules = false, }
                 ? []
                 : [
                     (0, postcss_cli_resources_1.PostcssCliResources)({
-                        baseHref: options.baseHref,
+                        baseHref: options.baseHref ? options.baseHref : undefined,
                         deployUrl: options.deployUrl,
                         loader,
                         filename: `[name]${hashFormat.file}.[ext]`,

package/src/plugins/utils/models.d.ts

@@ -55,7 +55,7 @@ export interface NxAppRspackPluginOptions {
     /**
      * Set <base href> for the resulting index.html.
      */
-    baseHref?: string;
+    baseHref?: string | false;
     /**
      * Build the libraries from source. Default is `true`.
      */
@@ -63,6 +63,7 @@ export interface NxAppRspackPluginOptions {
     commonChunk?: boolean;
     /**
      * Delete the output path before building.
+     * @deprecated Use the `output.clean` option in Rspack. https://rspack.dev/config/output#outputclean
      */
     deleteOutputPath?: boolean;
     /**

package/src/utils/e2e-web-server-info-utils.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export declare function getRspackE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number): Promise<import("@nx/devkit/src/generators/e2e-web-server-info-utils").E2EWebServerDetails>;

package/src/utils/e2e-web-server-info-utils.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRspackE2EWebServerInfo = getRspackE2EWebServerInfo;
+const devkit_1 = require("@nx/devkit");
+const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
+async function getRspackE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let e2ePort = e2ePortOverride ?? 4200;
+    if (nxJson.targetDefaults?.['serve'] &&
+        nxJson.targetDefaults?.['serve'].options?.port) {
+        e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
+    }
+    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+        plugin: '@nx/rspack/plugin',
+        serveTargetName: 'serveTargetName',
+        serveStaticTargetName: 'previewTargetName',
+        configFilePath,
+    }, {
+        defaultServeTargetName: 'serve',
+        defaultServeStaticTargetName: 'preview',
+        defaultE2EWebServerAddress: `http://localhost:${e2ePort}`,
+        defaultE2ECiBaseUrl: 'http://localhost:4200',
+        defaultE2EPort: e2ePort,
+    }, isPluginBeingAdded);
+}

package/src/utils/versions.d.ts

@@ -1,7 +1,6 @@
 export declare const nxVersion: any;
 export declare const rspackCoreVersion = "1.2.2";
 export declare const rspackDevServerVersion = "1.0.9";
-export declare const rspackPluginMinifyVersion = "^0.7.5";
 export declare const rspackPluginReactRefreshVersion = "^1.0.0";
 export declare const lessLoaderVersion = "~11.1.3";
 export declare const sassLoaderVersion = "^16.0.4";

package/src/utils/versions.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.stylusVersion = exports.lessVersion = exports.nestjsMicroservicesVersion = exports.nestjsPlatformExpressVersion = exports.nestjsCoreVersion = exports.nestjsCommonVersion = exports.reactRefreshVersion = exports.sassEmbeddedVersion = exports.sassLoaderVersion = exports.lessLoaderVersion = exports.rspackPluginReactRefreshVersion = exports.rspackPluginMinifyVersion = exports.rspackDevServerVersion = exports.rspackCoreVersion = exports.nxVersion = void 0;
+exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.stylusVersion = exports.lessVersion = exports.nestjsMicroservicesVersion = exports.nestjsPlatformExpressVersion = exports.nestjsCoreVersion = exports.nestjsCommonVersion = exports.reactRefreshVersion = exports.sassEmbeddedVersion = exports.sassLoaderVersion = exports.lessLoaderVersion = exports.rspackPluginReactRefreshVersion = exports.rspackDevServerVersion = exports.rspackCoreVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.rspackCoreVersion = '1.2.2';
 exports.rspackDevServerVersion = '1.0.9';
-exports.rspackPluginMinifyVersion = '^0.7.5';
 exports.rspackPluginReactRefreshVersion = '^1.0.0';
 exports.lessLoaderVersion = '~11.1.3';
 exports.sassLoaderVersion = '^16.0.4';