@rsbuild/core 2.0.2 → 2.0.4

package/compiled/style-loader/index.js

@@ -1,16 +1,16 @@
 (() => {
   "use strict";
   var __webpack_modules__ = {
-    715: (module, __unused_webpack_exports, __nccwpck_require__) => {
-      const loader = __nccwpck_require__(709);
+    346: (module, __unused_webpack_exports, __nccwpck_require__) => {
+      const loader = __nccwpck_require__(480);
       module.exports = loader.default;
     },
-    709: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    480: (__unused_webpack_module, exports, __nccwpck_require__) => {
       Object.defineProperty(exports, "__esModule", { value: true });
       exports["default"] = void 0;
       var _path = _interopRequireDefault(__nccwpck_require__(928));
-      var _utils = __nccwpck_require__(736);
-      var _options = _interopRequireDefault(__nccwpck_require__(119));
+      var _utils = __nccwpck_require__(521);
+      var _options = _interopRequireDefault(__nccwpck_require__(726));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule ? obj : { default: obj };
       }
@@ -95,7 +95,7 @@
       };
       var _default = (exports["default"] = loader);
     },
-    962: (module) => {
+    347: (module) => {
       function isEqualLocals(a, b, isNamedExport) {
         if ((!a && b) || (a && !b)) {
           return false;
@@ -121,7 +121,7 @@
       }
       module.exports = isEqualLocals;
     },
-    736: (__unused_webpack_module, exports, __nccwpck_require__) => {
+    521: (__unused_webpack_module, exports, __nccwpck_require__) => {
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.getExportLazyStyleCode = getExportLazyStyleCode;
       exports.getExportStyleCode = getExportStyleCode;
@@ -142,7 +142,7 @@
       exports.getdomAPI = getdomAPI;
       exports.stringifyRequest = stringifyRequest;
       var _path = _interopRequireDefault(__nccwpck_require__(928));
-      var _isEqualLocals = _interopRequireDefault(__nccwpck_require__(962));
+      var _isEqualLocals = _interopRequireDefault(__nccwpck_require__(347));
       function _interopRequireDefault(obj) {
         return obj && obj.__esModule ? obj : { default: obj };
       }
@@ -337,7 +337,7 @@
     928: (module) => {
       module.exports = require("path");
     },
-    119: (module) => {
+    726: (module) => {
       module.exports = JSON.parse(
         '{"title":"Style Loader options","type":"object","properties":{"injectType":{"description":"Allows to setup how styles will be injected into DOM.","link":"https://github.com/webpack-contrib/style-loader#injecttype","enum":["styleTag","singletonStyleTag","autoStyleTag","lazyStyleTag","lazySingletonStyleTag","lazyAutoStyleTag","linkTag"]},"attributes":{"description":"Adds custom attributes to tag.","link":"https://github.com/webpack-contrib/style-loader#attributes","type":"object"},"insert":{"description":"Inserts `<style>`/`<link>` at the given position.","link":"https://github.com/webpack-contrib/style-loader#insert","type":"string"},"base":{"description":"Sets module ID base for DLLPlugin.","link":"https://github.com/webpack-contrib/style-loader#base","type":"number"},"esModule":{"description":"Use the ES modules syntax.","link":"https://github.com/webpack-contrib/css-loader#esmodule","type":"boolean"},"styleTagTransform":{"description":"Transform tag and css when insert \'style\' tag into the DOM","link":"https://github.com/webpack-contrib/style-loader#styleTagTransform","type":"string"}},"additionalProperties":false}',
       );
@@ -365,6 +365,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(715);
+  var __webpack_exports__ = __nccwpck_require__(346);
   module.exports = __webpack_exports__;
 })();

package/dist/753.js

@@ -384,8 +384,8 @@ __webpack_require__.add({
             return (asyncHooks.AsyncResource && (res = new asyncHooks.AsyncResource(fn.name || 'bound-anonymous-fn')), res && res.runInAsyncScope) ? res.runInAsyncScope.bind(res, fn, null) : fn;
         }
     },
-    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.6.1_postcss@8.5.12_yaml@2.8.2/node_modules/postcss-load-config/src/index.js" (module, __unused_rspack_exports, __webpack_require__) {
-        let yaml, { resolve } = __webpack_require__("node:path?435f"), config = __webpack_require__("../../node_modules/.pnpm/lilconfig@3.1.3/node_modules/lilconfig/src/index.js"), loadOptions = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.6.1_postcss@8.5.12_yaml@2.8.2/node_modules/postcss-load-config/src/options.js"), loadPlugins = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.6.1_postcss@8.5.12_yaml@2.8.2/node_modules/postcss-load-config/src/plugins.js"), req = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.6.1_postcss@8.5.12_yaml@2.8.2/node_modules/postcss-load-config/src/req.js");
+    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.13/node_modules/postcss-load-config/src/index.js" (module, __unused_rspack_exports, __webpack_require__) {
+        let yaml, { resolve } = __webpack_require__("node:path?435f"), config = __webpack_require__("../../node_modules/.pnpm/lilconfig@3.1.3/node_modules/lilconfig/src/index.js"), loadOptions = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.13/node_modules/postcss-load-config/src/options.js"), loadPlugins = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.13/node_modules/postcss-load-config/src/plugins.js"), req = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.13/node_modules/postcss-load-config/src/req.js");
         async function processResult(ctx, result) {
             let obj, file = result.filepath || '', projectConfig = ((obj = result.config) && obj.__esModule ? obj : {
                 default: obj
@@ -458,8 +458,8 @@ __webpack_require__.add({
             });
         };
     },
-    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.6.1_postcss@8.5.12_yaml@2.8.2/node_modules/postcss-load-config/src/options.js" (module, __unused_rspack_exports, __webpack_require__) {
-        let req = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.6.1_postcss@8.5.12_yaml@2.8.2/node_modules/postcss-load-config/src/req.js");
+    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.13/node_modules/postcss-load-config/src/options.js" (module, __unused_rspack_exports, __webpack_require__) {
+        let req = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.13/node_modules/postcss-load-config/src/req.js");
         module.exports = async function options(config, file) {
             if (config.parser && 'string' == typeof config.parser) try {
                 config.parser = await req(config.parser, file);
@@ -479,8 +479,8 @@ __webpack_require__.add({
             return config;
         };
     },
-    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.6.1_postcss@8.5.12_yaml@2.8.2/node_modules/postcss-load-config/src/plugins.js" (module, __unused_rspack_exports, __webpack_require__) {
-        let req = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.6.1_postcss@8.5.12_yaml@2.8.2/node_modules/postcss-load-config/src/req.js");
+    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.13/node_modules/postcss-load-config/src/plugins.js" (module, __unused_rspack_exports, __webpack_require__) {
+        let req = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.13/node_modules/postcss-load-config/src/req.js");
         async function load(plugin, options, file) {
             try {
                 if (null == options || 0 === Object.keys(options).length) return await req(plugin, file);
@@ -496,7 +496,7 @@ __webpack_require__.add({
             }), list;
         };
     },
-    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.6.1_postcss@8.5.12_yaml@2.8.2/node_modules/postcss-load-config/src/req.js" (module, __unused_rspack_exports, __webpack_require__) {
+    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.13/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 = [];
@@ -1211,7 +1211,7 @@ let isDeno = "u" > typeof Deno, isWindows = 'win32' === process.platform, ROOT_D
     node: [
         'node >= 20'
     ]
-}, JS_REGEX = /\.(?:js|mjs|cjs|jsx)$/, SCRIPT_REGEX = /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/, CSS_REGEX = /\.css$/, RAW_QUERY_REGEX = /[?&]raw(?:&|=|$)/, INLINE_QUERY_REGEX = /[?&]inline(?:&|=|$)/, NODE_MODULES_REGEX = /[\\/]node_modules[\\/]/, PLUGIN_SWC_NAME = 'rsbuild:swc', PLUGIN_CSS_NAME = 'rsbuild:css', FONT_EXTENSIONS = [
+}, JS_REGEX = /\.(?:js|mjs|cjs|jsx)$/, SCRIPT_REGEX = /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/, CSS_REGEX = /\.css$/, RAW_QUERY_REGEX = /[?&]raw(?:&|=|$)/, INLINE_QUERY_REGEX = /[?&]inline(?:&|=|$)/, URL_QUERY_REGEX = /[?&]url(?:&|=|$)/, NODE_MODULES_REGEX = /[\\/]node_modules[\\/]/, PLUGIN_SWC_NAME = 'rsbuild:swc', PLUGIN_CSS_NAME = 'rsbuild:css', FONT_EXTENSIONS = [
     'woff',
     'woff2',
     'eot',
@@ -2271,7 +2271,7 @@ class RspackChain extends ChainedMap {
         ]);
     }
 }
-let vendors_require = createRequire(import.meta.url), requireCompiledPackage = (name)=>vendors_require(`${COMPILED_PATH}/${name}/index.js`), cjs_0 = __webpack_require__("../../node_modules/.pnpm/deepmerge@4.3.1/node_modules/deepmerge/dist/cjs.js");
+let vendors_require = createRequire(import.meta.url), cjs_0 = __webpack_require__("../../node_modules/.pnpm/deepmerge@4.3.1/node_modules/deepmerge/dist/cjs.js");
 var cjs_0_default = __webpack_require__.n(cjs_0);
 let setNodeEnv = (env)=>{
     process.env.NODE_ENV = env;
@@ -2279,14 +2279,23 @@ let setNodeEnv = (env)=>{
         arr
     ], cloneDeep = (value)=>null == value ? value : cjs_0_default()({}, value, {
         isMergeableObject: isPlainObject
-    });
+    }), DEFAULT_FILENAME_HASH = 'contenthash:10';
 function getFilename(config, type, isProd, isServer) {
-    let { filename, filenameHash } = config.output, defaultHash = '[contenthash:10]', getHash = ()=>'string' == typeof filenameHash ? filenameHash ? `.[${filenameHash}]` : '' : filenameHash ? `.${defaultHash}` : '';
+    let { filename, filenameHash } = config.output, hashConfig = 'boolean' == typeof filenameHash ? {
+        enable: filenameHash,
+        format: DEFAULT_FILENAME_HASH
+    } : 'string' == typeof filenameHash ? {
+        enable: !!filenameHash,
+        format: filenameHash || DEFAULT_FILENAME_HASH
+    } : {
+        enable: filenameHash.enable ?? !0,
+        format: filenameHash.format ?? DEFAULT_FILENAME_HASH
+    }, hashTemplate = `[${hashConfig.format}]`, getHash = ()=>!1 !== hashConfig.enable ? `.${hashTemplate}` : '', getJsCssHash = (flag)=>'always' === hashConfig.enable || !0 === hashConfig.enable && flag ? `.${hashTemplate}` : '';
     switch(type){
         case 'js':
-            return filename.js ?? `[name]${isProd && !isServer ? getHash() : ''}.js`;
+            return filename.js ?? `[name]${getJsCssHash(isProd && !isServer)}.js`;
         case 'css':
-            return filename.css ?? `[name]${isProd ? getHash() : ''}.css`;
+            return filename.css ?? `[name]${getJsCssHash(isProd)}.css`;
         case 'svg':
             return filename.svg ?? `[name]${getHash()}.svg`;
         case 'font':
@@ -2298,10 +2307,7 @@ function getFilename(config, type, isProd, isServer) {
         case 'assets':
             return filename.assets ?? `[name]${getHash()}[ext]`;
         case 'wasm':
-            {
-                let hash = 'string' == typeof filenameHash ? `[${filenameHash}]` : defaultHash;
-                return filename.wasm ?? `${hash}.module.wasm`;
-            }
+            return filename.wasm ?? `${hashTemplate}.module.wasm`;
         case 'html':
             if (filename.html) return filename.html;
             return 'flat' === config.html.outputStructure ? '[name].html' : '[name]/index.html';
@@ -2822,16 +2828,24 @@ let OVERRIDE_PATHS = new Set([
     'output.inlineScripts',
     'output.inlineStyles',
     'output.cssModules.auto',
+    'output.manifest.filter',
+    'output.manifest.generate',
     'output.overrideBrowserslist',
+    'performance.printFileSize.exclude',
+    'performance.printFileSize.include',
+    'performance.printFileSize.total',
     'server.open',
+    'server.compress.filter',
     'server.printUrls',
     'resolve.extensions',
     'resolve.conditionNames',
     'resolve.mainFields',
     'dev.writeToDisk',
+    'dev.client.overlay.errors',
+    'dev.client.overlay.runtime',
     'provider',
     'customLogger'
-]), mergeConfig_merge = (x, y, path = '')=>{
+]), merge = (x, y, path = '')=>{
     if (((key)=>{
         if (key.startsWith('environments.')) {
             let realKey = key.split('.').slice(2).join('.');
@@ -2864,7 +2878,7 @@ let OVERRIDE_PATHS = new Set([
         ...Object.keys(y)
     ])){
         let childPath = path ? `${path}.${key}` : key;
-        merged[key] = mergeConfig_merge(x[key], y[key], childPath);
+        merged[key] = merge(x[key], y[key], childPath);
     }
     return merged;
 }, normalizeConfigStructure = (config)=>{
@@ -2884,7 +2898,7 @@ let OVERRIDE_PATHS = new Set([
     ]), normalizedConfig.dev = dev), normalizedConfig;
 }, mergeRsbuildConfig = (...originalConfigs)=>{
     let configs = originalConfigs.filter((config)=>void 0 !== config).map(normalizeConfigStructure);
-    return 2 === configs.length ? mergeConfig_merge(configs[0], configs[1]) : 1 === configs.length ? configs[0] : 0 === configs.length ? {} : configs.reduce((result, config)=>mergeConfig_merge(result, config), {});
+    return 2 === configs.length ? merge(configs[0], configs[1]) : 1 === configs.length ? configs[0] : 0 === configs.length ? {} : configs.reduce((result, config)=>merge(result, config), {});
 }, defaultAllowedOrigins = /^https?:\/\/(?:(?:[^:]+\.)?localhost|127\.0\.0\.1|\[::1\])(?::\d+)?$/, createDefaultConfig = ()=>({
         dev: {
             hmr: !0,
@@ -3467,7 +3481,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.0.2",
+        version: "2.0.4",
         rootPath,
         distPath: '',
         cachePath,
@@ -3624,6 +3638,84 @@ function reduceConfigsMergeContext({ initial, config, ctx, mergeFn = Object.assi
             mergeFn
         }), initial) : config ?? initial;
 }
+function mergeTo(a, b, customizer) {
+    let ret = {};
+    return Object.keys(a).concat(Object.keys(b)).forEach((k)=>{
+        let v = customizer(a[k], b[k], k);
+        ret[k] = void 0 === v ? a[k] : v;
+    }), ret;
+}
+let merge_with = function mergeWith(objects, customizer) {
+    let [first, ...rest] = objects, ret = first;
+    return rest.forEach((a)=>{
+        ret = mergeTo(ret, a, customizer);
+    }), ret;
+};
+function isRegex(o) {
+    return o instanceof RegExp;
+}
+function rspack_merge_dist_isPlainObject(value) {
+    if ('[object Object]' !== Object.prototype.toString.call(value)) return !1;
+    let proto = Object.getPrototypeOf(value);
+    if (null === proto) return !0;
+    let baseProto = proto;
+    for(; null !== Object.getPrototypeOf(baseProto);)baseProto = Object.getPrototypeOf(baseProto);
+    return proto === baseProto;
+}
+function isUndefined(value) {
+    return void 0 === value;
+}
+function isPromiseLike(value) {
+    return null !== value && ('object' == typeof value || 'function' == typeof value) && 'function' == typeof value.then;
+}
+let isArray = Array.isArray;
+function joinArrays({ customizeArray, customizeObject, key } = {}) {
+    return function _joinArrays(a, b, k) {
+        let newKey = key ? `${key}.${k}` : k;
+        return 'function' == typeof a && 'function' == typeof b ? (...args)=>_joinArrays(a(...args), b(...args), k) : isArray(a) && isArray(b) ? customizeArray && customizeArray(a, b, newKey) || [
+            ...a,
+            ...b
+        ] : isRegex(b) ? b : rspack_merge_dist_isPlainObject(a) && rspack_merge_dist_isPlainObject(b) ? customizeObject && customizeObject(a, b, newKey) || merge_with([
+            a,
+            b
+        ], joinArrays({
+            customizeArray,
+            customizeObject,
+            key: newKey
+        })) : rspack_merge_dist_isPlainObject(b) ? merge_with([
+            {},
+            b
+        ], joinArrays({
+            customizeArray,
+            customizeObject,
+            key: newKey
+        })) : isArray(b) ? [
+            ...b
+        ] : b;
+    };
+}
+function dist_merge(firstConfiguration, ...configurations) {
+    return mergeWithCustomize({})(firstConfiguration, ...configurations);
+}
+function mergeWithCustomize(options) {
+    return function(firstConfiguration, ...configurations) {
+        if (isUndefined(firstConfiguration) || configurations.some(isUndefined)) throw TypeError('Merging undefined is not supported');
+        if (isPromiseLike(firstConfiguration)) throw TypeError('Promises are not supported');
+        if (!firstConfiguration) return {};
+        if (0 === configurations.length) {
+            if (Array.isArray(firstConfiguration)) {
+                if (0 === firstConfiguration.length) return {};
+                if (firstConfiguration.some(isUndefined)) throw TypeError('Merging undefined is not supported');
+                if (isPromiseLike(firstConfiguration[0])) throw TypeError('Promises are not supported');
+                return merge_with(firstConfiguration, joinArrays(options));
+            }
+            return firstConfiguration;
+        }
+        return merge_with([
+            firstConfiguration
+        ].concat(configurations), joinArrays(options));
+    };
+}
 async function modifyBundlerChain(context, utils) {
     context.logger.debug('applying modifyBundlerChain hook');
     let rspackChain = new RspackChain(), [modifiedBundlerChain] = await context.hooks.modifyBundlerChain.callChain({
@@ -3711,7 +3803,7 @@ let configChain_CHAIN_ID = {
     }
 };
 function pluginHelper_getHTMLPlugin(config) {
-    return config?.html.implementation === 'native' ? core_rspack.HtmlRspackPlugin : (pluginHelper_htmlPlugin || (pluginHelper_htmlPlugin = requireCompiledPackage('html-rspack-plugin')), pluginHelper_htmlPlugin);
+    return config?.html.implementation === 'native' ? core_rspack.HtmlRspackPlugin : (pluginHelper_htmlPlugin || (pluginHelper_htmlPlugin = vendors_require(`${COMPILED_PATH}/html-rspack-plugin/index.js`)), pluginHelper_htmlPlugin);
 }
 async function modifyRspackConfig(context, rspackConfig, chainUtils) {
     context.logger.debug('applying modifyRspackConfig hook');
@@ -3739,10 +3831,7 @@ async function modifyRspackConfig(context, rspackConfig, chainUtils) {
 function getConfigUtils(getCurrentConfig, chainUtils) {
     return {
         ...chainUtils,
-        mergeConfig: (...args)=>{
-            let { merge } = requireCompiledPackage('webpack-merge');
-            return merge(...args);
-        },
+        mergeConfig: dist_merge,
         addRules (rules) {
             let config = getCurrentConfig(), ruleArr = helpers_castArray(rules);
             config.module || (config.module = {}), config.module.rules || (config.module.rules = []), config.module.rules.unshift(...ruleArr);
@@ -4263,7 +4352,7 @@ let chainStaticAssetRule = ({ emit, rule, maxSize, filename, assetType })=>{
     let generatorOptions = {
         filename
     };
-    emit || (generatorOptions.emit = !1), rule.oneOf(`${assetType}-asset-url`).type('asset/resource').resourceQuery(/^\?url$/).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-raw`).type('asset/source').resourceQuery(RAW_QUERY_REGEX), rule.oneOf(`${assetType}-asset`).type('asset').parser({
         dataUrlCondition: {
             maxSize
         }
@@ -4378,7 +4467,7 @@ function parseMinifyOptions(config) {
         cssOptions: minify.cssOptions
     };
 }
-let postcss_load_config_src = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.6.1_postcss@8.5.12_yaml@2.8.2/node_modules/postcss-load-config/src/index.js");
+let postcss_load_config_src = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.13/node_modules/postcss-load-config/src/index.js");
 var postcss_load_config_src_default = __webpack_require__.n(postcss_load_config_src);
 function getLightningCSSLoaderOptions(config, targets, minify) {
     let userOptions = 'object' == typeof config.tools.lightningcssLoader ? config.tools.lightningcssLoader : {}, initialOptions = {
@@ -5695,6 +5784,7 @@ function applySwcDecoratorConfig(swcConfig, config) {
             throw Error(`${color.dim('[rsbuild:swc]')} Unknown decorators version: ${color.yellow(version)}`);
     }
 }
+let isRuntimeOverlayEnabled = (overlay)=>'object' == typeof overlay && (!0 === overlay.runtime || 'function' == typeof overlay.runtime);
 async function getLocalhostResolvedAddress() {
     let { promises: dns } = await import("node:dns"), [defaultLookup, explicitLookup] = await Promise.all([
         dns.lookup(LOCALHOST),
@@ -6042,6 +6132,8 @@ let noop = ()=>{}, normalizeLiveReload = (liveReload)=>'boolean' == typeof liveR
         html: !1 !== liveReload.html
     }, isTsError = (error)=>'message' in error && error.stack?.includes('ts-checker-rspack-plugin');
 function applyHMREntry({ config, compiler, token, resolvedHost, resolvedPort }) {
+    var overlay;
+    let overlay1;
     if (!((compiler)=>{
         let { target } = compiler.options;
         return !!target && (Array.isArray(target) ? target.includes('web') : 'web' === target);
@@ -6051,7 +6143,7 @@ function applyHMREntry({ config, compiler, token, resolvedHost, resolvedPort })
     };
     '<port>' === clientConfig.port && (clientConfig.port = resolvedPort);
     let hmrEntry = `import { init } from '${toPosixPath(join(CLIENT_PATH, 'hmr.js'))}';
-${config.dev.client.overlay ? `import '${toPosixPath(join(CLIENT_PATH, 'overlay.js'))}';` : ''}
+${!0 === (overlay1 = overlay = config.dev.client.overlay) || 'object' == typeof overlay1 && !1 !== overlay1.errors || isRuntimeOverlayEnabled(overlay) ? `import '${toPosixPath(join(CLIENT_PATH, 'overlay.js'))}';` : ''}
 init(
   '${token}',
   ${JSON.stringify(clientConfig)},
@@ -6221,7 +6313,7 @@ function parseNode(line) {
         column: parts[4] ? +parts[4] : null
     } : null;
 }
-let isValidMethodName = (methodName)=>'<unknown>' !== methodName && !/[\\/]/.test(methodName), parseFrame = async (frame, fs, context, cachedTraceMap)=>{
+let isValidMethodName = (methodName)=>'<unknown>' !== methodName && !/[\\/]/.test(methodName), isRspackRuntimeStack = (value)=>!!value && (value.includes('__webpack_require__') || value.startsWith('webpack/runtime/')), parseFrame = async (frame, fs, context, cachedTraceMap)=>{
     let { file, column, lineNumber } = frame, sourceMapInfo = await getFileFromUrl(`${file}.map`, fs, context);
     if (!sourceMapInfo || 'errorCode' in sourceMapInfo) return;
     let { TraceMap, originalPositionFor } = await import("./trace-mapping.js"), sourceMapPath = sourceMapInfo.filename;
@@ -6265,22 +6357,31 @@ let isValidMethodName = (methodName)=>'<unknown>' !== methodName && !/[\\/]/.tes
     let { file, lineNumber, column } = frame;
     if (file) return null !== lineNumber ? null !== column ? `${file}:${lineNumber}:${column}` : `${file}:${lineNumber}` : file;
 }, formatFullStack = async (stackFrames, context, fs, cachedTraceMap)=>{
-    let result = '';
+    let formattedFrames = [];
     for (let frame of stackFrames){
-        let parsedFrame = await parseFrame(frame, fs, context, cachedTraceMap), { methodName } = frame, parts = [];
+        let location, parsedFrame = await parseFrame(frame, fs, context, cachedTraceMap), { methodName } = frame, parts = [];
         isValidMethodName(methodName) && parts.push(methodName);
         let parsed = !1;
         if (parsedFrame) {
             let { sourceMapPath, originalPosition } = parsedFrame, originalLocation = formatOriginalLocation(sourceMapPath, originalPosition, context);
-            originalLocation && (parts.push(originalLocation), parsed = !0);
+            originalLocation && (location = originalLocation, parts.push(originalLocation), parsed = !0);
         }
         if (!parsed && isVerbose(context.logger)) {
             let frameString = formatFrameLocation(frame);
-            frameString && parts.push(frameString);
+            frameString && (location = frameString, parts.push(frameString));
+        }
+        let [first, second] = parts;
+        if (first) {
+            let isRspackRuntime = isRspackRuntimeStack(methodName) || isRspackRuntimeStack(location);
+            formattedFrames.push({
+                text: second ? `\n    at ${first} (${second})` : `\n    at ${first}`,
+                isRspackRuntime,
+                hasLocation: void 0 !== location
+            });
         }
-        parts[0] && (result += `\n    at ${parts[0]}`), parts[1] && (result += ` (${parts[1]})`);
     }
-    return result;
+    let shouldFilterRspackRuntime = formattedFrames.some((frame)=>!frame.isRspackRuntime && frame.hasLocation);
+    return formattedFrames.filter((frame)=>!(shouldFilterRspackRuntime && frame.isRspackRuntime)).map((frame)=>frame.text).join('');
 }, formatBrowserErrorLog = async (message, context, fs, stackTrace, stackFrames, cachedTraceMap)=>{
     var log;
     let log1 = color.red(message);
@@ -6418,7 +6519,12 @@ class SocketServer {
         });
     }
     sendError(errors, token) {
-        let { rootPath } = this.context, formattedErrors = errors.map((item)=>formatStatsError(item, rootPath, 'error', this.context.logger)), html = formattedErrors.map((error)=>convertLinksInHtml(ansiHTML(escapeHtml(error)), rootPath)).join('\n\n').trim();
+        let { rootPath } = this.context, formattedErrors = errors.map((item)=>formatStatsError(item, rootPath, 'error', this.context.logger)), environment = this.getEnvironmentByToken(token), overlay = environment?.config.dev.client.overlay, overlayErrors = formattedErrors;
+        if (overlay && 'object' == typeof overlay && 'function' == typeof overlay.errors) {
+            let { errors: filter } = overlay;
+            overlayErrors = formattedErrors.filter((error)=>filter(Error(error)));
+        }
+        let html = overlayErrors.map((error)=>convertLinksInHtml(ansiHTML(escapeHtml(error)), rootPath)).join('\n\n').trim();
         this.sendMessage({
             type: 'errors',
             data: {
@@ -6468,7 +6574,14 @@ class SocketServer {
                 let { browserLogs, client } = environment.config.dev;
                 if ('client-error' === payload.type && !context.buildState.hasErrors && browserLogs) {
                     let stackTrace = isObject(browserLogs) && browserLogs.stackTrace || DEFAULT_STACK_TRACE, outputFs = this.getOutputFileSystem(), stackFrames = payload.stack ? stack_trace_parser_esm_parse(payload.stack) : null, cachedTraceMap = new Map(), log = await formatBrowserErrorLog(payload.message, context, outputFs, stackTrace, stackFrames, cachedTraceMap);
-                    if (this.reportedBrowserLogs.has(log) || (this.reportedBrowserLogs.add(log), this.context.logger.error(`${color.cyan('[browser]')} ${log}`)), 'object' == typeof client.overlay && client.overlay.runtime) {
+                    if (this.reportedBrowserLogs.has(log) || (this.reportedBrowserLogs.add(log), this.context.logger.error(`${color.cyan('[browser]')} ${log}`)), ((overlay, payload)=>{
+                        if (!isRuntimeOverlayEnabled(overlay)) return !1;
+                        if ('object' == typeof overlay && 'function' == typeof overlay.runtime) {
+                            let error;
+                            return overlay.runtime((error = Error(payload.message), payload.name && (error.name = payload.name), payload.stack && (error.stack = payload.stack), error));
+                        }
+                        return !0;
+                    })(client.overlay, payload)) {
                         let resolvedLog = 'full' === stackTrace ? log : await formatBrowserErrorLog(payload.message, context, outputFs, 'full', stackFrames, cachedTraceMap);
                         this.sendMessage({
                             type: 'resolved-client-error',
@@ -7665,30 +7778,47 @@ function applyDefaultPlugins(pluginManager, context) {
         {
             name: 'rsbuild:source-map',
             setup (api) {
+                let normalizeExtractOptions = (extract = {})=>{
+                    let hasLegacyJs = 'js' in extract, hasFlatFields = [
+                        'test',
+                        'include',
+                        'exclude'
+                    ].some((key)=>void 0 !== extract[key]);
+                    if (!1 === extract.js) return !1;
+                    if (hasLegacyJs && !hasFlatFields) {
+                        var target;
+                        let legacyJs = !!(target = extract.js) && (!0 === target ? {} : {
+                            include: target.include?.map(normalizeRuleConditionPath),
+                            exclude: target.exclude?.map(normalizeRuleConditionPath)
+                        });
+                        return !!legacyJs && {
+                            name: 'source-map-extract-js',
+                            test: JS_REGEX,
+                            target: legacyJs
+                        };
+                    }
+                    let { test, include, exclude } = extract;
+                    return {
+                        name: 'source-map-extract',
+                        test: test ?? JS_REGEX,
+                        target: {
+                            include: include?.map(normalizeRuleConditionPath),
+                            exclude: exclude?.map(normalizeRuleConditionPath)
+                        }
+                    };
+                };
                 api.modifyBundlerChain({
                     order: 'pre',
                     handler: (chain, { environment })=>{
                         let extractConfig = ((config)=>{
-                            var target;
                             let { sourceMap } = config.output;
-                            if ('object' != typeof sourceMap || !sourceMap.extract) return !1;
-                            if (!0 === sourceMap.extract) return {
-                                js: {}
-                            };
-                            let js = !!(target = sourceMap.extract.js) && (!0 === target ? {} : {
-                                include: target.include?.map(normalizeRuleConditionPath),
-                                exclude: target.exclude?.map(normalizeRuleConditionPath)
-                            });
-                            return !!js && {
-                                js
-                            };
+                            return 'object' == typeof sourceMap && !!sourceMap.extract && (!0 === sourceMap.extract ? normalizeExtractOptions() : 'object' == typeof sourceMap.extract && normalizeExtractOptions(sourceMap.extract));
                         })(environment.config);
-                        extractConfig && ((chain, name, test, target)=>{
-                            if (!target) return;
-                            let rule = chain.module.rule(name).test(test).set('extractSourceMap', !0), { include, exclude } = target;
+                        extractConfig && ((chain, extractConfig)=>{
+                            let { name, test, target } = extractConfig, rule = chain.module.rule(name).test(test).set('extractSourceMap', !0), { include, exclude } = target;
                             if (include) for (let condition of include)rule.include.add(condition);
                             if (exclude) for (let condition of exclude)rule.exclude.add(condition);
-                        })(chain, 'source-map-extract-js', JS_REGEX, extractConfig.js);
+                        })(chain, extractConfig);
                     }
                 }), api.modifyBundlerChain((chain, { rspack, environment, isDev, target })=>{
                     let { config } = environment, devtool = ((config)=>{
@@ -8225,7 +8355,7 @@ try {
                         cssRule.test(CSS_REGEX).dependency({
                             not: 'url'
                         });
-                        let urlRule = cssRule.oneOf(CHAIN_ID.ONE_OF.CSS_URL).resourceQuery(/^\?url$/);
+                        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);
                         cssRule.oneOf(CHAIN_ID.ONE_OF.CSS_RAW).type('asset/source').resourceQuery(RAW_QUERY_REGEX);
@@ -8707,7 +8837,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("./manifest-plugin.js").then(__webpack_require__.bind(__webpack_require__, "../../node_modules/.pnpm/rspack-manifest-plugin@5.2.1_@rspack+core@2.0.0/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.1_@rspack+core@2.0.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,
@@ -9221,7 +9351,7 @@ let applyServerOptions = (command)=>{
 };
 function setupCommands() {
     let cli = ((name = "")=>new CAC(name))('rsbuild');
-    cli.version("2.0.2"), 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.0.4"), 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', {
         type: [
@@ -9298,7 +9428,7 @@ function initNodeEnv() {
 }
 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.0.2\n`);
+    src_logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v2.0.4\n`);
 }
 function setupLogLevel() {
     let logLevelIndex = process.argv.findIndex((item)=>'--log-level' === item || '--logLevel' === item);
@@ -9319,5 +9449,5 @@ function runCLI() {
         src_logger.error('Failed to start Rsbuild CLI.'), src_logger.error(err), process.exit(1);
     }
 }
-let src_version = "2.0.2";
+let src_version = "2.0.4";
 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, runCLI, src_logger as logger, src_version as version };

package/dist/client/hmr.js

@@ -1,6 +1,19 @@
 import { logger } from "./797.js";
 let createOverlay;
 let clearOverlay;
+const getErrorField = (error, field)=>{
+    if (error instanceof Error) {
+        const value = error[field];
+        return void 0 === value ? void 0 : String(value);
+    }
+};
+const formatErrorLikeMessage = (error)=>{
+    if (!(error instanceof Error)) return;
+    const message = getErrorField(error, 'message');
+    if (void 0 === message) return;
+    const name = getErrorField(error, 'name');
+    return name ? `${name}: ${message}` : message;
+};
 function setupCustomHMRListeners(customListenersMap) {
     __webpack_require__.i.push(({ module })=>{
         const newListeners = new Map();
@@ -74,7 +87,9 @@ function init(token, config, serverHost, serverPort, serverBase, liveReload, bro
         clearBuildErrors();
         hasBuildErrors = true;
         for (const error of text)logger.error(error);
-        if (createOverlay) createOverlay('Build failed', html);
+        const { overlay } = config;
+        if (createOverlay && (true === overlay || 'object' == typeof overlay && false !== overlay.errors)) if (html) createOverlay('Build failed', html);
+        else null == clearOverlay || clearOverlay();
     }
     function handleResolvedClientError({ id, message }) {
         if (!createOverlay || hasBuildErrors) return;
@@ -181,13 +196,14 @@ function init(token, config, serverHost, serverPort, serverBase, liveReload, bro
             connect(true);
         }
     }
-    function sendError(message, stack) {
+    function sendError(message, error) {
         const id = `${Date.now().toString(36)}${Math.random().toString(36).slice(2)}`;
         const messageInfo = {
             type: 'client-error',
             id,
             message,
-            stack
+            name: getErrorField(error, 'name'),
+            stack: getErrorField(error, 'stack')
         };
         clientErrors.push({
             id
@@ -197,17 +213,15 @@ function init(token, config, serverHost, serverPort, serverBase, liveReload, bro
     }
     function onUnhandledRejection({ reason }) {
         let message;
-        let stack;
-        if (reason instanceof Error) {
-            message = reason.name ? `${reason.name}: ${reason.message}` : reason.message;
-            stack = reason.stack;
-        } else if ('string' == typeof reason) message = reason;
+        const errorMessage = formatErrorLikeMessage(reason);
+        if (void 0 !== errorMessage) message = errorMessage;
+        else if ('string' == typeof reason) message = reason;
         else try {
             message = JSON.stringify(reason);
         } catch (unused) {
             return;
         }
-        sendError(`Uncaught (in promise) ${message}`, stack);
+        sendError(`Uncaught (in promise) ${message}`, reason);
     }
     function connect(fallback = false) {
         if (0 === reconnectCount) logger.info('[rsbuild] WebSocket connecting...');
@@ -241,7 +255,7 @@ function init(token, config, serverHost, serverPort, serverBase, liveReload, bro
     }
     if (browserLogs && "u" > typeof window) {
         window.addEventListener('error', ({ message, error })=>{
-            sendError(message, error instanceof Error ? error.stack : void 0);
+            sendError(message, error);
         });
         window.addEventListener('unhandledrejection', onUnhandledRejection);
     }