@rsbuild/core 2.0.9 → 2.0.11

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

@@ -1,8 +1,8 @@
 (() => {
   var __webpack_modules__ = {
-    99: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    203: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
-      const { HtmlWebpackChildCompiler } = __nccwpck_require__(515);
+      const { HtmlWebpackChildCompiler } = __nccwpck_require__(288);
       const compilerMap = new WeakMap();
       class CachedChildCompilation {
         constructor(compiler) {
@@ -311,7 +311,7 @@
       }
       module.exports = { CachedChildCompilation };
     },
-    515: (module) => {
+    288: (module) => {
       "use strict";
       class HtmlWebpackChildCompiler {
         constructor(templates) {
@@ -480,7 +480,7 @@
       }
       module.exports = { HtmlWebpackChildCompiler };
     },
-    120: (module) => {
+    880: (module) => {
       "use strict";
       module.exports = {};
       module.exports.none = (chunks) => chunks;
@@ -499,7 +499,7 @@
       };
       module.exports.auto = module.exports.none;
     },
-    783: (module) => {
+    447: (module) => {
       "use strict";
       module.exports = function (err) {
         return {
@@ -523,7 +523,7 @@
         };
       };
     },
-    310: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    334: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const { AsyncSeriesWaterfallHook } = __nccwpck_require__(159);
       const htmlWebpackPluginHooksMap = new WeakMap();
@@ -549,7 +549,7 @@
       }
       module.exports = { getHtmlRspackPluginHooks };
     },
-    75: (module) => {
+    619: (module) => {
       const voidTags = [
         "area",
         "base",
@@ -617,19 +617,19 @@
         htmlTagObjectToString,
       };
     },
-    954: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    914: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const promisify = __nccwpck_require__(23).promisify;
       const vm = __nccwpck_require__(154);
       const fs = __nccwpck_require__(896);
       const path = __nccwpck_require__(928);
-      const { CachedChildCompilation } = __nccwpck_require__(99);
+      const { CachedChildCompilation } = __nccwpck_require__(203);
       const { createHtmlTagObject, htmlTagObjectToString, HtmlTagArray } =
-        __nccwpck_require__(75);
-      const prettyError = __nccwpck_require__(783);
-      const chunkSorter = __nccwpck_require__(120);
+        __nccwpck_require__(619);
+      const prettyError = __nccwpck_require__(447);
+      const chunkSorter = __nccwpck_require__(880);
       const getHtmlRspackPluginHooks =
-        __nccwpck_require__(310).getHtmlRspackPluginHooks;
+        __nccwpck_require__(334).getHtmlRspackPluginHooks;
       const WITH_PLACEHOLDER = "function __with_placeholder__";
       class HtmlRspackPlugin {
         constructor(userOptions = {}) {
@@ -2398,6 +2398,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(954);
+  var __webpack_exports__ = __nccwpck_require__(914);
   module.exports = __webpack_exports__;
 })();

package/compiled/html-rspack-plugin/package.json

@@ -1 +1 @@
-{"name":"html-rspack-plugin","author":"Jan Nicklas <j.nicklas@me.com> (https://github.com/jantimon)","version":"6.1.8","funding":{"type":"opencollective","url":"https://opencollective.com/html-webpack-plugin"},"license":"MIT","types":"index.d.ts","type":"commonjs"}
+{"name":"html-rspack-plugin","author":"Jan Nicklas <j.nicklas@me.com> (https://github.com/jantimon)","version":"6.1.9","funding":{"type":"opencollective","url":"https://opencollective.com/html-webpack-plugin"},"license":"MIT","types":"index.d.ts","type":"commonjs"}

package/compiled/postcss-loader/index.js

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

package/compiled/rslog/index.d.ts

@@ -16,7 +16,7 @@ declare const color: {
     strikethrough: ColorFn;
 };
 
-declare let LOG_TYPES: {
+declare const LOG_TYPES: {
     error: {
         label: string;
         level: "error";
@@ -90,9 +90,9 @@ type Logger = Record<LogMethods, LogFunction> & {
     override: (customLogger: Partial<Record<LogMethods, LogFunction>>) => void;
 };
 
-declare let createLogger: (options?: Options) => Logger;
+declare const createLogger: (options?: Options) => Logger;
 
-declare let logger: Logger;
+declare const logger: Logger;
 
 export { color, createLogger, logger };
 export type { LogFunction, LogLevel, LogMessage, LogType, Logger, Options };

package/compiled/rslog/package.json

@@ -1 +1 @@
-{"name":"rslog","version":"2.1.1","license":"MIT","types":"index.d.ts","type":"module"}
+{"name":"rslog","version":"2.1.2","license":"MIT","types":"index.d.ts","type":"module"}

package/compiled/rspack-chain/package.json

@@ -1 +1 @@
-{"name":"rspack-chain","version":"2.0.1","license":"MIT","types":"types/index.d.ts","type":"module"}
+{"name":"rspack-chain","version":"2.0.2","license":"MIT","types":"types/index.d.ts","type":"module"}

package/dist/756.js

@@ -755,8 +755,8 @@ let supportsColor = {
     }
 }, normalizeErrorMessage = (err)=>{
     if (err.stack) {
-        let [name, ...rest] = err.stack.split('\n');
-        return name.startsWith('Error: ') && (name = name.slice(7)), `${name}\n${color.gray(rest.join('\n'))}`;
+        let [rawName, ...rest] = err.stack.split('\n'), name = rawName.startsWith('Error: ') ? rawName.slice(7) : rawName;
+        return `${name}\n${color.gray(rest.join('\n'))}`;
     }
     return err.message;
 }, createLogger = (options = {})=>{
@@ -1477,14 +1477,12 @@ __nested_rspack_require_65__.m = __webpack_modules__, __nested_rspack_require_65
         }
     },
     "./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/index.js" (__unused_rspack_module, exports, __nested_rspack_require_14714_14733__) {
-        Object.defineProperty(exports, "__esModule", {
-            value: !0
-        }), exports.stringify = void 0;
+        exports.A = void 0;
         let stringify_1 = __nested_rspack_require_14714_14733__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/stringify.js"), quote_1 = __nested_rspack_require_14714_14733__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/quote.js"), ROOT_SENTINEL = Symbol("root");
         function replacerToString(replacer) {
             return replacer ? (value, space, next, key)=>replacer(value, space, (value)=>stringify_1.toString(value, space, next, key), key) : stringify_1.toString;
         }
-        exports.stringify = function stringify(value, replacer, indent, options = {}) {
+        exports.A = function stringify(value, replacer, indent, options = {}) {
             let space = "string" == typeof indent ? indent : " ".repeat(indent || 0), path = [], stack = new Set(), tracking = new Map(), unpack = new Map(), valueCount = 0, { maxDepth = 100, references = !1, skipUndefinedProperties = !1, maxValues = 100000 } = options, valueToString = replacerToString(replacer), onNext = (value, key)=>{
                 if (++valueCount > maxValues || skipUndefinedProperties && void 0 === value || path.length > maxDepth) return;
                 if (void 0 === key) return valueToString(value, space, onNext, key);
@@ -1514,9 +1512,9 @@ __nested_rspack_require_65__.m = __webpack_modules__, __nested_rspack_require_65
             return result;
         };
     },
-    "./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/object.js" (__unused_rspack_module, exports, __nested_rspack_require_18136_18155__) {
+    "./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/object.js" (__unused_rspack_module, exports, __nested_rspack_require_18029_18048__) {
         exports.objectToString = void 0;
-        let quote_1 = __nested_rspack_require_18136_18155__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/quote.js"), function_1 = __nested_rspack_require_18136_18155__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/function.js"), array_1 = __nested_rspack_require_18136_18155__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/array.js");
+        let quote_1 = __nested_rspack_require_18029_18048__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/quote.js"), function_1 = __nested_rspack_require_18029_18048__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/function.js"), array_1 = __nested_rspack_require_18029_18048__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/array.js");
         exports.objectToString = (value, space, next, key)=>{
             if ("function" == typeof Buffer && Buffer.isBuffer(value)) return `Buffer.from(${next(value.toString("base64"))}, 'base64')`;
             if ("object" == typeof global && value === global) return globalToString(value, space, next);
@@ -1600,9 +1598,9 @@ __nested_rspack_require_65__.m = __webpack_modules__, __nested_rspack_require_65
             return result;
         };
     },
-    "./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/stringify.js" (__unused_rspack_module, exports, __nested_rspack_require_23555_23574__) {
+    "./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/stringify.js" (__unused_rspack_module, exports, __nested_rspack_require_23448_23467__) {
         exports.toString = void 0;
-        let quote_1 = __nested_rspack_require_23555_23574__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/quote.js"), object_1 = __nested_rspack_require_23555_23574__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/object.js"), function_1 = __nested_rspack_require_23555_23574__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/function.js"), PRIMITIVE_TYPES = {
+        let quote_1 = __nested_rspack_require_23448_23467__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/quote.js"), object_1 = __nested_rspack_require_23448_23467__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/object.js"), function_1 = __nested_rspack_require_23448_23467__("./node_modules/.pnpm/javascript-stringify@2.1.0/node_modules/javascript-stringify/dist/function.js"), PRIMITIVE_TYPES = {
             string: quote_1.quoteString,
             number: (value)=>Object.is(value, -0) ? "-0" : String(value),
             boolean: String,
@@ -2193,7 +2191,7 @@ class RspackChain extends ChainedMap {
         ]);
     }
     static toString(config, { verbose = !1, configPrefix = 'config' } = {}) {
-        return (0, dist.stringify)(config, (value, indent, stringify)=>{
+        return (0, dist.A)(config, (value, indent, stringify)=>{
             if (value && value.__pluginName) {
                 let prefix = `/* ${configPrefix}.${value.__pluginType}('${value.__pluginName}') */\n`, constructorExpression = value.__pluginPath ? `(require(${stringify(value.__pluginPath)}))` : value.__pluginConstructorName;
                 if (constructorExpression) {
@@ -3086,10 +3084,10 @@ function exitHook(onExit) {
         exitHook_callbacks.delete(onExit);
     };
 }
-let addTrailingSlash = (s)=>s.endsWith('/') ? s : `${s}/`, isURL = (str)=>str.startsWith('http') || str.startsWith('//'), urlJoin = (base, path)=>{
+let removeTailingSlash = (s)=>s.endsWith('/') ? s.replace(/\/+$/, '') : s, addTrailingSlash = (s)=>s.endsWith('/') ? s : `${s}/`, isURL = (str)=>str.startsWith('http') || str.startsWith('//'), urlJoin = (base, path)=>{
     let [urlProtocol, baseUrl] = base.split('://');
     return `${urlProtocol}://${posix.join(baseUrl, path)}`;
-}, ensureAssetPrefix = (url, assetPrefix = "/")=>url.startsWith('//') || external_node_url_URL.canParse(url) || 'auto' === assetPrefix || 'function' == typeof assetPrefix ? url : assetPrefix.startsWith('http') ? urlJoin(assetPrefix, url) : assetPrefix.startsWith('//') ? urlJoin(`https:${assetPrefix}`, url).replace('https:', '') : posix.join(assetPrefix, url), formatPublicPath = (publicPath, withSlash = !0)=>'auto' === publicPath || '' === publicPath ? publicPath : withSlash ? addTrailingSlash(publicPath) : publicPath.replace(/\/+$/, ''), getPublicPathFromChain = (chain, withSlash = !0)=>{
+}, ensureAssetPrefix = (url, assetPrefix = "/")=>url.startsWith('//') || external_node_url_URL.canParse(url) || 'auto' === assetPrefix || 'function' == typeof assetPrefix ? url : assetPrefix.startsWith('http') ? urlJoin(assetPrefix, url) : assetPrefix.startsWith('//') ? urlJoin(`https:${assetPrefix}`, url).replace('https:', '') : posix.join(assetPrefix, url), formatPublicPath = (publicPath, withSlash = !0)=>'auto' === publicPath || '' === publicPath ? publicPath : withSlash ? addTrailingSlash(publicPath) : removeTailingSlash(publicPath), getPublicPathFromChain = (chain, withSlash = !0)=>{
     let publicPath = chain.output.get('publicPath');
     return 'string' == typeof publicPath ? formatPublicPath(publicPath, withSlash) : formatPublicPath("/", withSlash);
 };
@@ -3485,7 +3483,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.9",
+        version: "2.0.11",
         rootPath,
         distPath: '',
         cachePath,
@@ -5173,9 +5171,14 @@ 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 ? '' : '/'}`;
-}, 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;
+}, joinUrlPath = (basePath, pathname)=>'' === basePath ? pathname : '' === pathname ? basePath : addTrailingSlash(basePath) + pathname.replace(/^\/+/, ''), isUrlPathUnderBase = (pathname, base)=>{
+    let basePath = removeTailingSlash(base);
+    return '' === basePath || pathname === basePath || pathname.startsWith(`${basePath}/`);
+}, removeBasePath = (url, base)=>{
+    let basePath = removeTailingSlash(base);
+    if ('' === basePath || !url.startsWith(basePath)) return url;
+    let nextChar = url[basePath.length];
+    return void 0 === nextChar ? '/' : '/' === nextChar ? url.slice(basePath.length) : '?' === nextChar || '#' === nextChar ? `/${url.slice(basePath.length)}` : url;
 }, getRoutes = (context)=>{
     let environmentWithHtml = context.environmentList.filter((item)=>Object.keys(item.htmlPaths).length > 0);
     if (0 === environmentWithHtml.length) return [];
@@ -5939,7 +5942,7 @@ async function getFileFromUrl(url, outputFileSystem, context) {
         }), { 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(node_path.join(distPath, pathname.slice(prefix.length)));
+        prefix && '/' !== prefix && isUrlPathUnderBase(pathname, prefix) && possibleFilenames.add(node_path.join(distPath, pathname.slice(prefix.length)));
     }
     for (let distPath of distPaths)possibleFilenames.add(node_path.join(distPath, pathname));
     for (let filename of possibleFilenames){
@@ -5990,13 +5993,13 @@ function getEtag(stat) {
     let mtime = stat.mtime.getTime().toString(16), size = stat.size.toString(16);
     return `W/"${size}-${mtime}"`;
 }
-function createReadStreamOrReadFileSync(filename, outputFileSystem, start, end) {
+function createReadStreamOrReadFileSync(filename, outputFileSystem, start, end, byteLength) {
     return {
         bufferOrStream: outputFileSystem.createReadStream(filename, {
             start,
             end
         }),
-        byteLength: 0 === end ? 0 : end - start + 1
+        byteLength
     };
 }
 async function getContentType(str) {
@@ -6050,7 +6053,7 @@ function sendError(res, code) {
     let byteLength = Buffer.byteLength(document);
     res.setHeader('Content-Length', byteLength), res.end(document);
 }
-function createMiddleware(context, ready, outputFileSystem) {
+function createAssetsMiddleware(context, ready, outputFileSystem) {
     let { logger } = context;
     return async function assetsMiddleware(req, res, next) {
         async function goNext() {
@@ -6175,7 +6178,7 @@ function createMiddleware(context, ready, outputFileSystem) {
             }
             let [start, end] = calcStartAndEnd(offset, len);
             try {
-                ({ bufferOrStream, byteLength } = createReadStreamOrReadFileSync(filename, outputFileSystem, start, end));
+                ({ bufferOrStream, byteLength } = createReadStreamOrReadFileSync(filename, outputFileSystem, start, end, len));
             } catch  {
                 await goNext();
                 return;
@@ -6204,7 +6207,7 @@ function createMiddleware(context, ready, outputFileSystem) {
 }
 async function setupOutputFileSystem(writeToDisk, compilers) {
     if (!0 !== writeToDisk) {
-        let { createFsFromVolume, Volume } = await import("./memfs.js").then(__webpack_require__.t.bind(__webpack_require__, "../../node_modules/.pnpm/memfs@4.57.2/node_modules/memfs/lib/index.js", 23)), outputFileSystem = createFsFromVolume(new Volume());
+        let { createFsFromVolume, Volume } = await import("./memfs.js").then(__webpack_require__.t.bind(__webpack_require__, "../../node_modules/.pnpm/memfs@4.57.3/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);
@@ -6340,7 +6343,7 @@ let assets_middleware_assetsMiddleware = async ({ config, compiler, context, soc
         return name && environments[name] && (writeToDisk = environments[name].config.dev.writeToDisk ?? writeToDisk), 'function' == typeof writeToDisk ? writeToDisk(filePath) : writeToDisk;
     });
     writeToDisk && setupWriteToDisk(compilers, writeToDisk, logger);
-    let instance = createMiddleware(context, (callback)=>{
+    let instance = createAssetsMiddleware(context, (callback)=>{
         'done' === context.buildState.status ? callback() : callbacks.push(callback);
     }, await setupOutputFileSystem(writeToDisk, compilers));
     return instance.watch = ()=>{
@@ -6992,21 +6995,38 @@ let faviconFallbackMiddleware = (req, res, next)=>{
     next();
 }, middlewares_isFileExists = async (filePath, outputFileSystem)=>new Promise((resolve)=>{
         outputFileSystem.stat(filePath, (_error, stats)=>{
-            resolve(stats?.isFile());
+            resolve(!!stats?.isFile());
         });
-    }), maybeHTMLRequest = (req)=>{
+    }), isFileExistsInDistPaths = async (distPaths, filename, outputFileSystem)=>{
+    for (let distPath of distPaths)if (await middlewares_isFileExists(node_path.join(distPath, filename), outputFileSystem)) return !0;
+    return !1;
+}, maybeHTMLRequest = (req)=>{
     if (!req.url || !req.headers || 'GET' !== req.method && 'HEAD' !== req.method) return !1;
     let { accept } = req.headers;
     return 'string' == typeof accept && (accept.includes('text/html') || accept.includes('*/*'));
-}, postfixRE = /[?#].*$/, getBaseUrlMiddleware = ({ base })=>function baseUrlMiddleware(req, res, next) {
-        var pathname;
-        let basePath, url = req.url, pathname1 = url.replace(postfixRE, '');
-        if (pathname = pathname1, '' === (basePath = base.replace(/\/+$/, '')) || pathname === basePath || pathname.startsWith(`${basePath}/`)) {
+}, postfixRE = /[?#].*$/, getHtmlCompletionMiddleware = ({ distPaths, assetsMiddleware, outputFileSystem })=>async function htmlCompletionMiddleware(req, res, next) {
+        if (!maybeHTMLRequest(req)) return void next();
+        let pathname = req.url.replace(postfixRE, ''), rewrite = (newUrl)=>{
+            req.url = newUrl, assetsMiddleware(req, res, (...args)=>{
+                next(...args);
+            });
+        };
+        if (pathname.endsWith('/')) {
+            let newUrl = `${pathname}index.html`;
+            if (await isFileExistsInDistPaths(distPaths, newUrl, outputFileSystem)) return void rewrite(newUrl);
+        } else if (!node_path.extname(pathname)) {
+            let newUrl = `${pathname}.html`;
+            if (await isFileExistsInDistPaths(distPaths, newUrl, outputFileSystem)) return void rewrite(newUrl);
+        }
+        next();
+    }, getBaseUrlMiddleware = ({ base })=>function baseUrlMiddleware(req, res, next) {
+        let url = req.url, pathname = url.replace(postfixRE, '');
+        if (isUrlPathUnderBase(pathname, base)) {
             req.url = removeBasePath(url, base), next();
             return;
         }
         let redirectPath = addTrailingSlash(url) !== base ? joinUrlPath(base, url) : base;
-        if ('/' === pathname1 || '/index.html' === pathname1) {
+        if ('/' === pathname || '/index.html' === pathname) {
             res.writeHead(302, {
                 Location: redirectPath
             }), res.end();
@@ -7021,6 +7041,16 @@ let faviconFallbackMiddleware = (req, res, next)=>{
         res.writeHead(404, {
             'Content-Type': 'text/plain'
         }), res.end(`The server is configured with a base URL of ${base} - did you mean to visit ${redirectPath} instead?`);
+    }, getHtmlFallbackMiddleware = ({ distPaths, assetsMiddleware, outputFileSystem, logger })=>async function htmlFallbackMiddleware(req, res, next) {
+        if (!maybeHTMLRequest(req) || '/favicon.ico' === req.url) return void next();
+        if (await isFileExistsInDistPaths(distPaths, 'index.html', outputFileSystem)) {
+            let newUrl = '/index.html';
+            isVerbose(logger) && logger.debug(`    ${req.method} ${req.url} ${color.yellow('fallback to')} ${newUrl}`), req.url = newUrl, assetsMiddleware(req, res, (...args)=>{
+                next(...args);
+            });
+            return;
+        }
+        next();
     };
 function formatProxyOptions(proxyOptions, logger) {
     let logPrefix = color.dim('[http-proxy-middleware]: '), defaultOptions = {
@@ -7086,7 +7116,7 @@ let applyDefaultMiddlewares = async ({ config, buildManager, context, devServer,
     server.base && '/' !== server.base && middlewares.use(getBaseUrlMiddleware({
         base: server.base
     }));
-    let { default: launchEditorMiddleware } = await import("./launch-editor-middleware.js").then(__webpack_require__.t.bind(__webpack_require__, "../../node_modules/.pnpm/launch-editor-middleware@2.13.2/node_modules/launch-editor-middleware/index.js", 23));
+    let { default: launchEditorMiddleware } = await import("./launch-editor-middleware.js").then(__webpack_require__.t.bind(__webpack_require__, "../../node_modules/.pnpm/launch-editor-middleware@2.14.0/node_modules/launch-editor-middleware/index.js", 23));
     if (middlewares.use('/__open-in-editor', launchEditorMiddleware()), middlewares.use((({ environments, logger })=>async function viewingServedFilesMiddleware(req, res, next) {
             if ('/rsbuild-dev-server' !== req.url.replace(postfixRE, '')) return void next();
             res.writeHead(200, {
@@ -7150,24 +7180,12 @@ let applyDefaultMiddlewares = async ({ config, buildManager, context, devServer,
         logger
     })), buildManager && (middlewares.use(buildManager.assetsMiddleware), upgradeEvents.push(buildManager.socketServer.upgrade), middlewares.use(function hotUpdateJsonFallbackMiddleware(req, res, next) {
         req.url?.endsWith('.hot-update.json') && 'OPTIONS' !== req.method ? notFoundMiddleware(req, res, next) : next();
-    })), buildManager && middlewares.use((({ distPath, buildManager })=>async function htmlCompletionMiddleware(req, res, next) {
-            if (!maybeHTMLRequest(req)) return void next();
-            let pathname = req.url.replace(postfixRE, ''), rewrite = (newUrl)=>{
-                req.url = newUrl, buildManager.assetsMiddleware(req, res, (...args)=>{
-                    next(...args);
-                });
-            };
-            if (pathname.endsWith('/')) {
-                let newUrl = `${pathname}index.html`, filePath = node_path.join(distPath, newUrl);
-                if (await middlewares_isFileExists(filePath, buildManager.outputFileSystem)) return void rewrite(newUrl);
-            } else if (!node_path.extname(pathname)) {
-                let newUrl = `${pathname}.html`, filePath = node_path.join(distPath, newUrl);
-                if (await middlewares_isFileExists(filePath, buildManager.outputFileSystem)) return void rewrite(newUrl);
-            }
-            next();
-        })({
-        buildManager,
-        distPath: context.distPath
+    })), buildManager && middlewares.use(getHtmlCompletionMiddleware({
+        assetsMiddleware: buildManager.assetsMiddleware,
+        distPaths: [
+            context.distPath
+        ],
+        outputFileSystem: buildManager.outputFileSystem
     })), server.publicDir.length) {
         let { default: sirv } = await import("./sirv.js");
         for (let { name } of server.publicDir){
@@ -7181,21 +7199,13 @@ let applyDefaultMiddlewares = async ({ config, buildManager, context, devServer,
         }
     }
     for (let callback of postCallbacks)await callback();
-    return server.historyApiFallback && (middlewares.use(historyApiFallback_historyApiFallbackMiddleware(logger, !0 === server.historyApiFallback ? {} : server.historyApiFallback)), buildManager?.assetsMiddleware && middlewares.use(buildManager.assetsMiddleware)), buildManager && server.htmlFallback && middlewares.use((({ distPath, buildManager, logger })=>async function htmlFallbackMiddleware(req, res, next) {
-            if (!maybeHTMLRequest(req) || '/favicon.ico' === req.url) return void next();
-            let filePath = node_path.join(distPath, 'index.html');
-            if (await middlewares_isFileExists(filePath, buildManager.outputFileSystem)) {
-                let newUrl = '/index.html';
-                isVerbose(logger) && logger.debug(`    ${req.method} ${req.url} ${color.yellow('fallback to')} ${newUrl}`), req.url = newUrl, buildManager.assetsMiddleware(req, res, (...args)=>{
-                    next(...args);
-                });
-                return;
-            }
-            next();
-        })({
-        buildManager,
-        distPath: context.distPath,
-        logger
+    return server.historyApiFallback && (middlewares.use(historyApiFallback_historyApiFallbackMiddleware(logger, !0 === server.historyApiFallback ? {} : server.historyApiFallback)), buildManager?.assetsMiddleware && middlewares.use(buildManager.assetsMiddleware)), buildManager && server.htmlFallback && middlewares.use(getHtmlFallbackMiddleware({
+        assetsMiddleware: buildManager.assetsMiddleware,
+        distPaths: [
+            context.distPath
+        ],
+        logger,
+        outputFileSystem: buildManager.outputFileSystem
     })), middlewares.use(faviconFallbackMiddleware), {
         onUpgrade: (...args)=>{
             for (let cb of upgradeEvents)cb(...args);
@@ -7503,7 +7513,7 @@ let runner_run = async ({ bundlePath, ...runnerFactoryOptions })=>{
     }
     let { createServer } = await import("node:http");
     return createServer(middlewares);
-};
+}, getPublicPathname = (publicPath)=>'auto' === publicPath || '' === publicPath ? '' : getPathnameFromUrl(publicPath.endsWith('/') ? publicPath : `${publicPath}/`), getPublicPathnames = (publicPaths, base)=>publicPaths.map(getPublicPathname).map((prefix)=>base && '/' !== base ? removeBasePath(prefix, base) : prefix);
 async function applyServerSetup(setup, context) {
     let postCallbacks = [];
     for (let handler of helpers_castArray(setup || [])){
@@ -7592,10 +7602,9 @@ async function devServer_createDevServer(options, createCompiler, config, { getP
     let startCompile = async ()=>{
         let compiler = await createCompiler();
         if (!compiler) throw Error(`${color.dim('[rsbuild:server]')} Failed to get compiler instance.`);
-        let publicPaths = compiler_isMultiCompiler(compiler) ? compiler.compilers.map(getPublicPathFromCompiler) : [
+        context.publicPathnames = getPublicPathnames(compiler_isMultiCompiler(compiler) ? compiler.compilers.map(getPublicPathFromCompiler) : [
             getPublicPathFromCompiler(compiler)
-        ], { base } = config.server;
-        context.publicPathnames = publicPaths.map(getPathnameFromUrl).map((prefix)=>base && '/' !== base ? removeBasePath(prefix, base) : prefix), compiler?.hooks.watchRun.tap('rsbuild:watchRun', ()=>{
+        ], config.server.base), compiler?.hooks.watchRun.tap('rsbuild:watchRun', ()=>{
             lastStats && (waitLastCompileDoneResolve && (waitLastCompileDoneResolve(), waitLastCompileDoneResolve = null), waitLastCompileDone = new Promise((resolve)=>{
                 waitLastCompileDoneResolve = resolve;
             }));
@@ -7750,7 +7759,9 @@ async function devServer_createDevServer(options, createCompiler, config, { getP
     }), state.buildManager?.watch(), logger.debug('create dev server done'), devServer;
 }
 async function startPreviewServer(context, config, { getPortSilently } = {}) {
-    let { logger } = context, { connect } = await import("./connect-next.js"), middlewares = connect(), { port, portTip } = await resolvePort(config), serverConfig = config.server, { host, headers, proxy, historyApiFallback, compress, base, cors } = serverConfig, protocol = serverConfig.https ? 'https' : 'http', routes = getRoutes(context), urls = await getAddressUrls({
+    let environmentList, { logger } = context, { connect } = await import("./connect-next.js"), middlewares = connect(), { port, portTip } = await resolvePort(config), serverConfig = config.server, { host, headers, proxy, historyApiFallback, compress, base, cors } = serverConfig, assetPrefixes = context.environmentList.map((environment)=>environment.config.output.assetPrefix);
+    context.publicPathnames = getPublicPathnames(assetPrefixes, base);
+    let protocol = serverConfig.https ? 'https' : 'http', routes = getRoutes(context), urls = await getAddressUrls({
         protocol,
         port,
         host
@@ -7791,21 +7802,14 @@ async function startPreviewServer(context, config, { getPortSilently } = {}) {
         server: previewServer,
         environments: context.environments
     });
-    let applyStaticAssetMiddleware = async ()=>{
-        let { default: sirv } = await import("./sirv.js"), assetsMiddleware = sirv(context.distPath, {
-            etag: !0,
-            dev: !0,
-            ignores: [
-                'favicon.ico'
-            ],
-            single: 'index' === serverConfig.htmlFallback
-        }), assetPrefixes = context.environmentList.map((e)=>getPathnameFromUrl(e.config.output.assetPrefix));
-        middlewares.use(function staticAssetMiddleware(req, res, next) {
-            let { url } = req, 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);
-            })) : assetsMiddleware(req, res, next);
-        });
+    let assetContext = (environmentList = context.environmentList.filter((environment)=>isWebTarget(environment.config.output.target)), {
+        ...context,
+        environmentList,
+        publicPathnames: environmentList.map((environment)=>context.publicPathnames[environment.index])
+    }), assetsMiddleware = createAssetsMiddleware(assetContext, (callback)=>callback(), node_fs), htmlMiddlewareOptions = {
+        assetsMiddleware,
+        distPaths: assetContext.environmentList.map((environment)=>environment.distPath),
+        outputFileSystem: node_fs
     };
     if (isVerbose(logger) && middlewares.use(getRequestLoggerMiddleware(logger)), cors) {
         let { default: corsMiddleware } = await import("./cors.js").then(__webpack_require__.t.bind(__webpack_require__, "../../node_modules/.pnpm/cors@2.8.6/node_modules/cors/lib/index.js", 23));
@@ -7828,8 +7832,11 @@ async function startPreviewServer(context, config, { getPortSilently } = {}) {
     }
     for (let callback of (base && '/' !== base && middlewares.use(getBaseUrlMiddleware({
         base
-    })), await applyStaticAssetMiddleware(), historyApiFallback && (middlewares.use(historyApiFallback_historyApiFallbackMiddleware(logger, !0 === historyApiFallback ? {} : historyApiFallback)), await applyStaticAssetMiddleware()), postSetupCallbacks))await callback();
-    return middlewares.use(faviconFallbackMiddleware), middlewares.use(optionsFallbackMiddleware), middlewares.use(notFoundMiddleware), new Promise((resolve)=>{
+    })), middlewares.use(assetsMiddleware), middlewares.use(getHtmlCompletionMiddleware(htmlMiddlewareOptions)), historyApiFallback && (middlewares.use(historyApiFallback_historyApiFallbackMiddleware(logger, !0 === historyApiFallback ? {} : historyApiFallback)), middlewares.use(assetsMiddleware)), postSetupCallbacks))await callback();
+    return serverConfig.htmlFallback && middlewares.use(getHtmlFallbackMiddleware({
+        ...htmlMiddlewareOptions,
+        logger
+    })), middlewares.use(faviconFallbackMiddleware), middlewares.use(optionsFallbackMiddleware), middlewares.use(notFoundMiddleware), new Promise((resolve)=>{
         httpServer.listen({
             host,
             port
@@ -8949,7 +8956,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.5/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.6/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,
@@ -9463,7 +9470,7 @@ let applyServerOptions = (command)=>{
 };
 function setupCommands() {
     let cli = ((name = "")=>new CAC(name))('rsbuild');
-    cli.version("2.0.9"), 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.11"), 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: [
@@ -9534,7 +9541,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.9\n`);
+    src_logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v2.0.11\n`);
 }
 function setupLogLevel() {
     if (cli_argv.length <= 3) return;
@@ -9556,5 +9563,5 @@ function runCLI() {
         src_logger.error('Failed to start Rsbuild CLI.'), src_logger.error(err), process.exit(1);
     }
 }
-let src_version = "2.0.9";
+let src_version = "2.0.11";
 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 };