@nx/rspack 21.2.0-beta.1 → 21.2.0-beta.2

package/README.md

@@ -22,7 +22,7 @@
 
 # Nx: Smart Repos · Fast Builds
 
-Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
+An AI-first build platform that connects everything from your editor to CI. Helping you deliver fast, without breaking things.
 
 This package is a [Rspack plugin for Nx](https://nx.dev/nx-api/rspack).
 

package/generators.json

@@ -25,7 +25,8 @@
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",
-      "description": "React application generator."
+      "description": "React application generator.",
+      "x-deprecated": "This generator will be removed in Nx 22. Please use the equivalent generator for your application type instead."
     },
     "convert-webpack": {
       "alias": "convert-to-rspack",

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": "21.2.0-beta.1",
+  "version": "21.2.0-beta.2",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,10 +24,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "21.2.0-beta.1",
-    "@nx/devkit": "21.2.0-beta.1",
-    "@nx/web": "21.2.0-beta.1",
-    "@nx/module-federation": "21.2.0-beta.1",
+    "@nx/js": "21.2.0-beta.2",
+    "@nx/devkit": "21.2.0-beta.2",
+    "@nx/web": "21.2.0-beta.2",
+    "@nx/module-federation": "21.2.0-beta.2",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@rspack/core": "^1.3.8",
     "@rspack/dev-server": "^1.1.1",

package/src/generators/application/application.js

@@ -7,13 +7,65 @@ const package_json_1 = require("nx/package.json");
 const configuration_1 = tslib_1.__importDefault(require("../configuration/configuration"));
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 const normalize_options_1 = require("./lib/normalize-options");
+/**
+ * Updates the exclude field for any @nx/rspack/plugin registrations in nx.json
+ */
+function updateRspackPluginExclusion(tree, options) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson.plugins?.length) {
+        return;
+    }
+    let updated = false;
+    // Loop through all plugins to find @nx/rspack/plugin registrations
+    for (let i = 0; i < nxJson.plugins.length; i++) {
+        const plugin = nxJson.plugins[i];
+        const isRspackPlugin = typeof plugin === 'string'
+            ? plugin === '@nx/rspack/plugin'
+            : plugin.plugin === '@nx/rspack/plugin';
+        if (!isRspackPlugin) {
+            continue;
+        }
+        if (typeof plugin === 'string') {
+            // Convert string notation to object notation with exclude field
+            nxJson.plugins[i] = {
+                plugin: '@nx/rspack/plugin',
+                exclude: [`${options.appProjectRoot}/**`],
+            };
+            updated = true;
+        }
+        else {
+            // Object notation
+            if (!plugin.exclude) {
+                // Add exclude field if it doesn't exist
+                plugin.exclude = [`${options.appProjectRoot}/**`];
+                updated = true;
+            }
+            else if (Array.isArray(plugin.exclude)) {
+                // Add to existing exclude field if it's an array
+                plugin.exclude.push(`${options.appProjectRoot}/**`);
+                updated = true;
+            }
+        }
+    }
+    if (updated) {
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+}
+// TODO(v22) - remove this generator
 async function default_1(tree, _options) {
+    // Add deprecation warning with alternatives based on framework
+    const framework = _options.framework || 'react'; // Default is react
+    devkit_1.logger.warn(`The @nx/rspack:application generator is deprecated and will be removed in Nx 22. ` +
+        `Please use @nx/${framework === 'nest' ? 'nest' : framework === 'web' ? 'web' : 'react'}:application instead.`);
     const tasks = [];
     const initTask = await (0, init_1.default)(tree, {
         ..._options,
     });
     tasks.push(initTask);
     const options = await (0, normalize_options_1.normalizeOptions)(tree, _options);
+    if (framework === 'nest') {
+        updateRspackPluginExclusion(tree, options);
+    }
     options.style ??= 'css';
     if (options.framework === 'nest') {
         const { applicationGenerator: nestAppGenerator } = (0, devkit_1.ensurePackage)('@nx/nest', package_json_1.version);
@@ -29,6 +81,7 @@ async function default_1(tree, _options) {
             newProject: false,
             buildTarget: 'build',
             framework: 'nest',
+            addPlugin: false,
         });
         tasks.push(createAppTask, convertAppTask);
     }
@@ -79,6 +132,7 @@ async function default_1(tree, _options) {
             buildTarget: 'build',
             serveTarget: 'serve',
             framework: 'react',
+            addPlugin: false,
         });
         tasks.push(createAppTask, convertAppTask);
     }

package/src/generators/application/schema.json

@@ -4,6 +4,7 @@
   "title": "Application generator for React + rspack",
   "type": "object",
   "description": "React + Rspack application generator.",
+  "x-deprecated": "This generator will be removed in Nx 22. Please use the equivalent generator for your application type instead.",
   "examples": [
     {
       "command": "nx g app myorg/myapp",

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

@@ -13,7 +13,7 @@ const nx_tsconfig_paths_rspack_plugin_1 = require("./plugins/nx-tsconfig-paths-r
 const get_terser_ecma_version_1 = require("./get-terser-ecma-version");
 const nodeExternals = require("webpack-node-externals");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const is_lib_buildable_1 = require("./is-lib-buildable");
+const get_non_buildable_libs_1 = require("./get-non-buildable-libs");
 const IGNORED_RSPACK_WARNINGS = [
     /The comment file/i,
     /could not find any license/i,
@@ -105,39 +105,41 @@ function applyNxIndependentConfig(options, config) {
         (x) => IGNORED_RSPACK_WARNINGS.some((r) => typeof x === 'string' ? r.test(x) : r.test(x.message)),
         ...(config.ignoreWarnings ?? []),
     ];
-    config.optimization = !isProd
-        ? undefined
-        : {
-            ...(config.optimization ?? {}),
-            sideEffects: true,
-            minimize: typeof options.optimization === 'object'
-                ? !!options.optimization.scripts
-                : !!options.optimization,
-            minimizer: [
-                new core_1.SwcJsMinimizerRspackPlugin({
-                    extractComments: false,
-                    minimizerOptions: {
-                        // this needs to be false to allow toplevel variables to be used in the global scope
-                        // important especially for module-federation which operates as such
-                        module: false,
-                        mangle: {
-                            keep_classnames: true,
-                        },
-                        format: {
-                            ecma: (0, get_terser_ecma_version_1.getTerserEcmaVersion)(path.join(options.root, options.projectRoot)),
-                            ascii_only: true,
-                            comments: false,
-                            webkit: true,
-                            safari10: true,
+    config.optimization = {
+        ...(config.optimization ?? {}),
+        ...(isProd
+            ? {
+                sideEffects: true,
+                minimize: typeof options.optimization === 'object'
+                    ? !!options.optimization.scripts
+                    : !!options.optimization,
+                minimizer: [
+                    new core_1.SwcJsMinimizerRspackPlugin({
+                        extractComments: false,
+                        minimizerOptions: {
+                            // this needs to be false to allow toplevel variables to be used in the global scope
+                            // important especially for module-federation which operates as such
+                            module: false,
+                            mangle: {
+                                keep_classnames: true,
+                            },
+                            format: {
+                                ecma: (0, get_terser_ecma_version_1.getTerserEcmaVersion)(path.join(options.root, options.projectRoot)),
+                                ascii_only: true,
+                                comments: false,
+                                webkit: true,
+                                safari10: true,
+                            },
                         },
-                    },
-                }),
-            ],
-            concatenateModules: true,
-            runtimeChunk: isDevServer
-                ? config.optimization?.runtimeChunk ?? undefined
-                : false,
-        };
+                    }),
+                ],
+                concatenateModules: true,
+                runtimeChunk: isDevServer
+                    ? config.optimization?.runtimeChunk ?? undefined
+                    : false,
+            }
+            : {}),
+    };
     config.stats = {
         hash: true,
         timings: false,
@@ -282,27 +284,12 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
         const modulesDir = `${options.root}/node_modules`;
         const graph = options.projectGraph;
         const projectName = options.projectName;
-        const deps = graph?.dependencies?.[projectName] ?? [];
         // Collect non-buildable TS project references so that they are bundled
         // in the final output. This is needed for projects that are not buildable
         // but are referenced by buildable projects. This is needed for the new TS
         // solution setup.
         const nonBuildableWorkspaceLibs = isUsingTsSolution
-            ? deps
-                .filter((dep) => {
-                const node = graph.nodes?.[dep.target];
-                if (!node || node.type !== 'lib')
-                    return false;
-                const hasBuildTarget = 'build' in (node.data?.targets ?? {});
-                if (hasBuildTarget) {
-                    return false;
-                }
-                // If there is no build target we check the package exports to see if they reference
-                // source files
-                return !(0, is_lib_buildable_1.isBuildableLibrary)(node);
-            })
-                .map((dep) => graph.nodes?.[dep.target]?.data?.metadata?.js?.packageName)
-                .filter((name) => !!name)
+            ? (0, get_non_buildable_libs_1.getNonBuildableLibs)(graph, projectName)
             : [];
         externals.push(nodeExternals({ modulesDir, allowlist: nonBuildableWorkspaceLibs }));
     }

package/src/plugins/utils/get-non-buildable-libs.d.ts

@@ -0,0 +1,10 @@
+import { type ProjectGraph } from '@nx/devkit';
+/**
+ * Get all non-buildable libraries in the project graph for a given project.
+ * This function retrieves all direct and transitive dependencies of a project,
+ * filtering out only those that are libraries and not buildable.
+ * @param graph Project graph
+ * @param projectName The project name to get dependencies for
+ * @returns A list of all non-buildable libraries that the project depends on, including transitive dependencies.
+ */
+export declare function getNonBuildableLibs(graph: ProjectGraph, projectName: string): string[];

package/src/plugins/utils/get-non-buildable-libs.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNonBuildableLibs = getNonBuildableLibs;
+const get_transitive_deps_1 = require("./get-transitive-deps");
+const is_lib_buildable_1 = require("./is-lib-buildable");
+/**
+ * Get all non-buildable libraries in the project graph for a given project.
+ * This function retrieves all direct and transitive dependencies of a project,
+ * filtering out only those that are libraries and not buildable.
+ * @param graph Project graph
+ * @param projectName The project name to get dependencies for
+ * @returns A list of all non-buildable libraries that the project depends on, including transitive dependencies.
+ */
+function getNonBuildableLibs(graph, projectName) {
+    const deps = graph?.dependencies?.[projectName] ?? [];
+    const allNonBuildable = new Set();
+    // First, find all direct non-buildable deps and add them App -> library
+    const directNonBuildable = deps.filter((dep) => {
+        const node = graph.nodes?.[dep.target];
+        if (!node || node.type !== 'lib')
+            return false;
+        const hasBuildTarget = 'build' in (node.data?.targets ?? {});
+        if (hasBuildTarget)
+            return false;
+        return !(0, is_lib_buildable_1.isBuildableLibrary)(node);
+    });
+    // Add direct non-buildable dependencies
+    for (const dep of directNonBuildable) {
+        const packageName = graph.nodes?.[dep.target]?.data?.metadata?.js?.packageName;
+        if (packageName) {
+            allNonBuildable.add(packageName);
+        }
+        // Get all transitive non-buildable dependencies App -> library1 -> library2
+        const transitiveDeps = (0, get_transitive_deps_1.getAllTransitiveDeps)(graph, dep.target);
+        transitiveDeps.forEach((pkg) => allNonBuildable.add(pkg));
+    }
+    return Array.from(allNonBuildable);
+}

package/src/plugins/utils/get-transitive-deps.d.ts

@@ -0,0 +1,10 @@
+import { type ProjectGraph } from '@nx/devkit';
+/**
+ * Get all transitive dependencies of a target that are non-buildable libraries.
+ * This function traverses the project graph to find all dependencies of a given target,
+ * @param graph Graph of the project
+ * @param targetName The project name to get dependencies for
+ * @param visited Set to keep track of visited nodes to prevent infinite loops in circular dependencies
+ * @returns string[] - List of all transitive dependencies that are non-buildable libraries
+ */
+export declare function getAllTransitiveDeps(graph: ProjectGraph, targetName: string, visited?: Set<string>): string[];

package/src/plugins/utils/get-transitive-deps.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllTransitiveDeps = getAllTransitiveDeps;
+const is_lib_buildable_1 = require("./is-lib-buildable");
+/**
+ * Get all transitive dependencies of a target that are non-buildable libraries.
+ * This function traverses the project graph to find all dependencies of a given target,
+ * @param graph Graph of the project
+ * @param targetName The project name to get dependencies for
+ * @param visited Set to keep track of visited nodes to prevent infinite loops in circular dependencies
+ * @returns string[] - List of all transitive dependencies that are non-buildable libraries
+ */
+function getAllTransitiveDeps(graph, targetName, visited = new Set()) {
+    if (visited.has(targetName)) {
+        return [];
+    }
+    visited.add(targetName);
+    const node = graph.nodes?.[targetName];
+    if (!node) {
+        return [];
+    }
+    // Get direct dependencies of this target
+    const directDeps = graph.dependencies?.[targetName] || [];
+    const transitiveDeps = [];
+    for (const dep of directDeps) {
+        const depNode = graph.nodes?.[dep.target];
+        // Only consider library dependencies
+        if (!depNode || depNode.type !== 'lib') {
+            continue;
+        }
+        // Check if this dependency is non-buildable
+        const hasBuildTarget = 'build' in (depNode.data?.targets ?? {});
+        const isBuildable = hasBuildTarget || (0, is_lib_buildable_1.isBuildableLibrary)(depNode);
+        if (!isBuildable) {
+            const packageName = depNode.data?.metadata?.js?.packageName;
+            if (packageName) {
+                transitiveDeps.push(packageName);
+            }
+            const nestedDeps = getAllTransitiveDeps(graph, dep.target, visited);
+            transitiveDeps.push(...nestedDeps);
+        }
+    }
+    return transitiveDeps;
+}

package/src/utils/generator-utils.js

@@ -144,6 +144,13 @@ function addOrChangeBuildTarget(tree, options, target) {
         rspackConfig: (0, devkit_1.joinPathFragments)(project.root, 'rspack.config.js'),
         assets,
     };
+    const existingProjectConfigurations = {};
+    const buildTarget = project.targets.build;
+    if (buildTarget && buildTarget.configurations) {
+        for (const [configurationName, configuration] of Object.entries(buildTarget.configurations)) {
+            existingProjectConfigurations[configurationName] = configuration;
+        }
+    }
     project.targets ??= {};
     project.targets[target] = {
         executor: '@nx/rspack:rspack',
@@ -152,9 +159,11 @@ function addOrChangeBuildTarget(tree, options, target) {
         options: buildOptions,
         configurations: {
             development: {
+                ...(existingProjectConfigurations['development'] ?? {}),
                 mode: 'development',
             },
             production: {
+                ...(existingProjectConfigurations['production'] ?? {}),
                 mode: 'production',
                 optimization: options.target === 'web' ? true : undefined,
                 sourceMap: false,
@@ -265,7 +274,7 @@ module.exports = composePlugins(withNx(), withReact(${stylePreprocessorOptions
     `;
 }
 function generateNestConfig(tree, options, project, buildOptions) {
-    if ((0, has_plugin_1.hasPlugin)(tree)) {
+    if ((0, has_plugin_1.hasPlugin)(tree) && options.addPlugin !== false) {
         return `
 const { NxAppRspackPlugin } = require('@nx/rspack/app-plugin');
 const rspack = require('@rspack/core');