@rsbuild/core 1.6.3 → 1.6.4

package/dist/index.cjs

@@ -3072,7 +3072,7 @@ ${section.body}` : section.body).join("\n\n"));
             await onEnvironmentDone(0, stats), await onDone(stats);
         });
     }, registerBuildHook = ({ context, isWatch, compiler, bundlerConfigs, MultiStatsCtor })=>{
-        let isFirstCompile = !0, environmentList = Object.values(context.environments).reduce((prev, curr)=>(prev[curr.index] = curr, prev), []), onDone = async (stats)=>{
+        let isFirstCompile = !0, { environmentList } = context, onDone = async (stats)=>{
             let p = context.hooks.onAfterBuild.callBatch({
                 isFirstCompile,
                 stats,
@@ -3120,7 +3120,7 @@ ${section.body}` : section.body).join("\n\n"));
             MultiStatsCtor
         });
     }, registerDevHook = ({ context, compiler, bundlerConfigs, MultiStatsCtor })=>{
-        let isFirstCompile = !0, environmentList = Object.values(context.environments).reduce((prev, curr)=>(prev[curr.index] = curr, prev), []), onDone = async (stats)=>{
+        let isFirstCompile = !0, { environmentList } = context, onDone = async (stats)=>{
             let p = context.hooks.onAfterDevCompile.callBatch({
                 isFirstCompile,
                 stats,
@@ -3227,12 +3227,19 @@ ${section.body}` : section.body).join("\n\n"));
         ])if (plugin.test.test(message)) return message.replace(hint, plugin.hint);
         return message;
     }
-    function formatStatsError(stats, verbose) {
-        var fileName;
-        let message, fileName1 = resolveFileName(stats), mainMessage = stats.message, details = verbose && stats.details ? `\nDetails: ${stats.details}\n` : '', stack = verbose && stats.stack ? `\n${stats.stack}` : '', moduleTrace = formatModuleTrace(stats, fileName1) ?? '';
-        message = `${!(fileName = fileName1) ? '' : /:\d+:\d+/.test(fileName) ? `File: ${color.cyan(fileName)}\n` : `File: ${color.cyan(`${fileName}:1:1`)}\n`}${mainMessage}${details}${stack}${moduleTrace}`;
+    function formatStatsError(stats) {
+        var fileName, stats1;
+        let fileName1 = resolveFileName(stats), message = `${(fileName = fileName1, stats1 = stats, !fileName ? '' : /:\d+:\d+/.test(fileName) ? `File: ${color.cyan(fileName)}\n` : stats1.loc ? `File: ${color.cyan(`${fileName}:${stats1.loc}`)}\n` : `File: ${color.cyan(`${fileName}:1:1`)}\n`)}${stats.message}`, verbose = 'verbose' === logger.level;
+        verbose && (stats.details && (message += `\nDetails: ${stats.details}\n`), stats.stack && (message += `\n${stats.stack}`));
+        let moduleTrace = formatModuleTrace(stats, fileName1);
+        moduleTrace && (message += moduleTrace);
         let innerError = '-- inner error --';
-        return !verbose && message.includes(innerError) && (message = message.split(innerError)[0]), (message = (message = ((message)=>{
+        !verbose && message.includes(innerError) && (message = message.split(innerError)[0]);
+        let lines = (message = ((message)=>{
+            if (-1 === message.indexOf('Multiple assets emit different content to the same filename')) return message;
+            let extraMessage = `You may need to adjust ${color.yellow('output.filename')} configuration to prevent name conflicts. (See ${color.yellow('https://rsbuild.rs/config/output/filename')})`;
+            return `${message}\n${extraMessage}`;
+        })(message = ((message)=>{
             let getTips = (moduleName)=>{
                 let tips = [
                     `Error: "${moduleName}" is a built-in Node.js module and cannot be imported in client-side code.\n`,
@@ -3287,7 +3294,8 @@ ${section.body}` : section.body).join("\n\n"));
                 'vm',
                 'zlib'
             ].includes(moduleName) ? getTips(moduleName) : message;
-        })(message = hintUnknownFiles(message))).split('\n').filter((line, index, arr)=>0 === index || '' !== line.trim() || line.trim() !== arr[index - 1].trim()).join('\n')).trim();
+        })(message = hintUnknownFiles(message)))).split('\n');
+        return (message = (lines = lines.filter((line, index, arr)=>0 === index || '' !== line.trim() || line.trim() !== arr[index - 1].trim())).join('\n')).trim();
     }
     function formatErrorMessage(errors) {
         if (!errors.length) return 'Build failed. No errors reported since Rspack\'s "stats.errors" is disabled.';
@@ -3304,7 +3312,8 @@ ${section.body}` : section.body).join("\n\n"));
             timings: !0,
             errors: !0,
             warnings: !0,
-            moduleTrace: !0
+            moduleTrace: !0,
+            errorStack: 'verbose' === logger.level
         };
         if ('dev' === action && (defaultOptions = {
             ...defaultOptions,
@@ -3328,12 +3337,11 @@ ${section.body}` : section.body).join("\n\n"));
         return statsInstance.toJson(statsOptions);
     }
     function formatStats(stats, hasErrors) {
-        let verbose = 'verbose' === logger.level;
         if (hasErrors) return {
-            message: formatErrorMessage(getStatsErrors(stats).map((item)=>formatStatsError(item, verbose))),
+            message: formatErrorMessage(getStatsErrors(stats).map((item)=>formatStatsError(item))),
             level: 'error'
         };
-        let warningMessages = getStatsWarnings(stats).map((item)=>formatStatsError(item, verbose));
+        let warningMessages = getStatsWarnings(stats).map((item)=>formatStatsError(item));
         if (warningMessages.length) {
             let title = color.bold(color.yellow(warningMessages.length > 1 ? 'Build warnings: \n' : 'Build warning: \n'));
             return {
@@ -3577,8 +3585,8 @@ ${section.body}` : section.body).join("\n\n"));
             dev.watchFiles
         ]), normalizedConfig.dev = dev), normalizedConfig;
     }, mergeRsbuildConfig = (...originalConfigs)=>{
-        let configs = originalConfigs.map(normalizeConfigStructure);
-        return 2 === configs.length ? merge(configs[0], configs[1]) : configs.length < 2 ? configs[0] : configs.reduce((result, config)=>merge(result, config), {});
+        let configs = originalConfigs.filter((config)=>void 0 !== config).map(normalizeConfigStructure);
+        return 2 === configs.length ? merge(configs[0], configs[1]) : 1 === configs.length ? configs[0] : 0 === configs.length ? {} : configs.reduce((result, config)=>merge(result, config), {});
     }, defaultConfig_require = (0, external_node_module_.createRequire)(__rslib_import_meta_url__), defaultAllowedOrigins = /^https?:\/\/(?:(?:[^:]+\.)?localhost|127\.0\.0\.1|\[::1\])(?::\d+)?$/, createDefaultConfig = ()=>({
             dev: {
                 hmr: !0,
@@ -4181,15 +4189,15 @@ ${section.body}` : section.body).join("\n\n"));
                 tsconfigPath,
                 config,
                 webSocketToken
-            };
-            context.environments[name] = new Proxy(environmentContext, {
+            }, readonlyEnvironmentContext = new Proxy(environmentContext, {
                 get: (target, prop)=>target[prop],
                 set: (target, prop, newValue)=>('manifest' === prop ? target[prop] = newValue : logger.error(`EnvironmentContext is readonly, you can not assign to the "environment.${prop}" prop.`), !0)
             });
+            context.environmentList[index] = readonlyEnvironmentContext, context.environments[name] = readonlyEnvironmentContext;
         }
     }
     function updateContextByNormalizedConfig(context) {
-        let distPaths = Object.values(context.environments).map((item)=>item.distPath);
+        let distPaths = context.environmentList.map((item)=>item.distPath);
         context.distPath = getCommonParentPath(distPaths);
     }
     function createPublicContext(context) {
@@ -4213,13 +4221,14 @@ ${section.body}` : section.body).join("\n\n"));
     async function createContext(options, userConfig) {
         let { cwd } = options, rootPath = userConfig.root ? ensureAbsolutePath(cwd, userConfig.root) : cwd, rsbuildConfig = await withDefaultConfig(rootPath, userConfig), cachePath = (0, external_node_path_.join)(rootPath, 'node_modules', '.cache'), specifiedEnvironments = options.environment && options.environment.length > 0 ? options.environment : void 0, bundlerType = userConfig.provider ? 'webpack' : 'rspack';
         return {
-            version: "1.6.3",
+            version: "1.6.4",
             rootPath,
             distPath: '',
             cachePath,
             callerName: options.callerName,
             bundlerType,
             environments: {},
+            environmentList: [],
             publicPathnames: [],
             hooks: initHooks(),
             config: {
@@ -4524,10 +4533,11 @@ ${section.body}` : section.body).join("\n\n"));
             }
         };
     }
-    function getChainUtils(target, environment) {
+    function getChainUtils(target, environment, environments) {
         return {
             rspack: rspack_rspack,
             environment,
+            environments,
             env: process.env.NODE_ENV || '',
             target,
             isDev: 'development' === environment.config.mode,
@@ -4547,8 +4557,8 @@ ${section.body}` : section.body).join("\n\n"));
         }
         config.devServer && logger.warn(`${color.dim('[rsbuild:config]')} Find invalid Rspack config: "${color.yellow('devServer')}". Note that Rspack's "devServer" config is not supported by Rsbuild. You can use Rsbuild's "dev" config to configure the Rsbuild dev server.`);
     }
-    async function generateRspackConfig({ target, context, environment }) {
-        let chainUtils = getChainUtils(target, context.environments[environment]), { BannerPlugin, DefinePlugin, IgnorePlugin, ProvidePlugin, SourceMapDevToolPlugin, HotModuleReplacementPlugin } = rspack_rspack, rspackConfig = (await modifyBundlerChain(context, {
+    async function generateRspackConfig({ target, context, environmentName }) {
+        let chainUtils = getChainUtils(target, context.environments[environmentName], context.environments), { BannerPlugin, DefinePlugin, IgnorePlugin, ProvidePlugin, SourceMapDevToolPlugin, HotModuleReplacementPlugin } = rspack_rspack, rspackConfig = (await modifyBundlerChain(context, {
             ...chainUtils,
             bundler: {
                 BannerPlugin,
@@ -4676,10 +4686,10 @@ ${section.body}` : section.body).join("\n\n"));
         let normalizedConfig = await initRsbuildConfig({
             context,
             pluginManager
-        }), rspackConfigs = await Promise.all(Object.entries(normalizedConfig.environments).map(([environment, config])=>generateRspackConfig({
+        }), rspackConfigs = await Promise.all(Object.entries(normalizedConfig.environments).map(([environmentName, config])=>generateRspackConfig({
                 target: config.output.target,
                 context,
-                environment
+                environmentName
             })));
         if (isDebug()) {
             let inspect = async ()=>{
@@ -4783,8 +4793,8 @@ ${section.body}` : section.body).join("\n\n"));
                     logger.ready(`built in ${time}${suffix}`);
                 }
             };
-            hasErrors || (isMultiCompiler && stats.children?.length ? stats.children.forEach((c, index)=>{
-                printTime(c, index);
+            hasErrors || (isMultiCompiler && stats.children?.length ? stats.children.forEach((item, index)=>{
+                printTime(item, index);
             }) : printTime(stats, 0));
             let { message, level } = formatStats(stats, hasErrors);
             'error' === level && logger.error(message), 'warning' === level && logger.warn(message), isCompiling = !1;
@@ -5507,7 +5517,7 @@ ${section.body}` : section.body).join("\n\n"));
         let trailingSlashBase = addTrailingSlash(base);
         return path.startsWith(trailingSlashBase) ? path.slice(trailingSlashBase.length - 1) : path;
     }, getRoutes = (context)=>{
-        let environmentWithHtml = Object.values(context.environments).filter((item)=>Object.keys(item.htmlPaths).length > 0);
+        let environmentWithHtml = context.environmentList.filter((item)=>Object.keys(item.htmlPaths).length > 0);
         if (0 === environmentWithHtml.length) return [];
         let commonDistPath = getCommonParentPath(environmentWithHtml.map((item)=>item.distPath));
         return environmentWithHtml.reduce((prev, environmentContext)=>{
@@ -6254,7 +6264,7 @@ ${section.body}` : section.body).join("\n\n"));
                 outputFileSystem.stat(filename, (err, stats)=>{
                     err ? reject(err) : resolve(stats);
                 });
-            }), { environments, publicPathnames } = context, distPaths = Object.values(environments).map((env)=>env.distPath), possibleFilenames = new Set();
+            }), { environmentList, publicPathnames } = context, distPaths = environmentList.map((env)=>env.distPath), possibleFilenames = new Set();
         for (let [index, distPath] of distPaths.entries()){
             let prefix = publicPathnames[index];
             prefix && '/' !== prefix && pathname.startsWith(prefix) && possibleFilenames.add(external_node_path_default().join(distPath, pathname.slice(prefix.length)));
@@ -6579,9 +6589,9 @@ ${section.body}` : section.body).join("\n\n"));
     }
     let assets_middleware_assetsMiddleware = async ({ config, compiler, context, socketServer, resolvedPort })=>{
         var config1, environments;
-        let watching, writeToDiskValues, resolvedHost = await resolveHostname(config.server.host), { environments: environments1 } = context;
+        let watching, writeToDiskValues, resolvedHost = await resolveHostname(config.server.host), { environments: environments1, environmentList } = context;
         applyToCompiler(compiler, (compiler, index)=>{
-            let environment = Object.values(environments1).find((env)=>env.index === index);
+            let environment = environmentList[index];
             if (!environment) return;
             let token = environment.webSocketToken;
             token && (applyHMREntry({
@@ -6635,7 +6645,7 @@ ${section.body}` : section.body).join("\n\n"));
                 }), callbacks.length = 0);
             });
         });
-        let writeToDisk = (config1 = config.dev, 1 === new Set(writeToDiskValues = Object.values(environments = environments1).map((env)=>env.config.dev.writeToDisk)).size ? writeToDiskValues[0] : (filePath, name)=>{
+        let writeToDisk = (config1 = config.dev, environments = environments1, 1 === new Set(writeToDiskValues = environmentList.map((env)=>env.config.dev.writeToDisk)).size ? writeToDiskValues[0] : (filePath, name)=>{
             let { writeToDisk } = config1;
             return name && environments[name] && (writeToDisk = environments[name].config.dev.writeToDisk ?? writeToDisk), 'function' == typeof writeToDisk ? writeToDisk(filePath) : writeToDisk;
         });
@@ -7014,7 +7024,7 @@ ${section.body}` : section.body).join("\n\n"));
         upgrade = (req, socket, head)=>{
             if (!this.wsServer.shouldHandle(req)) return;
             let query = parseQueryString(req);
-            Object.values(this.context.environments).map((env)=>env.webSocketToken).includes(query.token) ? this.wsServer.handleUpgrade(req, socket, head, (connection)=>{
+            this.context.environmentList.map(({ webSocketToken })=>webSocketToken).includes(query.token) ? this.wsServer.handleUpgrade(req, socket, head, (connection)=>{
                 this.wsServer.emit('connection', connection, req);
             }) : socket.destroy();
         };
@@ -7095,7 +7105,7 @@ ${section.body}` : section.body).join("\n\n"));
             });
         }
         getStats(token) {
-            let { stats } = this.context.buildState, environment = Object.values(this.context.environments).find(({ webSocketToken })=>webSocketToken === token);
+            let { stats } = this.context.buildState, environment = this.context.environmentList.find(({ webSocketToken })=>webSocketToken === token);
             if (!stats || !environment) return;
             let currentStats = stats;
             if (stats.children) {
@@ -7831,30 +7841,31 @@ ${section.body}` : section.body).join("\n\n"));
                 if (!htmlPath) throw Error(`${color.dim('[rsbuild:getTransformedHtml]')} Failed to get HTML file by entryName: ${color.yellow(entryName)}`);
                 let fileName = (0, external_node_path_.join)(distPath, htmlPath);
                 return utils.readFileSync(fileName);
-            })(entryName, utils)), environmentAPI = Object.fromEntries(Object.entries(context.environments).map(([name, environment])=>[
-                name,
-                {
-                    getStats: async ()=>{
-                        if (!buildManager) throw Error(`${color.dim('[rsbuild:server]')} Can not call ${color.yellow('getStats')} when ${color.yellow('runCompile')} is false`);
-                        return await waitLastCompileDone, lastStats[environment.index];
-                    },
-                    context: environment,
-                    loadBundle: async (entryName)=>{
-                        if (!buildManager) throw Error(`${color.dim('[rsbuild:server]')} Can not call ${color.yellow('loadBundle')} when ${color.yellow('runCompile')} is false`);
-                        return await waitLastCompileDone, cacheableLoadBundle(lastStats[environment.index], entryName, {
-                            readFileSync: buildManager.readFileSync,
-                            environment
-                        });
-                    },
-                    getTransformedHtml: async (entryName)=>{
-                        if (!buildManager) throw Error(`${color.dim('[rsbuild:server]')} Can not call ${color.yellow('getTransformedHtml')} when ${color.yellow('runCompile')} is false`);
-                        return await waitLastCompileDone, cacheableTransformedHtml(lastStats[environment.index], entryName, {
-                            readFileSync: buildManager.readFileSync,
-                            environment
-                        });
-                    }
+            })(entryName, utils)), environmentAPI = {}, getErrorMsg = (method)=>`${color.dim('[rsbuild:server]')} Can not call ${color.yellow(method)} when ${color.yellow('runCompile')} is false`;
+        context.environmentList.forEach((environment, index)=>{
+            environmentAPI[environment.name] = {
+                context: environment,
+                getStats: async ()=>{
+                    if (!buildManager) throw Error(getErrorMsg('getStats'));
+                    return await waitLastCompileDone, lastStats[index];
+                },
+                loadBundle: async (entryName)=>{
+                    if (!buildManager) throw Error(getErrorMsg('loadBundle'));
+                    return await waitLastCompileDone, cacheableLoadBundle(lastStats[index], entryName, {
+                        readFileSync: buildManager.readFileSync,
+                        environment
+                    });
+                },
+                getTransformedHtml: async (entryName)=>{
+                    if (!buildManager) throw Error(getErrorMsg('getTransformedHtml'));
+                    return await waitLastCompileDone, cacheableTransformedHtml(lastStats[index], entryName, {
+                        readFileSync: buildManager.readFileSync,
+                        environment
+                    });
                 }
-            ])), middlewares = requireCompiledPackage('connect')(), httpServer = middlewareMode ? null : await createHttpServer({
+            };
+        });
+        let middlewares = requireCompiledPackage('connect')(), httpServer = middlewareMode ? null : await createHttpServer({
             serverConfig: config.server,
             middlewares
         }), devServerAPI = {
@@ -8191,7 +8202,7 @@ ${section.body}` : section.body).join("\n\n"));
                 ],
                 single: 'index' === htmlFallback
             });
-            this.middlewares.use((req, res, next)=>{
+            this.middlewares.use(function staticAssetMiddleware(req, res, next) {
                 let url = req.url, assetPrefix = url && assetPrefixes.find((prefix)=>url.startsWith(prefix));
                 assetPrefix && url?.startsWith(assetPrefix) ? (req.url = url.slice(assetPrefix.length), assetsMiddleware(req, res, (...args)=>{
                     req.url = url, next(...args);
@@ -8207,7 +8218,7 @@ ${section.body}` : section.body).join("\n\n"));
             pwd: context.rootPath,
             output: {
                 path: context.distPath,
-                assetPrefixes: Object.values(context.environments).map((e)=>getPathnameFromUrl(e.config.output.assetPrefix))
+                assetPrefixes: context.environmentList.map((e)=>getPathnameFromUrl(e.config.output.assetPrefix))
             },
             serverConfig
         }, middlewares);
@@ -8873,7 +8884,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                     let postcssrcCache = new Map();
                     api.modifyBundlerChain({
                         order: 'pre',
-                        handler: async (chain, { target, isProd, CHAIN_ID, environment })=>{
+                        handler: async (chain, { target, isProd, CHAIN_ID, environment, environments })=>{
                             let config, isProd1, rule = chain.module.rule(CHAIN_ID.RULE.CSS), inlineRule = chain.module.rule(CHAIN_ID.RULE.CSS_INLINE), { config: config1 } = environment;
                             rule.test(CSS_REGEX).type("javascript/auto").dependency({
                                 not: 'url'
@@ -8892,34 +8903,43 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                                 rule.use(CHAIN_ID.USE.STYLE).loader(getCompiledPath('style-loader')).options(styleLoaderOptions);
                             } else rule.use(CHAIN_ID.USE.MINI_CSS_EXTRACT).loader(getCssExtractPlugin().loader).options(config1.tools.cssExtract.loaderOptions);
                             else rule.use(CHAIN_ID.USE.IGNORE_CSS).loader(external_node_path_default().join(LOADER_PATH, 'ignoreCssLoader.mjs'));
-                            let importLoaders = 0, updateRules = (callback)=>{
-                                callback(rule, 'normal'), callback(inlineRule, 'inline');
+                            let importLoaders = {
+                                normal: 0,
+                                inline: 0
+                            }, updateRules = (callback, options = {})=>{
+                                options.skipNormal || callback(rule, 'normal'), callback(inlineRule, 'inline');
                             }, cssLoaderPath = getCompiledPath('css-loader');
                             if (updateRules((rule)=>{
                                 rule.use(CHAIN_ID.USE.CSS).loader(cssLoaderPath);
-                            }), emitCss) {
-                                if ('rspack' === api.context.bundlerType && !1 !== config1.tools.lightningcssLoader) {
-                                    importLoaders++;
-                                    let { minifyCss } = parseMinifyOptions(config1);
-                                    updateRules((rule, type)=>{
-                                        let inlineStyle = 'inline' === type || config1.output.injectStyles, lightningcssOptions = getLightningCSSLoaderOptions(config1, environment.browserslist, inlineStyle && minifyCss);
-                                        rule.use(CHAIN_ID.USE.LIGHTNINGCSS).loader('builtin:lightningcss-loader').options(lightningcssOptions);
-                                    });
+                            }), 'rspack' === api.context.bundlerType && !1 !== config1.tools.lightningcssLoader) {
+                                emitCss && importLoaders.normal++, importLoaders.inline++;
+                                let { minifyCss } = parseMinifyOptions(config1), { browserslist } = environment;
+                                if ('node' === target) {
+                                    let webEnvironment = Object.values(environments).find((env)=>'web' === env.config.output.target);
+                                    webEnvironment?.browserslist && (browserslist = webEnvironment.browserslist);
                                 }
-                                let postcssLoaderOptions = await getPostcssLoaderOptions({
-                                    config: config1,
-                                    root: api.context.rootPath,
-                                    postcssrcCache
+                                updateRules((rule, type)=>{
+                                    let inlineStyle = 'inline' === type || config1.output.injectStyles, lightningcssOptions = getLightningCSSLoaderOptions(config1, browserslist, inlineStyle && minifyCss);
+                                    rule.use(CHAIN_ID.USE.LIGHTNINGCSS).loader('builtin:lightningcss-loader').options(lightningcssOptions);
+                                }, {
+                                    skipNormal: !emitCss
                                 });
-                                if ('function' == typeof postcssLoaderOptions.postcssOptions || postcssLoaderOptions.postcssOptions?.plugins?.length) {
-                                    importLoaders++;
-                                    let postcssLoaderPath = getCompiledPath('postcss-loader');
-                                    updateRules((rule)=>{
-                                        rule.use(CHAIN_ID.USE.POSTCSS).loader(postcssLoaderPath).options(postcssLoaderOptions);
-                                    });
-                                }
                             }
-                            let localIdentName = (config = config1, isProd1 = isProd, config.output.cssModules.localIdentName || (isProd1 ? '[local]-[hash:base64:6]' : '[path][name]__[local]-[hash:base64:6]')), cssLoaderOptions = (({ config, importLoaders, localIdentName, emitCss })=>{
+                            let postcssLoaderOptions = await getPostcssLoaderOptions({
+                                config: config1,
+                                root: api.context.rootPath,
+                                postcssrcCache
+                            });
+                            if ('function' == typeof postcssLoaderOptions.postcssOptions || postcssLoaderOptions.postcssOptions?.plugins?.length) {
+                                emitCss && importLoaders.normal++, importLoaders.inline++;
+                                let postcssLoaderPath = getCompiledPath('postcss-loader');
+                                updateRules((rule)=>{
+                                    rule.use(CHAIN_ID.USE.POSTCSS).loader(postcssLoaderPath).options(postcssLoaderOptions);
+                                }, {
+                                    skipNormal: !emitCss
+                                });
+                            }
+                            let localIdentName = (config = config1, isProd1 = isProd, config.output.cssModules.localIdentName || (isProd1 ? '[local]-[hash:base64:6]' : '[path][name]__[local]-[hash:base64:6]')), cssLoaderOptions = (({ config, localIdentName, emitCss })=>{
                                 let { cssModules } = config.output;
                                 return ((options, exportOnlyLocals)=>{
                                     if (options.modules && exportOnlyLocals) {
@@ -8940,7 +8960,6 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                                     return options;
                                 })(reduceConfigs({
                                     initial: {
-                                        importLoaders,
                                         modules: {
                                             ...cssModules,
                                             localIdentName
@@ -8952,16 +8971,20 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                                 }), !emitCss);
                             })({
                                 config: config1,
-                                importLoaders,
                                 localIdentName,
                                 emitCss
                             });
                             updateRules((rule, type)=>{
-                                rule.use(CHAIN_ID.USE.CSS).options('inline' === type ? {
+                                let finalOptions = cssLoaderOptions;
+                                finalOptions = 'inline' === type ? {
                                     ...cssLoaderOptions,
                                     exportType: 'string',
-                                    modules: !1
-                                } : cssLoaderOptions), rule.sideEffects(!0), rule.resolve.preferRelative(!0);
+                                    modules: !1,
+                                    importLoaders: importLoaders.inline
+                                } : {
+                                    ...cssLoaderOptions,
+                                    importLoaders: importLoaders.normal
+                                }, rule.use(CHAIN_ID.USE.CSS).options(finalOptions), rule.sideEffects(!0), rule.resolve.preferRelative(!0);
                             });
                             let isStringExport = 'string' === cssLoaderOptions.exportType;
                             if (isStringExport && rule.uses.has(CHAIN_ID.USE.MINI_CSS_EXTRACT) && rule.uses.delete(CHAIN_ID.USE.MINI_CSS_EXTRACT), emitCss && !config1.output.injectStyles && !isStringExport) {
@@ -9519,10 +9542,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                 name: 'rsbuild:nonce',
                 setup (api) {
                     api.onAfterCreateCompiler(({ compiler, environments })=>{
-                        let environmentList = Object.values(environments), nonces = environmentList.map((environment)=>{
-                            let { nonce } = environment.config.security;
-                            return nonce;
-                        });
+                        let environmentList = Object.values(environments), nonces = Object.values(environments).map((environment)=>environment.config.security.nonce);
                         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;
@@ -9848,7 +9868,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
     };
     function setupCommands() {
         let cli = ((name = "")=>new CAC(name))('rsbuild');
-        cli.version("1.6.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)', {
+        cli.version("1.6.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: [
@@ -9917,7 +9937,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
     }
     function showGreeting() {
         let { npm_execpath, npm_lifecycle_event, NODE_RUN_SCRIPT_NAME } = process.env, isBun = npm_execpath?.includes('.bun');
-        logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v1.6.3\n`);
+        logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v1.6.4\n`);
     }
     function setupLogLevel() {
         let logLevelIndex = process.argv.findIndex((item)=>'--log-level' === item || '--logLevel' === item);
@@ -9938,7 +9958,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
             logger.error('Failed to start Rsbuild CLI.'), logger.error(err);
         }
     }
-    let src_version = "1.6.3";
+    let src_version = "1.6.4";
 })(), exports.PLUGIN_CSS_NAME = __webpack_exports__.PLUGIN_CSS_NAME, exports.PLUGIN_SWC_NAME = __webpack_exports__.PLUGIN_SWC_NAME, exports.createRsbuild = __webpack_exports__.createRsbuild, exports.defaultAllowedOrigins = __webpack_exports__.defaultAllowedOrigins, exports.defineConfig = __webpack_exports__.defineConfig, exports.ensureAssetPrefix = __webpack_exports__.ensureAssetPrefix, exports.loadConfig = __webpack_exports__.loadConfig, exports.loadEnv = __webpack_exports__.loadEnv, exports.logger = __webpack_exports__.logger, exports.mergeRsbuildConfig = __webpack_exports__.mergeRsbuildConfig, exports.rspack = __webpack_exports__.rspack, exports.runCLI = __webpack_exports__.runCLI, exports.version = __webpack_exports__.version, __webpack_exports__)-1 === [
     "PLUGIN_CSS_NAME",
     "PLUGIN_SWC_NAME",