@nx/rspack 21.3.0-beta.3 → 21.3.0-beta.5

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

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

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = runExecutor;
 const devkit_1 = require("@nx/devkit");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const dev_server_1 = require("@rspack/dev-server");
 const create_compiler_1 = require("../../utils/create-compiler");
 const mode_utils_1 = require("../../utils/mode-utils");
-const get_dev_server_config_1 = require("./lib/get-dev-server-config");
 const normalize_options_1 = require("../rspack/lib/normalize-options");
+const get_dev_server_config_1 = require("./lib/get-dev-server-config");
 async function* runExecutor(options, context) {
     process.env.NODE_ENV ??= options.mode ?? 'development';
     if ((0, mode_utils_1.isMode)(process.env.NODE_ENV)) {
@@ -18,7 +19,7 @@ async function* runExecutor(options, context) {
     process.env.NX_BUILD_LIBS_FROM_SOURCE = `${buildOptions.buildLibsFromSource}`;
     process.env.NX_BUILD_TARGET = options.buildTarget;
     const metadata = context.projectsConfigurations.projects[context.projectName];
-    const sourceRoot = metadata.sourceRoot;
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(metadata);
     const normalizedBuildOptions = (0, normalize_options_1.normalizeOptions)(buildOptions, context.root, metadata.root, sourceRoot);
     let devServerConfig = (0, get_dev_server_config_1.getDevServerOptions)(context.root, options, normalizedBuildOptions);
     const compiler = await (0, create_compiler_1.createCompiler)({

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

@@ -4,11 +4,12 @@ exports.default = moduleFederationDevServer;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const utils_1 = require("@nx/module-federation/src/executors/utils");
 const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const utils_1 = require("@nx/module-federation/src/executors/utils");
 const dev_server_impl_1 = tslib_1.__importDefault(require("../dev-server/dev-server.impl"));
 const lib_1 = require("./lib");
 async function* moduleFederationDevServer(schema, context) {
@@ -24,8 +25,7 @@ async function* moduleFederationDevServer(schema, context) {
         }, context)
         : (0, dev_server_impl_1.default)(options, context);
     const p = context.projectsConfigurations.projects[context.projectName];
-    const buildOptions = (0, lib_1.getBuildOptions)(options.buildTarget, context);
-    let pathToManifestFile = (0, path_1.join)(context.root, p.sourceRoot, 'assets/module-federation.manifest.json');
+    let pathToManifestFile = (0, path_1.join)(context.root, (0, ts_solution_setup_1.getProjectSourceRoot)(p), 'assets/module-federation.manifest.json');
     if (options.pathToManifestFile) {
         const userPathToManifestFile = (0, path_1.join)(context.root, options.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {

package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js

@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = moduleFederationSsrDevServer;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const utils_1 = require("@nx/module-federation/src/executors/utils");
-const ssr_dev_server_impl_1 = tslib_1.__importDefault(require("../ssr-dev-server/ssr-dev-server.impl"));
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const fs_1 = require("fs");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const utils_1 = require("@nx/module-federation/src/executors/utils");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const ssr_dev_server_impl_1 = tslib_1.__importDefault(require("../ssr-dev-server/ssr-dev-server.impl"));
 const lib_1 = require("./lib");
 async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
     const options = (0, lib_1.normalizeOptions)(ssrDevServerOptions);
     const iter = (0, ssr_dev_server_impl_1.default)(options, context);
     const projectConfig = context.projectsConfigurations.projects[context.projectName];
-    const buildOptions = (0, lib_1.getBuildOptions)(options.browserTarget, context);
-    let pathToManifestFile = (0, path_1.join)(context.root, projectConfig.sourceRoot, 'assets/module-federation.manifest.json');
+    let pathToManifestFile = (0, path_1.join)(context.root, (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig), 'assets/module-federation.manifest.json');
     if (options.pathToManifestFile) {
         const userPathToManifestFile = (0, path_1.join)(context.root, options.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {

package/src/executors/module-federation-static-server/module-federation-static-server.impl.d.ts

@@ -1,5 +1,5 @@
-import { ExecutorContext } from 'nx/src/config/misc-interfaces';
 import { StaticRemotesConfig } from '@nx/module-federation/src/utils';
+import { ExecutorContext } from 'nx/src/config/misc-interfaces';
 import { ModuleFederationDevServerOptions } from '../module-federation-dev-server/schema';
 import { ModuleFederationStaticServerSchema } from './schema';
 export declare function startProxies(staticRemotesConfig: StaticRemotesConfig, hostServeOptions: ModuleFederationDevServerOptions, mappedLocationOfHost: string, mappedLocationsOfRemotes: Record<string, string>, sslOptions?: {

package/src/executors/module-federation-static-server/module-federation-static-server.impl.js

@@ -5,19 +5,20 @@ exports.default = moduleFederationStaticServer;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const utils_1 = require("@nx/module-federation/src/executors/utils");
+const utils_2 = require("@nx/module-federation/src/utils");
 const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const utils_1 = require("@nx/module-federation/src/utils");
-const utils_2 = require("@nx/module-federation/src/executors/utils");
 function getBuildAndServeOptionsFromServeTarget(serveTarget, context) {
     const target = (0, devkit_1.parseTargetString)(serveTarget, context);
     const serveOptions = (0, devkit_1.readTargetOptions)(target, context);
     const buildTarget = (0, devkit_1.parseTargetString)(serveOptions.buildTarget, context);
     const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
-    let pathToManifestFile = (0, path_1.join)(context.root, context.projectGraph.nodes[context.projectName].data.sourceRoot, 'assets/module-federation.manifest.json');
+    let pathToManifestFile = (0, path_1.join)(context.root, (0, ts_solution_setup_1.getProjectSourceRoot)(context.projectGraph.nodes[context.projectName].data), 'assets/module-federation.manifest.json');
     if (serveOptions.pathToManifestFile) {
         const userPathToManifestFile = (0, path_1.join)(context.root, serveOptions.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {
@@ -169,15 +170,15 @@ async function* moduleFederationStaticServer(schema, context) {
     // Get the remotes from the module federation config
     const p = context.projectsConfigurations.projects[context.projectName];
     const options = getBuildAndServeOptionsFromServeTarget(schema.serveTarget, context);
-    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
-    const remotes = (0, utils_1.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
+    const moduleFederationConfig = (0, utils_2.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
+    const remotes = (0, utils_2.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
         projectName: context.projectName,
         projectGraph: context.projectGraph,
         root: context.root,
     }, options.pathToManifestFile);
-    const staticRemotesConfig = (0, utils_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
+    const staticRemotesConfig = (0, utils_2.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
     options.serveOptions.staticRemotesPort ??= remotes.staticRemotePort;
-    const mappedLocationsOfStaticRemotes = await (0, utils_2.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options.serveOptions);
+    const mappedLocationsOfStaticRemotes = await (0, utils_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options.serveOptions);
     // Build the host
     const hostUrlSegment = (0, path_1.basename)(options.buildOptions.outputPath);
     const mappedLocationOfHost = `http${options.serveOptions.ssl ? 's' : ''}://${options.serveOptions.host}:${options.serveOptions.staticRemotesPort}/${hostUrlSegment}`;

package/src/executors/rspack/rspack.impl.js

@@ -4,16 +4,17 @@ exports.default = runExecutor;
 const devkit_1 = require("@nx/devkit");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const js_1 = require("@nx/js");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const fs_1 = require("fs");
+const path_1 = require("path");
 const create_compiler_1 = require("../../utils/create-compiler");
 const mode_utils_1 = require("../../utils/mode-utils");
 const normalize_options_1 = require("./lib/normalize-options");
-const path_1 = require("path");
 async function* runExecutor(options, context) {
     process.env.NODE_ENV ??= options.mode ?? 'production';
     options.target ??= 'web';
     const metadata = context.projectsConfigurations.projects[context.projectName];
-    const sourceRoot = metadata.sourceRoot;
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(metadata);
     const normalizedOptions = (0, normalize_options_1.normalizeOptions)(options, context.root, metadata.root, sourceRoot);
     if ((0, mode_utils_1.isMode)(process.env.NODE_ENV)) {
         normalizedOptions.mode = process.env.NODE_ENV;

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

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyWebConfig = applyWebConfig;
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const core_1 = require("@rspack/core");
-const write_index_html_plugin_1 = require("../write-index-html-plugin");
-const instantiate_script_plugins_1 = require("./instantiate-script-plugins");
 const path_1 = require("path");
+const write_index_html_plugin_1 = require("../write-index-html-plugin");
 const hash_format_1 = require("./hash-format");
-const normalize_entry_1 = require("./normalize-entry");
+const instantiate_script_plugins_1 = require("./instantiate-script-plugins");
 const stylesheet_loaders_1 = require("./loaders/stylesheet-loaders");
+const normalize_entry_1 = require("./normalize-entry");
 function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     if (global.NX_GRAPH_CREATION)
         return;
@@ -17,7 +18,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     options.generateIndexHtml ??= true;
     options.index = options.index
         ? (0, path_1.join)(options.root, options.index)
-        : (0, path_1.join)(options.root, options.projectGraph.nodes[options.projectName].data.sourceRoot, 'index.html');
+        : (0, path_1.join)(options.root, (0, ts_solution_setup_1.getProjectSourceRoot)(options.projectGraph.nodes[options.projectName].data), 'index.html');
     options.styles ??= [];
     options.scripts ??= [];
     const isProd = process.env.NODE_ENV === 'production' || options.mode === 'production';

package/src/plugins/utils/plugins/normalize-options.d.ts

@@ -1,4 +1,4 @@
-import { AssetGlobPattern, FileReplacement, NxAppRspackPluginOptions, NormalizedNxAppRspackPluginOptions } from '../models';
+import { AssetGlobPattern, FileReplacement, NormalizedNxAppRspackPluginOptions, NxAppRspackPluginOptions } from '../models';
 export declare function normalizeOptions(options: NxAppRspackPluginOptions): NormalizedNxAppRspackPluginOptions;
 export declare function normalizeAssets(assets: any[], root: string, sourceRoot: string, projectRoot: string, resolveRelativePathsToProjectRoot?: boolean): AssetGlobPattern[];
 export declare function normalizeFileReplacements(root: string, fileReplacements: FileReplacement[]): FileReplacement[];

package/src/plugins/utils/plugins/normalize-options.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 exports.normalizeAssets = normalizeAssets;
 exports.normalizeFileReplacements = normalizeFileReplacements;
-const path_1 = require("path");
-const fs_1 = require("fs");
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const fs_1 = require("fs");
+const path_1 = require("path");
 function normalizeOptions(options) {
     const combinedPluginAndMaybeExecutorOptions = {};
     const isProd = process.env.NODE_ENV === 'production';
@@ -48,7 +49,7 @@ function normalizeOptions(options) {
         // executor options take precedence (especially for overriding with CLI args)
         originalTargetOptions);
     }
-    const sourceRoot = projectNode.data.sourceRoot ?? projectNode.data.root;
+    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data);
     if (!combinedPluginAndMaybeExecutorOptions.main) {
         throw new Error(`Missing "main" option for the entry file. Set this option in your Nx rspack plugin.`);
     }

package/src/utils/config.js

@@ -5,6 +5,7 @@ exports.isNxRspackComposablePlugin = isNxRspackComposablePlugin;
 exports.composePlugins = composePlugins;
 exports.composePluginsSync = composePluginsSync;
 const devkit_1 = require("@nx/devkit");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const configuration_1 = require("nx/src/config/configuration");
 exports.nxRspackComposablePlugin = 'nxRspackComposablePlugin';
 function isNxRspackComposablePlugin(a) {
@@ -49,7 +50,7 @@ function ensureNxRspackExecutionContext(ctx) {
     ctx.options ??= {
         root: devkit_1.workspaceRoot,
         projectRoot: projectNode.data.root,
-        sourceRoot: projectNode.data.sourceRoot ?? projectNode.data.root,
+        sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data),
         // These aren't actually needed since NxRspackPlugin and withNx both support them being undefined.
         assets: undefined,
         outputFileName: undefined,