@rsbuild/core 2.2.0-beta.1 → 2.2.0-rc.0

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

@@ -1,8 +1,8 @@
 (() => {
   var __webpack_modules__ = {
-    63: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    277: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
-      const { HtmlWebpackChildCompiler } = __nccwpck_require__(292);
+      const { HtmlWebpackChildCompiler } = __nccwpck_require__(254);
       const compilerMap = new WeakMap();
       class CachedChildCompilation {
         constructor(compiler) {
@@ -311,7 +311,7 @@
       }
       module.exports = { CachedChildCompilation };
     },
-    292: (module) => {
+    254: (module) => {
       "use strict";
       class HtmlWebpackChildCompiler {
         constructor(templates) {
@@ -480,7 +480,7 @@
       }
       module.exports = { HtmlWebpackChildCompiler };
     },
-    908: (module) => {
+    94: (module) => {
       "use strict";
       module.exports = {};
       module.exports.none = (chunks) => chunks;
@@ -499,7 +499,7 @@
       };
       module.exports.auto = module.exports.none;
     },
-    931: (module) => {
+    857: (module) => {
       "use strict";
       module.exports = function (err) {
         return {
@@ -523,7 +523,7 @@
         };
       };
     },
-    938: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    672: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const { AsyncSeriesWaterfallHook } = __nccwpck_require__(517);
       const htmlWebpackPluginHooksMap = new WeakMap();
@@ -549,7 +549,7 @@
       }
       module.exports = { getHtmlRspackPluginHooks };
     },
-    439: (module) => {
+    861: (module) => {
       const voidTags = [
         "area",
         "base",
@@ -617,19 +617,19 @@
         htmlTagObjectToString,
       };
     },
-    630: (module, __unused_webpack_exports, __nccwpck_require__) => {
+    920: (module, __unused_webpack_exports, __nccwpck_require__) => {
       "use strict";
       const promisify = __nccwpck_require__(23).promisify;
       const vm = __nccwpck_require__(154);
       const fs = __nccwpck_require__(896);
       const path = __nccwpck_require__(928);
-      const { CachedChildCompilation } = __nccwpck_require__(63);
+      const { CachedChildCompilation } = __nccwpck_require__(277);
       const { createHtmlTagObject, htmlTagObjectToString, HtmlTagArray } =
-        __nccwpck_require__(439);
-      const prettyError = __nccwpck_require__(931);
-      const chunkSorter = __nccwpck_require__(908);
+        __nccwpck_require__(861);
+      const prettyError = __nccwpck_require__(857);
+      const chunkSorter = __nccwpck_require__(94);
       const getHtmlRspackPluginHooks =
-        __nccwpck_require__(938).getHtmlRspackPluginHooks;
+        __nccwpck_require__(672).getHtmlRspackPluginHooks;
       const WITH_PLACEHOLDER = "function __with_placeholder__";
       class HtmlRspackPlugin {
         constructor(userOptions = {}) {
@@ -2403,6 +2403,6 @@
   }
   if (typeof __nccwpck_require__ !== "undefined")
     __nccwpck_require__.ab = __dirname + "/";
-  var __webpack_exports__ = __nccwpck_require__(630);
+  var __webpack_exports__ = __nccwpck_require__(920);
   module.exports = __webpack_exports__;
 })();

package/compiled/postcss-loader/index.js

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

package/dist/626.js

@@ -2996,7 +2996,7 @@ let withDefaultConfig = async (rootPath, userConfig)=>{
         await isFileExists(tsconfigPath) && (config.source.tsconfigPath = tsconfigPath);
     }
     return config;
-}, exitHook_callbacks = new Set(), isCalled = !1, isRegistered = !1;
+}, restartPorts = new WeakMap(), exitHook_callbacks = new Set(), isCalled = !1, isRegistered = !1;
 function exit(exitCode, type) {
     if (!isCalled) {
         for (let callback of (isCalled = !0, exitHook_callbacks))callback(exitCode);
@@ -3425,7 +3425,7 @@ function createPublicContext(context) {
 async function createContext(options, userConfig, logger, loadConfigResult) {
     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, hooks = initHooks();
     return {
-        version: "2.2.0-beta.1",
+        version: "2.2.0-rc.0",
         rootPath,
         configFile: loadConfigResult?.filePath ?? userConfig._privateMeta?.configFilePath,
         configFileDependencies: loadConfigResult?.dependencies ?? userConfig._privateMeta?.configFileDependencies ?? [],
@@ -3439,9 +3439,16 @@ async function createContext(options, userConfig, logger, loadConfigResult) {
         publicPathnames: [],
         hooks,
         restartManager: (({ onRestart, restart })=>{
-            let cleanups = new Set();
+            let port, cleanups = new Set();
             return {
                 canRestart: !!restart,
+                setPort (nextPort) {
+                    port = nextPort;
+                },
+                inheritPort (options) {
+                    let inheritedPort = options ? restartPorts.get(options) : void 0;
+                    return options && restartPorts.delete(options), inheritedPort;
+                },
                 registerCleanup: (cleanup)=>(cleanups.add(cleanup), ()=>{
                         cleanups.delete(cleanup);
                     }),
@@ -3462,7 +3469,13 @@ async function createContext(options, userConfig, logger, loadConfigResult) {
                         hasError || (hasError = !0, firstError = error);
                     }
                     if (hasError) throw firstError;
-                    return restart(context);
+                    if ('dev' !== context.action || void 0 === port) return restart(context);
+                    restartPorts.set(context.options, port);
+                    try {
+                        return await restart(context);
+                    } finally{
+                        restartPorts.delete(context.options);
+                    }
                 }
             };
         })({
@@ -5460,7 +5473,7 @@ let entryNameSymbol = Symbol('entryName'), VOID_TAGS = [
 }, getTagPriority = (tag, tagConfig)=>{
     let priority = tag.head ?? HEAD_TAGS.includes(tag.tag) ? -2 : 2, append = tag.append ?? tagConfig.append;
     return 'boolean' == typeof append && (priority += append ? 1 : -1), priority;
-}, formatBasicTag = (tag)=>({
+}, sortTags = (tags, tagConfig)=>tags.sort((tag1, tag2)=>getTagPriority(tag1, tagConfig) - getTagPriority(tag2, tagConfig)), formatBasicTag = (tag)=>({
         tag: tag.tagName,
         attrs: tag.attributes,
         children: tag.innerHTML,
@@ -5597,8 +5610,9 @@ class RsbuildHtmlPlugin {
                         entryName,
                         outputName: data.outputName,
                         publicPath: data.publicPath
-                    };
-                    for (let item of tagConfig.tags)isFunction(item) ? tags = item(tags, context) || tags : tags.push(item), tags = tags.sort((tag1, tag2)=>getTagPriority(tag1, tagConfig) - getTagPriority(tag2, tagConfig));
+                    }, shouldSort = !1;
+                    for (let item of tagConfig.tags)isFunction(item) ? (shouldSort && (tags = sortTags(tags, tagConfig)), tags = item(tags, context) || tags) : tags.push(item), shouldSort = !0;
+                    shouldSort && (tags = sortTags(tags, tagConfig));
                     let [headTags, bodyTags] = partition(tags, (tag)=>tag.head ?? HEAD_TAGS.includes(tag.tag));
                     return data.headTags = fromInjectTags(headTags), data.bodyTags = fromInjectTags(bodyTags);
                 })(data, tagConfig, compilation.hash ?? '', entryName), data;
@@ -5846,6 +5860,10 @@ let getPort = async ({ host, port, strictPort, tryLimits = 20 })=>{
                 port,
                 host
             }, ()=>{
+                if (0 === port) {
+                    let address = server.address();
+                    address && 'string' != typeof address && (port = address.port);
+                }
                 found = !0, server.close(resolve);
             });
         });
@@ -5854,14 +5872,14 @@ let getPort = async ({ host, port, strictPort, tryLimits = 20 })=>{
         port++, attempts++;
     }
     if (!found) throw Error(`${color.dim('[rsbuild:server]')} Failed to find an available port after ${tryLimits + 1} attempts, starting from ${color.yellow(original)}.`);
-    if (port !== original && strictPort) throw Error(`${color.dim('[rsbuild:server]')} Port ${color.yellow(original)} is occupied, please choose another one.`);
+    if (0 !== original && port !== original && strictPort) throw Error(`${color.dim('[rsbuild:server]')} Port ${color.yellow(original)} is occupied, please choose another one.`);
     return port;
-}, resolvePort = async (config)=>{
-    let { host, port: originalPort, strictPort } = config.server, port = await getPort({
+}, resolvePort = async (config, lastPort)=>{
+    let { host, port: originalPort, strictPort } = config.server, preferredPort = 0 === originalPort ? lastPort : void 0, port = await getPort({
         host,
-        port: originalPort,
-        strictPort
-    }), portTip = port !== originalPort ? `port ${originalPort} is in use, ${color.yellow(`using port ${port}.`)}` : void 0;
+        port: preferredPort ?? originalPort,
+        strictPort: void 0 === preferredPort && strictPort
+    }), portTip = 0 !== originalPort && port !== originalPort ? `port ${originalPort} is in use, ${color.yellow(`using port ${port}.`)}` : void 0;
     return {
         port,
         portTip
@@ -6017,7 +6035,7 @@ async function open_open({ port, routes, config, protocol, clearCache, logger })
     })(config);
     clearCache && (openedURLs = []);
     let urls = [], host = await getHostInUrl(config.server.host), baseUrl = `${protocol}://${host}:${port}`;
-    for (let url of (targets.length ? urls.push(...targets.map((target)=>resolveUrl(replacePortPlaceholder(target, port), baseUrl))) : routes.length ? urls.push(`${baseUrl}${routes[0].pathname}`) : urls.push(baseUrl), before && await before(), urls))openedURLs.includes(url) || (openBrowser(url, logger), openedURLs.push(url));
+    for (let url of (targets.length ? urls.push(...targets.map((target)=>resolveUrl(replacePortPlaceholder(target, port), baseUrl))) : routes.length ? urls.push(`${baseUrl}${routes[0].pathname}`) : urls.push(baseUrl), before && await before(), urls))openedURLs.includes(url) || (await openBrowser(url, logger), openedURLs.push(url));
 }
 let getServerUrlFromClientConfig = async (config, context)=>{
     let { assetPrefix } = config.dev;
@@ -6072,7 +6090,7 @@ function pluginModuleFederation() {
                 let { moduleFederation } = config;
                 if (moduleFederation?.options && moduleFederation.options.exposes) {
                     let userConfig = api.getRsbuildConfig('original');
-                    config.dev ||= {}, config.server ||= {}, userConfig.server?.cors === void 0 && (config.server.cors = !0), config.server?.port && !config.dev.client?.port && (config.dev.client ||= {}, config.dev.client.port = config.server.port), userConfig.dev?.assetPrefix === void 0 && config.dev.assetPrefix === config.server?.base && (config.dev.assetPrefix = !0);
+                    config.dev ||= {}, config.server ||= {}, userConfig.server?.cors === void 0 && (config.server.cors = !0), config.server?.port === void 0 || config.dev.client?.port || (config.dev.client ||= {}, config.dev.client.port = 0 === config.server.port ? '<port>' : config.server.port), userConfig.dev?.assetPrefix === void 0 && config.dev.assetPrefix === config.server?.base && (config.dev.assetPrefix = !0);
                 }
             }), api.modifyEnvironmentConfig((config)=>{
                 config.moduleFederation?.options && (config.source.include = [
@@ -6166,22 +6184,35 @@ let HtmlResourceHintsPlugin_defaultOptions = {
     type: 'async-chunks',
     dedupe: !0
 };
-function filterResourceHints(resourceHints, scripts) {
-    return resourceHints.filter((resourceHint)=>!scripts.find((script)=>script.attributes.src === resourceHint.attributes.href));
+function filterResourceHints(resourceHints, scriptSources) {
+    return resourceHints.filter((resourceHint)=>!scriptSources.has(resourceHint.attributes.href));
 }
 function getResourceHintKey(resourceHint) {
     return `${resourceHint.attributes.rel}:${resourceHint.attributes.href}`;
 }
 function mergeResourceHints(resourceHintGroups, scripts) {
-    let links = [], seen = new Set();
-    for (let { links: groupLinks, dedupe } of resourceHintGroups)for (let link of dedupe ? filterResourceHints(groupLinks, scripts) : groupLinks){
-        let key = getResourceHintKey(link);
-        seen.has(key) || (seen.add(key), links.push(link));
+    let scriptSources, links = [], seen = new Set();
+    for (let { links: groupLinks, dedupe } of resourceHintGroups){
+        let filteredLinks = groupLinks;
+        for (let link of (dedupe && (scriptSources ??= new Set(scripts.map((script)=>script.attributes.src)), filteredLinks = filterResourceHints(groupLinks, scriptSources)), filteredLinks)){
+            let key = getResourceHintKey(link);
+            seen.has(key) || (seen.add(key), links.push(link));
+        }
     }
     return links;
 }
 function generateLinks(options, type, compilation, data, HTMLCount, isDev) {
-    let extractedChunks = extractChunks(compilation, options.type), sortedFilteredFiles = ((files, include, exclude)=>{
+    let extractedChunks = extractChunks(compilation, options.type), htmlChunks = 'all-assets' === options.type || 1 === HTMLCount ? extractedChunks : extractedChunks.filter((chunk)=>doesChunkBelongToHtml({
+            chunk: chunk,
+            compilation,
+            htmlPluginData: data,
+            pluginOptions: options
+        })), uniqueFiles = new Set();
+    for (let chunk of htmlChunks)for (let files of [
+        chunk.files,
+        chunk.auxiliaryFiles ?? []
+    ])for (let file of files)isDev && file.endsWith('.hot-update.js') || file.endsWith('.map') || uniqueFiles.add(file);
+    let sortedFilteredFiles = ((files, include, exclude)=>{
         let includeRegExp = [], excludeRegExp = [], includeFn = [], excludeFn = [];
         if (include) for (let item of helpers_castArray(include))'string' == typeof item ? includeRegExp.push(new RegExp(item)) : isFunction(item) ? includeFn.push(item) : includeRegExp.push(item);
         if (exclude) for (let item of helpers_castArray(exclude))'string' == typeof item ? excludeRegExp.push(new RegExp(item)) : isFunction(item) ? excludeFn.push(item) : excludeRegExp.push(item);
@@ -6195,15 +6226,7 @@ function generateLinks(options, type, compilation, data, HTMLCount, isDev) {
             return !0;
         });
     })([
-        ...new Set(('all-assets' === options.type || 1 === HTMLCount ? extractedChunks : extractedChunks.filter((chunk)=>doesChunkBelongToHtml({
-                chunk: chunk,
-                compilation,
-                htmlPluginData: data,
-                pluginOptions: options
-            }))).reduce((accumulated, chunk)=>accumulated.concat([
-                ...chunk.files,
-                ...chunk.auxiliaryFiles || []
-            ]), []).filter((file)=>!(isDev && file.endsWith('.hot-update.js')) && !file.endsWith('.map')))
+        ...uniqueFiles
     ], options.include, options.exclude).sort(), links = [], { publicPath, crossOriginLoading } = compilation.outputOptions;
     for (let file of sortedFilteredFiles){
         let href = ensureAssetPrefix(file, publicPath), attributes = {
@@ -7927,7 +7950,7 @@ class BasicRunner {
             subPath: ''
         };
         let joinedPath = /^\.\.?\//.test(modulePath) ? node_path.join(currentDirectory, modulePath) : modulePath;
-        return this._options.isBundleOutput(joinedPath) ? {
+        return this._options.isOutputFile(joinedPath) ? {
             path: joinedPath,
             content: this._options.readFileSync(joinedPath),
             subPath: ((p)=>{
@@ -8086,14 +8109,18 @@ class BasicRunnerFactory {
 let runner_run = async ({ bundlePath, ...runnerFactoryOptions })=>{
     let runner = new BasicRunnerFactory(bundlePath).create(runnerFactoryOptions);
     return await runner.run(bundlePath);
-}, loadBundle = async (stats, entryName, utils)=>{
-    let { chunks, entrypoints, outputPath } = stats.toJson({
-        all: !1,
-        chunks: !0,
-        entrypoints: !0,
-        ids: !0,
-        outputPath: !0
-    });
+}, loadBundleStatsCache = new WeakMap(), loadBundle = async (stats, entryName, utils)=>{
+    let loadBundleStats = loadBundleStatsCache.get(stats);
+    loadBundleStats || (loadBundleStats = {
+        ...stats.toJson({
+            all: !1,
+            chunks: !0,
+            entrypoints: !0,
+            ids: !0,
+            outputPath: !0
+        })
+    }, loadBundleStatsCache.set(stats, loadBundleStats));
+    let { chunks, entrypoints, outputPath } = loadBundleStats;
     if (!entrypoints?.[entryName]) throw Error(`${color.dim('[rsbuild:loadBundle]')} Can't find entry: ${color.yellow(entryName)}`);
     let { chunks: entryChunks = [] } = entrypoints[entryName], files = entryChunks.reduce((prev, entryChunkId)=>{
         let chunk = chunks?.find((chunk)=>chunk.entry && chunk.id === entryChunkId);
@@ -8101,13 +8128,17 @@ let runner_run = async ({ bundlePath, ...runnerFactoryOptions })=>{
     }, []);
     if (0 === files.length) throw Error(`${color.dim('[rsbuild:loadBundle]')} Failed to get bundle by entryName: ${color.yellow(entryName)}`);
     if (files.length > 1) throw Error(`${color.dim('[rsbuild:loadBundle]')} Only support load single entry chunk, but got ${color.yellow(files.length)}: ${files.join(',')}`);
-    let allChunkFiles = chunks?.flatMap((c)=>c.files).map((file)=>join(outputPath, file)) || [];
+    let { outputFilePaths } = loadBundleStats;
+    if (!outputFilePaths) {
+        for (let chunk of (outputFilePaths = new Set(), chunks || []))for (let file of chunk.files)outputFilePaths.add(join(outputPath, file));
+        loadBundleStats.outputFilePaths = outputFilePaths;
+    }
     return await runner_run({
         bundlePath: files[0],
         dist: outputPath,
         compilerOptions: stats.compilation.options,
         readFileSync: utils.readFileSync,
-        isBundleOutput: (modulePath)=>allChunkFiles.includes(modulePath)
+        isOutputFile: (modulePath)=>outputFilePaths.has(modulePath)
     });
 }, createCacheableFunction = (getter)=>{
     let cache = new WeakMap();
@@ -8174,7 +8205,9 @@ async function devServer_createDevServer(options, createCompiler, config, devSer
         ])
     }, { context } = options, { logger } = context;
     logger.debug('create dev server');
-    let { port, portTip } = await resolvePort(config), { middlewareMode, host } = config.server, isHttps = !!config.server.https, routes = getRoutes(context), fallbackPathname = 0 === routes.length && context.environmentList.some((item)=>'web' === item.config.output.target) ? config.server.base : void 0;
+    let isDynamicPort = 0 === config.server.port, lastPort = isDynamicPort ? context.restartManager.inheritPort(devServerOptions) : void 0, { port, portTip } = await resolvePort(config, lastPort);
+    isDynamicPort && context.restartManager.setPort(port);
+    let { middlewareMode, host } = config.server, isHttps = !!config.server.https, routes = getRoutes(context), fallbackPathname = 0 === routes.length && context.environmentList.some((item)=>'web' === item.config.output.target) ? config.server.base : void 0;
     context.devServer = {
         hostname: host,
         port,
@@ -8321,14 +8354,24 @@ async function devServer_createDevServer(options, createCompiler, config, devSer
         listen: async ()=>{
             if (!httpServer) throw Error(`${color.dim('[rsbuild:server]')} Can not listen dev server as ${color.yellow('server.middlewareMode')} is enabled.`);
             let serverTerminator = getServerTerminator(httpServer);
-            return logger.debug('listen dev server'), context.hooks.onCloseDevServer.tap(serverTerminator), httpServer.listen({
-                host,
-                port
-            }), await once(httpServer, 'listening'), middlewares.use(optionsFallbackMiddleware), middlewares.use(notFoundMiddleware), state.devMiddlewares && httpServer.on('upgrade', state.devMiddlewares.onUpgrade), logger.debug('listen dev server done'), await devServer.afterListen(), {
-                port,
-                urls: urls.map((item)=>item.url),
-                server: devServer
-            };
+            logger.debug('listen dev server'), context.hooks.onCloseDevServer.tap(serverTerminator);
+            try {
+                return httpServer.listen({
+                    host,
+                    port
+                }), await once(httpServer, 'listening'), middlewares.use(optionsFallbackMiddleware), middlewares.use(notFoundMiddleware), state.devMiddlewares && httpServer.on('upgrade', state.devMiddlewares.onUpgrade), logger.debug('listen dev server done'), await devServer.afterListen(), {
+                    port,
+                    urls: urls.map((item)=>item.url),
+                    server: devServer
+                };
+            } catch (error) {
+                try {
+                    await closeServer();
+                } catch (closeError) {
+                    logger.error('Failed to close dev server after startup error.'), logger.error(closeError);
+                }
+                throw error;
+            }
         },
         afterListen: async ()=>{
             await context.hooks.onAfterStartDevServer.callBatch({
@@ -8446,32 +8489,42 @@ async function startPreviewServer(context, config, { getPortSilently } = {}) {
     for (let callback of (base && '/' !== base && middlewares.use(getBaseUrlMiddleware({
         base
     })), middlewares.use(assetsMiddleware), middlewares.use(getHtmlCompletionMiddleware(htmlMiddlewareOptions)), historyApiFallback && (middlewares.use(historyApiFallback_historyApiFallbackMiddleware(logger, !0 === historyApiFallback ? {} : historyApiFallback)), middlewares.use(assetsMiddleware)), postSetupCallbacks))await callback();
-    if (serverConfig.htmlFallback && middlewares.use(getHtmlFallbackMiddleware({
+    serverConfig.htmlFallback && middlewares.use(getHtmlFallbackMiddleware({
         ...htmlMiddlewareOptions,
         logger
-    })), middlewares.use(faviconFallbackMiddleware), middlewares.use(optionsFallbackMiddleware), middlewares.use(notFoundMiddleware), httpServer.listen({
-        host,
-        port
-    }), await once(httpServer, 'listening'), await context.hooks.onAfterStartPreviewServer.callBatch({
-        port,
-        routes,
-        environments: context.environments
-    }), registerCleanup(closeServer), printUrls(), cliShortcutsEnabled) {
-        let shortcutsOptions = 'boolean' == typeof config.dev.cliShortcuts ? {} : config.dev.cliShortcuts;
-        await setupCliShortcuts({
-            openPage,
-            closeServer,
-            printUrls,
-            help: shortcutsOptions.help,
-            customShortcuts: shortcutsOptions.custom,
-            logger
-        });
+    })), middlewares.use(faviconFallbackMiddleware), middlewares.use(optionsFallbackMiddleware), middlewares.use(notFoundMiddleware);
+    try {
+        if (httpServer.listen({
+            host,
+            port
+        }), await once(httpServer, 'listening'), await context.hooks.onAfterStartPreviewServer.callBatch({
+            port,
+            routes,
+            environments: context.environments
+        }), registerCleanup(closeServer), printUrls(), cliShortcutsEnabled) {
+            let shortcutsOptions = 'boolean' == typeof config.dev.cliShortcuts ? {} : config.dev.cliShortcuts;
+            await setupCliShortcuts({
+                openPage,
+                closeServer,
+                printUrls,
+                help: shortcutsOptions.help,
+                customShortcuts: shortcutsOptions.custom,
+                logger
+            });
+        }
+        return !getPortSilently && portTip && logger.info(portTip), {
+            port,
+            urls: urls.map((item)=>item.url),
+            server: previewServer
+        };
+    } catch (error) {
+        try {
+            await closeServer();
+        } catch (closeError) {
+            logger.error('Failed to close preview server after startup error.'), logger.error(closeError);
+        }
+        throw error;
     }
-    return !getPortSilently && portTip && logger.info(portTip), {
-        port,
-        urls: urls.map((item)=>item.url),
-        server: previewServer
-    };
 }
 function applyDefaultPlugins(pluginManager, context) {
     pluginManager.addPlugins([
@@ -8486,7 +8539,6 @@ function applyDefaultPlugins(pluginManager, context) {
                         aggregateTimeout: 0
                     }), chain.performance.hints(!1), chain.experiments({
                         ...chain.get('experiments'),
-                        nativeWatcher: !0,
                         sourceImport: !0
                     }), chain.module.parser.merge({
                         javascript: {
@@ -9336,7 +9388,19 @@ try {
                         javascript: {
                             dynamicImportMode: 'eager'
                         }
-                    }), isServer || isWebWorker) {
+                    }), isServer) {
+                        if (!1 === splitChunks) chain.optimization.splitChunks(!1);
+                        else {
+                            let { preset = 'none', ...rest } = splitChunks;
+                            chain.optimization.splitChunks({
+                                chunks: 'all',
+                                ...getSplitChunksByPreset(config, preset),
+                                ...rest
+                            });
+                        }
+                        return;
+                    }
+                    if (isWebWorker) {
                         if (!1 === splitChunks || 0 === Object.keys(splitChunks).length) chain.optimization.splitChunks(!1);
                         else {
                             let { preset = 'none', ...rest } = splitChunks;
@@ -9534,11 +9598,11 @@ try {
         {
             name: 'rsbuild:server',
             setup (api) {
-                let onStartServer = ({ port, routes })=>{
+                let onStartServer = async ({ port, routes })=>{
                     let config = api.getNormalizedConfig();
                     if (config.server.open) {
                         let protocol = config.server.https ? 'https' : 'http';
-                        open_open({
+                        await open_open({
                             port,
                             routes,
                             config,
@@ -9592,18 +9656,20 @@ try {
                 api.modifyBundlerChain(async (chain, { CHAIN_ID, environment, isDev })=>{
                     let { output: { manifest }, dev: { writeToDisk } } = environment.config;
                     if (!1 === manifest) return;
-                    let manifestOptions = normalizeManifestObjectConfig(manifest), { RspackManifestPlugin } = await import("./manifest-plugin.js").then(__webpack_require__.bind(__webpack_require__, "../../node_modules/.pnpm/rspack-manifest-plugin@5.2.2_@rspack+core@2.2.0-beta.1/node_modules/rspack-manifest-plugin/dist/index.js")), { htmlPaths } = environment, filter = manifestOptions.filter ?? ((file)=>!file.name.endsWith('.LICENSE.txt'));
+                    let manifestOptions = normalizeManifestObjectConfig(manifest), { RspackManifestPlugin } = await import("./manifest-plugin.js").then(__webpack_require__.bind(__webpack_require__, "../../node_modules/.pnpm/rspack-manifest-plugin@5.2.2_@rspack+core@2.2.0-rc.0/node_modules/rspack-manifest-plugin/dist/index.js")), { htmlPaths } = environment, filter = manifestOptions.filter ?? ((file)=>!file.name.endsWith('.LICENSE.txt'));
                     manifestFilenames.set(environment.name, manifestOptions.filename);
                     let pluginOptions = {
                         fileName: manifestOptions.filename,
                         filter,
                         writeToFileEmit: isDev && !0 !== writeToDisk,
                         generate: (_seed, files, entries, { compilation })=>{
-                            let chunkEntries = new Map(), licenseMap = new Map(), publicPath = getPublicPathFromCompiler(compilation), integrity = {}, allFiles = files.map((file)=>{
-                                if (file.integrity && (integrity[file.path] = file.integrity), file.chunk) for (let entryName of recursiveChunkEntryNames(file.chunk))chunkEntries.set(entryName, [
-                                    file,
-                                    ...chunkEntries.get(entryName) || []
-                                ]);
+                            let chunkEntries = new Map(), filePathByName = new Map(), licenseMap = new Map(), publicPath = getPublicPathFromCompiler(compilation), integrity = {}, allFiles = files.map((file)=>{
+                                if (filePathByName.has(file.name) || filePathByName.set(file.name, file.path), file.integrity && (integrity[file.path] = file.integrity), file.chunk) for (let entryName of recursiveChunkEntryNames(file.chunk)){
+                                    let chunkFiles = chunkEntries.get(entryName);
+                                    chunkFiles ? chunkFiles.push(file) : chunkEntries.set(entryName, [
+                                        file
+                                    ]);
+                                }
                                 if (file.path.endsWith('.LICENSE.txt')) {
                                     let sourceFilePath = file.path.split('.LICENSE.txt')[0];
                                     licenseMap.set(sourceFilePath, file.path);
@@ -9623,7 +9689,7 @@ try {
                                 }
                                 let entryManifest = {};
                                 assets.size && (entryManifest.assets = Array.from(assets));
-                                let htmlPath = files.find((f)=>f.name === htmlPaths[entryName])?.path;
+                                let htmlPath = filePathByName.get(htmlPaths[entryName]);
                                 htmlPath && (entryManifest.html = [
                                     htmlPath
                                 ]), initialJS.length && (entryManifest.initial = {
@@ -9845,9 +9911,7 @@ async function createRsbuild(options = {}) {
             context,
             pluginManager,
             rsbuildOptions: resolvedOptions
-        }, createCompiler, config, {
-            ...options
-        })).listen();
+        }, createCompiler, config, options)).listen();
     }, createDevServer = async (options)=>{
         context.action = 'dev', process.env.NODE_ENV || setNodeEnv('development');
         let config = await initRsbuildConfig({
@@ -10088,7 +10152,7 @@ let cliState = {
         loader: options.configLoader,
         command
     }), { content: config } = result;
-    if (config.dev ||= {}, config.source ||= {}, config.server ||= {}, options.base && (config.server.base = options.base), options.root && (config.root = root), options.mode && (config.mode = options.mode), options.logLevel && (config.logLevel = options.logLevel), options.open && !config.server?.open && (config.server.open = options.open), void 0 !== options.host && (config.server.host = options.host), options.port && (config.server.port = options.port), void 0 !== options.strictPort && (config.server.strictPort = options.strictPort), void 0 !== options.distPath) {
+    if (config.dev ||= {}, config.source ||= {}, config.server ||= {}, options.base && (config.server.base = options.base), options.root && (config.root = root), options.mode && (config.mode = options.mode), options.logLevel && (config.logLevel = options.logLevel), options.open && !config.server?.open && (config.server.open = options.open), void 0 !== options.host && (config.server.host = options.host), void 0 !== options.port && (config.server.port = options.port), void 0 !== options.strictPort && (config.server.strictPort = options.strictPort), void 0 !== options.distPath) {
         config.output ||= {};
         let { distPath } = config.output;
         config.output.distPath = distPath && 'object' == typeof distPath ? {
@@ -10135,7 +10199,7 @@ let applyServerOptions = (command)=>{
 };
 function setupCommands(argv) {
     let cli = ((name = "")=>new CAC(name))('rsbuild');
-    cli.version("2.2.0-beta.1"), cli.option('--base <base>', 'Set the base path of the server').option('-c, --config <config>', 'Set the configuration file (relative or absolute path)').option('--config-loader <loader>', 'Set the config file loader (auto | jiti | native)', {
+    cli.version("2.2.0-rc.0"), cli.option('--base <base>', 'Set the base path of the server').option('-c, --config <config>', 'Set the configuration file (relative or absolute path)').option('--config-loader <loader>', 'Set the config file loader (auto | jiti | native)', {
         default: 'auto'
     }).option('--dist-path <dir>', 'Set the root directory of output files').option('--source-map', 'Enable source map').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: [
@@ -10200,7 +10264,7 @@ function setupCommands(argv) {
 }
 function showGreeting() {
     let { npm_execpath, npm_lifecycle_event, NODE_RUN_SCRIPT_NAME } = process.env, isBun = npm_execpath?.includes('.bun');
-    src_logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v2.2.0-beta.1\n`);
+    src_logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v2.2.0-rc.0\n`);
 }
 function setupLogLevel(argv) {
     if (argv.length <= 3) return;
@@ -10222,5 +10286,5 @@ function runCLI({ argv = process.argv } = {}) {
         src_logger.error('Failed to start Rsbuild CLI.'), src_logger.error(err), process.exit(1);
     }
 }
-let src_version = "2.2.0-beta.1";
+let src_version = "2.2.0-rc.0";
 export { PLUGIN_CSS_NAME, PLUGIN_SWC_NAME, core_rspack as rspack, createRsbuild, defaultAllowedOrigins, defineConfig, ensureAssetPrefix, loadConfig_loadConfig as loadConfig, loadEnv, logger_createLogger as createLogger, mergeRsbuildConfig, mrmime_lookup, runCLI, src_logger as logger, src_version as version };

package/dist/helpers/restartManager.d.ts

@@ -3,6 +3,8 @@ import type { MaybePromise } from '../types/utils.js';
 type Cleanup = () => MaybePromise<void>;
 export type RestartManager = {
     /** Whether a restart executor is available. */ readonly canRestart: boolean;
+    /** Store the dynamic port for the next restart. */ setPort(port: number): void;
+    /** Consume the dynamic port associated with restart options. */ inheritPort(options?: object): number | undefined;
     /** Register a cleanup callback and return a function that unregisters it. */ registerCleanup(cleanup: Cleanup): () => void;
     /** Handle a restart request and return whether the restart succeeded. */ requestRestart(context: RestartContext): Promise<boolean>;
 };