@nx/rspack 23.0.0-rc.4 → 23.1.0-beta.0

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

@@ -1,20 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyReactConfig = applyReactConfig;
+exports.applyReactConfigSync = applyReactConfigSync;
+exports.applyReactHotReloadToCompiler = applyReactHotReloadToCompiler;
+/**
+ * Apply rspack/react config for the compose path (e.g. `withReact`):
+ * sync tweaks + push react-refresh into `config.plugins`. Plugins that
+ * participate in rspack's lifecycle should call
+ * `applyReactConfigSync(...)` + `applyReactHotReloadToCompiler(...)`
+ * instead.
+ */
 function applyReactConfig(options = {}, config = {}) {
     if (global.NX_GRAPH_CREATION)
         return;
-    addHotReload(config);
+    applyReactConfigSync(config);
+    if (isDevConfig(config)) {
+        const ReactRefreshPlugin = loadReactRefreshPluginClass();
+        config.plugins ??= [];
+        config.plugins.push(new ReactRefreshPlugin({ overlay: false }));
+    }
+}
+function applyReactConfigSync(config) {
     // enable rspack node api
     config.node = {
         __dirname: true,
         __filename: true,
     };
 }
-function addHotReload(config) {
-    const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
-    const isDev = process.env.NODE_ENV === 'development' || config.mode === 'development';
-    if (isDev) {
-        config.plugins.push(new ReactRefreshPlugin({ overlay: false }));
-    }
+function applyReactHotReloadToCompiler(compiler) {
+    if (!isDevConfig(compiler.options))
+        return;
+    const ReactRefreshPlugin = loadReactRefreshPluginClass();
+    new ReactRefreshPlugin({ overlay: false }).apply(compiler);
+}
+function isDevConfig(config) {
+    return (process.env.NODE_ENV === 'development' || config.mode === 'development');
+}
+function loadReactRefreshPluginClass() {
+    // Lazy require — runs only when actually instantiated (CLI executor
+    // path; Jest never reaches this). Works on Node 22.12+ via require(esm).
+    // v1 (CJS) exports the class as default; v2 (ESM) only exports the named
+    // ReactRefreshRspackPlugin.
+    const mod = require('@rspack/plugin-react-refresh');
+    return mod.ReactRefreshRspackPlugin ?? mod.default ?? mod;
 }

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

@@ -1,5 +1,6 @@
-import { type Configuration, RspackOptionsNormalized } from '@rspack/core';
+import type { Compiler, Configuration, RspackOptionsNormalized } from '@rspack/core';
 import { NormalizedNxAppRspackPluginOptions } from './models';
-export declare function applyWebConfig(options: NormalizedNxAppRspackPluginOptions, config?: Partial<RspackOptionsNormalized | Configuration>, { useNormalizedEntry, }?: {
+export declare function applyWebConfig(options: NormalizedNxAppRspackPluginOptions, config?: Partial<RspackOptionsNormalized | Configuration>, { useNormalizedEntry, compiler, }?: {
     useNormalizedEntry?: boolean;
+    compiler?: Compiler;
 }): void;

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

@@ -2,16 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyWebConfig = applyWebConfig;
 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");
 const hash_format_1 = require("./hash-format");
 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, } = {}) {
+function applyWebConfig(options, config = {}, { useNormalizedEntry, compiler, } = {}) {
     if (global.NX_GRAPH_CREATION)
         return;
+    // Prefer compiler.rspack when available; otherwise lazy-require
+    // @rspack/core (works on Node 22.12+ via require(esm), and keeps the
+    // file Jest-loadable since the require is inside the function body).
+    const rspackCore = compiler
+        ? compiler.rspack
+        : require('@rspack/core');
+    const { CssExtractRspackPlugin, DefinePlugin, EnvironmentPlugin, HtmlRspackPlugin, LightningCssMinimizerRspackPlugin, } = rspackCore;
+    const cssExtractLoader = CssExtractRspackPlugin.loader;
     // Defaults that was applied from executor schema previously.
     options.runtimeChunk ??= true; // need this for HMR and other things to work
     options.extractCss ??= true;
@@ -23,7 +30,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     options.scripts ??= [];
     const isProd = process.env.NODE_ENV === 'production' || options.mode === 'production';
     const plugins = [
-        new core_1.EnvironmentPlugin({
+        new EnvironmentPlugin({
             NODE_ENV: isProd ? 'production' : 'development',
         }),
     ];
@@ -46,7 +53,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             }));
         }
         else {
-            plugins.push(new core_1.HtmlRspackPlugin({
+            plugins.push(new HtmlRspackPlugin({
                 template: options.index,
                 templateParameters: options.templateParameters,
                 sri: options.subresourceIntegrity ? 'sha256' : undefined,
@@ -59,12 +66,12 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     }
     const minimizer = [];
     if (isProd && stylesOptimization) {
-        minimizer.push(new core_1.LightningCssMinimizerRspackPlugin({
+        minimizer.push(new LightningCssMinimizerRspackPlugin({
             test: /\.(?:css|scss|sass|less)$/,
         }));
     }
     if (!options.ssr) {
-        plugins.push(new core_1.DefinePlugin(getClientEnvironment(process.env.NODE_ENV).stringified));
+        plugins.push(new DefinePlugin(getClientEnvironment(process.env.NODE_ENV).stringified));
     }
     const entries = {};
     const globalStylePaths = [];
@@ -96,13 +103,13 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
         {
             test: /\.module\.css$/,
             exclude: globalStylePaths,
-            use: (0, stylesheet_loaders_1.getCommonLoadersForCssModules)(options, includePaths),
+            use: (0, stylesheet_loaders_1.getCommonLoadersForCssModules)(options, includePaths, cssExtractLoader),
         },
         {
             test: /\.module\.(scss|sass)$/,
             exclude: globalStylePaths,
             use: [
-                ...(0, stylesheet_loaders_1.getCommonLoadersForCssModules)(options, includePaths),
+                ...(0, stylesheet_loaders_1.getCommonLoadersForCssModules)(options, includePaths, cssExtractLoader),
                 {
                     loader: require.resolve('sass-loader'),
                     options: {
@@ -122,7 +129,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             test: /\.module\.less$/,
             exclude: globalStylePaths,
             use: [
-                ...(0, stylesheet_loaders_1.getCommonLoadersForCssModules)(options, includePaths),
+                ...(0, stylesheet_loaders_1.getCommonLoadersForCssModules)(options, includePaths, cssExtractLoader),
                 {
                     loader: (0, path_1.join)(__dirname, 'loaders/deprecated-less-loader.js'),
                     options: {
@@ -139,13 +146,13 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
         {
             test: /\.css$/,
             exclude: globalStylePaths,
-            use: (0, stylesheet_loaders_1.getCommonLoadersForGlobalCss)(options, includePaths),
+            use: (0, stylesheet_loaders_1.getCommonLoadersForGlobalCss)(options, includePaths, cssExtractLoader),
         },
         {
             test: /\.scss$|\.sass$/,
             exclude: globalStylePaths,
             use: [
-                ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalCss)(options, includePaths),
+                ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalCss)(options, includePaths, cssExtractLoader),
                 {
                     loader: require.resolve('sass-loader'),
                     options: {
@@ -167,7 +174,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             test: /\.less$/,
             exclude: globalStylePaths,
             use: [
-                ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalCss)(options, includePaths),
+                ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalCss)(options, includePaths, cssExtractLoader),
                 {
                     loader: (0, path_1.join)(__dirname, 'loaders/deprecated-less-loader.js'),
                     options: {
@@ -186,13 +193,13 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
         {
             test: /\.css$/,
             include: globalStylePaths,
-            use: (0, stylesheet_loaders_1.getCommonLoadersForGlobalStyle)(options, includePaths),
+            use: (0, stylesheet_loaders_1.getCommonLoadersForGlobalStyle)(options, includePaths, cssExtractLoader),
         },
         {
             test: /\.scss$|\.sass$/,
             include: globalStylePaths,
             use: [
-                ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalStyle)(options, includePaths),
+                ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalStyle)(options, includePaths, cssExtractLoader),
                 {
                     loader: require.resolve('sass-loader'),
                     options: {
@@ -214,7 +221,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
             test: /\.less$/,
             include: globalStylePaths,
             use: [
-                ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalStyle)(options, includePaths),
+                ...(0, stylesheet_loaders_1.getCommonLoadersForGlobalStyle)(options, includePaths, cssExtractLoader),
                 {
                     loader: (0, path_1.join)(__dirname, 'loaders/deprecated-less-loader.js'),
                     options: {
@@ -238,7 +245,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
     if (options.extractCss) {
         plugins.push(
         // extract global css from js files into own css file
-        new core_1.CssExtractRspackPlugin({
+        new CssExtractRspackPlugin({
             filename: config.output?.cssFilename ??
                 (options.outputHashing
                     ? `[name]${hashFormat.extract}.css`

package/dist/src/plugins/utils/loaders/stylesheet-loaders.d.ts

@@ -3,7 +3,7 @@ interface PostcssOptions {
     (loader: any): any;
     config?: string;
 }
-export declare function getCommonLoadersForCssModules(options: any, includePaths: string[]): ({
+export declare function getCommonLoadersForCssModules(options: any, includePaths: string[], cssExtractLoader: string): ({
     loader: string;
     options?: undefined;
 } | {
@@ -20,53 +20,53 @@ export declare function getCommonLoadersForCssModules(options: any, includePaths
 } | {
     loader: string;
     options: {
-        implementation: any;
-        postcssOptions: PostcssOptions;
         modules?: undefined;
         importLoaders?: undefined;
+        implementation: any;
+        postcssOptions: PostcssOptions;
     };
 })[];
-export declare function getCommonLoadersForGlobalCss(options: any, includePaths: string[]): ({
-    loader: string;
+export declare function getCommonLoadersForGlobalCss(options: any, includePaths: string[], cssExtractLoader: string): ({
     options?: undefined;
+    loader: string;
 } | {
     loader: string;
     options: {
-        url: boolean;
         implementation?: undefined;
         postcssOptions?: undefined;
+        url: boolean;
     };
 } | {
     loader: string;
     options: {
+        url?: undefined;
         implementation: any;
         postcssOptions: PostcssOptions;
-        url?: undefined;
     };
 })[];
-export declare function getCommonLoadersForGlobalStyle(options: any, includePaths: string[]): ({
+export declare function getCommonLoadersForGlobalStyle(options: any, includePaths: string[], cssExtractLoader: string): ({
     loader: string;
     options: {
-        esModule: boolean;
-        url?: undefined;
         implementation?: undefined;
         postcssOptions?: undefined;
+        url?: undefined;
+        esModule: boolean;
     };
 } | {
     loader: string;
     options: {
-        url: boolean;
-        esModule?: undefined;
         implementation?: undefined;
         postcssOptions?: undefined;
+        esModule?: undefined;
+        url: boolean;
     };
 } | {
     loader: string;
     options: {
+        url?: undefined;
+        esModule?: undefined;
         implementation: any;
         postcssOptions: PostcssOptions;
-        esModule?: undefined;
-        url?: undefined;
     };
 })[];
 export {};

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

@@ -7,16 +7,15 @@ const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const autoprefixer = require("autoprefixer");
 const postcssImports = require("postcss-import");
-const core_1 = require("@rspack/core");
 const get_css_module_local_ident_1 = require("../get-css-module-local-ident");
 const hash_format_1 = require("../hash-format");
 const postcss_cli_resources_1 = require("../plugins/postcss-cli-resources");
-function getCommonLoadersForCssModules(options, includePaths) {
+function getCommonLoadersForCssModules(options, includePaths, cssExtractLoader) {
     // load component css as raw strings
     return [
         {
             loader: options.extractCss
-                ? core_1.CssExtractRspackPlugin.loader
+                ? cssExtractLoader
                 : require.resolve('style-loader'),
         },
         {
@@ -41,11 +40,11 @@ function getCommonLoadersForCssModules(options, includePaths) {
         },
     ];
 }
-function getCommonLoadersForGlobalCss(options, includePaths) {
+function getCommonLoadersForGlobalCss(options, includePaths, cssExtractLoader) {
     return [
         {
             loader: options.extractCss
-                ? core_1.CssExtractRspackPlugin.loader
+                ? cssExtractLoader
                 : require.resolve('style-loader'),
         },
         { loader: require.resolve('css-loader'), options: { url: false } },
@@ -60,11 +59,11 @@ function getCommonLoadersForGlobalCss(options, includePaths) {
         },
     ];
 }
-function getCommonLoadersForGlobalStyle(options, includePaths) {
+function getCommonLoadersForGlobalStyle(options, includePaths, cssExtractLoader) {
     return [
         {
             loader: options.extractCss
-                ? core_1.CssExtractRspackPlugin.loader
+                ? cssExtractLoader
                 : require.resolve('style-loader'),
             options: { esModule: true },
         },

package/dist/src/plugins/utils/plugins/generate-package-json-plugin.d.ts

@@ -1,4 +1,4 @@
-import { type Compiler, type RspackPluginInstance } from '@rspack/core';
+import type { Compiler, RspackPluginInstance } from '@rspack/core';
 import { type ProjectGraph } from '@nx/devkit';
 export declare class GeneratePackageJsonPlugin implements RspackPluginInstance {
     private readonly options;

package/dist/src/plugins/utils/plugins/generate-package-json-plugin.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GeneratePackageJsonPlugin = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
-const core_1 = require("@rspack/core");
 const js_1 = require("@nx/js");
 const devkit_1 = require("@nx/devkit");
 const pluginName = 'GeneratePackageJsonPlugin';
@@ -26,10 +25,11 @@ class GeneratePackageJsonPlugin {
     }
     apply(compiler) {
         compiler.hooks.thisCompilation.tap(pluginName, (compilation) => {
-            compilation.hooks.processAssets.tap({
+            compilation.hooks.processAssets.tapPromise({
                 name: pluginName,
                 stage: compiler.rspack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL,
-            }, () => {
+            }, async () => {
+                const sources = compiler.rspack.sources;
                 const helperDependencies = (0, js_1.getHelperDependenciesFromProjectGraph)(this.options.root, this.options.projectName, this.options.projectGraph);
                 const importHelpers = !!(0, js_1.readTsConfig)(this.options.tsConfig).options
                     .importHelpers;
@@ -55,7 +55,7 @@ class GeneratePackageJsonPlugin {
                     ...packageJson.dependencies,
                     ...runtimeDependencies,
                 };
-                compilation.emitAsset('package.json', new core_1.sources.RawSource((0, devkit_1.serializeJson)(packageJson)));
+                compilation.emitAsset('package.json', new sources.RawSource((0, devkit_1.serializeJson)(packageJson)));
                 const packageManager = (0, devkit_1.detectPackageManager)(this.options.root);
                 if (packageManager === 'bun') {
                     compilation
@@ -63,7 +63,7 @@ class GeneratePackageJsonPlugin {
                         .warn('Bun lockfile generation is not supported. Only package.json will be generated.');
                 }
                 else {
-                    compilation.emitAsset((0, js_1.getLockFileName)(packageManager), new core_1.sources.RawSource((0, js_1.createLockFile)(packageJson, this.options.projectGraph, packageManager)));
+                    compilation.emitAsset((0, js_1.getLockFileName)(packageManager), new sources.RawSource((0, js_1.createLockFile)(packageJson, this.options.projectGraph, packageManager)));
                 }
             });
         });

package/dist/src/plugins/utils/plugins/nx-tsconfig-paths-rspack-plugin.d.ts

@@ -1,4 +1,4 @@
-import { Compiler, type Configuration, type RspackOptionsNormalized } from '@rspack/core';
+import type { Compiler, Configuration, RspackOptionsNormalized } from '@rspack/core';
 import { NormalizedNxAppRspackPluginOptions } from '../models';
 export declare class NxTsconfigPathsRspackPlugin {
     private options;

package/dist/src/plugins/utils/plugins/scripts-rspack-plugin.d.ts

@@ -1,4 +1,4 @@
-import { type Compiler } from '@rspack/core';
+import type { Compiler } from '@rspack/core';
 export interface ScriptsRspackPluginOptions {
     name: string;
     sourceMap: boolean;

package/dist/src/plugins/utils/plugins/scripts-rspack-plugin.js

@@ -4,7 +4,6 @@ exports.ScriptsRspackPlugin = void 0;
 const tslib_1 = require("tslib");
 const loader_utils_1 = require("loader-utils");
 const path = tslib_1.__importStar(require("path"));
-const core_1 = require("@rspack/core");
 function addDependencies(compilation, scripts) {
     for (const script of scripts) {
         compilation.fileDependencies.add(script);
@@ -19,8 +18,8 @@ class ScriptsRspackPlugin {
     constructor(options = {}) {
         this.options = options;
     }
-    _insertOutput(compiler, compilation, { filename, source }, cached = false) {
-        new core_1.EntryPlugin(compiler.context, this.options.name).apply(compiler);
+    _insertOutput(compiler, compilation, { filename, source }, EntryPluginCtor, cached = false) {
+        new EntryPluginCtor(compiler.context, this.options.name).apply(compiler);
         compilation.assets[filename] = source;
     }
     apply(compiler) {
@@ -31,6 +30,8 @@ class ScriptsRspackPlugin {
             .filter((script) => !!script)
             .map((script) => path.resolve(this.options.basePath || '', script));
         hook(compiler, (compilation, callback) => {
+            const rspackSources = compiler.rspack.sources;
+            const EntryPluginCtor = compiler.rspack.EntryPlugin;
             const sourceGetters = scripts.map((fullPath) => {
                 return new Promise((resolve, reject) => {
                     compilation.inputFileSystem.readFile(fullPath, (err, data) => {
@@ -46,10 +47,10 @@ class ScriptsRspackPlugin {
                             if (this.options.basePath) {
                                 adjustedPath = path.relative(this.options.basePath, fullPath);
                             }
-                            source = new core_1.sources.OriginalSource(content, adjustedPath);
+                            source = new rspackSources.OriginalSource(content, adjustedPath);
                         }
                         else {
-                            source = new core_1.sources.RawSource(content);
+                            source = new rspackSources.RawSource(content);
                         }
                         resolve(source);
                     });
@@ -57,15 +58,15 @@ class ScriptsRspackPlugin {
             });
             Promise.all(sourceGetters)
                 .then((_sources) => {
-                const concatSource = new core_1.sources.ConcatSource();
+                const concatSource = new rspackSources.ConcatSource();
                 _sources.forEach((source) => {
                     concatSource.add(source);
                     concatSource.add('\n;');
                 });
-                const combinedSource = new core_1.sources.CachedSource(concatSource);
+                const combinedSource = new rspackSources.CachedSource(concatSource);
                 const filename = (0, loader_utils_1.interpolateName)({ resourcePath: 'scripts.js' }, this.options.filename, { content: combinedSource.source() });
                 const output = { filename, source: combinedSource };
-                this._insertOutput(compiler, compilation, output);
+                this._insertOutput(compiler, compilation, output, EntryPluginCtor);
                 this._cachedOutput = output;
                 addDependencies(compilation, scripts);
                 callback();

package/dist/src/plugins/utils/plugins/stats-json-plugin.d.ts

@@ -1,4 +1,4 @@
-import { Compiler } from '@rspack/core';
+import type { Compiler } from '@rspack/core';
 export declare class StatsJsonPlugin {
     apply(compiler: Compiler): void;
 }

package/dist/src/plugins/utils/plugins/stats-json-plugin.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StatsJsonPlugin = void 0;
-const core_1 = require("@rspack/core");
 class StatsJsonPlugin {
     apply(compiler) {
         compiler.hooks.emit.tap('StatsJsonPlugin', (compilation) => {
+            const sources = compiler.rspack.sources;
             const data = JSON.stringify(compilation.getStats().toJson('verbose'));
-            compilation.assets[`stats.json`] = new core_1.sources.RawSource(data);
+            compilation.assets[`stats.json`] = new sources.RawSource(data);
         });
     }
 }

package/dist/src/plugins/write-index-html-plugin.d.ts

@@ -1,4 +1,4 @@
-import { Compiler } from '@rspack/core';
+import type { Compiler } from '@rspack/core';
 import { ExtraEntryPoint } from '../utils/model';
 export interface WriteIndexHtmlOptions {
     indexPath: string;

package/dist/src/plugins/write-index-html-plugin.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WriteIndexHtmlPlugin = void 0;
-const tslib_1 = require("tslib");
-const rspack = tslib_1.__importStar(require("@rspack/core"));
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
 const interpolate_env_variables_to_index_1 = require("../utils/webpack/interpolate-env-variables-to-index");
@@ -16,11 +14,12 @@ class WriteIndexHtmlPlugin {
     apply(compiler) {
         const { outputPath, indexPath, baseHref, deployUrl, sri = false, scripts = [], styles = [], crossOrigin, } = this.options;
         compiler.hooks.thisCompilation.tap('WriteIndexHtmlPlugin', (compilation) => {
-            compilation.hooks.processAssets.tap({
+            compilation.hooks.processAssets.tapPromise({
                 name: 'WriteIndexHtmlPlugin',
                 // After minification and sourcemaps are done
-                stage: rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_INLINE,
-            }, () => {
+                stage: compiler.rspack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_INLINE,
+            }, async () => {
+                const sources = compiler.rspack.sources;
                 const moduleFiles = this.getEmittedFiles(compilation);
                 const files = moduleFiles.filter((x) => x.extension === '.css');
                 let content = (0, fs_1.readFileSync)(indexPath).toString();
@@ -36,7 +35,7 @@ class WriteIndexHtmlPlugin {
                     files: this.filterAndMapBuildFiles(files, ['.js', '.css']),
                     moduleFiles: this.filterAndMapBuildFiles(moduleFiles, ['.js']),
                     loadOutputFile: (filePath) => compilation.assets[filePath].source().toString(),
-                });
+                }, sources);
             });
         });
     }
@@ -70,7 +69,7 @@ class WriteIndexHtmlPlugin {
     stripBom(data) {
         return data.replace(/^\uFEFF/, '');
     }
-    augmentIndexHtml(params) {
+    augmentIndexHtml(params, sources) {
         const { loadOutputFile, files, moduleFiles = [], entrypoints } = params;
         let { crossOrigin = 'none' } = params;
         if (params.sri && crossOrigin === 'none') {
@@ -138,7 +137,7 @@ class WriteIndexHtmlPlugin {
             styleInsertionPoint = params.inputContent.indexOf('</head>');
         }
         // Inject into the html
-        const indexSource = new rspack.sources.ReplaceSource(new rspack.sources.RawSource(params.inputContent), params.input);
+        const indexSource = new sources.ReplaceSource(new sources.RawSource(params.inputContent), params.input);
         let scriptElements = '';
         for (const script of scripts) {
             const attrs = [

package/dist/src/utils/create-compiler.d.ts

@@ -1,5 +1,5 @@
 import { ExecutorContext } from '@nx/devkit';
-import { Compiler, MultiCompiler } from '@rspack/core';
+import { type Compiler, type MultiCompiler } from '@rspack/core';
 import { NormalizedRspackExecutorSchema } from '../executors/rspack/schema';
 export declare function createCompiler(options: NormalizedRspackExecutorSchema & {
     devServer?: any;

package/dist/src/utils/is-serve-mode.d.ts

@@ -0,0 +1 @@
+export declare function isServeMode(): boolean;

package/dist/src/utils/is-serve-mode.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isServeMode = isServeMode;
+// v1 dev-server sets WEBPACK_SERVE on module load; v2 sets RSPACK_SERVE.
+// rspack-cli imports the dev-server before loading the user config.
+function isServeMode() {
+    return !!process.env['WEBPACK_SERVE'] || !!process.env['RSPACK_SERVE'];
+}

package/dist/src/utils/mode-utils.d.ts

@@ -1,2 +1,2 @@
-import { Mode } from '@rspack/core';
+import type { Mode } from '@rspack/core';
 export declare function isMode(mode: string): mode is Mode;

package/dist/src/utils/read-rspack-options.d.ts

@@ -1,4 +1,4 @@
-import { Configuration } from '@rspack/core';
+import type { Configuration } from '@rspack/core';
 /**
  * Reads the Rspack options from a give Rspack configuration. The configuration can be:
  * 1. A single standard config object

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

@@ -1,24 +1,8 @@
 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 getRspackCoreMajorVersion(rspackCore: typeof import('@rspack/core')): number;
 export declare function getRspackVersionsForInstalledMajor(tree: Tree): {
     rspackCoreVersion: string;
     rspackDevServerVersion: string;

package/dist/src/utils/version-utils.js

@@ -2,17 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInstalledRspackMajorVersion = getInstalledRspackMajorVersion;
 exports.getInstalledRspackVersionRuntime = getInstalledRspackVersionRuntime;
+exports.getRspackCoreMajorVersion = getRspackCoreMajorVersion;
 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) {
@@ -23,12 +18,6 @@ function getInstalledRspackMajorVersion(tree) {
         ? 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) {
@@ -39,11 +28,11 @@ function getInstalledRspackVersionRuntime() {
         ? 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.
- */
+// Reads the version off an already-resolved `@rspack/core` module instance
+// (e.g. `compiler.rspack`) — avoids a second resolution at runtime.
+function getRspackCoreMajorVersion(rspackCore) {
+    return (0, semver_1.major)(rspackCore.rspackVersion ?? '1.0.0');
+}
 function getRspackVersionsForInstalledMajor(tree) {
     const installed = getInstalledRspackMajorVersion(tree);
     if (installed === undefined) {

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

@@ -4,7 +4,7 @@ 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 declare const supportedRspackMajorVersions: readonly [2, 1];
 export type SupportedRspackMajorVersion = (typeof supportedRspackMajorVersions)[number];
 type RspackVersionMap = {
     rspackCoreVersion: string;