@rsbuild/core 1.4.12 → 1.4.13

package/dist/index.cjs

@@ -1200,7 +1200,7 @@ __webpack_require__.n = (module)=>{
 var __webpack_exports__ = {};
 for(var __webpack_i__ in (()=>{
     "use strict";
-    let swcHelpersPath, pluginHelper_htmlPlugin, cssExtractPlugin, isDockerCached, cachedResult;
+    let swcHelpersPath, pluginHelper_htmlPlugin, cssExtractPlugin, isDockerCached, cachedResult, hmrClientPath, overlayClientPath;
     __webpack_require__.r(__webpack_exports__), __webpack_require__.d(__webpack_exports__, {
         PLUGIN_CSS_NAME: ()=>PLUGIN_CSS_NAME,
         createRsbuild: ()=>createRsbuild,
@@ -3039,7 +3039,8 @@ ${section.body}` : section.body).join("\n\n"));
                     wasm: 'static/wasm',
                     image: 'static/image',
                     media: 'static/media',
-                    assets: 'static/assets'
+                    assets: 'static/assets',
+                    favicon: './'
                 },
                 assetPrefix: DEFAULT_ASSET_PREFIX,
                 filename: {},
@@ -3322,7 +3323,7 @@ ${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_namespaceObject.join)(rootPath, 'node_modules', '.cache'), specifiedEnvironments = options.environment && options.environment.length > 0 ? options.environment : void 0, bundlerType = userConfig.provider ? 'webpack' : 'rspack';
         return {
-            version: "1.4.12",
+            version: "1.4.13",
             rootPath,
             distPath: '',
             cachePath,
@@ -3684,6 +3685,14 @@ ${section.body}` : section.body).join("\n\n"));
         }
         return config.devServer && index_js_namespaceObject.logger.warn(`${picocolors_index_js_default().dim('[rsbuild:config]')} Find invalid Rspack config: "${picocolors_index_js_default().yellow('devServer')}". Note that Rspack's "devServer" config is not supported by Rsbuild. You can use Rsbuild's "dev" config to configure the Rsbuild dev server.`), rspackConfig;
     }
+    let allowedEnvironmentDevKeys = [
+        'hmr',
+        'liveReload',
+        'writeToDisk',
+        'assetPrefix',
+        'progressBar',
+        'lazyCompilation'
+    ];
     async function modifyRsbuildConfig(context) {
         var _context_config_plugins, _modified_plugins;
         index_js_namespaceObject.logger.debug('modify Rsbuild config');
@@ -3750,13 +3759,7 @@ ${section.body}` : section.body).join("\n\n"));
                         applyEnvironmentDefaultConfig({
                             ...mergeRsbuildConfig({
                                 ...rsbuildSharedConfig,
-                                dev: pick(dev, [
-                                    'writeToDisk',
-                                    'hmr',
-                                    'assetPrefix',
-                                    'progressBar',
-                                    'lazyCompilation'
-                                ])
+                                dev: pick(dev, allowedEnvironmentDevKeys)
                             }, config)
                         })
                     ]));
@@ -3768,24 +3771,18 @@ ${section.body}` : section.body).join("\n\n"));
             return {
                 [defaultEnvironmentName]: applyEnvironmentDefaultConfig({
                     ...rsbuildSharedConfig,
-                    dev: pick(dev, [
-                        'hmr',
-                        'assetPrefix',
-                        'progressBar',
-                        'lazyCompilation',
-                        'writeToDisk'
-                    ])
+                    dev: pick(dev, allowedEnvironmentDevKeys)
                 })
             };
-        })(normalizedBaseConfig, context.rootPath, context.specifiedEnvironments), { dev: { hmr: _hmr, assetPrefix: _assetPrefix, progressBar: _progressBar, lazyCompilation: _lazyCompilation, writeToDisk: _writeToDisk, ...rsbuildSharedDev }, server } = normalizedBaseConfig, tsconfigPaths = new Set();
+        })(normalizedBaseConfig, context.rootPath, context.specifiedEnvironments), tsconfigPaths = new Set();
         for (let [name, config] of Object.entries(mergedEnvironments)){
             let environmentConfig = await modifyEnvironmentConfig(context, config, name), normalizedEnvironmentConfig = {
                 ...environmentConfig,
                 dev: {
-                    ...environmentConfig.dev,
-                    ...rsbuildSharedDev
+                    ...normalizedBaseConfig.dev,
+                    ...environmentConfig.dev
                 },
-                server
+                server: normalizedBaseConfig.server
             }, { tsconfigPath } = normalizedEnvironmentConfig.source;
             if (tsconfigPath) {
                 let absoluteTsconfigPath = ensureAbsolutePath(context.rootPath, tsconfigPath);
@@ -4311,22 +4308,26 @@ ${section.body}` : section.body).join("\n\n"));
             }));
     class RsbuildHtmlPlugin {
         apply(compiler) {
-            let emitFavicon = async (compilation, favicon)=>{
+            let emitFavicon = async ({ compilation, favicon, faviconDistPath })=>{
                 let buffer, name = external_node_path_default().basename(favicon);
                 if (compilation.assets[name]) return name;
                 if (!compilation.inputFileSystem) return addCompilationError(compilation, `${picocolors_index_js_default().dim('[rsbuild:html]')} Failed to read the favicon file as ${picocolors_index_js_default().yellow('compilation.inputFileSystem')} is not available.`), null;
-                let filename = external_node_path_default().isAbsolute(favicon) ? favicon : external_node_path_default().join(compilation.compiler.context, favicon);
+                let inputFilename = external_node_path_default().isAbsolute(favicon) ? favicon : external_node_path_default().join(compilation.compiler.context, favicon);
                 try {
-                    if (!(buffer = await (0, external_node_util_namespaceObject.promisify)(compilation.inputFileSystem.readFile)(filename))) throw Error('Buffer is undefined');
+                    if (!(buffer = await (0, external_node_util_namespaceObject.promisify)(compilation.inputFileSystem.readFile)(inputFilename))) throw Error('Buffer is undefined');
                 } catch (error) {
-                    return index_js_namespaceObject.logger.debug(`read favicon error: ${error}`), addCompilationError(compilation, `${picocolors_index_js_default().dim('[rsbuild:html]')} Failed to read the favicon file at ${picocolors_index_js_default().yellow(filename)}.`), null;
+                    return index_js_namespaceObject.logger.debug(`read favicon error: ${error}`), addCompilationError(compilation, `${picocolors_index_js_default().dim('[rsbuild:html]')} Failed to read the favicon file at ${picocolors_index_js_default().yellow(inputFilename)}.`), null;
                 }
-                let source = new compiler.webpack.sources.RawSource(buffer, !1);
-                return compilation.emitAsset(name, source), name;
-            }, addFavicon = async (headTags, favicon, compilation, publicPath)=>{
+                let source = new compiler.webpack.sources.RawSource(buffer, !1), outputFilename = external_node_path_default().posix.join(faviconDistPath, name);
+                return compilation.emitAsset(outputFilename, source), outputFilename;
+            }, addFavicon = async ({ headTags, favicon, faviconDistPath, compilation, publicPath })=>{
                 let href = favicon;
                 if (!isURL(favicon)) {
-                    let name = await emitFavicon(compilation, favicon);
+                    let name = await emitFavicon({
+                        compilation,
+                        favicon,
+                        faviconDistPath
+                    });
                     if (null === name) return;
                     href = ensureAssetPrefix(name, publicPath);
                 }
@@ -4350,7 +4351,7 @@ ${section.body}` : section.body).join("\n\n"));
                 hooks.alterAssetTagGroups.tapPromise(this.name, async (data)=>{
                     let html, extraData = getExtraDataByPlugin(data.plugin);
                     if (!extraData) return data;
-                    let { headTags, bodyTags } = data, { favicon, context, tagConfig, entryName, environment, templateContent } = extraData;
+                    let { headTags, bodyTags } = data, { favicon, faviconDistPath, context, tagConfig, entryName, environment, templateContent } = extraData;
                     if (!((html = templateContent) && /<title/i.test(html) && /<\/title/i.test(html))) {
                         var _data_plugin_options;
                         ((headTags, title = '')=>{
@@ -4363,7 +4364,13 @@ ${section.body}` : section.body).join("\n\n"));
                             });
                         })(headTags, null == (_data_plugin_options = data.plugin.options) ? void 0 : _data_plugin_options.title);
                     }
-                    favicon && await addFavicon(headTags, favicon, compilation, data.publicPath);
+                    favicon && await addFavicon({
+                        headTags,
+                        favicon,
+                        faviconDistPath,
+                        compilation,
+                        publicPath: data.publicPath
+                    });
                     let tags = {
                         headTags: headTags.map(formatBasicTag),
                         bodyTags: bodyTags.map(formatBasicTag)
@@ -5443,16 +5450,23 @@ ${section.body}` : section.body).join("\n\n"));
             port: serverConfig.port
         };
     }
-    let getCompilationMiddleware = async (compiler, options)=>{
-        let { default: rsbuildDevMiddleware } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "../../compiled/rsbuild-dev-middleware/index.js")), { clientPaths, callbacks, devConfig, serverConfig } = options, resolvedClientConfig = await getResolvedClientConfig(devConfig.client, serverConfig);
+    let compilationMiddleware_require = (0, external_node_module_namespaceObject.createRequire)(__rslib_import_meta_url__), getCompilationMiddleware = async (compiler, options)=>{
+        let { default: rsbuildDevMiddleware } = await Promise.resolve().then(__webpack_require__.bind(__webpack_require__, "../../compiled/rsbuild-dev-middleware/index.js")), { callbacks, devConfig, serverConfig } = options, resolvedClientConfig = await getResolvedClientConfig(devConfig.client, serverConfig);
         return applyToCompiler(compiler, (compiler, index)=>{
-            var _Object_values_find;
-            let token = null == (_Object_values_find = Object.values(options.environments).find((env)=>env.index === index)) ? void 0 : _Object_values_find.webSocketToken;
-            token && (clientPaths && function({ compiler, clientPaths, devConfig, resolvedClientConfig, token }) {
-                if (((compiler)=>{
+            let environment = Object.values(options.environments).find((env)=>env.index === index);
+            if (!environment) return;
+            let token = environment.webSocketToken;
+            token && (!function({ config, compiler, devConfig, resolvedClientConfig, token }) {
+                if (!((compiler)=>{
                     let { target } = compiler.options;
                     return !!target && (Array.isArray(target) ? target.includes('web') : 'web' === target);
-                })(compiler)) for (let clientPath of (new compiler.webpack.DefinePlugin({
+                })(compiler)) return;
+                let clientPaths = function(devConfig) {
+                    var _devConfig_client;
+                    let clientPaths = [];
+                    return (devConfig.hmr || devConfig.liveReload) && (hmrClientPath || (hmrClientPath = compilationMiddleware_require.resolve('@rsbuild/core/client/hmr')), clientPaths.push(hmrClientPath), (null == (_devConfig_client = devConfig.client) ? void 0 : _devConfig_client.overlay) && (overlayClientPath || (overlayClientPath = compilationMiddleware_require.resolve('@rsbuild/core/client/overlay')), clientPaths.push(overlayClientPath))), clientPaths;
+                }(config.dev);
+                if (clientPaths.length) for (let clientPath of (new compiler.webpack.DefinePlugin({
                     RSBUILD_WEB_SOCKET_TOKEN: JSON.stringify(token),
                     RSBUILD_CLIENT_CONFIG: JSON.stringify(devConfig.client),
                     RSBUILD_RESOLVED_CLIENT_CONFIG: JSON.stringify(resolvedClientConfig),
@@ -5462,10 +5476,10 @@ ${section.body}` : section.body).join("\n\n"));
                 }).apply(compiler);
             }({
                 compiler,
-                clientPaths,
                 devConfig,
                 resolvedClientConfig,
-                token
+                token,
+                config: environment.config
             }), (({ compiler, token, callbacks: { onDone, onInvalid } })=>{
                 if (((compiler)=>{
                     let { target } = compiler.options;
@@ -5563,9 +5577,6 @@ ${section.body}` : section.body).join("\n\n"));
                 socket && this.send(socket, messageStr);
             } else for (let socket of this.sockets.values())this.send(socket, messageStr);
         }
-        singleWrite(socket, message) {
-            this.send(socket, JSON.stringify(message));
-        }
         async close() {
             for (let socket of (this.clearHeartbeatTimer(), this.wsServer.removeAllListeners(), this.wsServer.clients))socket.terminate();
             for (let socket of this.sockets.values())socket.close();
@@ -5580,8 +5591,6 @@ ${section.body}` : section.body).join("\n\n"));
                 socket.isAlive = !0;
             }), this.sockets.set(token, socket), socket.on('close', ()=>{
                 this.sockets.delete(token);
-            }), (this.options.hmr || this.options.liveReload) && this.singleWrite(socket, {
-                type: 'hot'
             }), this.stats && this.sendStats({
                 force: !0,
                 token
@@ -5627,7 +5636,7 @@ ${section.body}` : section.body).join("\n\n"));
             if (!force && statsJson && !statsJson.errorsCount && statsJson.assets && statsJson.assets.every((asset)=>!asset.emitted)) return void this.sockWrite({
                 type: 'ok'
             }, token);
-            if (this.sockWrite({
+            if (statsJson.hash && this.sockWrite({
                 type: 'hash',
                 data: statsJson.hash
             }, token), statsJson.errorsCount) {
@@ -5839,7 +5848,6 @@ ${section.body}` : section.body).join("\n\n"));
             writable: !0
         }) : obj[key] = value, obj;
     }
-    let compilationManager_require = (0, external_node_module_namespaceObject.createRequire)(__rslib_import_meta_url__);
     class CompilationManager {
         async init() {
             await this.setupCompilationMiddleware(), await this.socketServer.prepare();
@@ -5861,25 +5869,17 @@ ${section.body}` : section.body).join("\n\n"));
             });
         }
         async setupCompilationMiddleware() {
-            let { devConfig, serverConfig, publicPaths, environments } = this, clientPaths = function(devConfig) {
-                var _devConfig_client;
-                let clientPaths = [];
-                return (devConfig.hmr || devConfig.liveReload) && (clientPaths.push(compilationManager_require.resolve('@rsbuild/core/client/hmr')), (null == (_devConfig_client = devConfig.client) ? void 0 : _devConfig_client.overlay) && clientPaths.push(compilationManager_require.resolve('@rsbuild/core/client/overlay'))), clientPaths;
-            }(devConfig), middleware = await getCompilationMiddleware(this.compiler, {
+            let { devConfig, serverConfig, publicPaths, environments } = this, middleware = await getCompilationMiddleware(this.compiler, {
                 callbacks: {
                     onInvalid: (token, fileName)=>{
                         if ('string' == typeof fileName && fileName.endsWith('.html')) return void this.socketServer.sockWrite({
                             type: 'static-changed'
                         }, token);
-                        this.socketServer.sockWrite({
-                            type: 'invalid'
-                        }, token);
                     },
                     onDone: (token, stats)=>{
                         this.socketServer.updateStats(stats, token);
                     }
                 },
-                clientPaths,
                 devConfig,
                 serverConfig,
                 environments
@@ -6256,12 +6256,12 @@ ${section.body}` : section.body).join("\n\n"));
                 'default',
                 ...Object.keys(something)
             ])
-        ], m = new SyntheticModule(exports1, ()=>{
-            for (let name of exports1)m.setExport(name, 'default' === name ? something : something[name]);
+        ], syntheticModule = new SyntheticModule(exports1, ()=>{
+            for (let name of exports1)syntheticModule.setExport(name, 'default' === name ? something : something[name]);
         }, {
             context
         });
-        return unlinked || (await m.link(()=>{}), m.instantiate && m.instantiate(), await m.evaluate()), m;
+        return unlinked || (await syntheticModule.link(()=>{}), await syntheticModule.evaluate()), syntheticModule;
     };
     function basic_define_property(obj, key, value) {
         return key in obj ? Object.defineProperty(obj, key, {
@@ -6427,7 +6427,7 @@ ${section.body}` : section.body).join("\n\n"));
                 }), esmCache.set(file.path, esm)), context.esmMode === type_EsmMode.Unlinked) ? esm : (async ()=>{
                     if (await esm.link(async (specifier, referencingModule)=>asModule(await _require(external_node_path_default().dirname(referencingModule.identifier ? referencingModule.identifier.slice(esmIdentifier.length + 1) : (0, external_node_url_namespaceObject.fileURLToPath)(referencingModule.url)), specifier, {
                             esmMode: type_EsmMode.Unlinked
-                        }), referencingModule.context, !0)), esm.instantiate && esm.instantiate(), await esm.evaluate(), context.esmMode === type_EsmMode.Evaluated) return esm;
+                        }), referencingModule.context, !0)), await esm.evaluate(), context.esmMode === type_EsmMode.Evaluated) return esm;
                     let ns = esm.namespace;
                     return ns.default && ns.default instanceof Promise ? ns.default : ns;
                 })();
@@ -7373,7 +7373,8 @@ ${section.body}` : section.body).join("\n\n"));
                             let extraData = {
                                 entryName,
                                 context: context1,
-                                environment
+                                environment,
+                                faviconDistPath: config.output.distPath.favicon
                             };
                             extraDataMap.set(entryName, extraData), templateContent && (extraData.templateContent = templateContent);
                             let tagConfig = ((config)=>{
@@ -9034,11 +9035,11 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
             ].includes(level) && (index_js_namespaceObject.logger.level = level);
         }
         let { npm_execpath } = process.env;
-        (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && index_js_namespaceObject.logger.log(), index_js_namespaceObject.logger.greet(`  Rsbuild v1.4.12\n`);
+        (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && index_js_namespaceObject.logger.log(), index_js_namespaceObject.logger.greet(`  Rsbuild v1.4.13\n`);
         try {
             !function() {
                 let cli = ((name = "")=>new CAC(name))('rsbuild');
-                cli.help(), cli.version("1.4.12"), cli.option('--base <base>', 'specify the base path of the server').option('-c, --config <config>', 'specify the configuration file, can be a relative or absolute path').option('--config-loader <loader>', 'specify the loader to load the config file, can be `jiti` or `native`', {
+                cli.help(), cli.version("1.4.13"), cli.option('--base <base>', 'specify the base path of the server').option('-c, --config <config>', 'specify the configuration file, can be a relative or absolute path').option('--config-loader <loader>', 'specify the loader to load the config file, can be `jiti` or `native`', {
                     default: 'jiti'
                 }).option('-r, --root <root>', 'specify the project root directory, can be an absolute path or a path relative to cwd').option('-m, --mode <mode>', 'specify the build mode, can be `development`, `production` or `none`').option('--log-level <level>', 'specify the log level, can be `info`, `warn`, `error` or `silent`').option('--env-mode <mode>', 'specify the env mode to load the `.env.[mode]` file').option('--environment <name>', 'specify the name of environment to build', {
                     type: [
@@ -9096,7 +9097,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
             index_js_namespaceObject.logger.error('Failed to start Rsbuild CLI.'), index_js_namespaceObject.logger.error(err);
         }
     }
-    let src_version = "1.4.12";
+    let src_version = "1.4.13";
 })(), 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

@@ -1,5 +1,5 @@
 /*! For license information please see index.js.LICENSE.txt */
-let swcHelpersPath, pluginHelper_htmlPlugin, cssExtractPlugin, isDockerCached, cachedResult;
+let swcHelpersPath, pluginHelper_htmlPlugin, cssExtractPlugin, isDockerCached, cachedResult, hmrClientPath, overlayClientPath;
 import { createRequire } from "node:module";
 import { logger } from "../compiled/rslog/index.js";
 import node_path, { dirname, isAbsolute as external_node_path_isAbsolute, join, posix, relative, sep } from "node:path";
@@ -2846,7 +2846,8 @@ let configCache = {}, OVERRIDE_PATHS = [
                 wasm: 'static/wasm',
                 image: 'static/image',
                 media: 'static/media',
-                assets: 'static/assets'
+                assets: 'static/assets',
+                favicon: './'
             },
             assetPrefix: DEFAULT_ASSET_PREFIX,
             filename: {},
@@ -3125,7 +3126,7 @@ 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 = join(rootPath, 'node_modules', '.cache'), specifiedEnvironments = options.environment && options.environment.length > 0 ? options.environment : void 0, bundlerType = userConfig.provider ? 'webpack' : 'rspack';
     return {
-        version: "1.4.12",
+        version: "1.4.13",
         rootPath,
         distPath: '',
         cachePath,
@@ -3483,6 +3484,14 @@ async function generateRspackConfig({ target, context, environment }) {
     }
     return config.devServer && logger.warn(`${picocolors.dim('[rsbuild:config]')} Find invalid Rspack config: "${picocolors.yellow('devServer')}". Note that Rspack's "devServer" config is not supported by Rsbuild. You can use Rsbuild's "dev" config to configure the Rsbuild dev server.`), rspackConfig;
 }
+let allowedEnvironmentDevKeys = [
+    'hmr',
+    'liveReload',
+    'writeToDisk',
+    'assetPrefix',
+    'progressBar',
+    'lazyCompilation'
+];
 async function modifyRsbuildConfig(context) {
     var _context_config_plugins, _modified_plugins;
     logger.debug('modify Rsbuild config');
@@ -3549,13 +3558,7 @@ async function initRsbuildConfig({ context, pluginManager }) {
                     applyEnvironmentDefaultConfig({
                         ...mergeRsbuildConfig({
                             ...rsbuildSharedConfig,
-                            dev: pick(dev, [
-                                'writeToDisk',
-                                'hmr',
-                                'assetPrefix',
-                                'progressBar',
-                                'lazyCompilation'
-                            ])
+                            dev: pick(dev, allowedEnvironmentDevKeys)
                         }, config)
                     })
                 ]));
@@ -3567,24 +3570,18 @@ async function initRsbuildConfig({ context, pluginManager }) {
         return {
             [defaultEnvironmentName]: applyEnvironmentDefaultConfig({
                 ...rsbuildSharedConfig,
-                dev: pick(dev, [
-                    'hmr',
-                    'assetPrefix',
-                    'progressBar',
-                    'lazyCompilation',
-                    'writeToDisk'
-                ])
+                dev: pick(dev, allowedEnvironmentDevKeys)
             })
         };
-    })(normalizedBaseConfig, context.rootPath, context.specifiedEnvironments), { dev: { hmr: _hmr, assetPrefix: _assetPrefix, progressBar: _progressBar, lazyCompilation: _lazyCompilation, writeToDisk: _writeToDisk, ...rsbuildSharedDev }, server } = normalizedBaseConfig, tsconfigPaths = new Set();
+    })(normalizedBaseConfig, context.rootPath, context.specifiedEnvironments), tsconfigPaths = new Set();
     for (let [name, config] of Object.entries(mergedEnvironments)){
         let environmentConfig = await modifyEnvironmentConfig(context, config, name), normalizedEnvironmentConfig = {
             ...environmentConfig,
             dev: {
-                ...environmentConfig.dev,
-                ...rsbuildSharedDev
+                ...normalizedBaseConfig.dev,
+                ...environmentConfig.dev
             },
-            server
+            server: normalizedBaseConfig.server
         }, { tsconfigPath } = normalizedEnvironmentConfig.source;
         if (tsconfigPath) {
             let absoluteTsconfigPath = ensureAbsolutePath(context.rootPath, tsconfigPath);
@@ -4107,22 +4104,26 @@ let entryNameSymbol = Symbol('entryName'), VOID_TAGS = [
         }));
 class RsbuildHtmlPlugin {
     apply(compiler) {
-        let emitFavicon = async (compilation, favicon)=>{
+        let emitFavicon = async ({ compilation, favicon, faviconDistPath })=>{
             let buffer, name = node_path.basename(favicon);
             if (compilation.assets[name]) return name;
             if (!compilation.inputFileSystem) return addCompilationError(compilation, `${picocolors.dim('[rsbuild:html]')} Failed to read the favicon file as ${picocolors.yellow('compilation.inputFileSystem')} is not available.`), null;
-            let filename = node_path.isAbsolute(favicon) ? favicon : node_path.join(compilation.compiler.context, favicon);
+            let inputFilename = node_path.isAbsolute(favicon) ? favicon : node_path.join(compilation.compiler.context, favicon);
             try {
-                if (!(buffer = await external_node_util_promisify(compilation.inputFileSystem.readFile)(filename))) throw Error('Buffer is undefined');
+                if (!(buffer = await external_node_util_promisify(compilation.inputFileSystem.readFile)(inputFilename))) throw Error('Buffer is undefined');
             } catch (error) {
-                return logger.debug(`read favicon error: ${error}`), addCompilationError(compilation, `${picocolors.dim('[rsbuild:html]')} Failed to read the favicon file at ${picocolors.yellow(filename)}.`), null;
+                return logger.debug(`read favicon error: ${error}`), addCompilationError(compilation, `${picocolors.dim('[rsbuild:html]')} Failed to read the favicon file at ${picocolors.yellow(inputFilename)}.`), null;
             }
-            let source = new compiler.webpack.sources.RawSource(buffer, !1);
-            return compilation.emitAsset(name, source), name;
-        }, addFavicon = async (headTags, favicon, compilation, publicPath)=>{
+            let source = new compiler.webpack.sources.RawSource(buffer, !1), outputFilename = node_path.posix.join(faviconDistPath, name);
+            return compilation.emitAsset(outputFilename, source), outputFilename;
+        }, addFavicon = async ({ headTags, favicon, faviconDistPath, compilation, publicPath })=>{
             let href = favicon;
             if (!isURL(favicon)) {
-                let name = await emitFavicon(compilation, favicon);
+                let name = await emitFavicon({
+                    compilation,
+                    favicon,
+                    faviconDistPath
+                });
                 if (null === name) return;
                 href = ensureAssetPrefix(name, publicPath);
             }
@@ -4146,7 +4147,7 @@ class RsbuildHtmlPlugin {
             hooks.alterAssetTagGroups.tapPromise(this.name, async (data)=>{
                 let extraData = getExtraDataByPlugin(data.plugin);
                 if (!extraData) return data;
-                let { headTags, bodyTags } = data, { favicon, context, tagConfig, entryName, environment, templateContent } = extraData;
+                let { headTags, bodyTags } = data, { favicon, faviconDistPath, context, tagConfig, entryName, environment, templateContent } = extraData;
                 if (!(templateContent && /<title/i.test(templateContent) && /<\/title/i.test(templateContent))) {
                     var _data_plugin_options;
                     ((headTags, title = '')=>{
@@ -4159,7 +4160,13 @@ class RsbuildHtmlPlugin {
                         });
                     })(headTags, null == (_data_plugin_options = data.plugin.options) ? void 0 : _data_plugin_options.title);
                 }
-                favicon && await addFavicon(headTags, favicon, compilation, data.publicPath);
+                favicon && await addFavicon({
+                    headTags,
+                    favicon,
+                    faviconDistPath,
+                    compilation,
+                    publicPath: data.publicPath
+                });
                 let tags = {
                     headTags: headTags.map(formatBasicTag),
                     bodyTags: bodyTags.map(formatBasicTag)
@@ -5234,16 +5241,23 @@ async function getResolvedClientConfig(clientConfig, serverConfig) {
         port: serverConfig.port
     };
 }
-let getCompilationMiddleware = async (compiler, options)=>{
-    let { default: rsbuildDevMiddleware } = await import("../compiled/rsbuild-dev-middleware/index.js"), { clientPaths, callbacks, devConfig, serverConfig } = options, resolvedClientConfig = await getResolvedClientConfig(devConfig.client, serverConfig);
+let compilationMiddleware_require = createRequire(import.meta.url), getCompilationMiddleware = async (compiler, options)=>{
+    let { default: rsbuildDevMiddleware } = await import("../compiled/rsbuild-dev-middleware/index.js"), { callbacks, devConfig, serverConfig } = options, resolvedClientConfig = await getResolvedClientConfig(devConfig.client, serverConfig);
     return applyToCompiler(compiler, (compiler, index)=>{
-        var _Object_values_find;
-        let token = null == (_Object_values_find = Object.values(options.environments).find((env)=>env.index === index)) ? void 0 : _Object_values_find.webSocketToken;
-        token && (clientPaths && function({ compiler, clientPaths, devConfig, resolvedClientConfig, token }) {
-            if (((compiler)=>{
+        let environment = Object.values(options.environments).find((env)=>env.index === index);
+        if (!environment) return;
+        let token = environment.webSocketToken;
+        token && (!function({ config, compiler, devConfig, resolvedClientConfig, token }) {
+            if (!((compiler)=>{
                 let { target } = compiler.options;
                 return !!target && (Array.isArray(target) ? target.includes('web') : 'web' === target);
-            })(compiler)) for (let clientPath of (new compiler.webpack.DefinePlugin({
+            })(compiler)) return;
+            let clientPaths = function(devConfig) {
+                var _devConfig_client;
+                let clientPaths = [];
+                return (devConfig.hmr || devConfig.liveReload) && (hmrClientPath || (hmrClientPath = compilationMiddleware_require.resolve('@rsbuild/core/client/hmr')), clientPaths.push(hmrClientPath), (null == (_devConfig_client = devConfig.client) ? void 0 : _devConfig_client.overlay) && (overlayClientPath || (overlayClientPath = compilationMiddleware_require.resolve('@rsbuild/core/client/overlay')), clientPaths.push(overlayClientPath))), clientPaths;
+            }(config.dev);
+            if (clientPaths.length) for (let clientPath of (new compiler.webpack.DefinePlugin({
                 RSBUILD_WEB_SOCKET_TOKEN: JSON.stringify(token),
                 RSBUILD_CLIENT_CONFIG: JSON.stringify(devConfig.client),
                 RSBUILD_RESOLVED_CLIENT_CONFIG: JSON.stringify(resolvedClientConfig),
@@ -5253,10 +5267,10 @@ let getCompilationMiddleware = async (compiler, options)=>{
             }).apply(compiler);
         }({
             compiler,
-            clientPaths,
             devConfig,
             resolvedClientConfig,
-            token
+            token,
+            config: environment.config
         }), (({ compiler, token, callbacks: { onDone, onInvalid } })=>{
             if (((compiler)=>{
                 let { target } = compiler.options;
@@ -5354,9 +5368,6 @@ class SocketServer {
             socket && this.send(socket, messageStr);
         } else for (let socket of this.sockets.values())this.send(socket, messageStr);
     }
-    singleWrite(socket, message) {
-        this.send(socket, JSON.stringify(message));
-    }
     async close() {
         for (let socket of (this.clearHeartbeatTimer(), this.wsServer.removeAllListeners(), this.wsServer.clients))socket.terminate();
         for (let socket of this.sockets.values())socket.close();
@@ -5371,8 +5382,6 @@ class SocketServer {
             socket.isAlive = !0;
         }), this.sockets.set(token, socket), socket.on('close', ()=>{
             this.sockets.delete(token);
-        }), (this.options.hmr || this.options.liveReload) && this.singleWrite(socket, {
-            type: 'hot'
         }), this.stats && this.sendStats({
             force: !0,
             token
@@ -5417,7 +5426,7 @@ class SocketServer {
         if (!force && statsJson && !statsJson.errorsCount && statsJson.assets && statsJson.assets.every((asset)=>!asset.emitted)) return void this.sockWrite({
             type: 'ok'
         }, token);
-        if (this.sockWrite({
+        if (statsJson.hash && this.sockWrite({
             type: 'hash',
             data: statsJson.hash
         }, token), statsJson.errorsCount) {
@@ -5629,7 +5638,6 @@ function compilationManager_define_property(obj, key, value) {
         writable: !0
     }) : obj[key] = value, obj;
 }
-let compilationManager_require = createRequire(import.meta.url);
 class CompilationManager {
     async init() {
         await this.setupCompilationMiddleware(), await this.socketServer.prepare();
@@ -5651,25 +5659,17 @@ class CompilationManager {
         });
     }
     async setupCompilationMiddleware() {
-        let { devConfig, serverConfig, publicPaths, environments } = this, clientPaths = function(devConfig) {
-            var _devConfig_client;
-            let clientPaths = [];
-            return (devConfig.hmr || devConfig.liveReload) && (clientPaths.push(compilationManager_require.resolve('@rsbuild/core/client/hmr')), (null == (_devConfig_client = devConfig.client) ? void 0 : _devConfig_client.overlay) && clientPaths.push(compilationManager_require.resolve('@rsbuild/core/client/overlay'))), clientPaths;
-        }(devConfig), middleware = await getCompilationMiddleware(this.compiler, {
+        let { devConfig, serverConfig, publicPaths, environments } = this, middleware = await getCompilationMiddleware(this.compiler, {
             callbacks: {
                 onInvalid: (token, fileName)=>{
                     if ('string' == typeof fileName && fileName.endsWith('.html')) return void this.socketServer.sockWrite({
                         type: 'static-changed'
                     }, token);
-                    this.socketServer.sockWrite({
-                        type: 'invalid'
-                    }, token);
                 },
                 onDone: (token, stats)=>{
                     this.socketServer.updateStats(stats, token);
                 }
             },
-            clientPaths,
             devConfig,
             serverConfig,
             environments
@@ -6044,12 +6044,12 @@ let faviconFallbackMiddleware = (req, res, next)=>{
             'default',
             ...Object.keys(something)
         ])
-    ], m = new SyntheticModule(exports, ()=>{
-        for (let name of exports)m.setExport(name, 'default' === name ? something : something[name]);
+    ], syntheticModule = new SyntheticModule(exports, ()=>{
+        for (let name of exports)syntheticModule.setExport(name, 'default' === name ? something : something[name]);
     }, {
         context
     });
-    return unlinked || (await m.link(()=>{}), m.instantiate && m.instantiate(), await m.evaluate()), m;
+    return unlinked || (await syntheticModule.link(()=>{}), await syntheticModule.evaluate()), syntheticModule;
 };
 function basic_define_property(obj, key, value) {
     return key in obj ? Object.defineProperty(obj, key, {
@@ -6212,7 +6212,7 @@ class EsmRunner extends CommonJsRunner {
             }), esmCache.set(file.path, esm)), context.esmMode === type_EsmMode.Unlinked) ? esm : (async ()=>{
                 if (await esm.link(async (specifier, referencingModule)=>asModule(await _require(node_path.dirname(referencingModule.identifier ? referencingModule.identifier.slice(esmIdentifier.length + 1) : fileURLToPath(referencingModule.url)), specifier, {
                         esmMode: type_EsmMode.Unlinked
-                    }), referencingModule.context, !0)), esm.instantiate && esm.instantiate(), await esm.evaluate(), context.esmMode === type_EsmMode.Evaluated) return esm;
+                    }), referencingModule.context, !0)), await esm.evaluate(), context.esmMode === type_EsmMode.Evaluated) return esm;
                 let ns = esm.namespace;
                 return ns.default && ns.default instanceof Promise ? ns.default : ns;
             })();
@@ -7152,7 +7152,8 @@ async function applyDefaultPlugins(pluginManager, context) {
                         let extraData = {
                             entryName,
                             context: context,
-                            environment
+                            environment,
+                            faviconDistPath: config.output.distPath.favicon
                         };
                         extraDataMap.set(entryName, extraData), templateContent && (extraData.templateContent = templateContent);
                         let tagConfig = ((config)=>{
@@ -8808,11 +8809,11 @@ async function runCLI() {
         ].includes(level) && (logger.level = level);
     }
     let { npm_execpath } = process.env;
-    (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && logger.log(), logger.greet(`  Rsbuild v1.4.12\n`);
+    (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && logger.log(), logger.greet(`  Rsbuild v1.4.13\n`);
     try {
         !function() {
             let cli = ((name = "")=>new CAC(name))('rsbuild');
-            cli.help(), cli.version("1.4.12"), cli.option('--base <base>', 'specify the base path of the server').option('-c, --config <config>', 'specify the configuration file, can be a relative or absolute path').option('--config-loader <loader>', 'specify the loader to load the config file, can be `jiti` or `native`', {
+            cli.help(), cli.version("1.4.13"), cli.option('--base <base>', 'specify the base path of the server').option('-c, --config <config>', 'specify the configuration file, can be a relative or absolute path').option('--config-loader <loader>', 'specify the loader to load the config file, can be `jiti` or `native`', {
                 default: 'jiti'
             }).option('-r, --root <root>', 'specify the project root directory, can be an absolute path or a path relative to cwd').option('-m, --mode <mode>', 'specify the build mode, can be `development`, `production` or `none`').option('--log-level <level>', 'specify the log level, can be `info`, `warn`, `error` or `silent`').option('--env-mode <mode>', 'specify the env mode to load the `.env.[mode]` file').option('--environment <name>', 'specify the name of environment to build', {
                 type: [
@@ -8870,5 +8871,5 @@ async function runCLI() {
         logger.error('Failed to start Rsbuild CLI.'), logger.error(err);
     }
 }
-let src_version = "1.4.12";
+let src_version = "1.4.13";
 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/constants.d.ts

@@ -2,6 +2,7 @@ export declare const __filename: string;
 export declare const __dirname: string;
 export declare const ROOT_DIST_DIR = "dist";
 export declare const HTML_DIST_DIR = "./";
+export declare const FAVICON_DIST_DIR = "./";
 export declare const JS_DIST_DIR = "static/js";
 export declare const CSS_DIST_DIR = "static/css";
 export declare const SVG_DIST_DIR = "static/svg";

package/dist-types/rspack-plugins/RsbuildHtmlPlugin.d.ts

@@ -20,6 +20,7 @@ export type HtmlExtraData = {
     context: InternalContext;
     environment: EnvironmentContext;
     favicon?: string;
+    faviconDistPath: string;
     tagConfig?: TagConfig;
     templateContent?: string;
 };