@rsbuild/core 2.2.4 → 2.2.6

package/dist/626.js

@@ -2280,6 +2280,9 @@ let compiler_isMultiCompiler = (compiler)=>'compilers' in compiler && Array.isAr
 }, addCompilationError = (compilation, message)=>{
     compilation.errors.push(new core_rspack.WebpackError(message));
 };
+function formatDiagnosticPath(filePath, root) {
+    return /^(\.\.[\\/]){4}/.test(filePath) ? external_node_path_resolve(root, filePath) : filePath;
+}
 function resolveFileName(stats, logger) {
     let file = stats.file || stats.moduleName;
     if (file) return removeLoaderChainDelimiter(file, logger);
@@ -2292,7 +2295,7 @@ function resolveFileName(stats, logger) {
     }
     return '';
 }
-function formatModuleTrace(stats, errorFile, level, logger) {
+function formatModuleTrace(stats, errorFile, root, level, logger) {
     if (!stats.moduleTrace) return;
     let moduleNames = stats.moduleTrace.map((trace)=>trace.originName && removeLoaderChainDelimiter(trace.originName, logger)).filter((trace)=>trace && !trace.startsWith(LAZY_COMPILATION_IDENTIFIER));
     if (!moduleNames.length) return;
@@ -2300,7 +2303,7 @@ function formatModuleTrace(stats, errorFile, level, logger) {
         let formatted = removeLoaderChainDelimiter(errorFile, logger);
         moduleNames[0] !== formatted && moduleNames.unshift(formatted);
     }
-    let trace = moduleNames.slice().reverse();
+    let trace = moduleNames.slice().reverse().map((name)=>formatDiagnosticPath(name, root));
     return trace.length > 4 && !isVerbose(logger) && (trace = [
         ...trace.slice(0, 2),
         `... (${trace.length - 2 - 2} hidden)`,
@@ -2356,10 +2359,10 @@ function formatStatsError(stats, root, level = 'error', logger) {
             return snippet.length > 30 && (snippet = `${snippet.slice(0, 30)}...`), `File: ${color.cyan('data-uri virtual module')} ${color.dim(`(${snippet})`)}\n`;
         }
         let prefix = root + sep;
-        return (fileName.startsWith(prefix) && (fileName = fileName.replace(prefix, `.${sep}`)), /:\d+:\d+/.test(fileName)) ? `File: ${color.cyan(fileName)}\n` : stats.loc ? `File: ${color.cyan(`${fileName}:${stats.loc}`)}\n` : `File: ${color.cyan(`${fileName}:1:1`)}\n`;
+        return (fileName = fileName.startsWith(prefix) ? fileName.replace(prefix, `.${sep}`) : formatDiagnosticPath(fileName, root), /:\d+:\d+/.test(fileName)) ? `File: ${color.cyan(fileName)}\n` : stats.loc ? `File: ${color.cyan(`${fileName}:${stats.loc}`)}\n` : `File: ${color.cyan(`${fileName}:1:1`)}\n`;
     })(fileName, stats, root)}${stats.message}`, verbose = isVerbose(logger);
     if (verbose && (stats.details && (message += `\nDetails: ${stats.details}\n`), stats.stack && (message += `\n${stats.stack}`)), 'error' === level || isVerbose(logger)) {
-        let moduleTrace = formatModuleTrace(stats, fileName, level, logger);
+        let moduleTrace = formatModuleTrace(stats, fileName, root, level, logger);
         moduleTrace && (message += moduleTrace);
     }
     let innerError = '-- inner error --';
@@ -3425,7 +3428,7 @@ function createPublicContext(context) {
 async function createContext(options, userConfig, logger, loadConfigResult) {
     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, hooks = initHooks();
     return {
-        version: "2.2.4",
+        version: "2.2.6",
         rootPath,
         configFile: loadConfigResult?.filePath ?? userConfig._privateMeta?.configFilePath,
         configFileDependencies: loadConfigResult?.dependencies ?? userConfig._privateMeta?.configFileDependencies ?? [],
@@ -4094,7 +4097,7 @@ async function createCompiler_createCompiler(options) {
             if (item1 < item2) return -1;
         }
         return 0;
-    })(version, '2.0.0') >= 0)) throw Error(`${color.dim('[rsbuild]')} The current Rspack version does not meet the requirements, the minimum supported version of Rspack is ${color.green("2.0.0")}`);
+    })(version, '2.2.3') >= 0)) throw Error(`${color.dim('[rsbuild]')} The current Rspack version does not meet the requirements, the minimum supported version of Rspack is ${color.green("2.2.3")}`);
     let isMultiCompiler = rspackConfigs.length > 1, compiler = isMultiCompiler ? core_rspack(rspackConfigs) : core_rspack(rspackConfigs[0]);
     'true' === process.env.RSPACK_UNSAFE_FAST_DROP && (compiler.unsafeFastDrop = !0);
     let isVersionLogged = !1, isCompiling = !1, hasFatalError = !1, compilers = isMultiCompiler ? compiler.compilers : [
@@ -5261,11 +5264,36 @@ function pluginExternals() {
         }
     };
 }
-async function gzipSize(input) {
+function getCompression(compressed) {
+    let { type = 'gzip', level = 6 } = 'object' == typeof compressed ? compressed : {};
+    return 'brotli' === type ? {
+        type,
+        level,
+        header: 'Br',
+        label: 'brotli',
+        sizeKey: 'brotliSize',
+        totalKey: 'totalBrotliSize'
+    } : {
+        type,
+        level,
+        header: 'Gzip',
+        label: 'gzipped',
+        sizeKey: 'gzippedSize',
+        totalKey: 'totalGzipSize'
+    };
+}
+async function calcCompressedSize(input, type, level) {
     return (await new Promise((resolve, reject)=>{
-        node_zlib.gzip(input, (err, result)=>{
+        let callback = (err, result)=>{
             err ? reject(err) : resolve(result);
-        });
+        };
+        'brotli' === type ? node_zlib.brotliCompress(input, {
+            params: {
+                [node_zlib.constants.BROTLI_PARAM_QUALITY]: level
+            }
+        }, callback) : node_zlib.gzip(input, {
+            level
+        }, callback);
     })).length;
 }
 function getSnapshotPath(dir, snapshotHash) {
@@ -5298,7 +5326,7 @@ let EXCLUDE_ASSET_REGEX = /\.(?:map|LICENSE\.txt|d\.(?:ts|mts|cts))$/, isSignifi
         length: label.length
     };
 }, getAssetColor = (size)=>size > 300000 ? color.red : size > 100000 ? color.yellow : (input)=>input;
-function getHeader(maxFileLength, maxSizeLength, fileHeader, showGzipHeader) {
+function getHeader(maxFileLength, maxSizeLength, fileHeader, compressionHeader) {
     let lengths = [
         maxFileLength,
         maxSizeLength
@@ -5306,7 +5334,7 @@ function getHeader(maxFileLength, maxSizeLength, fileHeader, showGzipHeader) {
         fileHeader,
         'Size'
     ];
-    showGzipHeader && rowTypes.push('Gzip');
+    compressionHeader && rowTypes.push(compressionHeader);
     let headerRow = rowTypes.reduce((prev, cur, index)=>{
         let length = lengths[index], curLabel = cur;
         return length && (curLabel = cur.length < length ? cur + ' '.repeat(length - cur.length) : cur), `${prev + curLabel}   `;
@@ -5321,30 +5349,31 @@ let calcFileSize = (len)=>{
     return -1 === queryIndex ? assetName : assetName.slice(0, queryIndex);
 };
 async function printFileSizes(options, stats, rootPath, distPath, environmentName, previousSizes, saveSnapshot) {
-    let logs = [], showDetail = !1 !== options.detail, showDiff = !1 !== options.diff && null !== previousSizes, showTotal = !1 !== options.total;
+    let logs = [], compression = getCompression(options.compressed), prev = previousSizes?.[environmentName], showDetail = !1 !== options.detail, showDiff = !1 !== options.diff && null !== previousSizes, prevType = prev?.compressionType ?? (!!prev?.totalGzipSize && 'gzip'), showCompressedDiff = showDiff && prevType === compression.type, showTotal = !1 !== options.total;
     if (!showTotal && !showDetail) return {
         logs
     };
     let relativeDistPath = node_path.relative(rootPath, distPath), rootFolderLabel = `${relativeDistPath || '.'}${node_path.sep}`, snapshot = saveSnapshot ? {
         files: {},
         totalSize: 0,
-        totalGzipSize: 0
-    } : null, formatAsset = (filePath, size, gzippedSize)=>{
+        totalGzipSize: 0,
+        compressionType: !!options.compressed && compression.type
+    } : null, formatAsset = (filePath, size, compressedSize)=>{
         let normalizedPath = '';
         (snapshot || showDiff) && (normalizedPath = normalizeFilePath(filePath), snapshot && (snapshot.files[normalizedPath] = {
             size,
-            gzippedSize: gzippedSize ?? void 0
+            [compression.sizeKey]: compressedSize ?? void 0
         }));
-        let sizeLabel = calcFileSize(size), sizeLabelLength = sizeLabel.length, gzipSizeLabel = gzippedSize ? getAssetColor(gzippedSize)(calcFileSize(gzippedSize)) : null;
+        let sizeLabel = calcFileSize(size), sizeLabelLength = sizeLabel.length, compressedSizeLabel = compressedSize ? getAssetColor(compressedSize)(calcFileSize(compressedSize)) : null;
         if (showDiff) {
-            let sizeData = previousSizes[environmentName]?.files[normalizedPath], sizeDiff = size - (sizeData?.size ?? 0);
+            let sizeData = prev?.files[normalizedPath], sizeDiff = size - (sizeData?.size ?? 0);
             if (isSignificantDiff(sizeDiff)) {
                 let { label, length } = formatDiff(sizeDiff);
                 sizeLabel += ` ${label}`, sizeLabelLength += length + 1;
             }
-            if (null !== gzippedSize) {
-                let gzipDiff = gzippedSize - (sizeData?.gzippedSize ?? 0);
-                isSignificantDiff(gzipDiff) && (gzipSizeLabel += ` ${formatDiff(gzipDiff).label}`);
+            if (null !== compressedSize && showCompressedDiff) {
+                let compressedDiff = compressedSize - (sizeData?.[compression.sizeKey] ?? 0);
+                isSignificantDiff(compressedDiff) && (compressedSizeLabel += ` ${formatDiff(compressedDiff).label}`);
             }
         }
         let separatorIndex = filePath.lastIndexOf('/'), folderLabel = -1 === separatorIndex ? rootFolderLabel : `${node_path.join(relativeDistPath, filePath.slice(0, separatorIndex))}${node_path.sep}`, filename = -1 === separatorIndex ? filePath : filePath.slice(separatorIndex + 1);
@@ -5355,8 +5384,8 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
             size,
             sizeLabel,
             sizeLabelLength,
-            gzippedSize,
-            gzipSizeLabel
+            compressedSize,
+            compressedSizeLabel
         };
     }, getAssets = async ()=>{
         let { exclude, include } = options, formattedAssets = [], compilationAssets = stats.compilation.assets;
@@ -5371,7 +5400,7 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
                 };
                 if (exclude?.(publicAsset) || include && !include(publicAsset)) continue;
             }
-            void 0 === content ? formattedAssets.push(formatAsset(filePath, size, null)) : formattedAssets.push(gzipSize(content).then((gzippedSize)=>formatAsset(filePath, size, gzippedSize)));
+            void 0 === content ? formattedAssets.push(formatAsset(filePath, size, null)) : formattedAssets.push(calcCompressedSize(content, compression.type, compression.level).then((compressedSize)=>formatAsset(filePath, size, compressedSize)));
         }
         return (await Promise.all(formattedAssets)).sort((a, b)=>a.size - b.size);
     }, assets = await getAssets();
@@ -5379,15 +5408,15 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
         logs
     };
     logs.push(''), showDetail && 1 === assets.length && (showTotal = !1);
-    let { totalSize, totalGzipSize } = ((assets, compressed)=>{
-        let totalSize = 0, totalGzipSize = 0;
-        for (let { size, gzippedSize } of assets)totalSize += size, compressed && (totalGzipSize += gzippedSize ?? size);
+    let { totalSize, totalCompressedSize } = ((assets, compressed)=>{
+        let totalSize = 0, totalCompressedSize = 0;
+        for (let { size, compressedSize } of assets)totalSize += size, compressed && (totalCompressedSize += compressedSize ?? size);
         return {
             totalSize,
-            totalGzipSize
+            totalCompressedSize
         };
-    })(assets, options.compressed);
-    snapshot && (snapshot.totalSize = totalSize, snapshot.totalGzipSize = totalGzipSize);
+    })(assets, !!options.compressed);
+    snapshot && (snapshot.totalSize = totalSize, options.compressed && (snapshot[compression.totalKey] = totalCompressedSize));
     let fileHeader = showDetail ? `File (${environmentName})` : '', { totalSizeTitle, totalSizeLabel, totalSizeLabelLength } = (()=>{
         if (!showTotal) return {
             totalSizeTitle: '',
@@ -5396,7 +5425,7 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
         };
         let totalSizeTitle = showDetail ? 'Total:' : `Total size (${environmentName}):`, totalSizeLabel = calcFileSize(totalSize), totalSizeLabelLength = totalSizeLabel.length;
         if (showDiff) {
-            let totalSizeDiff = totalSize - (previousSizes[environmentName]?.totalSize ?? 0);
+            let totalSizeDiff = totalSize - (prev?.totalSize ?? 0);
             if (isSignificantDiff(totalSizeDiff)) {
                 let { label, length } = formatDiff(totalSizeDiff);
                 totalSizeLabel += ` ${label}`, totalSizeLabelLength += length + 1;
@@ -5407,7 +5436,11 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
             totalSizeLabel,
             totalSizeLabelLength
         };
-    })(), getCustomTotal = ()=>'function' == typeof options.total ? options.total({
+    })(), getCompressedTotalDiff = ()=>{
+        if (!showCompressedDiff) return '';
+        let diff = totalCompressedSize - (prev?.[compression.totalKey] ?? 0);
+        return isSignificantDiff(diff) ? ` ${formatDiff(diff).label}` : '';
+    }, getCustomTotal = ()=>'function' == typeof options.total ? options.total({
             environmentName,
             distPath: relativeDistPath,
             assets: assets.map((asset)=>({
@@ -5415,17 +5448,18 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
                     size: asset.size
                 })),
             totalSize,
-            totalGzipSize
+            totalGzipSize: 'gzip' === compression.type ? totalCompressedSize : 0,
+            totalBrotliSize: options.compressed && 'brotli' === compression.type ? totalCompressedSize : void 0
         }) : null;
     if (showDetail) {
-        let maxFileLength = Math.max(showTotal ? totalSizeTitle.length : 0, fileHeader.length), maxSizeLength = totalSizeLabelLength, hasGzipSize = !1;
-        for (let asset of assets)asset.filenameLength > maxFileLength && (maxFileLength = asset.filenameLength), asset.sizeLabelLength > maxSizeLength && (maxSizeLength = asset.sizeLabelLength), null !== asset.gzippedSize && (hasGzipSize = !0);
-        let showGzipHeader = !!(options.compressed && hasGzipSize);
-        for (let asset of (logs.push(getHeader(maxFileLength, maxSizeLength, fileHeader, showGzipHeader)), assets)){
-            let { sizeLabel, filenameLabel } = asset, { sizeLabelLength, gzipSizeLabel, filenameLength } = asset;
+        let maxFileLength = Math.max(showTotal ? totalSizeTitle.length : 0, fileHeader.length), maxSizeLength = totalSizeLabelLength, hasCompressedSize = !1;
+        for (let asset of assets)asset.filenameLength > maxFileLength && (maxFileLength = asset.filenameLength), asset.sizeLabelLength > maxSizeLength && (maxSizeLength = asset.sizeLabelLength), null !== asset.compressedSize && (hasCompressedSize = !0);
+        let showCompressedHeader = !!(options.compressed && hasCompressedSize);
+        for (let asset of (logs.push(getHeader(maxFileLength, maxSizeLength, fileHeader, showCompressedHeader && compression.header)), assets)){
+            let { sizeLabel, filenameLabel } = asset, { sizeLabelLength, compressedSizeLabel, filenameLength } = asset;
             sizeLabelLength < maxSizeLength && (sizeLabel += ' '.repeat(maxSizeLength - sizeLabelLength)), filenameLength < maxFileLength && (filenameLabel += ' '.repeat(maxFileLength - filenameLength));
             let log = `${filenameLabel}   ${sizeLabel}`;
-            gzipSizeLabel && (log += `   ${gzipSizeLabel}`), logs.push(log);
+            compressedSizeLabel && (log += `   ${compressedSizeLabel}`), logs.push(log);
         }
         if (showTotal) {
             logs.push('');
@@ -5434,11 +5468,8 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
             else {
                 let log = '';
                 if (log += ' '.repeat(maxFileLength - totalSizeTitle.length), log += color.magenta(totalSizeTitle), log += `   ${totalSizeLabel}`, options.compressed) {
-                    let colorFn = getAssetColor(totalGzipSize / assets.length);
-                    if (log += ' '.repeat(maxSizeLength - totalSizeLabelLength), log += `   ${colorFn(calcFileSize(totalGzipSize))}`, showDiff) {
-                        let totalGzipSizeDiff = totalGzipSize - (previousSizes[environmentName]?.totalGzipSize ?? 0);
-                        isSignificantDiff(totalGzipSizeDiff) && (log += ` ${formatDiff(totalGzipSizeDiff).label}`);
-                    }
+                    let colorFn = getAssetColor(totalCompressedSize / assets.length);
+                    log += ' '.repeat(maxSizeLength - totalSizeLabelLength), log += `   ${colorFn(calcFileSize(totalCompressedSize))}${getCompressedTotalDiff()}`;
                 }
                 logs.push(log);
             }
@@ -5448,7 +5479,7 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
         if (customTotal) logs.push(customTotal);
         else {
             let log = `${color.magenta(totalSizeTitle)} ${totalSizeLabel}`;
-            options.compressed && (log += color.green(` (${calcFileSize(totalGzipSize)} gzipped)`)), logs.push(log);
+            options.compressed && (log += color.green(` (${calcFileSize(totalCompressedSize)}${getCompressedTotalDiff()} ${compression.label})`)), logs.push(log);
         }
     }
     return logs.push(''), {
@@ -5456,7 +5487,7 @@ async function printFileSizes(options, stats, rootPath, distPath, environmentNam
         snapshot
     };
 }
-let entryNameSymbol = Symbol('entryName'), VOID_TAGS = [
+let isNonceTag = (tag)=>"script" === tag.tag || 'style' === tag.tag || 'link' === tag.tag && tag.attrs?.rel === 'preload' && tag.attrs?.as === "script", entryNameSymbol = Symbol('entryName'), VOID_TAGS = [
     'area',
     'base',
     'br',
@@ -5487,7 +5518,26 @@ let entryNameSymbol = Symbol('entryName'), VOID_TAGS = [
 }, getTagPriority = (tag, tagConfig)=>{
     let priority = tag.head ?? HEAD_TAGS.includes(tag.tag) ? -2 : 2, append = tag.append ?? tagConfig.append;
     return 'boolean' == typeof append && (priority += append ? 1 : -1), priority;
-}, sortTags = (tags, tagConfig)=>tags.sort((tag1, tag2)=>getTagPriority(tag1, tagConfig) - getTagPriority(tag2, tagConfig)), formatBasicTag = (tag)=>({
+}, sortTags = (tags, tagConfig)=>tags.sort((tag1, tag2)=>getTagPriority(tag1, tagConfig) - getTagPriority(tag2, tagConfig)), moveImportMaps = (tags)=>{
+    let importMaps;
+    if (!tags.some((tag)=>{
+        let type = tag.attributes.type;
+        return 'string' == typeof type && 9 === type.length && 'importmap' === type.toLowerCase() && "script" === tag.tagName.toLowerCase();
+    })) return tags;
+    let firstModuleIndex = -1;
+    for(let index = 0; index < tags.length; index++){
+        let tag = tags[index], name = tag.tagName.toLowerCase(), type = tag.attributes.type, scriptType = "script" === name && 'string' == typeof type ? type.toLowerCase() : '';
+        if (-1 === firstModuleIndex) {
+            let rel = tag.attributes.rel;
+            ('module' === scriptType || 'link' === name && 'string' == typeof rel && rel.toLowerCase().split(/[\t\n\f\r ]+/).includes('modulepreload')) && (firstModuleIndex = index);
+        } else if ('importmap' === scriptType) {
+            (importMaps ??= []).push(tag);
+            continue;
+        }
+        importMaps && (tags[index - importMaps.length] = tag);
+    }
+    return importMaps && (tags.length -= importMaps.length, tags.splice(firstModuleIndex, 0, ...importMaps)), tags;
+}, formatBasicTag = (tag)=>({
         tag: tag.tagName,
         attrs: tag.attributes,
         children: tag.innerHTML,
@@ -5592,7 +5642,7 @@ class RsbuildHtmlPlugin {
                 return Object.assign(data, {
                     headTags: modified.headTags.map(fromBasicTag),
                     bodyTags: modified.bodyTags.map(fromBasicTag)
-                }), tagConfig && ((data, tagConfig, compilationHash, entryName)=>{
+                }), tagConfig && ((data, tagConfig, compilationHash, entryName, nonce)=>{
                     if (!tagConfig.tags?.length) return;
                     let fromInjectTags = (tags)=>{
                         let ret = [];
@@ -5624,12 +5674,19 @@ class RsbuildHtmlPlugin {
                         entryName,
                         outputName: data.outputName,
                         publicPath: data.publicPath
-                    }, shouldSort = !1;
-                    for (let item of tagConfig.tags)isFunction(item) ? (shouldSort && (tags = sortTags(tags, tagConfig)), tags = item(tags, context) || tags) : tags.push(item), shouldSort = !0;
+                    }, shouldSort = !1, withNonce = (tag)=>(nonce && isNonceTag(tag) && tag.attrs?.nonce === void 0 && (tag.attrs ??= {}, tag.attrs.nonce = nonce), tag);
+                    for (let item of tagConfig.tags){
+                        if (isFunction(item)) {
+                            shouldSort && (tags = sortTags(tags, tagConfig));
+                            let existingTags = nonce ? new Set(tags) : void 0;
+                            if (tags = item(tags, context) || tags, existingTags) for (let tag of tags)existingTags.has(tag) || withNonce(tag);
+                        } else tags.push(withNonce(item));
+                        shouldSort = !0;
+                    }
                     shouldSort && (tags = sortTags(tags, tagConfig));
                     let [headTags, bodyTags] = partition(tags, (tag)=>tag.head ?? HEAD_TAGS.includes(tag.tag));
                     return data.headTags = fromInjectTags(headTags), data.bodyTags = fromInjectTags(bodyTags);
-                })(data, tagConfig, compilation.hash ?? '', entryName), data;
+                })(data, tagConfig, compilation.hash ?? '', entryName, environment.config.security.nonce), data.headTags = moveImportMaps(data.headTags), data.bodyTags = moveImportMaps(data.bodyTags), data;
             }), hooks.beforeEmit.tapPromise(this.name, async (data)=>{
                 let extraData = getExtraDataByPlugin(data.plugin);
                 if (!extraData) return data;
@@ -6881,7 +6938,7 @@ function createAssetsMiddleware(context, ready, outputFileSystem) {
 }
 async function setupOutputFileSystem(writeToDisk, compilers) {
     if (!0 !== writeToDisk) {
-        let { createFsFromVolume, Volume } = await import("./memfs.js").then(createFakeNamespaceObject.bind(rspackRequire, "../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/memfs/4.71.0/717d01ef4d84cedabdf3b728d1862a444e82bbbcc379d834c8006e341a87f7d9/node_modules/memfs/lib/index.js", 23)), outputFileSystem = createFsFromVolume(new Volume());
+        let { createFsFromVolume, Volume } = await import("./memfs.js").then(createFakeNamespaceObject.bind(rspackRequire, "../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/memfs/4.76.0/faf1dbc5150aad7a40813fed85f89f32005245b4653e078bb6e3431e6d0c023c/node_modules/memfs/lib/index.js", 23)), outputFileSystem = createFsFromVolume(new Volume());
         for (let compiler of compilers)compiler.outputFileSystem = outputFileSystem;
     }
     let compiler = compilers.find((compiler)=>!!compiler.outputFileSystem);
@@ -8556,7 +8613,7 @@ function applyDefaultPlugins(pluginManager, context) {
         {
             name: 'rsbuild:basic',
             setup (api) {
-                api.modifyBundlerChain((chain, { isDev, target, rspack, environment, CHAIN_ID })=>{
+                api.modifyBundlerChain((chain, { isDev, isProd, target, rspack, environment, CHAIN_ID })=>{
                     let { config } = environment;
                     chain.name(environment.name), chain.context(api.context.rootPath), chain.mode(environment.config.mode), chain.infrastructureLogging({
                         level: 'error'
@@ -8569,7 +8626,7 @@ function applyDefaultPlugins(pluginManager, context) {
                         javascript: {
                             typeReexportsPresence: 'tolerant'
                         }
-                    }), isDev && config.dev.hmr && 'web' === target && chain.plugin(CHAIN_ID.PLUGIN.HMR).use(rspack.HotModuleReplacementPlugin);
+                    }), isProd && chain.optimization.chunkIds('compact-hashed').moduleIds('compact-hashed'), isDev && config.dev.hmr && 'web' === target && chain.plugin(CHAIN_ID.PLUGIN.HMR).use(rspack.HotModuleReplacementPlugin);
                 });
             }
         },
@@ -9537,32 +9594,38 @@ try {
             name: 'rsbuild:rsdoctor',
             setup (api) {
                 api.onBeforeCreateCompiler(async ({ bundlerConfigs })=>{
-                    let packagePath, module;
                     if ('true' !== process.env.RSDOCTOR) return;
                     let pluginName = 'RsdoctorRspackPlugin', isRsdoctorPlugin = (plugin)=>plugin?.isRsdoctorPlugin === !0 || plugin?.constructor?.name === pluginName;
                     for (let config of bundlerConfigs)if (config.plugins?.some((plugin)=>isRsdoctorPlugin(plugin))) return;
-                    let packageName = '@rsdoctor/rspack-plugin';
-                    try {
-                        packagePath = vendors_require.resolve(packageName, {
-                            paths: [
-                                api.context.rootPath
-                            ]
-                        });
-                    } catch  {
-                        api.logger.warn(`\`process.env.RSDOCTOR\` enabled, please install ${color.bold(color.yellow(packageName))} package.`);
-                        return;
-                    }
-                    try {
-                        let moduleURL = isWindows ? pathToFileURL(packagePath).href : packagePath;
-                        module = await import(moduleURL);
-                    } catch  {
-                        api.logger.error(`\`process.env.RSDOCTOR\` enabled, but failed to load ${color.bold(color.yellow(packageName))} module.`);
-                        return;
-                    }
-                    if (module && module[pluginName]) {
-                        for (let config of bundlerConfigs)config.plugins ||= [], config.plugins.push(new module[pluginName]());
-                        api.logger.info(`${color.bold(color.yellow(packageName))} enabled.`);
+                    for (let packageName of [
+                        '@rsdoctor/core',
+                        '@rsdoctor/rspack-plugin'
+                    ]){
+                        let packagePath, module;
+                        try {
+                            packagePath = vendors_require.resolve(packageName, {
+                                paths: [
+                                    api.context.rootPath
+                                ]
+                            });
+                        } catch  {
+                            continue;
+                        }
+                        try {
+                            let moduleURL = isWindows ? pathToFileURL(packagePath).href : packagePath;
+                            module = await import(moduleURL);
+                        } catch  {
+                            api.logger.error(`\`process.env.RSDOCTOR\` enabled, but failed to load ${color.bold(color.yellow(packageName))} module.`);
+                            return;
+                        }
+                        let RsdoctorPlugin = module[pluginName];
+                        if ('function' == typeof RsdoctorPlugin) {
+                            for (let config of bundlerConfigs)config.plugins ||= [], config.plugins.push(new RsdoctorPlugin());
+                            api.logger.info(`${color.bold(color.yellow(packageName))} enabled.`);
+                            return;
+                        }
                     }
+                    api.logger.warn(`\`process.env.RSDOCTOR\` enabled, please install ${color.bold(color.yellow('@rsdoctor/rspack-plugin'))} package.`);
                 });
             }
         },
@@ -9683,7 +9746,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(rspackRequire.bind(rspackRequire, "../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/rspack-manifest-plugin/5.2.2/0e24beaf1b234a114f5305075e91a7e73b51041985d9a6da39afa17869758a5c/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(rspackRequire.bind(rspackRequire, "../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/rspack-manifest-plugin/5.2.2/9919f482fd00d27c94e8e9f65edbae4f86987a8c95774cc077aa085a1cd380ae/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,
@@ -9853,7 +9916,7 @@ try {
                             ...headTags,
                             ...bodyTags
                         ];
-                        if (nonce) for (let tag of allTags)("script" === tag.tag || 'style' === tag.tag || 'link' === tag.tag && tag.attrs?.rel === 'preload' && tag.attrs?.as === "script") && (tag.attrs ??= {}, tag.attrs.nonce = nonce);
+                        if (nonce) for (let tag of allTags)isNonceTag(tag) && (tag.attrs ??= {}, tag.attrs.nonce = nonce);
                         return {
                             headTags,
                             bodyTags
@@ -10068,7 +10131,11 @@ let canReadExport = (module)=>null !== module && ('object' == typeof module || '
         configExport: getConfigExport(await jiti.import(configPath), exportName, configPath),
         dependencies: []
     };
-}, JS_CONFIG_REGEXP = /\.(?:js|mjs|cjs)$/, loadWithNative = async (configPath, fresh)=>{
+}, CONFIG_META = Symbol.for('@rstackjs/load-config/meta');
+function getConfigMeta(config) {
+    if (null !== config && 'object' == typeof config && Object.hasOwn(config, CONFIG_META)) return config[CONFIG_META];
+}
+let JS_CONFIG_REGEXP = /\.(?:js|mjs|cjs)$/, loadWithNative = async (configPath, fresh)=>{
     let configFileURL = pathToFileURL(configPath).href;
     if (!fresh) return {
         configModule: await import(configFileURL),
@@ -10084,7 +10151,7 @@ let canReadExport = (module)=>null !== module && ('object' == typeof module || '
     };
 };
 async function dist_loadConfig({ cwd = process.cwd(), path, configFileNames = [], loader = 'auto', exportName = 'default', configParams = [], fresh = !1 } = {}) {
-    let loadedConfig;
+    let loadedConfig, content;
     if (!path && 0 === configFileNames.length) throw Error('Either `path` or at least one `configFileNames` entry must be provided.');
     let configPath = ((root, customConfig, configFileNames = [])=>{
         if (customConfig) {
@@ -10120,17 +10187,20 @@ async function dist_loadConfig({ cwd = process.cwd(), path, configFileNames = []
     if ('function' == typeof configExport) {
         let result = await configExport(...configParams);
         if (void 0 === result) throw Error('The config function must return a config object.');
-        return {
-            content: result,
-            filePath: configPath,
-            dependencies
-        };
-    }
-    return {
-        content: configExport,
+        content = result;
+    } else content = configExport;
+    let meta = getConfigMeta(content), result = {
+        content,
         filePath: configPath,
         dependencies
     };
+    return meta && (result.filePath = meta.filePath, result.dependencies = [
+        ...new Set([
+            ...meta.dependencies ?? [],
+            configPath,
+            ...dependencies
+        ])
+    ]), result;
 }
 function defineConfig(config) {
     return config;
@@ -10226,7 +10296,7 @@ let applyServerOptions = (command)=>{
 };
 function setupCommands(argv) {
     let cli = ((name = "")=>new CAC(name))('rsbuild');
-    cli.version("2.2.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)', {
+    cli.version("2.2.6"), 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('--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: [
@@ -10291,7 +10361,7 @@ function setupCommands(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.2.4\n`);
+    src_logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v2.2.6\n`);
 }
 function setupLogLevel(argv) {
     if (argv.length <= 3) return;
@@ -10313,5 +10383,5 @@ function runCLI({ argv = process.argv } = {}) {
         src_logger.error('Failed to start Rsbuild CLI.'), src_logger.error(err), process.exit(1);
     }
 }
-let src_version = "2.2.4";
+let src_version = "2.2.6";
 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 };