@rsbuild/core 2.1.1 → 2.1.3

package/compiled/html-rspack-plugin/index.js

@@ -1,8 +1,8 @@
 (() => {
   var __webpack_modules__ = {
-    685: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    776: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
-      const { HtmlWebpackChildCompiler } = __nccwpck_require__(934);
+      const { HtmlWebpackChildCompiler } = __nccwpck_require__(469);
       const compilerMap = new WeakMap();
       class CachedChildCompilation {
         constructor(compiler) {
@@ -311,7 +311,7 @@
       }
       module.exports = { CachedChildCompilation };
     },
-    934: (module) => {
+    469: (module) => {
       "use strict";
       class HtmlWebpackChildCompiler {
         constructor(templates) {
@@ -480,7 +480,7 @@
       }
       module.exports = { HtmlWebpackChildCompiler };
     },
-    230: (module) => {
+    67: (module) => {
       "use strict";
       module.exports = {};
       module.exports.none = (chunks) => chunks;
@@ -499,7 +499,7 @@
       };
       module.exports.auto = module.exports.none;
     },
-    641: (module) => {
+    262: (module) => {
       "use strict";
       module.exports = function (err) {
         return {
@@ -523,7 +523,7 @@
         };
       };
     },
-    200: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    917: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const { AsyncSeriesWaterfallHook } = __nccwpck_require__(159);
       const htmlWebpackPluginHooksMap = new WeakMap();
@@ -549,7 +549,7 @@
       }
       module.exports = { getHtmlRspackPluginHooks };
     },
-    157: (module) => {
+    492: (module) => {
       const voidTags = [
         "area",
         "base",
@@ -617,19 +617,19 @@
         htmlTagObjectToString,
       };
     },
-    400: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    345: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const promisify = __nccwpck_require__(23).promisify;
       const vm = __nccwpck_require__(154);
       const fs = __nccwpck_require__(896);
       const path = __nccwpck_require__(928);
-      const { CachedChildCompilation } = __nccwpck_require__(685);
+      const { CachedChildCompilation } = __nccwpck_require__(776);
       const { createHtmlTagObject, htmlTagObjectToString, HtmlTagArray } =
-        __nccwpck_require__(157);
-      const prettyError = __nccwpck_require__(641);
-      const chunkSorter = __nccwpck_require__(230);
+        __nccwpck_require__(492);
+      const prettyError = __nccwpck_require__(262);
+      const chunkSorter = __nccwpck_require__(67);
       const getHtmlRspackPluginHooks =
-        __nccwpck_require__(200).getHtmlRspackPluginHooks;
+        __nccwpck_require__(917).getHtmlRspackPluginHooks;
       const WITH_PLACEHOLDER = "function __with_placeholder__";
       class HtmlRspackPlugin {
         constructor(userOptions = {}) {
@@ -2398,6 +2398,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(400);
+  var __webpack_exports__ = __nccwpck_require__(345);
   module.exports = __webpack_exports__;
 })();

package/compiled/postcss-loader/index.js

@@ -1,15 +1,15 @@
 (() => {
   "use strict";
   var __webpack_modules__ = {
-    253: (module, __unused_webpack_exports, __nccwpck_require__) => {
-      module.exports = __nccwpck_require__(583)["default"];
+    69: (module, __unused_webpack_exports, __nccwpck_require__) => {
+      module.exports = __nccwpck_require__(487)["default"];
     },
-    583: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    487: (__unused_webpack_module, exports, __nccwpck_require__) => {
       var __webpack_unused_export__;
       __webpack_unused_export__ = { value: true };
       exports["default"] = loader;
       var _nodePath = _interopRequireDefault(__nccwpck_require__(760));
-      var _utils = __nccwpck_require__(906);
+      var _utils = __nccwpck_require__(474);
       function _interopRequireDefault(e) {
         return e && e.__esModule ? e : { default: e };
       }
@@ -179,7 +179,7 @@
         callback(null, result.css, map, { ast });
       }
     },
-    906: (module, exports, __nccwpck_require__) => {
+    474: (module, exports, __nccwpck_require__) => {
       module = __nccwpck_require__.nmd(module);
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.exec = exec;
@@ -716,6 +716,6 @@
   })();
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(253);
+  var __webpack_exports__ = __nccwpck_require__(69);
   module.exports = __webpack_exports__;
 })();

package/dist/756.js

@@ -13,6 +13,7 @@ import { isPromise, isRegExp } from "node:util/types";
 import { readFile } from "node:fs/promises";
 import node_zlib from "node:zlib";
 import { __webpack_require__ } from "./1~rslib-runtime.js";
+var superClass, superClass1, __rspack_import_meta_filename__ = __rspack_fileURLToPath(import.meta.url);
 let __rspack_createRequire_require = __rspack_createRequire(import.meta.url);
 __webpack_require__.add({
     "../../node_modules/.pnpm/deepmerge@4.3.1/node_modules/deepmerge/dist/cjs.js" (module) {
@@ -499,10 +500,8 @@ __webpack_require__.add({
         };
     },
     "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.15/node_modules/postcss-load-config/src/req.js" (module, __unused_rspack_exports, __webpack_require__) {
-        let tsx, jiti;
-        var __filename = __rspack_fileURLToPath(import.meta.url);
-        let { createRequire } = __webpack_require__("node:module?1bcb"), { pathToFileURL } = __webpack_require__("node:url?b4ec"), TS_EXT_RE = /\.[mc]?ts$/, importError = [];
-        module.exports = async function req(name, rootFile = __filename) {
+        let tsx, jiti, { createRequire } = __webpack_require__("node:module?1bcb"), { pathToFileURL } = __webpack_require__("node:url?b4ec"), TS_EXT_RE = /\.[mc]?ts$/, importError = [];
+        module.exports = async function req(name, rootFile = __rspack_import_meta_filename__) {
             let url = createRequire(rootFile).resolve(name);
             try {
                 return (await import(`${pathToFileURL(url)}?t=${Date.now()}`)).default;
@@ -935,7 +934,7 @@ function getFileName(input) {
 function camelcaseOptionName(name) {
     return name.split(".").map((v, i)=>0 === i ? camelcase(v) : v).join(".");
 }
-var superClass, superClass1, CACError = class extends Error {
+var CACError = class extends Error {
     constructor(message){
         super(message), this.name = "CACError", "function" != typeof Error.captureStackTrace && (this.stack = Error(message).stack);
     }
@@ -2385,7 +2384,7 @@ function formatModuleTrace(stats, errorFile, level, logger) {
     let trace = moduleNames.slice().reverse();
     return trace.length > 4 && !isVerbose(logger) && (trace = [
         ...trace.slice(0, 2),
-        `… (${trace.length - 2 - 2} hidden)`,
+        `... (${trace.length - 2 - 2} hidden)`,
         ...trace.slice(trace.length - 2)
     ]), color.dim(`Import traces (entry → ${level}):\n  ${trace.join('\n  ')} ${color.bold(color.red('×'))}`);
 }
@@ -3501,7 +3500,7 @@ function createPublicContext(context) {
 async function createContext(options, userConfig, logger) {
     let { cwd } = options, rootPath = userConfig.root ? ensureAbsolutePath(cwd, userConfig.root) : cwd, rsbuildConfig = await withDefaultConfig(rootPath, userConfig), cachePath = join(rootPath, 'node_modules', '.cache'), specifiedEnvironments = options.environment && options.environment.length > 0 ? options.environment : void 0;
     return {
-        version: "2.1.1",
+        version: "2.1.3",
         rootPath,
         distPath: '',
         cachePath,
@@ -3779,12 +3778,15 @@ let configChain_CHAIN_ID = {
         JS_MAIN: 'js',
         JS_WORKER: 'js-worker',
         JS_RAW: 'js-raw',
+        JS_TEXT: 'js-text',
         CSS_MAIN: 'css',
         CSS_RAW: 'css-raw',
+        CSS_TEXT: 'css-text',
         CSS_URL: 'css-url',
         CSS_INLINE: 'css-inline',
         SVG: 'svg',
         SVG_RAW: 'svg-asset-raw',
+        SVG_TEXT: 'svg-asset-text',
         SVG_URL: 'svg-asset-url',
         SVG_ASSET: 'svg-asset',
         SVG_REACT: 'svg-react',
@@ -4818,7 +4820,9 @@ let chainStaticAssetRule = ({ emit, rule, maxSize, filename, assetType })=>{
     let generatorOptions = {
         filename
     };
-    emit || (generatorOptions.emit = !1), rule.oneOf(`${assetType}-asset-url`).type('asset/resource').resourceQuery(URL_QUERY_REGEX).set('generator', generatorOptions), rule.oneOf(`${assetType}-asset-inline`).type('asset/inline').resourceQuery(INLINE_QUERY_REGEX), rule.oneOf(`${assetType}-asset-raw`).type('asset/source').resourceQuery(RAW_QUERY_REGEX), rule.oneOf(`${assetType}-asset`).type('asset').parser({
+    emit || (generatorOptions.emit = !1), rule.oneOf(`${assetType}-asset-url`).type('asset/resource').resourceQuery(URL_QUERY_REGEX).set('generator', generatorOptions), rule.oneOf(`${assetType}-asset-inline`).type('asset/inline').resourceQuery(INLINE_QUERY_REGEX), rule.oneOf(`${assetType}-asset-text`).type('asset/source').with({
+        type: 'text'
+    }), rule.oneOf(`${assetType}-asset-raw`).type('asset/source').resourceQuery(RAW_QUERY_REGEX), rule.oneOf(`${assetType}-asset`).type('asset').parser({
         dataUrlCondition: {
             maxSize
         }
@@ -5151,7 +5155,7 @@ async function saveSnapshots(snapshotPath, snapshots, logger) {
         logger.debug('Failed to save file size snapshots:', err);
     }
 }
-let EXCLUDE_ASSET_REGEX = /\.(?:map|LICENSE\.txt|d\.ts)$/, isSignificantDiff = (diff)=>Math.abs(diff) >= 10, formatDiff = (diff)=>{
+let EXCLUDE_ASSET_REGEX = /\.(?:map|LICENSE\.txt|d\.(?:ts|mts|cts))$/, isSignificantDiff = (diff)=>Math.abs(diff) >= 10, formatDiff = (diff)=>{
     let label = `(${diff > 0 ? '+' : '-'}${calcFileSize(Math.abs(diff))})`;
     return {
         label: (diff > 0 ? color.red : color.green)(label),
@@ -5176,7 +5180,7 @@ function getHeader(maxFileLength, maxSizeLength, fileHeader, showGzipHeader) {
 let calcFileSize = (len)=>{
     let val = len / 1000;
     return `${val.toFixed(val < 1 ? 2 : 1)} kB`;
-}, COMPRESSIBLE_REGEX = /\.(?:js|css|html|json|svg|txt|xml|xhtml|wasm|manifest|md)$/i, isCompressible = (assetName)=>COMPRESSIBLE_REGEX.test(assetName), getFilePath = (assetName)=>{
+}, COMPRESSIBLE_REGEX = /\.(?:js|mjs|cjs|jsx|ts|tsx|mts|cts|css|html|json|svg|txt|xml|xhtml|wasm|manifest|md)$/i, isCompressible = (assetName)=>COMPRESSIBLE_REGEX.test(assetName), getFilePath = (assetName)=>{
     let queryIndex = assetName.indexOf('?');
     return -1 === queryIndex ? assetName : assetName.slice(0, queryIndex);
 };
@@ -5824,7 +5828,8 @@ let supportedChromiumBrowsers = [
     'Microsoft Edge',
     'Brave Browser',
     'Vivaldi',
-    'Chromium'
+    'Chromium',
+    'Helium'
 ], mapChromiumBrowserName = (browser)=>'chrome' === browser || 'google chrome' === browser ? 'Google Chrome' : browser;
 async function openBrowser(url, logger) {
     let browser = process.env.BROWSER, browserArgs = process.env.BROWSER_ARGS;
@@ -7115,7 +7120,7 @@ class SocketServer {
     }
     async prepare() {
         this.clearHeartbeatTimer();
-        let { WebSocketServer } = await import("./wrapper.js");
+        let { WebSocketServer } = await import("./ws.js");
         this.wsServer = new WebSocketServer({
             noServer: !0,
             path: this.options.client?.path
@@ -7705,7 +7710,7 @@ let applyDefaultMiddlewares = async ({ config, buildManager, context, devServer,
         ],
         outputFileSystem: buildManager.outputFileSystem
     })), server.publicDir.length) {
-        let { default: sirv } = await import("./build.js");
+        let { default: sirv } = await import("./sirv.js");
         for (let { name } of server.publicDir){
             let sirvMiddleware = sirv(name, {
                 etag: !0,
@@ -8580,7 +8585,11 @@ function applyDefaultPlugins(pluginManager, context) {
                     } : posix.join(jsPath, jsFilename)).chunkFilename(isJsFilenameFn ? (...args)=>{
                         let name = jsFilename(...args);
                         return posix.join(jsAsyncPath, name);
-                    } : posix.join(jsAsyncPath, jsFilename)).publicPath(publicPath);
+                    } : posix.join(jsAsyncPath, jsFilename)).publicPath(publicPath), ('web' === target || 'web-worker' === target) && chain.output.merge({
+                        environment: {
+                            const: !1
+                        }
+                    });
                     let isESM = config.output.module;
                     if (isServer && chain.output.library({
                         ...chain.output.get('library') || {},
@@ -8733,7 +8742,11 @@ function applyDefaultPlugins(pluginManager, context) {
                     ], emitAssets), createAssetRule(configChain_CHAIN_ID.RULE.MEDIA, [
                         ...VIDEO_EXTENSIONS,
                         ...AUDIO_EXTENSIONS
-                    ], emitAssets), createAssetRule(configChain_CHAIN_ID.RULE.FONT, FONT_EXTENSIONS, emitAssets), chain.module.rule(configChain_CHAIN_ID.RULE.JSON).test(/\.json$/i).oneOf('json-asset-raw').type('asset/source').resourceQuery(RAW_QUERY_REGEX);
+                    ], emitAssets), createAssetRule(configChain_CHAIN_ID.RULE.FONT, FONT_EXTENSIONS, emitAssets);
+                    let rule = chain.module.rule(configChain_CHAIN_ID.RULE.JSON).test(/\.json$/i);
+                    rule.oneOf('json-asset-text').type('asset/source').with({
+                        type: 'text'
+                    }), rule.oneOf('json-asset-raw').type('asset/source').resourceQuery(RAW_QUERY_REGEX);
                     let assetsFilename = getMergedFilename('assets');
                     chain.output.assetModuleFilename(assetsFilename), emitAssets || chain.module.generator.merge({
                         'asset/resource': {
@@ -9031,7 +9044,9 @@ try {
                         let cssRule = chain.module.rule(CHAIN_ID.RULE.CSS), { config } = environment;
                         cssRule.test(CSS_REGEX).dependency({
                             not: 'url'
-                        });
+                        }), cssRule.oneOf(CHAIN_ID.ONE_OF.CSS_TEXT).with({
+                            type: 'text'
+                        }).type('asset/source');
                         let urlRule = cssRule.oneOf(CHAIN_ID.ONE_OF.CSS_URL).resourceQuery(URL_QUERY_REGEX);
                         urlRule.use(CHAIN_ID.USE.CSS_URL).loader(node_path.join(dirname, 'cssUrlLoader.mjs'));
                         let inlineRule = cssRule.oneOf(CHAIN_ID.ONE_OF.CSS_INLINE).resourceQuery(INLINE_QUERY_REGEX);
@@ -9191,7 +9206,9 @@ try {
                         let { config, browserslist } = environment, cacheRoot = node_path.join(api.context.cachePath, '.swc'), rule = chain.module.rule(CHAIN_ID.RULE.JS).test(SCRIPT_REGEX).dependency({
                             not: 'url'
                         });
-                        rule.oneOf(CHAIN_ID.ONE_OF.JS_RAW).resourceQuery(RAW_QUERY_REGEX).type('asset/source');
+                        rule.oneOf(CHAIN_ID.ONE_OF.JS_TEXT).with({
+                            type: 'text'
+                        }).type('asset/source'), rule.oneOf(CHAIN_ID.ONE_OF.JS_RAW).resourceQuery(RAW_QUERY_REGEX).type('asset/source');
                         let mainRule = rule.oneOf(CHAIN_ID.ONE_OF.JS_MAIN).type("javascript/auto"), dataUriRule = chain.module.rule(CHAIN_ID.RULE.JS_DATA_URI).mimetype({
                             or: [
                                 "text/javascript",
@@ -9493,7 +9510,7 @@ try {
                 api.modifyBundlerChain(async (chain, { CHAIN_ID, environment, isDev })=>{
                     let { output: { manifest }, dev: { writeToDisk } } = environment.config;
                     if (!1 === manifest) return;
-                    let manifestOptions = normalizeManifestObjectConfig(manifest), { RspackManifestPlugin } = await import("./rspack-manifest-plugin.js").then(__webpack_require__.bind(__webpack_require__, "../../node_modules/.pnpm/rspack-manifest-plugin@5.2.2_@rspack+core@2.1.1/node_modules/rspack-manifest-plugin/dist/index.js")), { htmlPaths } = environment, filter = manifestOptions.filter ?? ((file)=>!file.name.endsWith('.LICENSE.txt'));
+                    let manifestOptions = normalizeManifestObjectConfig(manifest), { RspackManifestPlugin } = await import("./manifest-plugin.js").then(__webpack_require__.bind(__webpack_require__, "../../node_modules/.pnpm/rspack-manifest-plugin@5.2.2_@rspack+core@2.1.2/node_modules/rspack-manifest-plugin/dist/index.js")), { htmlPaths } = environment, filter = manifestOptions.filter ?? ((file)=>!file.name.endsWith('.LICENSE.txt'));
                     manifestFilenames.set(environment.name, manifestOptions.filename);
                     let pluginOptions = {
                         fileName: manifestOptions.filename,
@@ -9649,7 +9666,7 @@ try {
                     nonces.some((nonce)=>!!nonce) && applyToCompiler(compiler, (compiler, index)=>{
                         let nonce = nonces[index], environment = environmentList.find((item)=>item.index === index);
                         if (!Object.keys(environment?.htmlPaths ?? {}).length || !nonce) return;
-                        let injectCode = createVirtualModule(`__webpack_nonce__ = "${nonce}";`);
+                        let injectCode = createVirtualModule(`import.meta.rspackNonce = ${JSON.stringify(nonce)};`);
                         new core_rspack.EntryPlugin(compiler.context, injectCode, {
                             name: void 0
                         }).apply(compiler);
@@ -9850,36 +9867,53 @@ async function createRsbuild(options = {}) {
 function defineConfig(config) {
     return config;
 }
-async function loadConfig_loadConfig({ cwd = process.cwd(), path, envMode, meta, loader = 'auto' } = {}) {
-    let configExport, configFilePath = ((root, customConfig)=>{
+let DEFAULT_CONFIG_FILE_NAMES = [
+    'rsbuild.config.ts',
+    'rsbuild.config.js',
+    'rsbuild.config.mts',
+    'rsbuild.config.mjs',
+    'rsbuild.config.cts',
+    'rsbuild.config.cjs'
+], getConfigExport = (module)=>module && 'object' == typeof module && 'default' in module ? module.default : module, tryFreshImport = async (configFileURL)=>{
+    try {
+        let { freshImport } = await import("./fresh-import.js");
+        return await freshImport(configFileURL);
+    } catch (err) {
+        src_logger.debug('failed to initialize fresh-import, fallback to dynamic import.'), src_logger.debug(err);
+    }
+}, loadConfigWithNative = async (configFilePath)=>{
+    let configFileURL = pathToFileURL(configFilePath).href, freshImportResult = await tryFreshImport(configFileURL);
+    return freshImportResult ? {
+        configExport: getConfigExport(freshImportResult.result),
+        dependencies: freshImportResult.dependencies.sort()
+    } : {
+        configExport: getConfigExport(await import(`${configFileURL}?t=${Date.now()}`)),
+        dependencies: []
+    };
+};
+async function loadConfig_loadConfig({ cwd = process.cwd(), path, configFileNames, envMode, meta, loader = 'auto', command } = {}) {
+    let configExport, configFilePath = ((root, customConfig, configFileNames = DEFAULT_CONFIG_FILE_NAMES)=>{
         if (customConfig) {
             let customConfigPath = external_node_path_isAbsolute(customConfig) ? customConfig : join(root, customConfig);
             if (node_fs.existsSync(customConfigPath)) return customConfigPath;
-            throw Error(`${color.dim('[rsbuild:loadConfig]')} Cannot find config file: ${color.dim(customConfigPath)}`);
-        }
-        for (let file of [
-            'rsbuild.config.ts',
-            'rsbuild.config.js',
-            'rsbuild.config.mts',
-            'rsbuild.config.mjs',
-            'rsbuild.config.cts',
-            'rsbuild.config.cjs'
-        ]){
+            throw Error(`Cannot find config file: ${color.dim(customConfigPath)}`);
+        }
+        for (let file of configFileNames){
             let configFile = join(root, file);
             if (node_fs.existsSync(configFile)) return configFile;
         }
         return null;
-    })(cwd, path);
+    })(cwd, path, configFileNames);
     if (!configFilePath) return src_logger.debug('no config file found.'), {
         content: {},
-        filePath: configFilePath
+        filePath: configFilePath,
+        dependencies: []
     };
-    let applyMetaInfo = (config)=>(config._privateMeta = {
+    let dependencies = [], applyMetaInfo = (config)=>(config._privateMeta = {
             configFilePath
         }, config);
     if ('native' === loader || 'auto' === loader && (process.features.typescript || process.versions.bun || process.versions.deno) || /\.(?:js|mjs|cjs)$/.test(configFilePath)) try {
-        let configFileURL = pathToFileURL(configFilePath).href, exportModule = await import(`${configFileURL}?t=${Date.now()}`);
-        configExport = exportModule.default ? exportModule.default : exportModule;
+        ({ configExport, dependencies } = await loadConfigWithNative(configFilePath));
     } catch (err) {
         let errorMessage = `Failed to load file with native loader: ${color.dim(configFilePath)}`;
         if ('native' === loader) throw src_logger.error(errorMessage), err;
@@ -9900,51 +9934,75 @@ async function loadConfig_loadConfig({ cwd = process.cwd(), path, envMode, meta,
         throw src_logger.error(`Failed to load file with jiti: ${color.dim(configFilePath)}`), err;
     }
     if ('function' == typeof configExport) {
-        let command = process.argv[2], nodeEnv = process.env.NODE_ENV || '', result = await configExport({
+        let nodeEnv = process.env.NODE_ENV || '', configParams = {
             env: nodeEnv,
-            command,
+            command: command ?? process.argv[2],
             envMode: envMode || nodeEnv,
             meta
-        });
+        }, result = await configExport(configParams);
         if (void 0 === result) throw Error(`${color.dim('[rsbuild:loadConfig]')} The config function must return a config object.`);
         return {
             content: applyMetaInfo(result),
-            filePath: configFilePath
+            filePath: configFilePath,
+            dependencies
         };
     }
     if (!isObject(configExport)) throw Error(`${color.dim('[rsbuild:loadConfig]')} The config must be an object or a function that returns an object, get ${color.yellow(configExport)}`);
     return src_logger.debug('configuration loaded from:', configFilePath), {
         content: applyMetaInfo(configExport),
-        filePath: configFilePath
+        filePath: configFilePath,
+        dependencies
     };
 }
-let commonOpts = {}, init_loadConfig = async (root)=>{
-    let { content: config, filePath } = await loadConfig_loadConfig({
+let cliState = {
+    options: {}
+}, initCliAction = (command, options)=>{
+    process.env.NODE_ENV || (process.env.NODE_ENV = 'build' === command || 'preview' === command ? 'production' : 'development'), options.environment?.some((env)=>env.includes(',')) && (options.environment = options.environment.flatMap((env)=>env.split(','))), cliState.command = command, cliState.options = options;
+}, init_loadConfig = async (root)=>{
+    let { options, command } = cliState, { content: config, filePath, dependencies } = await loadConfig_loadConfig({
         cwd: root,
-        path: commonOpts.config,
-        envMode: commonOpts.envMode,
-        loader: commonOpts.configLoader
+        path: options.config,
+        envMode: options.envMode,
+        loader: options.configLoader,
+        command
     });
-    return config.dev ||= {}, config.source ||= {}, config.server ||= {}, commonOpts.base && (config.server.base = commonOpts.base), commonOpts.root && (config.root = root), commonOpts.mode && (config.mode = commonOpts.mode), commonOpts.logLevel && (config.logLevel = commonOpts.logLevel), commonOpts.open && !config.server?.open && (config.server.open = commonOpts.open), void 0 !== commonOpts.host && (config.server.host = commonOpts.host), commonOpts.port && (config.server.port = commonOpts.port), void 0 === config.dev.cliShortcuts && (config.dev.cliShortcuts = !0), filePath && (config.dev.watchFiles = [
+    if (config.dev ||= {}, config.source ||= {}, config.server ||= {}, options.base && (config.server.base = options.base), options.root && (config.root = root), options.mode && (config.mode = options.mode), options.logLevel && (config.logLevel = options.logLevel), options.open && !config.server?.open && (config.server.open = options.open), void 0 !== options.host && (config.server.host = options.host), options.port && (config.server.port = options.port), void 0 !== options.strictPort && (config.server.strictPort = options.strictPort), void 0 !== options.distPath) {
+        config.output ||= {};
+        let { distPath } = config.output;
+        config.output.distPath = distPath && 'object' == typeof distPath ? {
+            ...distPath,
+            root: options.distPath
+        } : {
+            root: options.distPath
+        };
+    }
+    if (void 0 !== options.sourceMap) {
+        let sourceMap = options.sourceMap;
+        if ('boolean' != typeof sourceMap) throw Error('The "--source-map" option only accepts a boolean value.');
+        config.output ||= {}, config.output.sourceMap = sourceMap;
+    }
+    return void 0 === config.dev.cliShortcuts && (config.dev.cliShortcuts = !0), filePath && (config.dev.watchFiles = [
         ...config.dev.watchFiles ? helpers_castArray(config.dev.watchFiles) : [],
         {
-            paths: filePath,
+            paths: [
+                filePath,
+                ...dependencies
+            ],
             type: 'reload-server'
         }
     ]), config;
 };
-async function init_init({ cliOptions, isRestart, isBuildWatch = !1 }) {
-    cliOptions && (commonOpts = cliOptions), commonOpts.environment?.some((env)=>env.includes(',')) && (commonOpts.environment = commonOpts.environment.flatMap((env)=>env.split(',')));
-    let logger = src_logger;
+async function init_init({ isRestart, isBuildWatch = !1 } = {}) {
+    let logger = src_logger, { options } = cliState;
     try {
         var envDir;
-        let cwd = process.cwd(), root = commonOpts.root ? ensureAbsolutePath(cwd, commonOpts.root) : cwd, rsbuild = await createRsbuild({
+        let cwd = process.cwd(), root = options.root ? ensureAbsolutePath(cwd, options.root) : cwd, rsbuild = await createRsbuild({
             cwd: root,
             config: ()=>init_loadConfig(root),
-            environment: commonOpts.environment,
-            loadEnv: !1 !== commonOpts.env && {
-                cwd: (envDir = commonOpts.envDir) ? node_path.isAbsolute(envDir) ? envDir : node_path.join(root, envDir) : root,
-                mode: commonOpts.envMode
+            environment: options.environment,
+            loadEnv: !1 !== options.env && {
+                cwd: (envDir = options.envDir) ? node_path.isAbsolute(envDir) ? envDir : node_path.join(root, envDir) : root,
+                mode: options.envMode
             }
         });
         return logger = rsbuild.logger, rsbuild.onBeforeCreateCompiler(()=>{
@@ -10024,13 +10082,13 @@ async function watchFilesForRestart({ files, rsbuild, isBuildWatch, watchOptions
     watcher.on('add', onChange), watcher.on('change', onChange), watcher.on('unlink', onChange);
 }
 let applyServerOptions = (command)=>{
-    command.option('-o, --open [url]', 'Open the page in browser on startup').option('--port <port>', 'Set the port number for the server').option('--host [host]', 'Set the host that the server listens to');
+    command.option('-o, --open [url]', 'Open the page in browser on startup').option('--port <port>', 'Set the port number for the server').option('--strict-port', 'Exit if the specified port is already in use').option('--host [host]', 'Set the host that the server listens to');
 };
-function setupCommands() {
+function setupCommands(argv) {
     let cli = ((name = "")=>new CAC(name))('rsbuild');
-    cli.version("2.1.1"), cli.option('--base <base>', 'Set the base path of the server').option('-c, --config <config>', 'Set the configuration file (relative or absolute path)').option('--config-loader <loader>', 'Set the config file loader (auto | jiti | native)', {
+    cli.version("2.1.3"), cli.option('--base <base>', 'Set the base path of the server').option('-c, --config <config>', 'Set the configuration file (relative or absolute path)').option('--config-loader <loader>', 'Set the config file loader (auto | jiti | native)', {
         default: 'auto'
-    }).option('--env-dir <dir>', 'Set the directory for loading `.env` files').option('--env-mode <mode>', 'Set the env mode to load the `.env.[mode]` file').option('--environment <name>', 'Set the environment name(s) to build', {
+    }).option('--dist-path <dir>', 'Set the root directory of output files').option('--source-map', 'Enable source map').option('--env-dir <dir>', 'Set the directory for loading `.env` files').option('--env-mode <mode>', 'Set the env mode to load the `.env.[mode]` file').option('--environment <name>', 'Set the environment name(s) to build', {
         type: [
             String
         ],
@@ -10040,20 +10098,19 @@ function setupCommands() {
     applyServerOptions(devCommand), applyServerOptions(previewCommand);
     let logger = src_logger;
     devCommand.action(async (options)=>{
+        initCliAction('dev', options);
         try {
-            let rsbuild = await init_init({
-                cliOptions: options
-            });
+            let rsbuild = await init_init();
             if (!rsbuild) return;
             logger = rsbuild.logger, await rsbuild.startDevServer();
         } catch (err) {
             logger.error('Failed to start dev server.'), logger.error(err), process.exit(1);
         }
     }), buildCommand.option('-w, --watch', 'Enable watch mode to automatically rebuild on file changes').action(async (options)=>{
+        initCliAction('build', options);
         try {
             options.watch || (process.env.RSPACK_UNSAFE_FAST_DROP = 'true');
             let rsbuild = await init_init({
-                cliOptions: options,
                 isBuildWatch: options.watch
             });
             if (!rsbuild) return;
@@ -10066,20 +10123,18 @@ function setupCommands() {
             err instanceof Error && err.message === RSPACK_BUILD_ERROR || logger.error('Failed to build.'), logger.error(err), process.exit(1);
         }
     }), previewCommand.action(async (options)=>{
+        initCliAction('preview', options);
         try {
-            let rsbuild = await init_init({
-                cliOptions: options
-            });
+            let rsbuild = await init_init();
             if (!rsbuild) return;
             logger = rsbuild.logger, await rsbuild.preview();
         } catch (err) {
             logger.error('Failed to start preview server.'), logger.error(err), process.exit(1);
         }
     }), inspectCommand.option('--output <output>', 'Set the output path for inspection results').option('--verbose', 'Show complete function definitions in output').action(async (options)=>{
+        initCliAction('inspect', options);
         try {
-            let rsbuild = await init_init({
-                cliOptions: options
-            });
+            let rsbuild = await init_init();
             if (!rsbuild) return;
             logger = rsbuild.logger, await rsbuild.inspectConfig({
                 verbose: options.verbose,
@@ -10091,21 +10146,17 @@ function setupCommands() {
         }
     }), cli.help((sections)=>{
         for (let section of (sections.shift(), sections))'Usage' === section.title && (section.body = section.body.replace('$ rsbuild', color.yellow("$ rsbuild [command] [options]"))), 'Commands' === section.title && (section.body = section.body.replace(`         ${devDescription}`, `dev      ${devDescription}`)), section.title?.startsWith('For more info') ? (section.title = color.dim('  For details on a sub-command, run'), section.body = color.dim('  $ rsbuild <command> -h')) : section.title && (section.title = color.cyan(section.title));
-    }), cli.parse();
-}
-let { argv: cli_argv } = process;
-function initNodeEnv(command) {
-    process.env.NODE_ENV || (process.env.NODE_ENV = 'build' === command || 'preview' === command ? 'production' : 'development');
+    }), cli.parse(argv);
 }
 function showGreeting() {
     let { npm_execpath, npm_lifecycle_event, NODE_RUN_SCRIPT_NAME } = process.env, isBun = npm_execpath?.includes('.bun');
-    src_logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v2.1.1\n`);
+    src_logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v2.1.3\n`);
 }
-function setupLogLevel() {
-    if (cli_argv.length <= 3) return;
-    let logLevelIndex = cli_argv.findIndex((item)=>'--log-level' === item || '--logLevel' === item);
+function setupLogLevel(argv) {
+    if (argv.length <= 3) return;
+    let logLevelIndex = argv.findIndex((item)=>'--log-level' === item || '--logLevel' === item);
     if (-1 !== logLevelIndex) {
-        let level = process.argv[logLevelIndex + 1];
+        let level = argv[logLevelIndex + 1];
         level && [
             'warn',
             'error',
@@ -10113,13 +10164,13 @@ function setupLogLevel() {
         ].includes(level) && !isDebug() && (src_logger.level = level);
     }
 }
-function runCLI() {
-    initNodeEnv(cli_argv[2]), setupLogLevel(), showGreeting();
+function runCLI({ argv = process.argv } = {}) {
+    setupLogLevel(argv), showGreeting();
     try {
-        setupCommands();
+        setupCommands(argv);
     } catch (err) {
         src_logger.error('Failed to start Rsbuild CLI.'), src_logger.error(err), process.exit(1);
     }
 }
-let src_version = "2.1.1";
+let src_version = "2.1.3";
 export { PLUGIN_CSS_NAME, PLUGIN_SWC_NAME, core_rspack as rspack, createRsbuild, defaultAllowedOrigins, defineConfig, ensureAssetPrefix, loadConfig_loadConfig as loadConfig, loadEnv, logger_createLogger as createLogger, mergeRsbuildConfig, mrmime_lookup, runCLI, src_logger as logger, src_version as version };

package/dist/client/hmr.js

@@ -100,7 +100,7 @@ function init(token, config, serverHost, serverPort, serverBase, liveReload, bro
         for (const item of clientErrors)if (item.id === id) item.message = message;
         createOverlay('Runtime errors', clientErrors.map((item)=>item.message).filter(Boolean).join('\n\n'));
     }
-    const shouldUpdate = ()=>lastHash !== __webpack_hash__;
+    const shouldUpdate = ()=>lastHash !== import.meta.rspackHash;
     const handleApplyUpdates = (err, updatedModules)=>{
         const forcedReload = err || !updatedModules;
         if (forcedReload) {

package/dist/cssUrlLoader.mjs

@@ -26,7 +26,7 @@ let HASH_PLACEHOLDER_REGEX = /\[(?:[^:\]]+:)?(?:chunkhash|contenthash|hash|fullh
         ...info,
         ...assetInfo,
         immutable: info.immutable || HASH_PLACEHOLDER_REGEX.test(filenameTemplate)
-    }), `export default __webpack_public_path__ + ${JSON.stringify(filename)};`;
+    }), `export default import.meta.rspackPublicPath + ${JSON.stringify(filename)};`;
 };
 export default function(source) {
     return source;