@rsbuild/core 1.5.15 → 1.5.17

package/dist/index.cjs

@@ -3088,7 +3088,8 @@ ${section.body}` : section.body).join("\n\n"));
         });
     };
     function formatStatsError(stats, verbose) {
-        let fileName, message, fileName1 = function(stats) {
+        var fileName;
+        let message, fileName1 = function(stats) {
             let file = stats.file || stats.moduleName;
             if (file) return file;
             if (stats.moduleIdentifier) {
@@ -3107,7 +3108,7 @@ ${section.body}` : section.body).join("\n\n"));
             let rawTrace = moduleNames.reverse().map((item)=>`\n  ${item}`).join('');
             return color.dim(`Import traces (entry → error):${rawTrace}`);
         }(stats, fileName1) ?? '';
-        message = `${fileName = fileName1, /:\d+:\d+/.test(fileName) ? `File: ${color.cyan(fileName)}\n` : `File: ${color.cyan(`${fileName}:1:1`)}\n`}${mainMessage}${details}${stack}${moduleTrace}`;
+        message = `${!(fileName = fileName1) ? '' : /:\d+:\d+/.test(fileName) ? `File: ${color.cyan(fileName)}\n` : `File: ${color.cyan(`${fileName}:1:1`)}\n`}${mainMessage}${details}${stack}${moduleTrace}`;
         let innerError = '-- inner error --';
         return !verbose && message.includes(innerError) && (message = message.split(innerError)[0]), (message = (message = ((message)=>{
             let getTips = (moduleName)=>{
@@ -3340,11 +3341,11 @@ ${section.body}` : section.body).join("\n\n"));
         }
         return common.join(external_node_path_.sep);
     }
-    let getCompiledPath = (packageName)=>(0, external_node_path_.join)(COMPILED_PATH, packageName, 'index.js'), ensureAbsolutePath = (base, filePath)=>(0, external_node_path_.isAbsolute)(filePath) ? filePath : (0, external_node_path_.join)(base, filePath), getPathnameFromUrl = (publicPath)=>{
+    let getCompiledPath = (packageName)=>(0, external_node_path_.join)(COMPILED_PATH, packageName, 'index.js'), ensureAbsolutePath = (base, filePath)=>(0, external_node_path_.isAbsolute)(filePath) ? filePath : (0, external_node_path_.join)(base, filePath), getPathnameFromUrl = (url)=>{
         try {
-            return publicPath ? new URL(publicPath).pathname : publicPath;
+            return url ? new URL(url, 'http://localhost').pathname : url;
         } catch  {
-            return publicPath;
+            return url;
         }
     }, dedupeNestedPaths = (paths)=>paths.sort((p1, p2)=>p2.length > p1.length ? -1 : 1).reduce((prev, curr)=>prev.find((p)=>curr.startsWith(p) || curr === p) ? prev : prev.concat(curr), []), toPosixPath = (filepath)=>'/' === external_node_path_.sep ? filepath : filepath.replace(/\\/g, '/'), isFileSync = (filePath)=>{
         try {
@@ -3796,13 +3797,14 @@ ${section.body}` : section.body).join("\n\n"));
     async function createContext(options, userConfig) {
         let { cwd } = options, rootPath = userConfig.root ? ensureAbsolutePath(cwd, userConfig.root) : cwd, rsbuildConfig = await withDefaultConfig(rootPath, userConfig), cachePath = (0, external_node_path_.join)(rootPath, 'node_modules', '.cache'), specifiedEnvironments = options.environment && options.environment.length > 0 ? options.environment : void 0, bundlerType = userConfig.provider ? 'webpack' : 'rspack';
         return {
-            version: "1.5.15",
+            version: "1.5.17",
             rootPath,
             distPath: '',
             cachePath,
             callerName: options.callerName,
             bundlerType,
             environments: {},
+            publicPathnames: [],
             hooks: {
                 onExit: createAsyncHook(),
                 onCloseBuild: createAsyncHook(),
@@ -4395,7 +4397,7 @@ ${section.body}` : section.body).join("\n\n"));
             logger.info('build started...'), logRspackVersion();
         }), compiler.hooks.done.tap(HOOK_NAME, (statsInstance)=>{
             let stats = getRsbuildStats(statsInstance, compiler, context.action), hasErrors = statsInstance.hasErrors();
-            context.buildState.stats = stats, context.buildState.status = 'done', context.buildState.hasErrors = hasErrors;
+            context.buildState.stats = stats, context.buildState.status = 'done', context.buildState.hasErrors = hasErrors, context.socketServer?.onBuildDone();
             let printTime = (statsItem, index)=>{
                 if (statsItem.time) {
                     let time = prettyTime(statsItem.time / 1000), { name } = rspackConfigs[index], suffix = name && isMultiCompiler ? color.dim(` (${name})`) : '';
@@ -5352,10 +5354,15 @@ ${section.body}` : section.body).join("\n\n"));
             });
             if (!newUrls) return null;
             if (!Array.isArray(newUrls)) throw Error(`${color.dim('[rsbuild:config]')} "server.printUrls" must return an array, but got ${typeof newUrls}.`);
-            urls = newUrls.map((url)=>({
+            urls = newUrls.map((u)=>{
+                let { url, label } = 'string' == typeof u ? {
+                    url: u
+                } : u;
+                return {
                     url,
-                    label: getUrlLabel(url)
-                }));
+                    label: label ?? getUrlLabel(url)
+                };
+            });
         }
         if (0 === urls.length || 0 === routes.length && !useCustomUrl) return null;
         let message = function(urls, routes) {
@@ -5613,16 +5620,17 @@ ${section.body}` : section.body).join("\n\n"));
         resourceHints = [];
         type;
         HTMLCount;
-        constructor(options, type, HTMLCount){
+        isDev;
+        constructor(options, type, HTMLCount, isDev){
             this.options = {
                 ...HtmlResourceHintsPlugin_defaultOptions,
                 ...options
-            }, this.type = type, this.HTMLCount = HTMLCount;
+            }, this.type = type, this.HTMLCount = HTMLCount, this.isDev = isDev;
         }
         apply(compiler) {
             compiler.hooks.compilation.tap(this.name, (compilation)=>{
                 let pluginHooks = getHTMLPlugin().getCompilationHooks(compilation), pluginName = `HTML${upperFirst(this.type)}Plugin`;
-                pluginHooks.beforeAssetTagGeneration.tap(pluginName, (data)=>(this.resourceHints = function(options, type, compilation, data, HTMLCount) {
+                pluginHooks.beforeAssetTagGeneration.tap(pluginName, (data)=>(this.resourceHints = function(options, type, compilation, data, HTMLCount, isDev) {
                         let extractedChunks = function(compilation, includeType) {
                             let chunks = [
                                 ...compilation.chunks
@@ -5669,7 +5677,7 @@ ${section.body}` : section.body).join("\n\n"));
                                 }))).reduce((accumulated, chunk)=>accumulated.concat([
                                     ...chunk.files,
                                     ...chunk.auxiliaryFiles || []
-                                ]), []).filter((file)=>!file.endsWith('.map')))
+                                ]), []).filter((file)=>!(isDev && file.endsWith('.hot-update.js')) && !file.endsWith('.map')))
                         ], options.include, options.exclude).sort(), links = [], { publicPath, crossOriginLoading } = compilation.outputOptions;
                         for (let file of sortedFilteredFiles){
                             let href = ensureAssetPrefix(file, publicPath), attributes = {
@@ -5694,7 +5702,7 @@ ${section.body}` : section.body).join("\n\n"));
                             });
                         }
                         return links;
-                    }(this.options, this.type, compilation, data, this.HTMLCount), data)), pluginHooks.alterAssetTags.tap(pluginName, (data)=>{
+                    }(this.options, this.type, compilation, data, this.HTMLCount, this.isDev), data)), pluginHooks.alterAssetTags.tap(pluginName, (data)=>{
                     var resourceHints, scripts;
                     return this.resourceHints && (data.assetTags.styles = [
                         ...this.options.dedupe ? (resourceHints = this.resourceHints, scripts = data.assetTags.scripts, resourceHints.filter((resourceHint)=>!scripts.find((script)=>script.attributes.src === resourceHint.attributes.href))) : this.resourceHints,
@@ -5851,14 +5859,8 @@ ${section.body}` : section.body).join("\n\n"));
     }
     var on_finished = __webpack_require__("../../node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js"), on_finished_default = __webpack_require__.n(on_finished), range_parser = __webpack_require__("../../node_modules/.pnpm/range-parser@1.2.1/node_modules/range-parser/index.js"), range_parser_default = __webpack_require__.n(range_parser);
     let matchHtmlRegExp = /["'&<>]/, external_node_querystring_namespaceObject = require("node:querystring"), UP_PATH_REGEXP = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
-    async function getFileFromUrl(url, outputFileSystem, environments) {
-        let pathname;
-        try {
-            let urlObject = new URL(url, 'http://localhost');
-            urlObject.pathname && (pathname = (0, external_node_querystring_namespaceObject.unescape)(urlObject.pathname));
-        } catch  {
-            return;
-        }
+    async function getFileFromUrl(url, outputFileSystem, context) {
+        let pathname = (0, external_node_querystring_namespaceObject.unescape)(getPathnameFromUrl(url));
         if (!pathname) return;
         if (pathname.includes('\0')) return {
             errorCode: 400
@@ -5866,13 +5868,18 @@ ${section.body}` : section.body).join("\n\n"));
         if (UP_PATH_REGEXP.test(external_node_path_default().normalize(`./${pathname}`))) return {
             errorCode: 403
         };
-        let distPaths = new Set(Object.values(environments).map((env)=>env.distPath)), stat = async (filename)=>new Promise((resolve, reject)=>{
+        let stat = async (filename)=>new Promise((resolve, reject)=>{
                 outputFileSystem.stat(filename, (err, stats)=>{
                     err ? reject(err) : resolve(stats);
                 });
-            });
-        for (let distPath of distPaths){
-            let fsStats, filename = external_node_path_default().join(distPath, pathname);
+            }), { environments, publicPathnames } = context, distPaths = Object.values(environments).map((env)=>env.distPath), possibleFilenames = new Set();
+        for (let [index, distPath] of distPaths.entries()){
+            let prefix = publicPathnames[index];
+            prefix && '/' !== prefix && pathname.startsWith(prefix) && possibleFilenames.add(external_node_path_default().join(distPath, pathname.slice(prefix.length)));
+        }
+        for (let distPath of distPaths)possibleFilenames.add(external_node_path_default().join(distPath, pathname));
+        for (let filename of possibleFilenames){
+            let fsStats;
             try {
                 fsStats = await stat(filename);
             } catch  {
@@ -5944,7 +5951,7 @@ ${section.body}` : section.body).join("\n\n"));
     }), acceptedMethods = [
         'GET',
         'HEAD'
-    ], noop = ()=>{}, assets_middleware_require = (0, external_node_module_.createRequire)(__rslib_import_meta_url__), isTsError = (error)=>'message' in error && error.stack?.includes('ts-checker-rspack-plugin'), assetsMiddleware = async ({ config, compiler, context, socketServer, resolvedPort })=>{
+    ], noop = ()=>{}, assets_middleware_require = (0, external_node_module_.createRequire)(__rslib_import_meta_url__), isTsError = (error)=>'message' in error && error.stack?.includes('ts-checker-rspack-plugin'), assets_middleware_assetsMiddleware = async ({ config, compiler, context, socketServer, resolvedPort })=>{
         var config1, environments, context1, ready, outputFileSystem;
         let watching, writeToDiskValues, resolvedHost = await resolveHostname(config.server.host), { environments: environments1 } = context;
         applyToCompiler(compiler, (compiler, index)=>{
@@ -6006,7 +6013,6 @@ ${section.body}` : section.body).join("\n\n"));
                         ] : statsErrors), socketServer.sendError(statsErrors, token);
                         return;
                     }
-                    socketServer.onBuildDone(token);
                 });
             })({
                 context,
@@ -6062,7 +6068,6 @@ ${section.body}` : section.body).join("\n\n"));
         }(writeToDisk, compilers), instance = (context1 = context, ready = (callback)=>{
             'done' === context.buildState.status ? callback() : callbacks.push(callback);
         }, outputFileSystem = outputFileSystem1, async function(req, res, next) {
-            let { environments } = context1;
             async function goNext() {
                 return new Promise((resolve)=>{
                     ready(()=>{
@@ -6116,7 +6121,7 @@ ${section.body}` : section.body).join("\n\n"));
                 var stat, range, offset, filename, outputFileSystem1, start, end;
                 let bufferOrStream, byteLength, end1;
                 if (!req.url) return void await goNext();
-                let resolved = await getFileFromUrl(req.url, outputFileSystem, environments);
+                let resolved = await getFileFromUrl(req.url, outputFileSystem, context1);
                 if (!resolved) return void await goNext();
                 if ('errorCode' in resolved) {
                     403 === resolved.errorCode && logger.error(`[rsbuild:middleware] Malicious path "${req.url}".`), sendError(resolved.errorCode);
@@ -6268,7 +6273,7 @@ ${section.body}` : section.body).join("\n\n"));
         }, instance;
     };
     var UNKNOWN_FUNCTION = '<unknown>', chromeRe = /^\s*at (.*?) ?\(((?:file|https?|blob|chrome-extension|native|eval|webpack|rsc|<anonymous>|\/|[a-z]:\\|\\\\).*?)(?::(\d+))?(?::(\d+))?\)?\s*$/i, chromeEvalRe = /\((\S*)(?::(\d+))(?::(\d+))\)/, winjsRe = /^\s*at (?:((?:\[object object\])?.+) )?\(?((?:file|ms-appx|https?|webpack|rsc|blob):.*?):(\d+)(?::(\d+))?\)?\s*$/i, geckoRe = /^\s*(.*?)(?:\((.*?)\))?(?:^|@)((?:file|https?|blob|chrome|webpack|rsc|resource|\[native).*?|[^@]*bundle)(?::(\d+))?(?::(\d+))?\s*$/i, geckoEvalRe = /(\S+) line (\d+)(?: > eval line \d+)* > eval/i, javaScriptCoreRe = /^\s*(?:([^@]*)(?:\((.*?)\))?@)?(\S.*?):(\d+)(?::(\d+))?\s*$/i, nodeRe = /^\s*at (?:((?:\[object object\])?[^\\/]+(?: \[as \S+\])?) )?\(?(.*?):(\d+)(?::(\d+))?\)?\s*$/i;
-    let resolveSourceLocation = async (stack, fs, environments)=>{
+    let resolveSourceLocation = async (stack, fs, context)=>{
         let parsed = stack.split('\n').reduce(function(stack, line) {
             var line1, parts, line2, parts1, line3, parts2, parseResult = function(line) {
                 var parts = chromeRe.exec(line);
@@ -6318,7 +6323,7 @@ ${section.body}` : section.body).join("\n\n"));
         if (!parsed.length) return;
         let frame = parsed.find((frame)=>null !== frame.file && null !== frame.column && null !== frame.lineNumber && SCRIPT_REGEX.test(frame.file));
         if (!frame) return;
-        let { file, column, lineNumber } = frame, sourceMapInfo = await getFileFromUrl(`${file}.map`, fs, environments);
+        let { file, column, lineNumber } = frame, sourceMapInfo = await getFileFromUrl(`${file}.map`, fs, context);
         if (!sourceMapInfo || 'errorCode' in sourceMapInfo) return;
         let readFile = (0, external_node_util_namespaceObject.promisify)(fs.readFile);
         try {
@@ -6334,7 +6339,7 @@ ${section.body}` : section.body).join("\n\n"));
             error instanceof Error && logger.debug(`failed to map source map position: ${error.message}`);
         }
     }, formatErrorLocation = async (stack, context, fs)=>{
-        let parsed = await resolveSourceLocation(stack, fs, context.environments);
+        let parsed = await resolveSourceLocation(stack, fs, context);
         if (!parsed) return;
         let { source, line, column } = parsed;
         if (!source) return;
@@ -6420,8 +6425,8 @@ ${section.body}` : section.body).join("\n\n"));
                 this.onConnect(socket, query.token);
             });
         }
-        onBuildDone(token) {
-            this.reportedBrowserLogs.clear(), this.socketsMap.size && this.sendStats({
+        onBuildDone() {
+            if (this.reportedBrowserLogs.clear(), this.socketsMap.size) for (let token of this.socketsMap.keys())this.sendStats({
                 token
             });
         }
@@ -6681,16 +6686,15 @@ ${section.body}` : section.body).join("\n\n"));
         }
     }
     class BuildManager {
-        middleware;
+        assetsMiddleware;
         outputFileSystem;
         socketServer;
         compiler;
         config;
-        publicPaths;
         resolvedPort;
         context;
-        constructor({ config, context, compiler, publicPaths, resolvedPort }){
-            this.config = config, this.context = context, this.compiler = compiler, this.publicPaths = publicPaths, this.resolvedPort = resolvedPort, this.outputFileSystem = external_node_fs_default(), this.socketServer = new SocketServer(context, config.dev, ()=>this.outputFileSystem);
+        constructor({ config, context, compiler, resolvedPort }){
+            this.config = config, this.context = context, this.compiler = compiler, this.resolvedPort = resolvedPort, this.outputFileSystem = external_node_fs_default(), this.socketServer = new SocketServer(context, config.dev, ()=>this.outputFileSystem), this.context.socketServer = this.socketServer;
         }
         async init() {
             await this.setupCompilationMiddleware(), this.socketServer.prepare();
@@ -6698,11 +6702,11 @@ ${section.body}` : section.body).join("\n\n"));
             this.outputFileSystem = (compiler_isMultiCompiler(compiler) ? compiler.compilers[0].outputFileSystem : compiler.outputFileSystem) || external_node_fs_default();
         }
         watch() {
-            this.middleware.watch();
+            this.assetsMiddleware.watch();
         }
         async close() {
-            await this.socketServer.close(), this.middleware && await new Promise((resolve)=>{
-                this.middleware.close(()=>{
+            await this.socketServer.close(), this.assetsMiddleware && await new Promise((resolve)=>{
+                this.assetsMiddleware.close(()=>{
                     resolve();
                 });
             }), await new Promise((resolve)=>{
@@ -6713,19 +6717,14 @@ ${section.body}` : section.body).join("\n\n"));
         }
         readFileSync = (fileName)=>'readFileSync' in this.outputFileSystem ? this.outputFileSystem.readFileSync(fileName, 'utf-8') : external_node_fs_default().readFileSync(fileName, 'utf-8');
         async setupCompilationMiddleware() {
-            let { config, context, publicPaths } = this, middleware = await assetsMiddleware({
+            let { config, context } = this, middleware = await assets_middleware_assetsMiddleware({
                 config,
                 context,
                 compiler: this.compiler,
                 socketServer: this.socketServer,
                 resolvedPort: this.resolvedPort
-            }), { base } = config.server, assetPrefixes = publicPaths.map(getPathnameFromUrl).map((prefix)=>base && '/' !== base ? stripBase(prefix, base) : prefix), wrapper = (req, res, next)=>{
-                let { url } = req, assetPrefix = url && assetPrefixes.find((prefix)=>url.startsWith(prefix));
-                assetPrefix && '/' !== assetPrefix ? (req.url = url.slice(assetPrefix.length - 1), middleware(req, res, (...args)=>{
-                    req.url = url, next(...args);
-                })) : middleware(req, res, next);
-            };
-            wrapper.close = middleware.close, wrapper.watch = middleware.watch, this.middleware = wrapper;
+            });
+            this.assetsMiddleware = middleware;
         }
     }
     let isCliShortcutsEnabled = (config)=>config.dev.cliShortcuts && isTTY('stdin');
@@ -7304,18 +7303,18 @@ ${section.body}` : section.body).join("\n\n"));
         let startCompile = async ()=>{
             let compiler = customCompiler || await createCompiler();
             if (!compiler) throw Error(`${color.dim('[rsbuild:server]')} Failed to get compiler instance.`);
-            compiler?.hooks.watchRun.tap('rsbuild:watchRun', ()=>{
+            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', ()=>{
                 lastStats && (waitLastCompileDoneResolve && (waitLastCompileDoneResolve(), waitLastCompileDoneResolve = null), waitLastCompileDone = new Promise((resolve)=>{
                     waitLastCompileDoneResolve = resolve;
                 }));
             });
-            let publicPaths = compiler_isMultiCompiler(compiler) ? compiler.compilers.map(getPublicPathFromCompiler) : [
-                getPublicPathFromCompiler(compiler)
-            ], buildManager = new BuildManager({
+            let buildManager = new BuildManager({
                 context,
                 config,
                 compiler,
-                publicPaths: publicPaths,
                 resolvedPort: port
             });
             return await buildManager.init(), buildManager;
@@ -7544,12 +7543,12 @@ ${section.body}` : section.body).join("\n\n"));
                         }
                     })({
                     environments: devServerAPI.environments
-                })), buildManager && (middlewares.push(buildManager.middleware), upgradeEvents.push(buildManager.socketServer.upgrade), middlewares.push((req, res, next)=>{
+                })), buildManager && (middlewares.push(buildManager.assetsMiddleware), upgradeEvents.push(buildManager.socketServer.upgrade), middlewares.push((req, res, next)=>{
                     req.url?.endsWith('.hot-update.json') && 'OPTIONS' !== req.method ? (res.statusCode = 404, res.end()) : next();
                 })), buildManager && middlewares.push((({ distPath, buildManager })=>async (req, res, next)=>{
                         if (!maybeHTMLRequest(req)) return void next();
                         let pathname = req.url.replace(postfixRE, ''), rewrite = (newUrl)=>{
-                            req.url = newUrl, buildManager.middleware(req, res, (...args)=>{
+                            req.url = newUrl, buildManager.assetsMiddleware(req, res, (...args)=>{
                                 next(...args);
                             });
                         };
@@ -7565,11 +7564,11 @@ ${section.body}` : section.body).join("\n\n"));
                     buildManager,
                     distPath: context.distPath
                 })), normalizePublicDirs(server?.publicDir))){
-                    let sirv = requireCompiledPackage('sirv'), { name } = publicDir, assetMiddleware = sirv((0, external_node_path_.isAbsolute)(name) ? name : (0, external_node_path_.join)(pwd, name), {
+                    let sirv = requireCompiledPackage('sirv'), { name } = publicDir, servePublicDirMiddleware = sirv((0, external_node_path_.isAbsolute)(name) ? name : (0, external_node_path_.join)(pwd, name), {
                         etag: !0,
                         dev: !0
                     });
-                    middlewares.push(assetMiddleware);
+                    middlewares.push(servePublicDirMiddleware);
                 }
                 for (let callback of postCallbacks)callback();
                 return buildManager && middlewares.push((({ htmlFallback, distPath, buildManager })=>async (req, res, next)=>{
@@ -7577,7 +7576,7 @@ ${section.body}` : section.body).join("\n\n"));
                         let filePath = external_node_path_default().join(distPath, 'index.html');
                         if (await middlewares_isFileExists(filePath, buildManager.outputFileSystem)) {
                             let newUrl = '/index.html';
-                            'verbose' === logger.level && logger.debug(`    ${req.method} ${req.url} ${color.yellow('fallback to')} ${newUrl}`), req.url = newUrl, buildManager.middleware(req, res, (...args)=>{
+                            'verbose' === logger.level && logger.debug(`    ${req.method} ${req.url} ${color.yellow('fallback to')} ${newUrl}`), req.url = newUrl, buildManager.assetsMiddleware(req, res, (...args)=>{
                                 next(...args);
                             });
                             return;
@@ -7587,7 +7586,7 @@ ${section.body}` : section.body).join("\n\n"));
                     buildManager,
                     distPath: context.distPath,
                     htmlFallback: server.htmlFallback
-                })), server.historyApiFallback && (middlewares.push(historyApiFallbackMiddleware(!0 === server.historyApiFallback ? {} : server.historyApiFallback)), buildManager?.middleware && middlewares.push(buildManager.middleware)), middlewares.push(faviconFallbackMiddleware), {
+                })), server.historyApiFallback && (middlewares.push(historyApiFallbackMiddleware(!0 === server.historyApiFallback ? {} : server.historyApiFallback)), buildManager?.assetsMiddleware && middlewares.push(buildManager.assetsMiddleware)), middlewares.push(faviconFallbackMiddleware), {
                     onUpgrade: (...args)=>{
                         for (let cb of upgradeEvents)cb(...args);
                     }
@@ -7714,7 +7713,7 @@ ${section.body}` : section.body).join("\n\n"));
             })), this.applyStaticAssetMiddleware(), historyApiFallback && (this.middlewares.use(historyApiFallbackMiddleware(!0 === historyApiFallback ? {} : historyApiFallback)), this.applyStaticAssetMiddleware()), this.middlewares.use(faviconFallbackMiddleware), this.middlewares.use(optionsFallbackMiddleware), this.middlewares.use(notFoundMiddleware);
         }
         applyStaticAssetMiddleware() {
-            let { output: { path, assetPrefixes }, serverConfig: { htmlFallback } } = this.options, assetMiddleware = requireCompiledPackage('sirv')(path, {
+            let { output: { path, assetPrefixes }, serverConfig: { htmlFallback } } = this.options, assetsMiddleware = requireCompiledPackage('sirv')(path, {
                 etag: !0,
                 dev: !0,
                 ignores: [
@@ -7724,9 +7723,9 @@ ${section.body}` : section.body).join("\n\n"));
             });
             this.middlewares.use((req, res, next)=>{
                 let url = req.url, assetPrefix = url && assetPrefixes.find((prefix)=>url.startsWith(prefix));
-                assetPrefix && url?.startsWith(assetPrefix) ? (req.url = url.slice(assetPrefix.length), assetMiddleware(req, res, (...args)=>{
+                assetPrefix && url?.startsWith(assetPrefix) ? (req.url = url.slice(assetPrefix.length), assetsMiddleware(req, res, (...args)=>{
                     req.url = url, next(...args);
-                })) : assetMiddleware(req, res, next);
+                })) : assetsMiddleware(req, res, next);
             });
         }
         async close() {}
@@ -9261,7 +9260,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                             headTags,
                             bodyTags
                         };
-                    }), api.modifyBundlerChain((chain, { CHAIN_ID, environment })=>{
+                    }), api.modifyBundlerChain((chain, { CHAIN_ID, environment, isDev })=>{
                         let { config, htmlPaths } = environment;
                         if (0 === Object.keys(htmlPaths).length) return;
                         let { performance: { preload, prefetch } } = config, HTMLCount = chain.entryPoints.values().length, excludes = ((config)=>{
@@ -9279,7 +9278,8 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                             ] : excludes), chain.plugin(CHAIN_ID.PLUGIN.HTML_PREFETCH).use(HtmlResourceHintsPlugin, [
                                 options,
                                 'prefetch',
-                                HTMLCount
+                                HTMLCount,
+                                isDev
                             ]);
                         }
                         if (preload) {
@@ -9290,7 +9290,8 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                             ] : excludes), chain.plugin(CHAIN_ID.PLUGIN.HTML_PRELOAD).use(HtmlResourceHintsPlugin, [
                                 options,
                                 'preload',
-                                HTMLCount
+                                HTMLCount,
+                                isDev
                             ]);
                         }
                     });
@@ -9873,11 +9874,11 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
         }
         !function() {
             let { npm_execpath, npm_lifecycle_event, NODE_RUN_SCRIPT_NAME } = process.env, isBun = npm_execpath?.includes('.bun');
-            logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v1.5.15\n`);
+            logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v1.5.17\n`);
         }();
         try {
             let cli, devDescription, devCommand, buildCommand, previewCommand, inspectCommand;
-            (cli = ((name = "")=>new CAC(name))('rsbuild')).version("1.5.15"), 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 = ((name = "")=>new CAC(name))('rsbuild')).version("1.5.17"), 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: 'jiti'
             }).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: [
@@ -9934,7 +9935,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
             logger.error('Failed to start Rsbuild CLI.'), logger.error(err);
         }
     }
-    let src_version = "1.5.15";
+    let src_version = "1.5.17";
 })(), exports.PLUGIN_CSS_NAME = __webpack_exports__.PLUGIN_CSS_NAME, exports.PLUGIN_SWC_NAME = __webpack_exports__.PLUGIN_SWC_NAME, exports.createRsbuild = __webpack_exports__.createRsbuild, exports.defaultAllowedOrigins = __webpack_exports__.defaultAllowedOrigins, exports.defineConfig = __webpack_exports__.defineConfig, exports.ensureAssetPrefix = __webpack_exports__.ensureAssetPrefix, exports.loadConfig = __webpack_exports__.loadConfig, exports.loadEnv = __webpack_exports__.loadEnv, exports.logger = __webpack_exports__.logger, exports.mergeRsbuildConfig = __webpack_exports__.mergeRsbuildConfig, exports.rspack = __webpack_exports__.rspack, exports.runCLI = __webpack_exports__.runCLI, exports.version = __webpack_exports__.version, __webpack_exports__)-1 === [
     "PLUGIN_CSS_NAME",
     "PLUGIN_SWC_NAME",

package/dist/index.js

@@ -2996,7 +2996,7 @@ function formatStatsError(stats, verbose) {
         let rawTrace = moduleNames.reverse().map((item)=>`\n  ${item}`).join('');
         return color.dim(`Import traces (entry → error):${rawTrace}`);
     }(stats, fileName) ?? '';
-    message = `${/:\d+:\d+/.test(fileName) ? `File: ${color.cyan(fileName)}\n` : `File: ${color.cyan(`${fileName}:1:1`)}\n`}${mainMessage}${details}${stack}${moduleTrace}`;
+    message = `${!fileName ? '' : /:\d+:\d+/.test(fileName) ? `File: ${color.cyan(fileName)}\n` : `File: ${color.cyan(`${fileName}:1:1`)}\n`}${mainMessage}${details}${stack}${moduleTrace}`;
     let innerError = '-- inner error --';
     return !verbose && message.includes(innerError) && (message = message.split(innerError)[0]), (message = (message = ((message)=>{
         let getTips = (moduleName)=>{
@@ -3226,11 +3226,11 @@ function getCommonParentPath(paths) {
     }
     return common.join(external_node_path_.sep);
 }
-let getCompiledPath = (packageName)=>(0, external_node_path_.join)(COMPILED_PATH, packageName, 'index.js'), ensureAbsolutePath = (base, filePath)=>(0, external_node_path_.isAbsolute)(filePath) ? filePath : (0, external_node_path_.join)(base, filePath), getPathnameFromUrl = (publicPath)=>{
+let getCompiledPath = (packageName)=>(0, external_node_path_.join)(COMPILED_PATH, packageName, 'index.js'), ensureAbsolutePath = (base, filePath)=>(0, external_node_path_.isAbsolute)(filePath) ? filePath : (0, external_node_path_.join)(base, filePath), getPathnameFromUrl = (url)=>{
     try {
-        return publicPath ? new URL(publicPath).pathname : publicPath;
+        return url ? new URL(url, 'http://localhost').pathname : url;
     } catch  {
-        return publicPath;
+        return url;
     }
 }, dedupeNestedPaths = (paths)=>paths.sort((p1, p2)=>p2.length > p1.length ? -1 : 1).reduce((prev, curr)=>prev.find((p)=>curr.startsWith(p) || curr === p) ? prev : prev.concat(curr), []), toPosixPath = (filepath)=>'/' === external_node_path_.sep ? filepath : filepath.replace(/\\/g, '/'), isFileSync = (filePath)=>{
     try {
@@ -3678,13 +3678,14 @@ async function updateEnvironmentContext(context, configs) {
 async function createContext(options, userConfig) {
     let { cwd } = options, rootPath = userConfig.root ? ensureAbsolutePath(cwd, userConfig.root) : cwd, rsbuildConfig = await withDefaultConfig(rootPath, userConfig), cachePath = (0, external_node_path_.join)(rootPath, 'node_modules', '.cache'), specifiedEnvironments = options.environment && options.environment.length > 0 ? options.environment : void 0, bundlerType = userConfig.provider ? 'webpack' : 'rspack';
     return {
-        version: "1.5.15",
+        version: "1.5.17",
         rootPath,
         distPath: '',
         cachePath,
         callerName: options.callerName,
         bundlerType,
         environments: {},
+        publicPathnames: [],
         hooks: {
             onExit: createAsyncHook(),
             onCloseBuild: createAsyncHook(),
@@ -4271,7 +4272,7 @@ async function createCompiler_createCompiler(options) {
         logger.info('build started...'), logRspackVersion();
     }), compiler.hooks.done.tap(HOOK_NAME, (statsInstance)=>{
         let stats = getRsbuildStats(statsInstance, compiler, context.action), hasErrors = statsInstance.hasErrors();
-        context.buildState.stats = stats, context.buildState.status = 'done', context.buildState.hasErrors = hasErrors;
+        context.buildState.stats = stats, context.buildState.status = 'done', context.buildState.hasErrors = hasErrors, context.socketServer?.onBuildDone();
         let printTime = (statsItem, index)=>{
             if (statsItem.time) {
                 let time = prettyTime(statsItem.time / 1000), { name } = rspackConfigs[index], suffix = name && isMultiCompiler ? color.dim(` (${name})`) : '';
@@ -5222,10 +5223,15 @@ function printServerURLs({ urls: originalUrls, port, routes, protocol, printUrls
         });
         if (!newUrls) return null;
         if (!Array.isArray(newUrls)) throw Error(`${color.dim('[rsbuild:config]')} "server.printUrls" must return an array, but got ${typeof newUrls}.`);
-        urls = newUrls.map((url)=>({
+        urls = newUrls.map((u)=>{
+            let { url, label } = 'string' == typeof u ? {
+                url: u
+            } : u;
+            return {
                 url,
-                label: getUrlLabel(url)
-            }));
+                label: label ?? getUrlLabel(url)
+            };
+        });
     }
     if (0 === urls.length || 0 === routes.length && !useCustomUrl) return null;
     let message = function(urls, routes) {
@@ -5482,16 +5488,17 @@ class HtmlResourceHintsPlugin {
     resourceHints = [];
     type;
     HTMLCount;
-    constructor(options, type, HTMLCount){
+    isDev;
+    constructor(options, type, HTMLCount, isDev){
         this.options = {
             ...HtmlResourceHintsPlugin_defaultOptions,
             ...options
-        }, this.type = type, this.HTMLCount = HTMLCount;
+        }, this.type = type, this.HTMLCount = HTMLCount, this.isDev = isDev;
     }
     apply(compiler) {
         compiler.hooks.compilation.tap(this.name, (compilation)=>{
             let pluginHooks = getHTMLPlugin().getCompilationHooks(compilation), pluginName = `HTML${upperFirst(this.type)}Plugin`;
-            pluginHooks.beforeAssetTagGeneration.tap(pluginName, (data)=>(this.resourceHints = function(options, type, compilation, data, HTMLCount) {
+            pluginHooks.beforeAssetTagGeneration.tap(pluginName, (data)=>(this.resourceHints = function(options, type, compilation, data, HTMLCount, isDev) {
                     let extractedChunks = function(compilation, includeType) {
                         let chunks = [
                             ...compilation.chunks
@@ -5538,7 +5545,7 @@ class HtmlResourceHintsPlugin {
                             }))).reduce((accumulated, chunk)=>accumulated.concat([
                                 ...chunk.files,
                                 ...chunk.auxiliaryFiles || []
-                            ]), []).filter((file)=>!file.endsWith('.map')))
+                            ]), []).filter((file)=>!(isDev && file.endsWith('.hot-update.js')) && !file.endsWith('.map')))
                     ], options.include, options.exclude).sort(), links = [], { publicPath, crossOriginLoading } = compilation.outputOptions;
                     for (let file of sortedFilteredFiles){
                         let href = ensureAssetPrefix(file, publicPath), attributes = {
@@ -5563,7 +5570,7 @@ class HtmlResourceHintsPlugin {
                         });
                     }
                     return links;
-                }(this.options, this.type, compilation, data, this.HTMLCount), data)), pluginHooks.alterAssetTags.tap(pluginName, (data)=>{
+                }(this.options, this.type, compilation, data, this.HTMLCount, this.isDev), data)), pluginHooks.alterAssetTags.tap(pluginName, (data)=>{
                 var resourceHints, scripts;
                 return this.resourceHints && (data.assetTags.styles = [
                     ...this.options.dedupe ? (resourceHints = this.resourceHints, scripts = data.assetTags.scripts, resourceHints.filter((resourceHint)=>!scripts.find((script)=>script.attributes.src === resourceHint.attributes.href))) : this.resourceHints,
@@ -5717,14 +5724,8 @@ async function resolveHostname(host = 'localhost') {
 }
 var on_finished = __webpack_require__("../../node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js"), on_finished_default = __webpack_require__.n(on_finished), range_parser = __webpack_require__("../../node_modules/.pnpm/range-parser@1.2.1/node_modules/range-parser/index.js"), range_parser_default = __webpack_require__.n(range_parser);
 let matchHtmlRegExp = /["'&<>]/, UP_PATH_REGEXP = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
-async function getFileFromUrl(url, outputFileSystem, environments) {
-    let pathname;
-    try {
-        let urlObject = new URL(url, 'http://localhost');
-        urlObject.pathname && (pathname = external_node_querystring_unescape(urlObject.pathname));
-    } catch  {
-        return;
-    }
+async function getFileFromUrl(url, outputFileSystem, context) {
+    let pathname = external_node_querystring_unescape(getPathnameFromUrl(url));
     if (!pathname) return;
     if (pathname.includes('\0')) return {
         errorCode: 400
@@ -5732,13 +5733,18 @@ async function getFileFromUrl(url, outputFileSystem, environments) {
     if (UP_PATH_REGEXP.test(external_node_path_.default.normalize(`./${pathname}`))) return {
         errorCode: 403
     };
-    let distPaths = new Set(Object.values(environments).map((env)=>env.distPath)), stat = async (filename)=>new Promise((resolve, reject)=>{
+    let stat = async (filename)=>new Promise((resolve, reject)=>{
             outputFileSystem.stat(filename, (err, stats)=>{
                 err ? reject(err) : resolve(stats);
             });
-        });
-    for (let distPath of distPaths){
-        let fsStats, filename = external_node_path_.default.join(distPath, pathname);
+        }), { environments, publicPathnames } = context, distPaths = Object.values(environments).map((env)=>env.distPath), possibleFilenames = new Set();
+    for (let [index, distPath] of distPaths.entries()){
+        let prefix = publicPathnames[index];
+        prefix && '/' !== prefix && pathname.startsWith(prefix) && possibleFilenames.add(external_node_path_.default.join(distPath, pathname.slice(prefix.length)));
+    }
+    for (let distPath of distPaths)possibleFilenames.add(external_node_path_.default.join(distPath, pathname));
+    for (let filename of possibleFilenames){
+        let fsStats;
         try {
             fsStats = await stat(filename);
         } catch  {
@@ -5810,7 +5816,7 @@ let CACHE_CONTROL_NO_CACHE_REGEXP = /(?:^|,)\s*?no-cache\s*?(?:,|$)/, statuses =
 }), acceptedMethods = [
     'GET',
     'HEAD'
-], noop = ()=>{}, assets_middleware_require = (0, external_node_module_.createRequire)(import.meta.url), isTsError = (error)=>'message' in error && error.stack?.includes('ts-checker-rspack-plugin'), assetsMiddleware = async ({ config, compiler, context, socketServer, resolvedPort })=>{
+], noop = ()=>{}, assets_middleware_require = (0, external_node_module_.createRequire)(import.meta.url), isTsError = (error)=>'message' in error && error.stack?.includes('ts-checker-rspack-plugin'), assets_middleware_assetsMiddleware = async ({ config, compiler, context, socketServer, resolvedPort })=>{
     var config1, ready;
     let watching, writeToDiskValues, resolvedHost = await resolveHostname(config.server.host), { environments } = context;
     applyToCompiler(compiler, (compiler, index)=>{
@@ -5872,7 +5878,6 @@ let CACHE_CONTROL_NO_CACHE_REGEXP = /(?:^|,)\s*?no-cache\s*?(?:,|$)/, statuses =
                     ] : statsErrors), socketServer.sendError(statsErrors, token);
                     return;
                 }
-                socketServer.onBuildDone(token);
             });
         })({
             context,
@@ -5928,7 +5933,6 @@ let CACHE_CONTROL_NO_CACHE_REGEXP = /(?:^|,)\s*?no-cache\s*?(?:,|$)/, statuses =
     }(writeToDisk, compilers), instance = (ready = (callback)=>{
         'done' === context.buildState.status ? callback() : callbacks.push(callback);
     }, async function(req, res, next) {
-        let { environments } = context;
         async function goNext() {
             return new Promise((resolve)=>{
                 ready(()=>{
@@ -5982,7 +5986,7 @@ let CACHE_CONTROL_NO_CACHE_REGEXP = /(?:^|,)\s*?no-cache\s*?(?:,|$)/, statuses =
             var range, offset;
             let bufferOrStream, byteLength, end;
             if (!req.url) return void await goNext();
-            let resolved = await getFileFromUrl(req.url, outputFileSystem, environments);
+            let resolved = await getFileFromUrl(req.url, outputFileSystem, context);
             if (!resolved) return void await goNext();
             if ('errorCode' in resolved) {
                 403 === resolved.errorCode && logger.error(`[rsbuild:middleware] Malicious path "${req.url}".`), sendError(resolved.errorCode);
@@ -6130,7 +6134,7 @@ let CACHE_CONTROL_NO_CACHE_REGEXP = /(?:^|,)\s*?no-cache\s*?(?:,|$)/, statuses =
     }, instance;
 };
 var UNKNOWN_FUNCTION = '<unknown>', chromeRe = /^\s*at (.*?) ?\(((?:file|https?|blob|chrome-extension|native|eval|webpack|rsc|<anonymous>|\/|[a-z]:\\|\\\\).*?)(?::(\d+))?(?::(\d+))?\)?\s*$/i, chromeEvalRe = /\((\S*)(?::(\d+))(?::(\d+))\)/, winjsRe = /^\s*at (?:((?:\[object object\])?.+) )?\(?((?:file|ms-appx|https?|webpack|rsc|blob):.*?):(\d+)(?::(\d+))?\)?\s*$/i, geckoRe = /^\s*(.*?)(?:\((.*?)\))?(?:^|@)((?:file|https?|blob|chrome|webpack|rsc|resource|\[native).*?|[^@]*bundle)(?::(\d+))?(?::(\d+))?\s*$/i, geckoEvalRe = /(\S+) line (\d+)(?: > eval line \d+)* > eval/i, javaScriptCoreRe = /^\s*(?:([^@]*)(?:\((.*?)\))?@)?(\S.*?):(\d+)(?::(\d+))?\s*$/i, nodeRe = /^\s*at (?:((?:\[object object\])?[^\\/]+(?: \[as \S+\])?) )?\(?(.*?):(\d+)(?::(\d+))?\)?\s*$/i;
-let resolveSourceLocation = async (stack, fs, environments)=>{
+let resolveSourceLocation = async (stack, fs, context)=>{
     let parsed = stack.split('\n').reduce(function(stack, line) {
         var line1, parts, line2, parts1, line3, parts2, parseResult = function(line) {
             var parts = chromeRe.exec(line);
@@ -6180,7 +6184,7 @@ let resolveSourceLocation = async (stack, fs, environments)=>{
     if (!parsed.length) return;
     let frame = parsed.find((frame)=>null !== frame.file && null !== frame.column && null !== frame.lineNumber && SCRIPT_REGEX.test(frame.file));
     if (!frame) return;
-    let { file, column, lineNumber } = frame, sourceMapInfo = await getFileFromUrl(`${file}.map`, fs, environments);
+    let { file, column, lineNumber } = frame, sourceMapInfo = await getFileFromUrl(`${file}.map`, fs, context);
     if (!sourceMapInfo || 'errorCode' in sourceMapInfo) return;
     let readFile = external_node_util_promisify(fs.readFile);
     try {
@@ -6196,7 +6200,7 @@ let resolveSourceLocation = async (stack, fs, environments)=>{
         error instanceof Error && logger.debug(`failed to map source map position: ${error.message}`);
     }
 }, formatErrorLocation = async (stack, context, fs)=>{
-    let parsed = await resolveSourceLocation(stack, fs, context.environments);
+    let parsed = await resolveSourceLocation(stack, fs, context);
     if (!parsed) return;
     let { source, line, column } = parsed;
     if (!source) return;
@@ -6282,8 +6286,8 @@ class SocketServer {
             this.onConnect(socket, query.token);
         });
     }
-    onBuildDone(token) {
-        this.reportedBrowserLogs.clear(), this.socketsMap.size && this.sendStats({
+    onBuildDone() {
+        if (this.reportedBrowserLogs.clear(), this.socketsMap.size) for (let token of this.socketsMap.keys())this.sendStats({
             token
         });
     }
@@ -6541,16 +6545,15 @@ class SocketServer {
     }
 }
 class BuildManager {
-    middleware;
+    assetsMiddleware;
     outputFileSystem;
     socketServer;
     compiler;
     config;
-    publicPaths;
     resolvedPort;
     context;
-    constructor({ config, context, compiler, publicPaths, resolvedPort }){
-        this.config = config, this.context = context, this.compiler = compiler, this.publicPaths = publicPaths, this.resolvedPort = resolvedPort, this.outputFileSystem = node_fs, this.socketServer = new SocketServer(context, config.dev, ()=>this.outputFileSystem);
+    constructor({ config, context, compiler, resolvedPort }){
+        this.config = config, this.context = context, this.compiler = compiler, this.resolvedPort = resolvedPort, this.outputFileSystem = node_fs, this.socketServer = new SocketServer(context, config.dev, ()=>this.outputFileSystem), this.context.socketServer = this.socketServer;
     }
     async init() {
         await this.setupCompilationMiddleware(), this.socketServer.prepare();
@@ -6558,11 +6561,11 @@ class BuildManager {
         this.outputFileSystem = (compiler_isMultiCompiler(compiler) ? compiler.compilers[0].outputFileSystem : compiler.outputFileSystem) || node_fs;
     }
     watch() {
-        this.middleware.watch();
+        this.assetsMiddleware.watch();
     }
     async close() {
-        await this.socketServer.close(), this.middleware && await new Promise((resolve)=>{
-            this.middleware.close(()=>{
+        await this.socketServer.close(), this.assetsMiddleware && await new Promise((resolve)=>{
+            this.assetsMiddleware.close(()=>{
                 resolve();
             });
         }), await new Promise((resolve)=>{
@@ -6573,19 +6576,14 @@ class BuildManager {
     }
     readFileSync = (fileName)=>'readFileSync' in this.outputFileSystem ? this.outputFileSystem.readFileSync(fileName, 'utf-8') : node_fs.readFileSync(fileName, 'utf-8');
     async setupCompilationMiddleware() {
-        let { config, context, publicPaths } = this, middleware = await assetsMiddleware({
+        let { config, context } = this, middleware = await assets_middleware_assetsMiddleware({
             config,
             context,
             compiler: this.compiler,
             socketServer: this.socketServer,
             resolvedPort: this.resolvedPort
-        }), { base } = config.server, assetPrefixes = publicPaths.map(getPathnameFromUrl).map((prefix)=>base && '/' !== base ? stripBase(prefix, base) : prefix), wrapper = (req, res, next)=>{
-            let { url } = req, assetPrefix = url && assetPrefixes.find((prefix)=>url.startsWith(prefix));
-            assetPrefix && '/' !== assetPrefix ? (req.url = url.slice(assetPrefix.length - 1), middleware(req, res, (...args)=>{
-                req.url = url, next(...args);
-            })) : middleware(req, res, next);
-        };
-        wrapper.close = middleware.close, wrapper.watch = middleware.watch, this.middleware = wrapper;
+        });
+        this.assetsMiddleware = middleware;
     }
 }
 let isCliShortcutsEnabled = (config)=>config.dev.cliShortcuts && isTTY('stdin');
@@ -7159,18 +7157,18 @@ async function devServer_createDevServer(options, createCompiler, config, { comp
     let startCompile = async ()=>{
         let compiler = customCompiler || await createCompiler();
         if (!compiler) throw Error(`${color.dim('[rsbuild:server]')} Failed to get compiler instance.`);
-        compiler?.hooks.watchRun.tap('rsbuild:watchRun', ()=>{
+        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', ()=>{
             lastStats && (waitLastCompileDoneResolve && (waitLastCompileDoneResolve(), waitLastCompileDoneResolve = null), waitLastCompileDone = new Promise((resolve)=>{
                 waitLastCompileDoneResolve = resolve;
             }));
         });
-        let publicPaths = compiler_isMultiCompiler(compiler) ? compiler.compilers.map(getPublicPathFromCompiler) : [
-            getPublicPathFromCompiler(compiler)
-        ], buildManager = new BuildManager({
+        let buildManager = new BuildManager({
             context,
             config,
             compiler,
-            publicPaths: publicPaths,
             resolvedPort: port
         });
         return await buildManager.init(), buildManager;
@@ -7399,12 +7397,12 @@ async function devServer_createDevServer(options, createCompiler, config, { comp
                     }
                 })({
                 environments: devServerAPI.environments
-            })), buildManager && (middlewares.push(buildManager.middleware), upgradeEvents.push(buildManager.socketServer.upgrade), middlewares.push((req, res, next)=>{
+            })), buildManager && (middlewares.push(buildManager.assetsMiddleware), upgradeEvents.push(buildManager.socketServer.upgrade), middlewares.push((req, res, next)=>{
                 req.url?.endsWith('.hot-update.json') && 'OPTIONS' !== req.method ? (res.statusCode = 404, res.end()) : next();
             })), buildManager && middlewares.push((({ distPath, buildManager })=>async (req, res, next)=>{
                     if (!maybeHTMLRequest(req)) return void next();
                     let pathname = req.url.replace(postfixRE, ''), rewrite = (newUrl)=>{
-                        req.url = newUrl, buildManager.middleware(req, res, (...args)=>{
+                        req.url = newUrl, buildManager.assetsMiddleware(req, res, (...args)=>{
                             next(...args);
                         });
                     };
@@ -7420,11 +7418,11 @@ async function devServer_createDevServer(options, createCompiler, config, { comp
                 buildManager,
                 distPath: context.distPath
             })), normalizePublicDirs(server?.publicDir))){
-                let sirv = requireCompiledPackage('sirv'), { name } = publicDir, assetMiddleware = sirv((0, external_node_path_.isAbsolute)(name) ? name : (0, external_node_path_.join)(pwd, name), {
+                let sirv = requireCompiledPackage('sirv'), { name } = publicDir, servePublicDirMiddleware = sirv((0, external_node_path_.isAbsolute)(name) ? name : (0, external_node_path_.join)(pwd, name), {
                     etag: !0,
                     dev: !0
                 });
-                middlewares.push(assetMiddleware);
+                middlewares.push(servePublicDirMiddleware);
             }
             for (let callback of postCallbacks)callback();
             return buildManager && middlewares.push((({ htmlFallback, distPath, buildManager })=>async (req, res, next)=>{
@@ -7432,7 +7430,7 @@ async function devServer_createDevServer(options, createCompiler, config, { comp
                     let filePath = external_node_path_.default.join(distPath, 'index.html');
                     if (await middlewares_isFileExists(filePath, buildManager.outputFileSystem)) {
                         let newUrl = '/index.html';
-                        'verbose' === logger.level && logger.debug(`    ${req.method} ${req.url} ${color.yellow('fallback to')} ${newUrl}`), req.url = newUrl, buildManager.middleware(req, res, (...args)=>{
+                        'verbose' === logger.level && logger.debug(`    ${req.method} ${req.url} ${color.yellow('fallback to')} ${newUrl}`), req.url = newUrl, buildManager.assetsMiddleware(req, res, (...args)=>{
                             next(...args);
                         });
                         return;
@@ -7442,7 +7440,7 @@ async function devServer_createDevServer(options, createCompiler, config, { comp
                 buildManager,
                 distPath: context.distPath,
                 htmlFallback: server.htmlFallback
-            })), server.historyApiFallback && (middlewares.push(historyApiFallbackMiddleware(!0 === server.historyApiFallback ? {} : server.historyApiFallback)), buildManager?.middleware && middlewares.push(buildManager.middleware)), middlewares.push(faviconFallbackMiddleware), {
+            })), server.historyApiFallback && (middlewares.push(historyApiFallbackMiddleware(!0 === server.historyApiFallback ? {} : server.historyApiFallback)), buildManager?.assetsMiddleware && middlewares.push(buildManager.assetsMiddleware)), middlewares.push(faviconFallbackMiddleware), {
                 onUpgrade: (...args)=>{
                     for (let cb of upgradeEvents)cb(...args);
                 }
@@ -7569,7 +7567,7 @@ class RsbuildProdServer {
         })), this.applyStaticAssetMiddleware(), historyApiFallback && (this.middlewares.use(historyApiFallbackMiddleware(!0 === historyApiFallback ? {} : historyApiFallback)), this.applyStaticAssetMiddleware()), this.middlewares.use(faviconFallbackMiddleware), this.middlewares.use(optionsFallbackMiddleware), this.middlewares.use(notFoundMiddleware);
     }
     applyStaticAssetMiddleware() {
-        let { output: { path, assetPrefixes }, serverConfig: { htmlFallback } } = this.options, assetMiddleware = requireCompiledPackage('sirv')(path, {
+        let { output: { path, assetPrefixes }, serverConfig: { htmlFallback } } = this.options, assetsMiddleware = requireCompiledPackage('sirv')(path, {
             etag: !0,
             dev: !0,
             ignores: [
@@ -7579,9 +7577,9 @@ class RsbuildProdServer {
         });
         this.middlewares.use((req, res, next)=>{
             let url = req.url, assetPrefix = url && assetPrefixes.find((prefix)=>url.startsWith(prefix));
-            assetPrefix && url?.startsWith(assetPrefix) ? (req.url = url.slice(assetPrefix.length), assetMiddleware(req, res, (...args)=>{
+            assetPrefix && url?.startsWith(assetPrefix) ? (req.url = url.slice(assetPrefix.length), assetsMiddleware(req, res, (...args)=>{
                 req.url = url, next(...args);
-            })) : assetMiddleware(req, res, next);
+            })) : assetsMiddleware(req, res, next);
         });
     }
     async close() {}
@@ -9109,7 +9107,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                         headTags,
                         bodyTags
                     };
-                }), api.modifyBundlerChain((chain, { CHAIN_ID, environment })=>{
+                }), api.modifyBundlerChain((chain, { CHAIN_ID, environment, isDev })=>{
                     let { config, htmlPaths } = environment;
                     if (0 === Object.keys(htmlPaths).length) return;
                     let { performance: { preload, prefetch } } = config, HTMLCount = chain.entryPoints.values().length, excludes = ((config)=>{
@@ -9127,7 +9125,8 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                         ] : excludes), chain.plugin(CHAIN_ID.PLUGIN.HTML_PREFETCH).use(HtmlResourceHintsPlugin, [
                             options,
                             'prefetch',
-                            HTMLCount
+                            HTMLCount,
+                            isDev
                         ]);
                     }
                     if (preload) {
@@ -9138,7 +9137,8 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                         ] : excludes), chain.plugin(CHAIN_ID.PLUGIN.HTML_PRELOAD).use(HtmlResourceHintsPlugin, [
                             options,
                             'preload',
-                            HTMLCount
+                            HTMLCount,
+                            isDev
                         ]);
                     }
                 });
@@ -9720,11 +9720,11 @@ function runCLI() {
     }
     !function() {
         let { npm_execpath, npm_lifecycle_event, NODE_RUN_SCRIPT_NAME } = process.env, isBun = npm_execpath?.includes('.bun');
-        logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v1.5.15\n`);
+        logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v1.5.17\n`);
     }();
     try {
         let cli, devDescription, devCommand, buildCommand, previewCommand, inspectCommand;
-        (cli = ((name = "")=>new CAC(name))('rsbuild')).version("1.5.15"), 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 = ((name = "")=>new CAC(name))('rsbuild')).version("1.5.17"), 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: 'jiti'
         }).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: [
@@ -9781,5 +9781,5 @@ function runCLI() {
         logger.error('Failed to start Rsbuild CLI.'), logger.error(err);
     }
 }
-let src_version = "1.5.15";
+let src_version = "1.5.17";
 export { PLUGIN_CSS_NAME, PLUGIN_SWC_NAME, createRsbuild, defaultAllowedOrigins, defineConfig, ensureAssetPrefix, loadConfig_loadConfig as loadConfig, loadEnv, logger, mergeRsbuildConfig, rspack_rspack as rspack, runCLI, src_version as version };

package/dist-types/helpers/path.d.ts

@@ -8,7 +8,7 @@ export declare const getCompiledPath: (packageName: string) => string;
  * @returns Resolved absolute file path.
  */
 export declare const ensureAbsolutePath: (base: string, filePath: string) => string;
-export declare const getPathnameFromUrl: (publicPath: string) => string;
+export declare const getPathnameFromUrl: (url: string) => string;
 /** dedupe and remove nested paths */
 export declare const dedupeNestedPaths: (paths: string[]) => string[];
 /**

package/dist-types/rspack-plugins/resource-hints/HtmlResourceHintsPlugin.d.ts

@@ -24,7 +24,8 @@ export declare class HtmlResourceHintsPlugin implements RspackPluginInstance {
     resourceHints: HtmlRspackPlugin.HtmlTagObject[];
     type: LinkType;
     HTMLCount: number;
-    constructor(options: ResourceHintsOptions, type: LinkType, HTMLCount: number);
+    isDev: boolean;
+    constructor(options: ResourceHintsOptions, type: LinkType, HTMLCount: number, isDev: boolean);
     apply(compiler: Compiler): void;
 }
 export {};

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

@@ -1,7 +1,11 @@
 import type { Stats as FSStats } from 'node:fs';
-import type { EnvironmentContext } from '../../types';
+import type { InternalContext } from '../../types';
 import type { OutputFileSystem } from './index';
-export declare function getFileFromUrl(url: string, outputFileSystem: OutputFileSystem, environments: Record<string, EnvironmentContext>): Promise<{
+/**
+ * Resolves URL to file path with security checks and retrieves file from
+ * the build output directories.
+ */
+export declare function getFileFromUrl(url: string, outputFileSystem: OutputFileSystem, context: InternalContext): Promise<{
     filename: string;
     fsStats: FSStats;
 } | {

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

@@ -5,7 +5,6 @@ type Options = {
     context: InternalContext;
     config: NormalizedConfig;
     compiler: Rspack.Compiler | Rspack.MultiCompiler;
-    publicPaths: string[];
     resolvedPort: number;
 };
 /**
@@ -14,15 +13,14 @@ type Options = {
  * 2. establish webSocket connect
  */
 export declare class BuildManager {
-    middleware: AssetsMiddleware;
+    assetsMiddleware: AssetsMiddleware;
     outputFileSystem: Rspack.OutputFileSystem;
     socketServer: SocketServer;
     compiler: Rspack.Compiler | Rspack.MultiCompiler;
     private config;
-    private publicPaths;
     private resolvedPort;
     private context;
-    constructor({ config, context, compiler, publicPaths, resolvedPort, }: Options);
+    constructor({ config, context, compiler, resolvedPort }: Options);
     init(): Promise<void>;
     /**
      * Call `compiler.watch()` to start compiling.

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

@@ -49,7 +49,7 @@ export declare class SocketServer {
     private checkSockets;
     private clearHeartbeatTimer;
     prepare(): void;
-    onBuildDone(token: string): void;
+    onBuildDone(): void;
     /**
      * Send error messages to the client and render error overlay
      */

package/dist-types/types/config.d.ts

@@ -277,7 +277,10 @@ export type PrintUrls = boolean | ((params: {
     port: number;
     routes: Routes;
     protocol: string;
-}) => string[] | void);
+}) => (string | {
+    url: string;
+    label?: string;
+})[] | void);
 export type PublicDirOptions = {
     /**
      * The name of the public directory, can be set as a relative path or an absolute path.

package/dist-types/types/context.d.ts

@@ -1,4 +1,5 @@
 import type { Hooks } from '../hooks';
+import type { SocketServer } from '../server/socketServer';
 import type { NormalizedConfig, RsbuildConfig } from './config';
 import type { EnvironmentContext } from './hooks';
 import type { RsbuildPluginAPI } from './plugin';
@@ -95,4 +96,11 @@ export type InternalContext = RsbuildContext & {
     specifiedEnvironments?: string[];
     /** Build state information */
     buildState: BuildState;
+    /** The socket server instance. */
+    socketServer?: SocketServer;
+    /**
+     * Pathnames derived from public paths, stripped of `server.base`.
+     * Used for static asset serving.
+     */
+    publicPathnames: string[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "1.5.15",
+  "version": "1.5.17",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.rs",
   "bugs": {
@@ -49,7 +49,7 @@
     "@rspack/core": "1.5.8",
     "@rspack/lite-tapable": "~1.0.1",
     "@swc/helpers": "^0.5.17",
-    "core-js": "~3.45.1",
+    "core-js": "~3.46.0",
     "jiti": "^2.6.1"
   },
   "devDependencies": {