@rsbuild/core 2.0.10 → 2.0.11

package/dist/756.js

@@ -3084,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);
 };
@@ -3483,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.10",
+        version: "2.0.11",
         rootPath,
         distPath: '',
         cachePath,
@@ -5171,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 [];
@@ -5937,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){
@@ -5988,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) {
@@ -6048,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() {
@@ -6173,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;
@@ -6338,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 = ()=>{
@@ -6990,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();
@@ -7019,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 = {
@@ -7148,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){
@@ -7179,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);
@@ -7501,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 || [])){
@@ -7590,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;
             }));
@@ -7748,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
@@ -7789,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));
@@ -7826,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
@@ -9461,7 +9470,7 @@ let applyServerOptions = (command)=>{
 };
 function setupCommands() {
     let cli = ((name = "")=>new CAC(name))('rsbuild');
-    cli.version("2.0.10"), 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: [
@@ -9532,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.10\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;
@@ -9554,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.10";
+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 };

package/dist-types/server/assets-middleware/middleware.d.ts

@@ -1,2 +1,2 @@
 import type { InternalContext, RequestHandler, Rspack } from '../../types';
-export declare function createMiddleware(context: InternalContext, ready: (callback: () => void) => void, outputFileSystem: Rspack.OutputFileSystem): RequestHandler;
+export declare function createAssetsMiddleware(context: InternalContext, ready: (callback: () => void) => void, outputFileSystem: Rspack.OutputFileSystem): RequestHandler;

package/dist-types/server/middlewares.d.ts

@@ -1,16 +1,17 @@
 import { type Logger } from '../logger';
-import type { Connect, EnvironmentAPI, RequestHandler } from '../types';
-import type { BuildManager } from './buildManager';
+import type { Connect, EnvironmentAPI, RequestHandler, Rspack } from '../types';
 export declare const faviconFallbackMiddleware: RequestHandler;
 export declare const getRequestLoggerMiddleware: (logger: Logger) => Connect.NextHandleFunction;
 export declare const notFoundMiddleware: RequestHandler;
 export declare const optionsFallbackMiddleware: RequestHandler;
+type HtmlAssetsMiddlewareOptions = {
+    distPaths: string[];
+    assetsMiddleware: RequestHandler;
+    outputFileSystem: Rspack.OutputFileSystem;
+};
 /**
  * Support access HTML without suffix
- */ export declare const getHtmlCompletionMiddleware: (params: {
-    distPath: string;
-    buildManager: BuildManager;
-}) => RequestHandler;
+ */ export declare const getHtmlCompletionMiddleware: (params: HtmlAssetsMiddlewareOptions) => RequestHandler;
 /**
  * handle `server.base`
  */ export declare const getBaseUrlMiddleware: (params: {
@@ -18,9 +19,7 @@ export declare const optionsFallbackMiddleware: RequestHandler;
 }) => RequestHandler;
 /**
  * support HTML fallback in some edge cases
- */ export declare const getHtmlFallbackMiddleware: (params: {
-    distPath: string;
-    buildManager: BuildManager;
+ */ export declare const getHtmlFallbackMiddleware: (params: HtmlAssetsMiddlewareOptions & {
     logger: Logger;
 }) => RequestHandler;
 /**
@@ -29,3 +28,4 @@ export declare const optionsFallbackMiddleware: RequestHandler;
     environments: EnvironmentAPI;
     logger: Logger;
 }) => RequestHandler;
+export { };

package/dist-types/server/publicPathnames.d.ts

@@ -0,0 +1,2 @@
+export declare const getPublicPathname: (publicPath: string) => string;
+export declare const getPublicPathnames: (publicPaths: string[], base: string) => string[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.rs",
   "bugs": {