@rsbuild/core 1.3.7 → 1.3.8

package/dist/index.cjs

@@ -2218,7 +2218,7 @@ for(var __webpack_i__ in (()=>{
     async function createContext(options, userConfig) {
         let { cwd } = options, rootPath = userConfig.root ? getAbsolutePath(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;
         return {
-            version: "1.3.7",
+            version: "1.3.8",
             rootPath,
             distPath: '',
             cachePath,
@@ -3805,10 +3805,10 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
         if (port !== original && strictPort) throw Error(`[rsbuild:server] Port "${original}" is occupied, please choose another one.`);
         return port;
     }, getServerConfig = async ({ config })=>{
-        let host = config.server.host || DEFAULT_DEV_HOST, originalPort = config.server.port || 3000, port = await getPort({
+        let { host, port: originalPort, strictPort } = config.server, port = await getPort({
             host,
             port: originalPort,
-            strictPort: config.server.strictPort || !1
+            strictPort
         }), https = !!config.server.https, portTip = port !== originalPort ? `port ${originalPort} is in use, ${index_js_default().yellow(`using port ${port}.`)}` : void 0;
         return {
             port,
@@ -3960,14 +3960,15 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                 api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd, isServer, environment })=>{
                     let { distPath, config } = environment, publicPath = function({ isProd, config, context }) {
                         var _context_devServer, _context_devServer1, _context_devServer2;
-                        let { dev, output, server } = config, publicPath = DEFAULT_ASSET_PREFIX, port = (null == (_context_devServer = context.devServer) ? void 0 : _context_devServer.port) || server.port || 3000;
+                        let { dev, output, server } = config, publicPath = DEFAULT_ASSET_PREFIX;
                         if (isProd) 'string' == typeof output.assetPrefix && (publicPath = output.assetPrefix);
                         else if ('string' == typeof dev.assetPrefix) publicPath = dev.assetPrefix;
                         else if (!0 === dev.assetPrefix) {
                             let protocol = (null == (_context_devServer1 = context.devServer) ? void 0 : _context_devServer1.https) ? 'https' : 'http', hostname = (null == (_context_devServer2 = context.devServer) ? void 0 : _context_devServer2.hostname) || DEFAULT_DEV_HOST;
                             publicPath = hostname === DEFAULT_DEV_HOST ? `${protocol}://localhost:<port>/` : `${protocol}://${hostname}:<port>/`, server.base && '/' !== server.base && (publicPath = urlJoin(publicPath, server.base));
                         }
-                        return formatPublicPath(replacePortPlaceholder(publicPath, port));
+                        let defaultPort = server.port ?? 3000;
+                        return formatPublicPath(replacePortPlaceholder(publicPath, isProd ? defaultPort : (null == (_context_devServer = context.devServer) ? void 0 : _context_devServer.port) ?? defaultPort));
                     }({
                         config,
                         isProd,
@@ -4865,7 +4866,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
             getPluginAPI: context.getPluginAPI,
             pluginManager
         }), await modifyRsbuildConfig(context);
-        let normalizeBaseConfig = normalizeConfig(context.config), environments = {}, mergedEnvironments = initEnvironmentConfigs(normalizeBaseConfig, context.rootPath, context.specifiedEnvironments), { dev: { hmr, assetPrefix, progressBar, lazyCompilation, writeToDisk, ...rsbuildSharedDev }, server } = normalizeBaseConfig;
+        let normalizedBaseConfig = normalizeConfig(context.config), environments = {}, mergedEnvironments = initEnvironmentConfigs(normalizedBaseConfig, context.rootPath, context.specifiedEnvironments), { dev: { hmr, assetPrefix, progressBar, lazyCompilation, writeToDisk, ...rsbuildSharedDev }, server } = normalizedBaseConfig;
         for (let [name, config] of Object.entries(mergedEnvironments)){
             let environmentConfig = await modifyEnvironmentConfig(context, config, name);
             environments[name] = {
@@ -4878,7 +4879,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
             };
         }
         context.normalizedConfig = {
-            ...normalizeBaseConfig,
+            ...normalizedBaseConfig,
             environments
         }, await updateEnvironmentContext(context, environments);
         var context1 = context;
@@ -5836,7 +5837,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
             next();
         }), 'dev' === context.action && 'rspack' === context.bundlerType && dev.lazyCompilation && compilationManager) {
             let { compiler } = compilationManager;
-            middlewares.push(core_default().experiments.lazyCompilationMiddleware(helpers_isMultiCompiler(compiler) ? compiler.compilers[0] : compiler, dev.lazyCompilation));
+            'object' == typeof dev.lazyCompilation && 'string' == typeof dev.lazyCompilation.serverUrl && context.devServer && (dev.lazyCompilation.serverUrl = replacePortPlaceholder(dev.lazyCompilation.serverUrl, context.devServer.port)), middlewares.push(core_default().experiments.lazyCompilationMiddleware(helpers_isMultiCompiler(compiler) ? compiler.compilers[0] : compiler, dev.lazyCompilation));
         }
         if (server.proxy) {
             let { middlewares: proxyMiddlewares, upgrade } = await createProxyMiddleware(server.proxy);
@@ -7416,11 +7417,11 @@ ${section.body}` : section.body).join("\n\n"));
         }
         process.title = 'rsbuild-node';
         let { npm_execpath } = process.env;
-        (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && console.log(), rslog_index_js_namespaceObject.logger.greet(`  Rsbuild v1.3.7\n`);
+        (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && console.log(), rslog_index_js_namespaceObject.logger.greet(`  Rsbuild v1.3.8\n`);
         try {
             !function() {
                 let cli = cac_dist('rsbuild');
-                cli.help(), cli.version("1.3.7"), applyCommonOptions(cli);
+                cli.help(), cli.version("1.3.8"), applyCommonOptions(cli);
                 let devCommand = cli.command('', 'starting the dev server').alias('dev'), buildCommand = cli.command('build', 'build the app for production'), previewCommand = cli.command('preview', 'preview the production build locally'), inspectCommand = cli.command('inspect', 'inspect the Rspack and Rsbuild configs');
                 applyServerOptions(devCommand), applyServerOptions(previewCommand), devCommand.action(async (options)=>{
                     try {
@@ -7471,7 +7472,7 @@ ${section.body}` : section.body).join("\n\n"));
             rslog_index_js_namespaceObject.logger.error('Failed to start Rsbuild CLI.'), rslog_index_js_namespaceObject.logger.error(err);
         }
     }
-    let src_version = "1.3.7";
+    let src_version = "1.3.8";
 })(), exports.PLUGIN_CSS_NAME = __webpack_exports__.PLUGIN_CSS_NAME, exports.PLUGIN_SWC_NAME = __webpack_exports__.PLUGIN_SWC_NAME, exports.createRsbuild = __webpack_exports__.createRsbuild, 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

@@ -2115,7 +2115,7 @@ async function updateEnvironmentContext(context, configs) {
 async function createContext(options, userConfig) {
     let { cwd } = options, rootPath = userConfig.root ? getAbsolutePath(cwd, userConfig.root) : cwd, rsbuildConfig = await withDefaultConfig(rootPath, userConfig), cachePath = (0, __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.join)(rootPath, 'node_modules', '.cache'), specifiedEnvironments = options.environment && options.environment.length > 0 ? options.environment : void 0;
     return {
-        version: "1.3.7",
+        version: "1.3.8",
         rootPath,
         distPath: '',
         cachePath,
@@ -3695,10 +3695,10 @@ let getPort = async ({ host, port, strictPort, tryLimits = 20 })=>{
     if (port !== original && strictPort) throw Error(`[rsbuild:server] Port "${original}" is occupied, please choose another one.`);
     return port;
 }, getServerConfig = async ({ config })=>{
-    let host = config.server.host || DEFAULT_DEV_HOST, originalPort = config.server.port || 3000, port = await getPort({
+    let { host, port: originalPort, strictPort } = config.server, port = await getPort({
         host,
         port: originalPort,
-        strictPort: config.server.strictPort || !1
+        strictPort
     }), https = !!config.server.https, portTip = port !== originalPort ? `port ${originalPort} is in use, ${__WEBPACK_EXTERNAL_MODULE__compiled_picocolors_index_js_ea7a20e9__.default.yellow(`using port ${port}.`)}` : void 0;
     return {
         port,
@@ -3850,14 +3850,15 @@ let getJsAsyncPath = (jsPath, isServer, jsAsync)=>void 0 !== jsAsync ? jsAsync :
             api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd, isServer, environment })=>{
                 let { distPath, config } = environment, publicPath = function({ isProd, config, context }) {
                     var _context_devServer, _context_devServer1, _context_devServer2;
-                    let { dev, output, server } = config, publicPath = DEFAULT_ASSET_PREFIX, port = (null == (_context_devServer = context.devServer) ? void 0 : _context_devServer.port) || server.port || 3000;
+                    let { dev, output, server } = config, publicPath = DEFAULT_ASSET_PREFIX;
                     if (isProd) 'string' == typeof output.assetPrefix && (publicPath = output.assetPrefix);
                     else if ('string' == typeof dev.assetPrefix) publicPath = dev.assetPrefix;
                     else if (!0 === dev.assetPrefix) {
                         let protocol = (null == (_context_devServer1 = context.devServer) ? void 0 : _context_devServer1.https) ? 'https' : 'http', hostname = (null == (_context_devServer2 = context.devServer) ? void 0 : _context_devServer2.hostname) || DEFAULT_DEV_HOST;
                         publicPath = hostname === DEFAULT_DEV_HOST ? `${protocol}://localhost:<port>/` : `${protocol}://${hostname}:<port>/`, server.base && '/' !== server.base && (publicPath = urlJoin(publicPath, server.base));
                     }
-                    return formatPublicPath(replacePortPlaceholder(publicPath, port));
+                    let defaultPort = server.port ?? 3000;
+                    return formatPublicPath(replacePortPlaceholder(publicPath, isProd ? defaultPort : (null == (_context_devServer = context.devServer) ? void 0 : _context_devServer.port) ?? defaultPort));
                 }({
                     config,
                     isProd,
@@ -4750,7 +4751,7 @@ async function initRsbuildConfig({ context, pluginManager }) {
         getPluginAPI: context.getPluginAPI,
         pluginManager
     }), await modifyRsbuildConfig(context);
-    let normalizeBaseConfig = normalizeConfig(context.config), environments = {}, mergedEnvironments = initEnvironmentConfigs(normalizeBaseConfig, context.rootPath, context.specifiedEnvironments), { dev: { hmr, assetPrefix, progressBar, lazyCompilation, writeToDisk, ...rsbuildSharedDev }, server } = normalizeBaseConfig;
+    let normalizedBaseConfig = normalizeConfig(context.config), environments = {}, mergedEnvironments = initEnvironmentConfigs(normalizedBaseConfig, context.rootPath, context.specifiedEnvironments), { dev: { hmr, assetPrefix, progressBar, lazyCompilation, writeToDisk, ...rsbuildSharedDev }, server } = normalizedBaseConfig;
     for (let [name, config] of Object.entries(mergedEnvironments)){
         let environmentConfig = await modifyEnvironmentConfig(context, config, name);
         environments[name] = {
@@ -4763,7 +4764,7 @@ async function initRsbuildConfig({ context, pluginManager }) {
         };
     }
     context.normalizedConfig = {
-        ...normalizeBaseConfig,
+        ...normalizedBaseConfig,
         environments
     }, await updateEnvironmentContext(context, environments);
     let distPaths = Object.values(context.environments).map((item)=>item.distPath);
@@ -5716,7 +5717,7 @@ let ENCODING_REGEX = /\bgzip\b/, CONTENT_TYPE_REGEX = /text|javascript|\/json|xm
         next();
     }), 'dev' === context.action && 'rspack' === context.bundlerType && dev.lazyCompilation && compilationManager) {
         let { compiler } = compilationManager;
-        middlewares.push(__WEBPACK_EXTERNAL_MODULE__rspack_core_e0096ff7__.default.experiments.lazyCompilationMiddleware(helpers_isMultiCompiler(compiler) ? compiler.compilers[0] : compiler, dev.lazyCompilation));
+        'object' == typeof dev.lazyCompilation && 'string' == typeof dev.lazyCompilation.serverUrl && context.devServer && (dev.lazyCompilation.serverUrl = replacePortPlaceholder(dev.lazyCompilation.serverUrl, context.devServer.port)), middlewares.push(__WEBPACK_EXTERNAL_MODULE__rspack_core_e0096ff7__.default.experiments.lazyCompilationMiddleware(helpers_isMultiCompiler(compiler) ? compiler.compilers[0] : compiler, dev.lazyCompilation));
     }
     if (server.proxy) {
         let { middlewares: proxyMiddlewares, upgrade } = await createProxyMiddleware(server.proxy);
@@ -7289,11 +7290,11 @@ async function runCLI() {
     }
     process.title = 'rsbuild-node';
     let { npm_execpath } = process.env;
-    (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && console.log(), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.greet(`  Rsbuild v1.3.7\n`);
+    (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && console.log(), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.greet(`  Rsbuild v1.3.8\n`);
     try {
         !function() {
             let cli = cac_dist('rsbuild');
-            cli.help(), cli.version("1.3.7"), applyCommonOptions(cli);
+            cli.help(), cli.version("1.3.8"), applyCommonOptions(cli);
             let devCommand = cli.command('', 'starting the dev server').alias('dev'), buildCommand = cli.command('build', 'build the app for production'), previewCommand = cli.command('preview', 'preview the production build locally'), inspectCommand = cli.command('inspect', 'inspect the Rspack and Rsbuild configs');
             applyServerOptions(devCommand), applyServerOptions(previewCommand), devCommand.action(async (options)=>{
                 try {
@@ -7344,6 +7345,6 @@ async function runCLI() {
         __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.error('Failed to start Rsbuild CLI.'), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.error(err);
     }
 }
-let src_version = "1.3.7";
+let src_version = "1.3.8";
 var __webpack_exports__logger = __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger, __webpack_exports__rspack = __WEBPACK_EXTERNAL_MODULE__rspack_core_e0096ff7__.rspack;
 export { PLUGIN_CSS_NAME, PLUGIN_SWC_NAME, createRsbuild, defineConfig, ensureAssetPrefix, config_loadConfig as loadConfig, loadEnv, mergeRsbuildConfig, runCLI, src_version as version, __webpack_exports__logger as logger, __webpack_exports__rspack as rspack };

package/dist-types/config.d.ts

@@ -8,10 +8,9 @@ import type { InspectConfigOptions, InspectConfigResult, NormalizedConfig, Plugi
 export declare const LOCAL_ORIGINS_REGEX: RegExp;
 export declare function getDefaultEntry(root: string): RsbuildEntry;
 export declare const withDefaultConfig: (rootPath: string, config: RsbuildConfig) => Promise<RsbuildConfig>;
-/** #__PURE__
- * 1. May used by multiple plugins.
- * 2. Object value that should not be empty.
- * 3. Meaningful and can be filled by constant value.
+/**
+ * Merges user config with default values to ensure required properties
+ * are initialized.
  */
 export declare const normalizeConfig: (config: RsbuildConfig) => NormalizedConfig;
 export type ConfigParams = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {
@@ -96,7 +96,7 @@
     "ws": "^8.18.1"
   },
   "engines": {
-    "node": ">=16.7.0"
+    "node": ">=16.10.0"
   },
   "publishConfig": {
     "access": "public",