@nx/rspack 20.7.1 → 20.8.0-beta.0

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.7.1",
+  "version": "20.8.0-beta.0",
   "type": "commonjs",
   "repository": {
     "type": "git",
@@ -24,10 +24,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx/js": "20.7.1",
-    "@nx/devkit": "20.7.1",
-    "@nx/web": "20.7.1",
-    "@nx/module-federation": "20.7.1",
+    "@nx/js": "20.8.0-beta.0",
+    "@nx/devkit": "20.8.0-beta.0",
+    "@nx/web": "20.8.0-beta.0",
+    "@nx/module-federation": "20.8.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@rspack/core": "^1.1.5",
     "@rspack/dev-server": "^1.0.9",

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/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/utils/apply-base-config.js

@@ -13,6 +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 IGNORED_RSPACK_WARNINGS = [
     /The comment file/i,
     /could not find any license/i,
@@ -276,7 +277,31 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
     if ((options.target === 'node' || options.target === 'async-node') &&
         options.externalDependencies === 'all') {
         const modulesDir = `${options.root}/node_modules`;
-        externals.push(nodeExternals({ modulesDir }));
+        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)
+            : [];
+        externals.push(nodeExternals({ modulesDir, allowlist: nonBuildableWorkspaceLibs }));
     }
     else if (Array.isArray(options.externalDependencies)) {
         externals.push(function (ctx, callback) {
@@ -344,6 +369,8 @@ function applyNxDependentConfig(options, config, { useNormalizedEntry } = {}) {
                             tsx: true,
                         },
                         transform: {
+                            legacyDecorator: true,
+                            decoratorMetadata: true,
                             react: {
                                 runtime: 'automatic',
                                 pragma: 'React.createElement',

package/src/plugins/utils/is-lib-buildable.d.ts

@@ -0,0 +1,7 @@
+import { type ProjectGraphProjectNode } from '@nx/devkit';
+/**
+ * Check if the library is buildable.
+ * @param node from the project graph
+ * @returns boolean
+ */
+export declare function isBuildableLibrary(node: ProjectGraphProjectNode): boolean;

package/src/plugins/utils/is-lib-buildable.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isBuildableLibrary = isBuildableLibrary;
+function isSourceFile(path) {
+    return ['.ts', '.tsx', '.mts', '.cts'].some((ext) => path.endsWith(ext));
+}
+function isBuildableExportMap(packageExports) {
+    if (!packageExports || Object.keys(packageExports).length === 0) {
+        return false; // exports = {} → not buildable
+    }
+    const isCompiledExport = (value) => {
+        if (typeof value === 'string') {
+            return !isSourceFile(value);
+        }
+        if (typeof value === 'object' && value !== null) {
+            return Object.entries(value).some(([key, subValue]) => {
+                if (key === 'types' ||
+                    key === 'development' ||
+                    key === './package.json')
+                    return false;
+                return typeof subValue === 'string' && !isSourceFile(subValue);
+            });
+        }
+        return false;
+    };
+    if (packageExports['.']) {
+        return isCompiledExport(packageExports['.']);
+    }
+    return Object.entries(packageExports).some(([key, value]) => key !== '.' && isCompiledExport(value));
+}
+/**
+ * Check if the library is buildable.
+ * @param node from the project graph
+ * @returns boolean
+ */
+function isBuildableLibrary(node) {
+    if (!node.data.metadata?.js) {
+        return false;
+    }
+    const { packageExports, packageMain } = node.data.metadata.js;
+    // if we have exports only check this else fallback to packageMain
+    if (packageExports) {
+        return isBuildableExportMap(packageExports);
+    }
+    return (typeof packageMain === 'string' &&
+        packageMain !== '' &&
+        !isSourceFile(packageMain));
+}

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);
+}