@nx/rspack 23.0.0-beta.2 → 23.0.0-beta.21

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

@@ -1,47 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyReactConfig = applyReactConfig;
-const devkit_1 = require("@nx/devkit");
-// TODO(v23): Remove SVGR support
-function applyReactConfig(options, config = {}) {
+function applyReactConfig(options = {}, config = {}) {
     if (global.NX_GRAPH_CREATION)
         return;
     addHotReload(config);
-    if (options.svgr !== false || typeof options.svgr === 'object') {
-        // Log deprecation warning when SVGR is used
-        if (options.svgr === true || typeof options.svgr === 'object') {
-            devkit_1.logger.warn('SVGR support is deprecated and will be removed in Nx 23. Please consider using alternative SVG handling methods.');
-        }
-        removeSvgLoaderIfPresent(config);
-        const defaultSvgrOptions = {
-            svgo: false,
-            titleProp: true,
-            ref: true,
-        };
-        const svgrOptions = typeof options.svgr === 'object' ? options.svgr : defaultSvgrOptions;
-        config.module.rules.push({
-            test: /\.svg$/i,
-            type: 'asset',
-            resourceQuery: /url/, // *.svg?url
-        }, {
-            test: /\.svg$/i,
-            issuer: /\.[jt]sx?$/,
-            resourceQuery: { not: [/url/] }, // exclude react component if not *.svg?url
-            use: [{ loader: '@svgr/webpack', options: svgrOptions }],
-        });
-    }
     // enable rspack node api
     config.node = {
         __dirname: true,
         __filename: true,
     };
 }
-function removeSvgLoaderIfPresent(config) {
-    const svgLoaderIdx = config.module.rules.findIndex((rule) => typeof rule === 'object' && rule.test?.toString().includes('svg'));
-    if (svgLoaderIdx === -1)
-        return;
-    config.module.rules.splice(svgLoaderIdx, 1);
-}
 function addHotReload(config) {
     const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
     const isDev = process.env.NODE_ENV === 'development' || config.mode === 'development';

package/src/plugins/utils/apply-web-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply-web-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/plugins/utils/apply-web-config.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAQlB,uBAAuB,EACxB,MAAM,cAAc,CAAC;AAUtB,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AAG9D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,kCAAkC,EAC3C,MAAM,GAAE,OAAO,CAAC,uBAAuB,GAAG,aAAa,CAAM,EAC7D,EACE,kBAAkB,GACnB,GAAE;IAID,kBAAkB,CAAC,EAAE,OAAO,CAAC;CACzB,GACL,IAAI,CAqXN"}
+{"version":3,"file":"apply-web-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/plugins/utils/apply-web-config.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,aAAa,EAQlB,uBAAuB,EACxB,MAAM,cAAc,CAAC;AAUtB,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AAG9D,wBAAgB,cAAc,CAC5B,OAAO,EAAE,kCAAkC,EAC3C,MAAM,GAAE,OAAO,CAAC,uBAAuB,GAAG,aAAa,CAAM,EAC7D,EACE,kBAAkB,GACnB,GAAE;IAID,kBAAkB,CAAC,EAAE,OAAO,CAAC;CACzB,GACL,IAAI,CA2WN"}

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

@@ -1,7 +1,7 @@
 "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 internal_1 = require("@nx/js/internal");
 const core_1 = require("@rspack/core");
 const path_1 = require("path");
 const write_index_html_plugin_1 = require("../write-index-html-plugin");
@@ -18,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, (0, ts_solution_setup_1.getProjectSourceRoot)(options.projectGraph.nodes[options.projectName].data), 'index.html');
+        : (0, path_1.join)(options.root, (0, internal_1.getProjectSourceRoot)(options.projectGraph.nodes[options.projectName].data), 'index.html');
     options.styles ??= [];
     options.scripts ??= [];
     const isProd = process.env.NODE_ENV === 'production' || options.mode === 'production';
@@ -306,19 +306,9 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
         ...(config.module ?? {}),
         rules: [
             ...(config.module.rules ?? []),
-            // Images: Inline small images, and emit a separate file otherwise.
+            // Images: Inline small images, and emit a separate file otherwise (including SVGs).
             {
-                test: /\.(avif|bmp|gif|ico|jpe?g|png|webp)$/,
-                type: 'asset',
-                parser: {
-                    dataUrlCondition: {
-                        maxSize: 10_000, // 10 kB
-                    },
-                },
-            },
-            // SVG: same as image but we need to separate it so it can be swapped for SVGR in the React plugin.
-            {
-                test: /\.svg$/,
+                test: /\.(avif|bmp|gif|ico|jpe?g|png|svg|webp)$/,
                 type: 'asset',
                 parser: {
                     dataUrlCondition: {

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

@@ -1,15 +1,6 @@
 import type { DevTool, Mode } from '@rspack/core';
 import type { ProjectGraph } from '@nx/devkit';
-import type { AssetGlob } from '@nx/js/src/utils/assets/assets';
-/**
- * @deprecated SVGR support is deprecated and will be removed in Nx 23.
- * TODO(v23): Remove SVGR support
- */
-export interface SvgrOptions {
-    svgo?: boolean;
-    titleProp?: boolean;
-    ref?: boolean;
-}
+import type { AssetGlob } from '@nx/js/internal';
 export interface AssetGlobPattern {
     glob: string;
     input: string;

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

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/plugins/utils/models.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../../packages/rspack/src/plugins/utils/models.ts"],"names":[],"mappings":"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"}

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

@@ -4,7 +4,7 @@ exports.normalizeOptions = normalizeOptions;
 exports.normalizeAssets = normalizeAssets;
 exports.normalizeFileReplacements = normalizeFileReplacements;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
 function normalizeOptions(options) {
@@ -49,7 +49,7 @@ function normalizeOptions(options) {
         // executor options take precedence (especially for overriding with CLI args)
         originalTargetOptions);
     }
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data);
+    const sourceRoot = (0, internal_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/plugins/utils/plugins/nx-tsconfig-paths-rspack-plugin.js

@@ -4,7 +4,7 @@ exports.NxTsconfigPathsRspackPlugin = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const devkit_1 = require("@nx/devkit");
-const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
+const internal_1 = require("@nx/js/internal");
 const rspack_nx_build_coordination_plugin_1 = require("./rspack-nx-build-coordination-plugin");
 const fs_1 = require("fs");
 class NxTsconfigPathsRspackPlugin {
@@ -43,8 +43,8 @@ class NxTsconfigPathsRspackPlugin {
     handleBuildLibsFromSource(config, options) {
         if (!options.buildLibsFromSource && options.targetName) {
             const remappedTarget = options.targetName === 'serve' ? 'build' : options.targetName;
-            const { target, dependencies } = (0, buildable_libs_utils_1.calculateProjectBuildableDependencies)(undefined, options.projectGraph, options.root, options.projectName, remappedTarget, options.configurationName);
-            options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)(options.tsConfig, options.root, target.data.root, dependencies);
+            const { target, dependencies } = (0, internal_1.calculateProjectBuildableDependencies)(undefined, options.projectGraph, options.root, options.projectName, remappedTarget, options.configurationName);
+            options.tsConfig = (0, internal_1.createTmpTsConfig)(options.tsConfig, options.root, target.data.root, dependencies);
             this.tmpTsConfigPath = options.tsConfig;
             if (options.targetName === 'serve') {
                 const buildableDependencies = dependencies

package/src/utils/assert-supported-rspack-version.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export declare function assertSupportedRspackVersion(tree: Tree): void;
+//# sourceMappingURL=assert-supported-rspack-version.d.ts.map

package/src/utils/assert-supported-rspack-version.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assert-supported-rspack-version.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/assert-supported-rspack-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAM7D"}

package/src/utils/assert-supported-rspack-version.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertSupportedRspackVersion = assertSupportedRspackVersion;
+const internal_1 = require("@nx/devkit/internal");
+const versions_1 = require("./versions");
+function assertSupportedRspackVersion(tree) {
+    (0, internal_1.assertSupportedPackageVersion)(tree, '@rspack/core', versions_1.minSupportedRspackVersion);
+}

package/src/utils/config.js

@@ -5,7 +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 internal_1 = require("@nx/js/internal");
 const configuration_1 = require("nx/src/config/configuration");
 exports.nxRspackComposablePlugin = 'nxRspackComposablePlugin';
 function isNxRspackComposablePlugin(a) {
@@ -50,7 +50,7 @@ function ensureNxRspackExecutionContext(ctx) {
     ctx.options ??= {
         root: devkit_1.workspaceRoot,
         projectRoot: projectNode.data.root,
-        sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data),
+        sourceRoot: (0, internal_1.getProjectSourceRoot)(projectNode.data),
         // These aren't actually needed since NxRspackPlugin and withNx both support them being undefined.
         assets: undefined,
         outputFileName: undefined,

package/src/utils/deprecation.d.ts

@@ -0,0 +1,6 @@
+export declare const RSPACK_EXECUTOR_DEPRECATION_MESSAGE = "The `@nx/rspack:rspack` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` to migrate to the `@nx/rspack/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.";
+export declare const RSPACK_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = "The `@nx/rspack:dev-server` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` to migrate to the `@nx/rspack/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.";
+export declare function warnRspackExecutorDeprecation(): void;
+export declare function warnRspackDevServerExecutorDeprecation(): void;
+export declare function warnRspackExecutorGenerating(): void;
+//# sourceMappingURL=deprecation.d.ts.map

package/src/utils/deprecation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deprecation.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/deprecation.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,mCAAmC,mQACkN,CAAC;AAEnQ,eAAO,MAAM,8CAA8C,uQAC2M,CAAC;AAEvQ,wBAAgB,6BAA6B,IAAI,IAAI,CAEpD;AAED,wBAAgB,sCAAsC,IAAI,IAAI,CAE7D;AAED,wBAAgB,4BAA4B,IAAI,IAAI,CAInD"}

package/src/utils/deprecation.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RSPACK_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = exports.RSPACK_EXECUTOR_DEPRECATION_MESSAGE = void 0;
+exports.warnRspackExecutorDeprecation = warnRspackExecutorDeprecation;
+exports.warnRspackDevServerExecutorDeprecation = warnRspackDevServerExecutorDeprecation;
+exports.warnRspackExecutorGenerating = warnRspackExecutorGenerating;
+const devkit_1 = require("@nx/devkit");
+// TODO(v24): Remove the @nx/rspack:rspack and @nx/rspack:dev-server
+// executors. The inferred plugin (@nx/rspack/plugin) and the
+// convert-to-inferred generator stay supported.
+exports.RSPACK_EXECUTOR_DEPRECATION_MESSAGE = 'The `@nx/rspack:rspack` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` to migrate to the `@nx/rspack/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.';
+exports.RSPACK_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = 'The `@nx/rspack:dev-server` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` to migrate to the `@nx/rspack/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.';
+function warnRspackExecutorDeprecation() {
+    devkit_1.logger.warn(exports.RSPACK_EXECUTOR_DEPRECATION_MESSAGE);
+}
+function warnRspackDevServerExecutorDeprecation() {
+    devkit_1.logger.warn(exports.RSPACK_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE);
+}
+function warnRspackExecutorGenerating() {
+    devkit_1.logger.warn('Generating targets that use the deprecated `@nx/rspack:rspack` and `@nx/rspack:dev-server` executors. These executors will be removed in Nx v24. Run `nx g @nx/rspack:convert-to-inferred` next to migrate these targets to the `@nx/rspack/plugin` inferred plugin and prevent future generators from emitting executor targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
+}

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

@@ -1,3 +1,3 @@
 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>;
+export declare function getRspackE2EWebServerInfo(tree: Tree, projectName: string, configFilePath: string, isPluginBeingAdded: boolean, e2ePortOverride?: number): Promise<import("@nx/devkit/internal").E2EWebServerDetails>;
 //# sourceMappingURL=e2e-web-server-info-utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAGnD,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,8FA8BzB"}
+{"version":3,"file":"e2e-web-server-info-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/e2e-web-server-info-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAMnD,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,kBAAkB,EAAE,OAAO,EAC3B,eAAe,CAAC,EAAE,MAAM,8DA6BzB"}

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

@@ -2,15 +2,16 @@
 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");
+const internal_1 = require("@nx/devkit/internal");
 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;
+    const servePort = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)
+        ?.options?.port;
+    if (servePort) {
+        e2ePort = servePort;
     }
-    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+    return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/rspack/plugin',
         serveTargetName: 'serveTargetName',
         serveStaticTargetName: 'previewTargetName',

package/src/utils/generator-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/generator-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,mBAAmB,EACnB,IAAI,EAEL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAG3D,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;AACvC,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAC3D,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACrE,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAKnE,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE;IACP,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC3C,EACD,mBAAmB,CAAC,EAAE,sBAAsB,GAC3C;IACD,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,kCAAkC,EAAE,OAAO,CAAC;IAC5C,+BAA+B,EAAE,WAAW,CAAC;IAC7C,yBAAyB,EAAE,WAAW,CAAC;CACxC,CAwHA;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,MAAM,QAgEf;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,MAAM,QAoBf;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,wBAAwB,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,QAQvD;AAyND,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,qBAAqB,CAAC,EAAE,MAAM,QAa/B;AAID,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,WAAW,EAAE,MAAM,QA8DpB;AAED,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAQR;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,UAchB;AAED,wBAAsB,oCAAoC,CACxD,+BAA+B,EAAE,WAAW,EAC5C,sBAAsB,EAAE,sBAAsB,EAC9C,oBAAoB,EAAE,oBAAoB,EAC1C,SAAS,EAAE,SAAS,iBAuBrB;AAqCD,wBAAsB,sBAAsB,CAAC,WAAW,EAAE,MAAM,iBA4B/D;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IACP,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;CAChD,GACA;IAAE,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,CAAA;CAAE,CAmEnD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,UASrE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,UAYzE"}
+{"version":3,"file":"generator-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/generator-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,mBAAmB,EACnB,IAAI,EAEL,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAG3D,MAAM,MAAM,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;AACvC,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAC3D,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACrE,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAKnE,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE;IACP,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC3C,EACD,mBAAmB,CAAC,EAAE,sBAAsB,GAC3C;IACD,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,kCAAkC,EAAE,OAAO,CAAC;IAC5C,+BAA+B,EAAE,WAAW,CAAC;IAC7C,yBAAyB,EAAE,WAAW,CAAC;CACxC,CAwHA;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,MAAM,QAgEf;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,MAAM,QAoBf;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,wBAAwB,CAAC,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,QAQvD;AAyND,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,qBAAqB,CAAC,EAAE,MAAM,QAa/B;AAID,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,WAAW,EAAE,MAAM,QA8DpB;AAED,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAQR;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,UAchB;AAED,wBAAsB,oCAAoC,CACxD,+BAA+B,EAAE,WAAW,EAC5C,sBAAsB,EAAE,sBAAsB,EAC9C,oBAAoB,EAAE,oBAAoB,EAC1C,SAAS,EAAE,SAAS,iBAuBrB;AAqCD,wBAAsB,sBAAsB,CAAC,WAAW,EAAE,MAAM,iBA4B/D;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,EAC5B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;IACP,CAAC,UAAU,EAAE,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;CAChD,GACA;IAAE,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,CAAA;CAAE,CAmEnD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,UASrE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,mBAAmB,UAYzE"}

package/src/utils/generator-utils.js

@@ -14,8 +14,7 @@ exports.determineFrameworkAndTarget = determineFrameworkAndTarget;
 exports.determineMain = determineMain;
 exports.determineTsConfig = determineTsConfig;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const has_plugin_1 = require("./has-plugin");
 function findExistingTargetsInProject(targets, userProvidedTargets) {
     const output = {
@@ -130,7 +129,7 @@ function addOrChangeBuildTarget(tree, options, target) {
     if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'src/assets'))) {
         assets.push((0, devkit_1.joinPathFragments)(project.root, 'src/assets'));
     }
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isTsSolutionSetup = (0, internal_1.isUsingTsSolutionSetup)(tree);
     const buildOptions = {
         target: options.target ?? 'web',
         outputPath: isTsSolutionSetup
@@ -486,7 +485,7 @@ async function handleUnknownExecutors(projectName) {
     }
 }
 function determineFrameworkAndTarget(tree, options, projectRoot, targets) {
-    (0, ensure_typescript_1.ensureTypescript)();
+    (0, internal_1.ensureTypescript)();
     const { ast, query } = require('@phenomnomnominal/tsquery');
     // First try to infer if the target is node
     if (options.target !== 'node') {

package/src/utils/module-federation-deprecation.d.ts

@@ -0,0 +1,7 @@
+export declare const RSPACK_MF_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = "The `@nx/rspack:module-federation-dev-server` executor is deprecated and will be removed in Nx v24. Dynamic federation in `@nx/react:consumer` removes the need for host-orchestrated remote serving. See https://nx.dev/docs/technologies/module-federation/consumer-and-provider for the v23 migration guide.";
+export declare const RSPACK_MF_SSR_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = "The `@nx/rspack:module-federation-ssr-dev-server` executor is deprecated and will be removed in Nx v24. SSR is not first-classed in the new generators; see https://nx.dev/docs/technologies/module-federation/consumer-and-provider for guidance on wiring SSR with `@nx/react:consumer`.";
+export declare const RSPACK_MF_STATIC_SERVER_EXECUTOR_DEPRECATION_MESSAGE = "The `@nx/rspack:module-federation-static-server` executor is deprecated and will be removed in Nx v24. Use plain `rsbuild preview` / `sirv-cli` via `nx:run-commands` if a static-serve workflow is still needed. See https://nx.dev/docs/technologies/module-federation/consumer-and-provider for details.";
+export declare function warnRspackMfDevServerExecutorDeprecation(): void;
+export declare function warnRspackMfSsrDevServerExecutorDeprecation(): void;
+export declare function warnRspackMfStaticServerExecutorDeprecation(): void;
+//# sourceMappingURL=module-federation-deprecation.d.ts.map

package/src/utils/module-federation-deprecation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-federation-deprecation.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/module-federation-deprecation.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,iDAAiD,oTAAgQ,CAAC;AAE/T,eAAO,MAAM,qDAAqD,+RAA2O,CAAC;AAE9S,eAAO,MAAM,oDAAoD,gTAAgQ,CAAC;AAUlU,wBAAgB,wCAAwC,IAAI,IAAI,CAK/D;AAED,wBAAgB,2CAA2C,IAAI,IAAI,CAKlE;AAED,wBAAgB,2CAA2C,IAAI,IAAI,CAKlE"}

package/src/utils/module-federation-deprecation.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RSPACK_MF_STATIC_SERVER_EXECUTOR_DEPRECATION_MESSAGE = exports.RSPACK_MF_SSR_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = exports.RSPACK_MF_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = void 0;
+exports.warnRspackMfDevServerExecutorDeprecation = warnRspackMfDevServerExecutorDeprecation;
+exports.warnRspackMfSsrDevServerExecutorDeprecation = warnRspackMfSsrDevServerExecutorDeprecation;
+exports.warnRspackMfStaticServerExecutorDeprecation = warnRspackMfStaticServerExecutorDeprecation;
+const devkit_1 = require("@nx/devkit");
+// TODO(v24): Remove these MF executors. Dynamic federation in the new
+// `@nx/react:consumer` generator removes the orchestration need.
+const MIGRATION_URL = 'https://nx.dev/docs/technologies/module-federation/consumer-and-provider';
+exports.RSPACK_MF_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = `The \`@nx/rspack:module-federation-dev-server\` executor is deprecated and will be removed in Nx v24. Dynamic federation in \`@nx/react:consumer\` removes the need for host-orchestrated remote serving. See ${MIGRATION_URL} for the v23 migration guide.`;
+exports.RSPACK_MF_SSR_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE = `The \`@nx/rspack:module-federation-ssr-dev-server\` executor is deprecated and will be removed in Nx v24. SSR is not first-classed in the new generators; see ${MIGRATION_URL} for guidance on wiring SSR with \`@nx/react:consumer\`.`;
+exports.RSPACK_MF_STATIC_SERVER_EXECUTOR_DEPRECATION_MESSAGE = `The \`@nx/rspack:module-federation-static-server\` executor is deprecated and will be removed in Nx v24. Use plain \`rsbuild preview\` / \`sirv-cli\` via \`nx:run-commands\` if a static-serve workflow is still needed. See ${MIGRATION_URL} for details.`;
+// Executor warnings fire once per process to avoid flooding dev-server loops.
+const executorWarned = new Set();
+function warnOnce(key, message) {
+    if (executorWarned.has(key))
+        return;
+    executorWarned.add(key);
+    devkit_1.logger.warn(message);
+}
+function warnRspackMfDevServerExecutorDeprecation() {
+    warnOnce('rspack-mf-dev-server', exports.RSPACK_MF_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE);
+}
+function warnRspackMfSsrDevServerExecutorDeprecation() {
+    warnOnce('rspack-mf-ssr-dev-server', exports.RSPACK_MF_SSR_DEV_SERVER_EXECUTOR_DEPRECATION_MESSAGE);
+}
+function warnRspackMfStaticServerExecutorDeprecation() {
+    warnOnce('rspack-mf-static-server', exports.RSPACK_MF_STATIC_SERVER_EXECUTOR_DEPRECATION_MESSAGE);
+}

package/src/utils/resolve-user-defined-rspack-config.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveUserDefinedRspackConfig = resolveUserDefinedRspackConfig;
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+const internal_1 = require("@nx/devkit/internal");
 async function resolveUserDefinedRspackConfig(path, tsConfig, 
 /** Skip require cache and return latest content */
 reload = false) {
-    return await (0, config_utils_1.loadConfigFile)(path);
+    return await (0, internal_1.loadConfigFile)(path);
 }

package/src/utils/version-utils.d.ts

@@ -0,0 +1,27 @@
+import { type Tree } from '@nx/devkit';
+import { type SupportedRspackMajorVersion } from './versions';
+/**
+ * Returns the declared @rspack/core major version from the workspace's
+ * package.json when it matches a supported major, or `undefined` otherwise
+ * (fresh install, dist tag, unknown major). Below-floor enforcement is
+ * handled at generator entry points via `assertSupportedRspackVersion`.
+ */
+export declare function getInstalledRspackMajorVersion(tree: Tree): SupportedRspackMajorVersion | undefined;
+/**
+ * Returns the installed @rspack/core major version resolved at runtime from
+ * node_modules. For use in executors and runtime code where no Tree is
+ * available. Returns `null` when @rspack/core can't be resolved or the
+ * installed major isn't supported.
+ */
+export declare function getInstalledRspackVersionRuntime(): SupportedRspackMajorVersion | null;
+/**
+ * Returns the version-map entry for the installed major, falling back to the
+ * latest supported map when no installed version is detected (fresh install)
+ * or the detected major is outside the supported window.
+ */
+export declare function getRspackVersionsForInstalledMajor(tree: Tree): {
+    rspackCoreVersion: string;
+    rspackDevServerVersion: string;
+    rspackPluginReactRefreshVersion: string;
+};
+//# sourceMappingURL=version-utils.d.ts.map

package/src/utils/version-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAMvC,OAAO,EAGL,KAAK,2BAA2B,EACjC,MAAM,YAAY,CAAC;AAIpB;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,GACT,2BAA2B,GAAG,SAAS,CASzC;AAED;;;;;GAKG;AACH,wBAAgB,gCAAgC,IAAI,2BAA2B,GAAG,IAAI,CASrF;AAED;;;;GAIG;AACH,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,IAAI;;;;EAM5D"}

package/src/utils/version-utils.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInstalledRspackMajorVersion = getInstalledRspackMajorVersion;
+exports.getInstalledRspackVersionRuntime = getInstalledRspackVersionRuntime;
+exports.getRspackVersionsForInstalledMajor = getRspackVersionsForInstalledMajor;
+const internal_1 = require("@nx/devkit/internal");
+const semver_1 = require("semver");
+const versions_1 = require("./versions");
+const RSPACK_CORE_PACKAGE = '@rspack/core';
+/**
+ * Returns the declared @rspack/core major version from the workspace's
+ * package.json when it matches a supported major, or `undefined` otherwise
+ * (fresh install, dist tag, unknown major). Below-floor enforcement is
+ * handled at generator entry points via `assertSupportedRspackVersion`.
+ */
+function getInstalledRspackMajorVersion(tree) {
+    const declared = (0, internal_1.getDeclaredPackageVersion)(tree, RSPACK_CORE_PACKAGE);
+    if (!declared) {
+        return undefined;
+    }
+    const installedMajor = (0, semver_1.major)(declared);
+    return installedMajor in versions_1.backwardCompatibleRspackVersions
+        ? installedMajor
+        : undefined;
+}
+/**
+ * Returns the installed @rspack/core major version resolved at runtime from
+ * node_modules. For use in executors and runtime code where no Tree is
+ * available. Returns `null` when @rspack/core can't be resolved or the
+ * installed major isn't supported.
+ */
+function getInstalledRspackVersionRuntime() {
+    const version = (0, internal_1.getInstalledPackageVersion)(RSPACK_CORE_PACKAGE);
+    if (!version) {
+        return null;
+    }
+    const installedMajor = (0, semver_1.major)(version);
+    return installedMajor in versions_1.backwardCompatibleRspackVersions
+        ? installedMajor
+        : null;
+}
+/**
+ * Returns the version-map entry for the installed major, falling back to the
+ * latest supported map when no installed version is detected (fresh install)
+ * or the detected major is outside the supported window.
+ */
+function getRspackVersionsForInstalledMajor(tree) {
+    const installed = getInstalledRspackMajorVersion(tree);
+    if (installed === undefined) {
+        return versions_1.latestRspackVersions;
+    }
+    return versions_1.backwardCompatibleRspackVersions[installed];
+}

package/src/utils/versions.d.ts

@@ -1,9 +1,24 @@
 export declare const nxVersion: any;
-export declare const rspackCoreVersion = "1.6.8";
-export declare const rspackDevServerVersion = "^1.1.4";
-export declare const rspackPluginReactRefreshVersion = "^1.0.0";
+export declare const minSupportedRspackVersion = "1.0.0";
 export declare const lessLoaderVersion = "~11.1.3";
 export declare const sassLoaderVersion = "^16.0.7";
 export declare const sassEmbeddedVersion = "^1.97.2";
 export declare const reactRefreshVersion = "~0.14.0";
+export declare const supportedRspackMajorVersions: readonly [1];
+export type SupportedRspackMajorVersion = (typeof supportedRspackMajorVersions)[number];
+type RspackVersionMap = {
+    rspackCoreVersion: string;
+    rspackDevServerVersion: string;
+    rspackPluginReactRefreshVersion: string;
+};
+export declare const latestRspackVersions: RspackVersionMap;
+export declare const backwardCompatibleRspackVersions: Record<SupportedRspackMajorVersion, RspackVersionMap>;
+/**
+ * Kept for backward compatibility with code paths that don't yet branch on
+ * the detected installed major. Points at the latest supported major.
+ */
+export declare const rspackCoreVersion: string;
+export declare const rspackDevServerVersion: string;
+export declare const rspackPluginReactRefreshVersion: string;
+export {};
 //# sourceMappingURL=versions.d.ts.map

package/src/utils/versions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAC/D,eAAO,MAAM,iBAAiB,UAAU,CAAC;AACzC,eAAO,MAAM,sBAAsB,WAAW,CAAC;AAE/C,eAAO,MAAM,+BAA+B,WAAW,CAAC;AACxD,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAE7C,eAAO,MAAM,mBAAmB,YAAY,CAAC"}
+{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,yBAAyB,UAAU,CAAC;AAEjD,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAK7C,eAAO,MAAM,4BAA4B,cAAe,CAAC;AACzD,MAAM,MAAM,2BAA2B,GACrC,CAAC,OAAO,4BAA4B,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhD,KAAK,gBAAgB,GAAG;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+BAA+B,EAAE,MAAM,CAAC;CACzC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,gBAIlC,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,MAAM,CACnD,2BAA2B,EAC3B,gBAAgB,CAGjB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAAyC,CAAC;AACxE,eAAO,MAAM,sBAAsB,QACU,CAAC;AAC9C,eAAO,MAAM,+BAA+B,QACU,CAAC"}

package/src/utils/versions.js

@@ -1,11 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reactRefreshVersion = exports.sassEmbeddedVersion = exports.sassLoaderVersion = exports.lessLoaderVersion = exports.rspackPluginReactRefreshVersion = exports.rspackDevServerVersion = exports.rspackCoreVersion = exports.nxVersion = void 0;
+exports.rspackPluginReactRefreshVersion = exports.rspackDevServerVersion = exports.rspackCoreVersion = exports.backwardCompatibleRspackVersions = exports.latestRspackVersions = exports.supportedRspackMajorVersions = exports.reactRefreshVersion = exports.sassEmbeddedVersion = exports.sassLoaderVersion = exports.lessLoaderVersion = exports.minSupportedRspackVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.rspackCoreVersion = '1.6.8';
-exports.rspackDevServerVersion = '^1.1.4';
-exports.rspackPluginReactRefreshVersion = '^1.0.0';
+exports.minSupportedRspackVersion = '1.0.0';
 exports.lessLoaderVersion = '~11.1.3';
 exports.sassLoaderVersion = '^16.0.7';
 exports.sassEmbeddedVersion = '^1.97.2';
 exports.reactRefreshVersion = '~0.14.0';
+// Supported `@rspack/core` majors. Currently v1 only — v2 ships as pure
+// ESM, which @nx/rspack (CommonJS) cannot consume without a deeper
+// refactor; tracked separately.
+exports.supportedRspackMajorVersions = [1];
+exports.latestRspackVersions = {
+    rspackCoreVersion: '1.6.8',
+    rspackDevServerVersion: '^1.1.4',
+    rspackPluginReactRefreshVersion: '^1.0.0',
+};
+exports.backwardCompatibleRspackVersions = {
+    1: exports.latestRspackVersions,
+};
+/**
+ * Kept for backward compatibility with code paths that don't yet branch on
+ * the detected installed major. Points at the latest supported major.
+ */
+exports.rspackCoreVersion = exports.latestRspackVersions.rspackCoreVersion;
+exports.rspackDevServerVersion = exports.latestRspackVersions.rspackDevServerVersion;
+exports.rspackPluginReactRefreshVersion = exports.latestRspackVersions.rspackPluginReactRefreshVersion;

package/src/utils/with-react.d.ts

@@ -1,13 +1,7 @@
-import { Configuration } from '@rspack/core';
+import type { Configuration } from '@rspack/core';
 import { NxRspackExecutionContext } from './config';
 import { WithWebOptions } from './with-web';
-import { SvgrOptions } from '../plugins/utils/models';
 export interface WithReactOptions extends WithWebOptions {
-    /**
-     * @deprecated SVGR support is deprecated and will be removed in Nx 23.
-     * TODO(v23): Remove SVGR support
-     */
-    svgr?: boolean | SvgrOptions;
 }
 export declare function withReact(opts?: WithReactOptions): (config: Configuration, { options, context }: NxRspackExecutionContext) => Configuration;
 //# sourceMappingURL=with-react.d.ts.map

package/src/utils/with-react.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-react.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-react.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAW,cAAc,EAAE,MAAM,YAAY,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACtD;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;CAC9B;AAED,wBAAgB,SAAS,CAAC,IAAI,GAAE,gBAAqB,IAEjD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CASjB"}
+{"version":3,"file":"with-react.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-react.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAW,cAAc,EAAE,MAAM,YAAY,CAAC;AAGrD,MAAM,WAAW,gBAAiB,SAAQ,cAAc;CAAG;AAE3D,wBAAgB,SAAS,CAAC,IAAI,GAAE,gBAAqB,IAEjD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CASjB"}

package/src/utils/with-react.js

@@ -9,7 +9,7 @@ function withReact(opts = {}) {
             options,
             context,
         });
-        (0, apply_react_config_1.applyReactConfig)(opts, config);
+        (0, apply_react_config_1.applyReactConfig)({}, config);
         return config;
     };
 }

package/src/utils/with-web.d.ts

@@ -1,4 +1,4 @@
-import { Configuration } from '@rspack/core';
+import type { Configuration } from '@rspack/core';
 import { ExtraEntryPointClass } from './model';
 import { NxRspackExecutionContext } from './config';
 export interface WithWebOptions {

package/src/utils/with-web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-web.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC9C,wBAAwB,CAAC,EAAE;QACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACnC,CAAC;IACF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,kBAAkB,CAAC,EACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,OAAO,GACP,CAAC,CACC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACxB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;CAC9D;AAID,wBAAgB,OAAO,CAAC,aAAa,GAAE,cAAmB,IAEtD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CAsBjB"}
+{"version":3,"file":"with-web.d.ts","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-web.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEpD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC,CAAC;IAC9C,wBAAwB,CAAC,EAAE;QACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACnC,CAAC;IACF,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;;OAGG;IACH,kBAAkB,CAAC,EACf,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,OAAO,GACP,CAAC,CACC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACxB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;CAC9D;AAID,wBAAgB,OAAO,CAAC,aAAa,GAAE,cAAmB,IAEtD,QAAQ,aAAa,EACrB,sBAAsB,wBAAwB,KAC7C,aAAa,CAsBjB"}