@rsbuild/core 2.2.0-beta.1 → 2.2.0-beta.2

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-beta.2",
         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);
+                    }
                 }
             };
         })({
@@ -5846,6 +5859,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 +5871,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 +6034,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 +6089,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 = [
@@ -8174,7 +8191,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 +8340,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 +8475,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 +8525,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 +9374,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 +9584,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,
@@ -9845,9 +9895,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 +10136,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 +10183,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-beta.2"), 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 +10248,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-beta.2\n`);
 }
 function setupLogLevel(argv) {
     if (argv.length <= 3) return;
@@ -10222,5 +10270,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-beta.2";
 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>;
 };

package/dist/server/helper.d.ts

@@ -60,7 +60,7 @@ export declare function printServerURLs({ urls: originalUrls, port, routes, prot
     strictPort: boolean;
     tryLimits?: number;
 }) => Promise<number>;
-export declare const resolvePort: (config: NormalizedConfig) => Promise<{
+export declare const resolvePort: (config: NormalizedConfig, lastPort?: number) => Promise<{
     port: number;
     portTip: string | undefined;
 }>;

package/package.json

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