@rsbuild/core 2.0.7 → 2.0.8

package/dist/{753.js → 756.js}

@@ -1,11 +1,11 @@
-/*! LICENSE: 753.js.LICENSE.txt */
+/*! LICENSE: 756.js.LICENSE.txt */
 let flagForceColor, runtimeProcessArgs, runtimeInfo, swcHelpersPath, pluginHelper_htmlPlugin;
 import { rspack as core_rspack } from "@rspack/core";
 import node_util, { stripVTControlCharacters } from "node:util";
 import node_process from "node:process";
 import node_os, { constants as external_node_os_constants } from "node:os";
 import node_tty from "node:tty";
-import node_path, { dirname as external_node_path_dirname, isAbsolute as external_node_path_isAbsolute, join, posix, relative, sep, win32 } from "node:path";
+import node_path, { dirname as external_node_path_dirname, isAbsolute as external_node_path_isAbsolute, join, posix, relative, resolve as external_node_path_resolve, sep, win32 } from "node:path";
 import { builtinModules, createRequire, createRequire as __rspack_createRequire } from "node:module";
 import node_fs, { existsSync } from "node:fs";
 import { URL as external_node_url_URL, pathToFileURL, fileURLToPath as __rspack_fileURLToPath } from "node:url";
@@ -385,8 +385,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.7.0_postcss@8.5.14/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.14/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.14/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.14/node_modules/postcss-load-config/src/req.js");
+    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.15/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.15/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.15/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.15/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
@@ -459,8 +459,8 @@ __webpack_require__.add({
             });
         };
     },
-    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.14/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.14/node_modules/postcss-load-config/src/req.js");
+    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.15/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.15/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);
@@ -480,8 +480,8 @@ __webpack_require__.add({
             return config;
         };
     },
-    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.14/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.14/node_modules/postcss-load-config/src/req.js");
+    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.15/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.15/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);
@@ -497,7 +497,7 @@ __webpack_require__.add({
             }), list;
         };
     },
-    "../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.14/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.15/node_modules/postcss-load-config/src/req.js" (module, __unused_rspack_exports, __webpack_require__) {
         let tsx, jiti;
         var __filename = __rspack_fileURLToPath(import.meta.url);
         let { createRequire } = __webpack_require__("node:module?1bcb"), { pathToFileURL } = __webpack_require__("node:url?b4ec"), TS_EXT_RE = /\.[mc]?ts$/, importError = [];
@@ -602,6 +602,9 @@ __webpack_require__.add({
     },
     events (module) {
         module.exports = __rspack_createRequire_require("node:events");
+    },
+    "supports-color" (module) {
+        module.exports = __rspack_createRequire_require("supports-color");
     }
 }), function checkNodeVersion() {
     let { versions } = process;
@@ -3482,7 +3485,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.7",
+        version: "2.0.8",
         rootPath,
         distPath: '',
         cachePath,
@@ -3597,28 +3600,28 @@ async function inspectConfig_inspectConfig({ context, pluginManager, bundlerConf
     };
 }
 let dist_isPlainObject = (obj)=>null !== obj && 'object' == typeof obj && '[object Object]' === Object.prototype.toString.call(obj);
-function reduceConfigs({ initial, config, mergeFn = Object.assign }) {
-    return null == config ? initial : dist_isPlainObject(config) ? dist_isPlainObject(initial) ? mergeFn(initial, config) : config : 'function' == typeof config ? config(initial) ?? initial : Array.isArray(config) ? config.reduce((initial, config)=>reduceConfigs({
-            initial,
-            config,
-            mergeFn
-        }), initial) : config ?? initial;
-}
-function reduceConfigsWithContext({ initial, config, ctx, mergeFn = Object.assign }) {
-    return null == config ? initial : dist_isPlainObject(config) ? dist_isPlainObject(initial) ? mergeFn(initial, config) : config : 'function' == typeof config ? config(initial, ctx) ?? initial : Array.isArray(config) ? config.reduce((initial, config)=>reduceConfigsWithContext({
-            initial,
-            config,
-            ctx,
+async function reduceConfigs({ initial, config, mergeFn = Object.assign }) {
+    if (null == config) return initial;
+    if (dist_isPlainObject(config)) return dist_isPlainObject(initial) ? mergeFn(initial, config) : config;
+    if ('function' == typeof config) return await config(initial) ?? initial;
+    if (Array.isArray(config)) {
+        let result = initial;
+        for (let item of config)result = await reduceConfigs({
+            initial: result,
+            config: item,
             mergeFn
-        }), initial) : config ?? initial;
+        });
+        return result;
+    }
+    return config ?? initial;
 }
-async function reduceConfigsAsyncWithContext({ initial, config, ctx, mergeFn = Object.assign }) {
+async function reduceConfigsWithContext({ initial, config, ctx, mergeFn = Object.assign }) {
     if (null == config) return initial;
     if (dist_isPlainObject(config)) return dist_isPlainObject(initial) ? mergeFn(initial, config) : config;
     if ('function' == typeof config) return await config(initial, ctx) ?? initial;
     if (Array.isArray(config)) {
         let result = initial;
-        for (let item of config)result = await reduceConfigsAsyncWithContext({
+        for (let item of config)result = await reduceConfigsWithContext({
             initial: result,
             config: item,
             ctx,
@@ -3628,16 +3631,24 @@ async function reduceConfigsAsyncWithContext({ initial, config, ctx, mergeFn = O
     }
     return config ?? initial;
 }
-function reduceConfigsMergeContext({ initial, config, ctx, mergeFn = Object.assign }) {
-    return null == config ? initial : dist_isPlainObject(config) ? dist_isPlainObject(initial) ? mergeFn(initial, config) : config : 'function' == typeof config ? config({
+async function reduceConfigsWithMergedContext({ initial, config, ctx, mergeFn = Object.assign }) {
+    if (null == config) return initial;
+    if (dist_isPlainObject(config)) return dist_isPlainObject(initial) ? mergeFn(initial, config) : config;
+    if ('function' == typeof config) return await config({
         value: initial,
         ...ctx
-    }) ?? initial : Array.isArray(config) ? config.reduce((initial, config)=>reduceConfigsMergeContext({
-            initial,
-            config,
+    }) ?? initial;
+    if (Array.isArray(config)) {
+        let result = initial;
+        for (let item of config)result = await reduceConfigsWithMergedContext({
+            initial: result,
+            config: item,
             ctx,
             mergeFn
-        }), initial) : config ?? initial;
+        });
+        return result;
+    }
+    return config ?? initial;
 }
 function mergeTo(a, b, customizer) {
     let ret = {};
@@ -3822,7 +3833,7 @@ async function modifyRspackConfig(context, rspackConfig, chainUtils) {
         }
     }), utils.environment.config.tools?.rspack) {
         let toolsRspackConfig = utils.environment.config.tools.rspack;
-        currentConfig = await reduceConfigsAsyncWithContext({
+        currentConfig = await reduceConfigsWithContext({
             initial: currentConfig,
             config: toolsRspackConfig,
             ctx: utils,
@@ -4465,9 +4476,9 @@ function parseMinifyOptions(config) {
         cssOptions: minify.cssOptions
     };
 }
-let postcss_load_config_src = __webpack_require__("../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.14/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.15/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) {
+async function getLightningCSSLoaderOptions(config, targets, minify) {
     let userOptions = 'object' == typeof config.tools.lightningcssLoader ? config.tools.lightningcssLoader : {}, initialOptions = {
         targets,
         errorRecovery: !0
@@ -4498,12 +4509,12 @@ async function loadUserPostcssrc(root, postcssrcCache) {
 let getPostcssLoaderOptions = async ({ config, root, postcssrcCache })=>{
     let extraPlugins = [], userOptions = await loadUserPostcssrc(root, postcssrcCache);
     userOptions.plugins ||= [];
-    let finalOptions = reduceConfigsWithContext({
-        initial: {
-            implementation: join(COMPILED_PATH, 'postcss', 'index.js'),
-            postcssOptions: userOptions,
-            sourceMap: getCSSSourceMap(config)
-        },
+    let defaultOptions = {
+        implementation: join(COMPILED_PATH, 'postcss', 'index.js'),
+        postcssOptions: userOptions,
+        sourceMap: getCSSSourceMap(config)
+    }, finalOptions = await reduceConfigsWithContext({
+        initial: defaultOptions,
         config: config.tools.postcss,
         ctx: {
             addPlugins (plugins, options = {}) {
@@ -4533,6 +4544,36 @@ let getPostcssLoaderOptions = async ({ config, root, postcssrcCache })=>{
         };
     }
     return finalOptions.postcssOptions = updatePostcssOptions(postcssOptions), finalOptions;
+}, getCSSLoaderOptions = async ({ config, localIdentName, emitCss })=>{
+    let { cssModules } = config.output, defaultOptions = {
+        modules: {
+            ...cssModules,
+            localIdentName
+        },
+        sourceMap: getCSSSourceMap(config)
+    };
+    return ((options, exportOnlyLocals)=>{
+        if (options.modules && exportOnlyLocals) {
+            let { modules } = options;
+            return modules = !0 === modules ? {
+                exportOnlyLocals: !0
+            } : 'string' == typeof modules ? {
+                mode: modules,
+                exportOnlyLocals: !0
+            } : {
+                ...modules,
+                exportOnlyLocals: !0
+            }, {
+                ...options,
+                modules
+            };
+        }
+        return options;
+    })(await reduceConfigs({
+        initial: defaultOptions,
+        config: config.tools.cssLoader,
+        mergeFn: cjs_0_default()
+    }), !emitCss);
 };
 function checkProcessEnvSecurity(define, logger) {
     let value = define['process.env'];
@@ -4546,8 +4587,7 @@ function checkProcessEnvSecurity(define, logger) {
         check(JSON.parse(value));
     } catch  {}
 }
-let readPackageJson = async (rootPath)=>{
-    let pkgJsonPath = join(rootPath, 'package.json');
+let readPackageJsonByPath = async (pkgJsonPath)=>{
     if (await isFileExists(pkgJsonPath)) try {
         return JSON.parse(await readFile(pkgJsonPath, 'utf8'));
     } catch  {
@@ -4570,29 +4610,42 @@ let readPackageJson = async (rootPath)=>{
         ...!0 === autoExternal ? {} : autoExternal
     };
     return dependencyTypes.some((type)=>externalOptions[type]) ? externalOptions : void 0;
+}, readPackageJsonList = async (paths, cache)=>{
+    var packageJsonList = (await Promise.all(paths.map(async (path)=>(cache.has(path) || cache.set(path, await readPackageJsonByPath(path)), cache.get(path))))).filter((pkgJson)=>!!pkgJson);
+    return packageJsonList.length ? dependencyTypes.reduce((merged, type)=>{
+        for (let pkgJson of packageJsonList){
+            let deps = pkgJson[type];
+            isPlainObject(deps) && (merged[type] = {
+                ...merged[type],
+                ...deps
+            });
+        }
+        return merged;
+    }, {}) : void 0;
 };
 function pluginExternals() {
     return {
         name: 'rsbuild:externals',
         setup (api) {
-            let pkgJson, hasReadPackageJson = !1, hasWarnedReadPackageJsonFailed = !1;
+            let packageJsonCache = new Map(), hasWarnedReadPackageJsonFailed = !1;
             api.modifyBundlerChain(async (chain, { environment })=>{
-                let { autoExternal, externals } = environment.config.output, externalOptions = resolveAutoExternalOptions(autoExternal);
-                externalOptions && !hasReadPackageJson && (pkgJson = await readPackageJson(api.context.rootPath), hasReadPackageJson = !0), !externalOptions || pkgJson || hasWarnedReadPackageJsonFailed || (api.logger.warn('The `output.autoExternal` configuration will not be applied because reading package.json failed.'), hasWarnedReadPackageJsonFailed = !0);
+                let pkgJson, { autoExternal, externals } = environment.config.output, externalOptions = resolveAutoExternalOptions(autoExternal);
+                if (externalOptions) {
+                    let rootPath, packageJsonPaths = (rootPath = api.context.rootPath, helpers_castArray(externalOptions.packageJson ?? 'package.json').map((path)=>external_node_path_resolve(rootPath, path)));
+                    pkgJson = await readPackageJsonList(packageJsonPaths, packageJsonCache);
+                }
+                !externalOptions || pkgJson || hasWarnedReadPackageJsonFailed || (api.logger.warn('The `output.autoExternal` configuration will not be applied because reading package.json failed.'), hasWarnedReadPackageJsonFailed = !0);
                 let autoExternalRules = ((options)=>{
                     let { autoExternal, pkgJson, userExternals } = options, externalOptions = resolveAutoExternalOptions(autoExternal);
                     if (!externalOptions || !pkgJson) return;
-                    let userExternalKeys = isPlainObject(userExternals) ? Object.keys(userExternals) : [], uniqueExternals = Array.from(new Set(dependencyTypes.reduce((prev, type)=>{
+                    let userExternalKeys = isPlainObject(userExternals) ? Object.keys(userExternals) : [], excludeConditions = externalOptions.exclude ? helpers_castArray(externalOptions.exclude) : void 0, uniqueExternals = Array.from(new Set(dependencyTypes.reduce((prev, type)=>{
                         if (externalOptions[type]) {
                             let deps = pkgJson[type];
                             return isPlainObject(deps) ? prev.concat(Object.keys(deps)) : prev;
                         }
                         return prev;
-                    }, []).filter((name)=>!userExternalKeys.includes(name))));
-                    return uniqueExternals.length ? [
-                        ...uniqueExternals.map((dep)=>RegExp(`^${dep.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')}($|\/|\\\\)`)),
-                        ...uniqueExternals
-                    ] : void 0;
+                    }, []).filter((name)=>!userExternalKeys.includes(name) && (!excludeConditions || !excludeConditions.some((condition)=>'string' == typeof condition ? condition === name : condition instanceof RegExp && (condition.global || condition.sticky ? new RegExp(condition) : condition).test(name))))));
+                    if (uniqueExternals.length) return uniqueExternals.map((dep)=>RegExp(`^${dep.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')}(?:$|[/\\\\])`));
                 })({
                     autoExternal,
                     pkgJson,
@@ -4997,7 +5050,7 @@ class RsbuildHtmlPlugin {
     }
 }
 function getTitle(entryName, config) {
-    return reduceConfigsMergeContext({
+    return reduceConfigsWithMergedContext({
         initial: '',
         config: config.html.title,
         ctx: {
@@ -5006,7 +5059,7 @@ function getTitle(entryName, config) {
     });
 }
 function getInject(entryName, config) {
-    return reduceConfigsMergeContext({
+    return reduceConfigsWithMergedContext({
         initial: 'head',
         config: config.html.inject,
         ctx: {
@@ -5016,7 +5069,7 @@ function getInject(entryName, config) {
 }
 let existTemplatePath = new Set();
 async function getTemplate(entryName, config, rootPath) {
-    let templatePath = reduceConfigsMergeContext({
+    let templatePath = await reduceConfigsWithMergedContext({
         initial: '',
         config: config.html.template,
         ctx: {
@@ -5042,7 +5095,7 @@ async function getTemplate(entryName, config, rootPath) {
     };
 }
 function getFavicon(entryName, config) {
-    return reduceConfigsMergeContext({
+    return reduceConfigsWithMergedContext({
         initial: '',
         config: config.html.favicon,
         ctx: {
@@ -5050,8 +5103,8 @@ function getFavicon(entryName, config) {
         }
     });
 }
-function getMetaTags(entryName, config, templateContent) {
-    let metaTags = reduceConfigsMergeContext({
+async function getMetaTags(entryName, config, templateContent) {
+    let metaTags = await reduceConfigsWithMergedContext({
         initial: {},
         config: config.html.meta,
         ctx: {
@@ -5061,7 +5114,7 @@ function getMetaTags(entryName, config, templateContent) {
     return templateContent && metaTags.charset && /<meta[^>]+charset=["'][^>]*>/i.test(templateContent) && delete metaTags.charset, metaTags;
 }
 function getTemplateParameters(entryName, config, assetPrefix) {
-    return (compilation, assets, assetTags, pluginOptions)=>{
+    return async (compilation, assets, assetTags, pluginOptions)=>{
         let { mountId, templateParameters } = config.html, rspackConfig = compilation.options;
         return reduceConfigsWithContext({
             initial: {
@@ -5120,10 +5173,9 @@ let normalizeUrl = (url)=>url.replace(/([^:]\/)\/+/g, '$1'), formatPrefix = (inp
     if (prefix?.startsWith('./') && (prefix = prefix.replace('./', '')), !prefix) return '/';
     let hasLeadingSlash = prefix.startsWith('/'), hasTailSlash = prefix.endsWith('/');
     return `${hasLeadingSlash ? '' : '/'}${prefix}${hasTailSlash ? '' : '/'}`;
-}, joinUrlSegments = (s1, s2)=>s1 && s2 ? addTrailingSlash(s1) + s2.replace(/^\/+/, '') : s1 || s2 || '', stripBase = (path, base)=>{
-    if (path === base) return '/';
-    let trailingSlashBase = addTrailingSlash(base);
-    return path.startsWith(trailingSlashBase) ? path.slice(trailingSlashBase.length - 1) : path;
+}, joinUrlPath = (basePath, pathname)=>'' === basePath ? pathname : '' === pathname ? basePath : addTrailingSlash(basePath) + pathname.replace(/^\/+/, ''), removeBasePath = (url, base)=>{
+    let basePath = base.replace(/\/+$/, '');
+    return '' === basePath ? url : url === basePath ? '/' : url.startsWith(`${basePath}/`) ? url.slice(basePath.length) : url;
 }, getRoutes = (context)=>{
     let environmentWithHtml = context.environmentList.filter((item)=>Object.keys(item.htmlPaths).length > 0);
     if (0 === environmentWithHtml.length) return [];
@@ -5133,7 +5185,7 @@ let normalizeUrl = (url)=>url.replace(/([^:]\/)\/+/g, '$1'), formatPrefix = (inp
         return prev.concat(...routes);
     }, []);
 }, formatRoutes = (entry, base, distPathPrefix, outputStructure)=>{
-    let prefix = joinUrlSegments(base, formatPrefix(distPathPrefix));
+    let prefix = joinUrlPath(base, formatPrefix(distPathPrefix));
     return Object.keys(entry).map((entryName)=>({
             entryName,
             pathname: prefix + ('index' === entryName && 'nested' !== outputStructure ? '' : entryName)
@@ -5436,8 +5488,8 @@ function getPublicPath({ isDev, config, context }) {
     let defaultPort = server.port ?? 3000;
     return formatPublicPath(replacePortPlaceholder(publicPath, isDev ? context.devServer?.port ?? defaultPort : defaultPort));
 }
-function applyAlias({ chain, config, rootPath, logger }) {
-    let mergedAlias = reduceConfigs({
+async function applyAlias({ chain, config, rootPath, logger }) {
+    let mergedAlias = await reduceConfigs({
         initial: {},
         config: config.resolve.alias
     });
@@ -6941,13 +6993,14 @@ let faviconFallbackMiddleware = (req, res, next)=>{
     let { accept } = req.headers;
     return 'string' == typeof accept && (accept.includes('text/html') || accept.includes('*/*'));
 }, postfixRE = /[?#].*$/, getBaseUrlMiddleware = ({ base })=>function baseUrlMiddleware(req, res, next) {
-        let url = req.url, pathname = url.replace(postfixRE, '');
-        if (pathname.startsWith(base)) {
-            req.url = stripBase(url, base), next();
+        var pathname;
+        let basePath, url = req.url, pathname1 = url.replace(postfixRE, '');
+        if (pathname = pathname1, '' === (basePath = base.replace(/\/+$/, '')) || pathname === basePath || pathname.startsWith(`${basePath}/`)) {
+            req.url = removeBasePath(url, base), next();
             return;
         }
-        let redirectPath = addTrailingSlash(url) !== base ? joinUrlSegments(base, url) : base;
-        if ('/' === pathname || '/index.html' === pathname) {
+        let redirectPath = addTrailingSlash(url) !== base ? joinUrlPath(base, url) : base;
+        if ('/' === pathname1 || '/index.html' === pathname1) {
             res.writeHead(302, {
                 Location: redirectPath
             }), res.end();
@@ -7536,7 +7589,7 @@ async function devServer_createDevServer(options, createCompiler, config, { getP
         let publicPaths = compiler_isMultiCompiler(compiler) ? compiler.compilers.map(getPublicPathFromCompiler) : [
             getPublicPathFromCompiler(compiler)
         ], { base } = config.server;
-        context.publicPathnames = publicPaths.map(getPathnameFromUrl).map((prefix)=>base && '/' !== base ? stripBase(prefix, base) : prefix), compiler?.hooks.watchRun.tap('rsbuild:watchRun', ()=>{
+        context.publicPathnames = publicPaths.map(getPathnameFromUrl).map((prefix)=>base && '/' !== base ? removeBasePath(prefix, base) : prefix), compiler?.hooks.watchRun.tap('rsbuild:watchRun', ()=>{
             lastStats && (waitLastCompileDoneResolve && (waitLastCompileDoneResolve(), waitLastCompileDoneResolve = null), waitLastCompileDone = new Promise((resolve)=>{
                 waitLastCompileDoneResolve = resolve;
             }));
@@ -7998,7 +8051,7 @@ function applyDefaultPlugins(pluginManager, context) {
             setup (api) {
                 api.modifyBundlerChain({
                     order: 'pre',
-                    handler: (chain, { environment, CHAIN_ID })=>{
+                    handler: async (chain, { environment, CHAIN_ID })=>{
                         let { config, tsconfigPath } = environment, { extensions, conditionNames, mainFields } = config.resolve;
                         chain.resolve.extensions.merge([
                             ...extensions
@@ -8013,7 +8066,7 @@ function applyDefaultPlugins(pluginManager, context) {
                         ]).set('.jsx', [
                             '.jsx',
                             '.tsx'
-                        ]), applyAlias({
+                        ]), await applyAlias({
                             chain,
                             config,
                             rootPath: api.context.rootPath,
@@ -8155,8 +8208,8 @@ function applyDefaultPlugins(pluginManager, context) {
                     let { config, htmlPaths } = environment;
                     if (0 === Object.keys(htmlPaths).length) return;
                     let assetPrefix = getPublicPathFromChain(chain, !1), entries = chain.entryPoints.entries() || {}, entryNames = Object.keys(entries).filter((entryName)=>!!htmlPaths[entryName]), extraDataMap = new Map(), finalOptions = await Promise.all(entryNames.map(async (entryName)=>{
-                        let entryValue = entries[entryName].values(), chunks = getChunks(entryName, entryValue), inject = getInject(entryName, config), filename = htmlPaths[entryName], { templatePath, templateContent } = await getTemplate(entryName, config, api.context.rootPath), templateParameters = getTemplateParameters(entryName, config, assetPrefix), pluginOptions = {
-                            meta: getMetaTags(entryName, config, templateContent),
+                        let entryValue = entries[entryName].values(), chunks = getChunks(entryName, entryValue), inject = await getInject(entryName, config), filename = htmlPaths[entryName], { templatePath, templateContent } = await getTemplate(entryName, config, api.context.rootPath), templateParameters = getTemplateParameters(entryName, config, assetPrefix), pluginOptions = {
+                            meta: await getMetaTags(entryName, config, templateContent),
                             chunks,
                             inject,
                             filename,
@@ -8181,8 +8234,8 @@ function applyDefaultPlugins(pluginManager, context) {
                                 tags
                             };
                         })(environment.config);
-                        tagConfig && (extraData.tagConfig = tagConfig), pluginOptions.title = getTitle(entryName, config);
-                        let favicon = getFavicon(entryName, config) || (()=>{
+                        tagConfig && (extraData.tagConfig = tagConfig), pluginOptions.title = await getTitle(entryName, config);
+                        let favicon = await getFavicon(entryName, config) || (()=>{
                             if (defaultFavicon) return defaultFavicon;
                             let { publicDir } = api.getNormalizedConfig().server, extensions = [
                                 'ico',
@@ -8194,7 +8247,7 @@ function applyDefaultPlugins(pluginManager, context) {
                             return faviconPath && (defaultFavicon = faviconPath), defaultFavicon;
                         })();
                         favicon && (extraData.favicon = favicon);
-                        let finalOptions = reduceConfigsWithContext({
+                        let finalOptions = await reduceConfigsWithContext({
                             initial: pluginOptions,
                             config: 'boolean' == typeof config.tools.htmlPlugin ? {} : config.tools.htmlPlugin,
                             ctx: {
@@ -8431,7 +8484,7 @@ try {
                         cssRule.oneOf(CHAIN_ID.ONE_OF.CSS_RAW).type('asset/source').resourceQuery(RAW_QUERY_REGEX);
                         let mainRule = cssRule.oneOf(CHAIN_ID.ONE_OF.CSS_MAIN), emitCss = config.output.emitCss ?? 'web' === target;
                         if (emitCss) if (config.output.injectStyles) {
-                            let styleLoaderOptions = reduceConfigs({
+                            let styleLoaderOptions = await reduceConfigs({
                                 initial: {},
                                 config: config.tools.styleLoader
                             });
@@ -8441,10 +8494,10 @@ try {
                         let importLoaders = {
                             normal: 0,
                             inline: 0
-                        }, updateRules = (callback, options = {})=>{
-                            options.skipMain || callback(mainRule, 'main'), callback(inlineRule, 'inline'), callback(urlRule, 'url');
+                        }, updateRules = async (callback, options = {})=>{
+                            options.skipMain || await callback(mainRule, 'main'), await callback(inlineRule, 'inline'), await callback(urlRule, 'url');
                         }, cssLoaderPath = join(COMPILED_PATH, 'css-loader', 'index.js');
-                        if (updateRules((rule)=>{
+                        if (await updateRules((rule)=>{
                             rule.use(CHAIN_ID.USE.CSS).loader(cssLoaderPath);
                         }), !1 !== config.tools.lightningcssLoader) {
                             emitCss && importLoaders.normal++, importLoaders.inline++;
@@ -8453,8 +8506,8 @@ try {
                                 let webEnvironment = Object.values(environments).find((env)=>'web' === env.config.output.target);
                                 webEnvironment && (browserslist = webEnvironment.browserslist, minifyCss = parseMinifyOptions(webEnvironment.config).minifyCss);
                             }
-                            updateRules((rule, type)=>{
-                                let minify = ('inline' === type || 'url' === type || config.output.injectStyles) && minifyCss, lightningcssOptions = getLightningCSSLoaderOptions(config, browserslist, minify);
+                            await updateRules(async (rule, type)=>{
+                                let minify = ('inline' === type || 'url' === type || config.output.injectStyles) && minifyCss, lightningcssOptions = await getLightningCSSLoaderOptions(config, browserslist, minify);
                                 rule.use(CHAIN_ID.USE.LIGHTNINGCSS).loader('builtin:lightningcss-loader').options(lightningcssOptions);
                             }, {
                                 skipMain: !emitCss
@@ -8468,48 +8521,18 @@ try {
                         if ('function' == typeof postcssLoaderOptions.postcssOptions || postcssLoaderOptions.postcssOptions?.plugins?.length) {
                             emitCss && importLoaders.normal++, importLoaders.inline++;
                             let postcssLoaderPath = join(COMPILED_PATH, 'postcss-loader', 'index.js');
-                            updateRules((rule)=>{
+                            await updateRules((rule)=>{
                                 rule.use(CHAIN_ID.USE.POSTCSS).loader(postcssLoaderPath).options(postcssLoaderOptions);
                             }, {
                                 skipMain: !emitCss
                             });
                         }
-                        let localIdentName = config.output.cssModules.localIdentName || (isProd ? '[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) {
-                                    let { modules } = options;
-                                    return modules = !0 === modules ? {
-                                        exportOnlyLocals: !0
-                                    } : 'string' == typeof modules ? {
-                                        mode: modules,
-                                        exportOnlyLocals: !0
-                                    } : {
-                                        ...modules,
-                                        exportOnlyLocals: !0
-                                    }, {
-                                        ...options,
-                                        modules
-                                    };
-                                }
-                                return options;
-                            })(reduceConfigs({
-                                initial: {
-                                    modules: {
-                                        ...cssModules,
-                                        localIdentName
-                                    },
-                                    sourceMap: getCSSSourceMap(config)
-                                },
-                                config: config.tools.cssLoader,
-                                mergeFn: cjs_0_default()
-                            }), !emitCss);
-                        })({
+                        let localIdentName = config.output.cssModules.localIdentName || (isProd ? '[local]-[hash:base64:6]' : '[path][name]__[local]-[hash:base64:6]'), cssLoaderOptions = await getCSSLoaderOptions({
                             config,
                             localIdentName,
                             emitCss
                         });
-                        updateRules((rule, type)=>{
+                        await updateRules((rule, type)=>{
                             let finalOptions = cssLoaderOptions;
                             finalOptions = 'inline' === type || 'url' === type ? {
                                 ...cssLoaderOptions,
@@ -8550,12 +8573,12 @@ try {
         {
             name: 'rsbuild:minimize',
             setup (api) {
-                api.modifyBundlerChain((chain, { environment, CHAIN_ID, rspack })=>{
+                api.modifyBundlerChain(async (chain, { environment, CHAIN_ID, rspack })=>{
                     let { config } = environment, { minifyJs, minifyCss, jsOptions, cssOptions } = parseMinifyOptions(config);
                     if (chain.optimization.minimize(minifyJs || minifyCss), minifyJs && chain.optimization.minimizer(CHAIN_ID.MINIMIZER.JS).use(rspack.SwcJsMinimizerRspackPlugin, [
                         getSwcMinimizerOptions(config, jsOptions)
                     ]).end(), minifyCss) {
-                        let loaderOptions = getLightningCSSLoaderOptions(config, environment.browserslist, !0), defaultOptions = {
+                        let loaderOptions = await getLightningCSSLoaderOptions(config, environment.browserslist, !0), defaultOptions = {
                             minimizerOptions: {
                                 targets: isPlainObject(loaderOptions.targets) ? environment.browserslist : loaderOptions.targets,
                                 ...pick(loaderOptions, [
@@ -8608,7 +8631,7 @@ try {
             setup (api) {
                 api.modifyBundlerChain({
                     order: 'pre',
-                    handler: (chain, { CHAIN_ID, isDev, isProd, target, environment })=>{
+                    handler: async (chain, { CHAIN_ID, isDev, isProd, target, environment })=>{
                         let { config, browserslist } = environment, cacheRoot = node_path.join(api.context.cachePath, '.swc'), rule = chain.module.rule(CHAIN_ID.RULE.JS).test(SCRIPT_REGEX).dependency({
                             not: 'url'
                         });
@@ -8642,7 +8665,7 @@ try {
                                 ])item.resolve.alias.set('core-js', coreJsDir);
                             }
                         }
-                        let mergedConfig = reduceConfigs({
+                        let mergedConfig = await reduceConfigs({
                             initial: swcConfig,
                             config: config.tools.swc,
                             mergeFn: cjs_0_default()
@@ -8920,7 +8943,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.4/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.5/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,
@@ -9434,7 +9457,7 @@ let applyServerOptions = (command)=>{
 };
 function setupCommands() {
     let cli = ((name = "")=>new CAC(name))('rsbuild');
-    cli.version("2.0.7"), 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.8"), 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: [
@@ -9505,7 +9528,7 @@ function initNodeEnv(command) {
 }
 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.7\n`);
+    src_logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v2.0.8\n`);
 }
 function setupLogLevel() {
     if (cli_argv.length <= 3) return;
@@ -9527,5 +9550,5 @@ function runCLI() {
         src_logger.error('Failed to start Rsbuild CLI.'), src_logger.error(err), process.exit(1);
     }
 }
-let src_version = "2.0.7";
+let src_version = "2.0.8";
 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,4 +1,4 @@
-import { logger } from "./797.js";
+import { logger } from "./60.js";
 let createOverlay;
 let clearOverlay;
 const getErrorField = (error, field)=>{

package/dist/client/overlay.js

@@ -1,5 +1,5 @@
 import { registerOverlay } from "./hmr.js";
-import { logger } from "./797.js";
+import { logger } from "./60.js";
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,