@rsbuild/core 1.2.18 → 1.2.19

package/dist/index.cjs

@@ -1556,43 +1556,39 @@ var __webpack_exports__ = {};
             merged[key] = merge(x[key], y[key], childPath);
         }
         return merged;
-    }, mergeRsbuildConfig = (...configs)=>2 === configs.length ? merge(configs[0], configs[1]) : configs.length < 2 ? configs[0] : configs.reduce((result, config)=>merge(result, config), {}), commonOpts = {}, getEnvDir = (cwd, envDir)=>envDir ? external_node_path_default().isAbsolute(envDir) ? envDir : external_node_path_default().join(cwd, envDir) : cwd;
+    }, mergeRsbuildConfig = (...configs)=>2 === configs.length ? merge(configs[0], configs[1]) : configs.length < 2 ? configs[0] : configs.reduce((result, config)=>merge(result, config), {}), commonOpts = {}, getEnvDir = (cwd, envDir)=>envDir ? external_node_path_default().isAbsolute(envDir) ? envDir : external_node_path_default().join(cwd, envDir) : cwd, init_loadConfig = async (root)=>{
+        var _config_server;
+        let { content: config, filePath } = await config_loadConfig({
+            cwd: root,
+            path: commonOpts.config,
+            envMode: commonOpts.envMode,
+            loader: commonOpts.configLoader
+        });
+        return config.dev ||= {}, config.source ||= {}, config.server ||= {}, commonOpts.base && (config.server.base = commonOpts.base), commonOpts.root && (config.root = root), commonOpts.mode && (config.mode = commonOpts.mode), !commonOpts.open || (null === (_config_server = config.server) || void 0 === _config_server ? void 0 : _config_server.open) || (config.server.open = commonOpts.open), commonOpts.host && (config.server.host = commonOpts.host), commonOpts.port && (config.server.port = commonOpts.port), void 0 === config.dev.cliShortcuts && (config.dev.cliShortcuts = !0), filePath && (config.dev.watchFiles = [
+            ...config.dev.watchFiles ? castArray(config.dev.watchFiles) : [],
+            {
+                paths: filePath,
+                type: 'reload-server'
+            }
+        ]), config;
+    };
     async function init({ cliOptions, isRestart, isBuildWatch = !1 }) {
         cliOptions && (commonOpts = cliOptions);
         try {
-            var _config_server, _config_dev, _config_performance;
-            let cwd = process.cwd(), root = commonOpts.root ? getAbsolutePath(cwd, commonOpts.root) : cwd, envs = loadEnv({
-                cwd: getEnvDir(root, commonOpts.envDir),
-                mode: commonOpts.envMode
-            }), { content: config, filePath: configFilePath } = await config_loadConfig({
-                cwd: root,
-                path: commonOpts.config,
-                envMode: commonOpts.envMode,
-                loader: commonOpts.configLoader
-            });
-            if (config.source ||= {}, config.source.define = {
-                ...envs.publicVars,
-                ...config.source.define
-            }, commonOpts.base && (config.server ||= {}, config.server.base = commonOpts.base), commonOpts.root && (config.root = root), commonOpts.mode && (config.mode = commonOpts.mode), !commonOpts.open || (null === (_config_server = config.server) || void 0 === _config_server ? void 0 : _config_server.open) || (config.server ||= {}, config.server.open = commonOpts.open), commonOpts.host && (config.server ||= {}, config.server.host = commonOpts.host), commonOpts.port && (config.server ||= {}, config.server.port = commonOpts.port), (null === (_config_dev = config.dev) || void 0 === _config_dev ? void 0 : _config_dev.cliShortcuts) === void 0 && (config.dev ||= {}, config.dev.cliShortcuts = !0), (null === (_config_performance = config.performance) || void 0 === _config_performance ? void 0 : _config_performance.buildCache) && envs.filePaths.length > 0) {
-                let { buildCache } = config.performance;
-                !0 === buildCache ? config.performance.buildCache = {
-                    buildDependencies: envs.filePaths
-                } : (buildCache.buildDependencies ||= [], buildCache.buildDependencies.push(...envs.filePaths));
-            }
-            let rsbuild = await createRsbuild({
+            let cwd = process.cwd(), root = commonOpts.root ? getAbsolutePath(cwd, commonOpts.root) : cwd, rsbuild = await createRsbuild({
                 cwd: root,
-                rsbuildConfig: config,
-                environment: commonOpts.environment
+                rsbuildConfig: ()=>init_loadConfig(root),
+                environment: commonOpts.environment,
+                loadEnv: {
+                    cwd: getEnvDir(root, commonOpts.envDir),
+                    mode: commonOpts.envMode
+                }
             });
             return rsbuild.onBeforeCreateCompiler(()=>{
                 let command = process.argv[2];
                 if ('dev' === command || isBuildWatch) {
                     var _config_dev;
-                    let files = [
-                        ...envs.filePaths
-                    ];
-                    configFilePath && files.push(configFilePath);
-                    let config = rsbuild.getNormalizedConfig();
+                    let files = [], config = rsbuild.getNormalizedConfig();
                     if (null === (_config_dev = config.dev) || void 0 === _config_dev ? void 0 : _config_dev.watchFiles) for (let watchFilesConfig of castArray(config.dev.watchFiles)){
                         if ('reload-server' !== watchFilesConfig.type) continue;
                         let paths = castArray(watchFilesConfig.paths);
@@ -1600,7 +1596,7 @@ var __webpack_exports__ = {};
                     }
                     watchFilesForRestart(files, root, isBuildWatch);
                 }
-            }), rsbuild.onCloseBuild(envs.cleanup), rsbuild.onCloseDevServer(envs.cleanup), rsbuild;
+            }), rsbuild;
         } catch (err) {
             if (isRestart) rslog_index_js_namespaceObject.logger.error(err);
             else throw err;
@@ -2379,14 +2375,14 @@ var __webpack_exports__ = {};
             });
         }
     }
-    async function createContext(options, userConfig, bundlerType) {
+    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.2.18",
+            version: "1.2.19",
             rootPath,
             distPath: '',
             cachePath,
-            bundlerType,
+            bundlerType: userConfig.provider ? 'webpack' : 'rspack',
             environments: {},
             hooks: {
                 onExit: createAsyncHook(),
@@ -5362,24 +5358,24 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
         getStats(name) {
             let curStats = this.stats[name];
             if (!curStats) return null;
-            let statsOptions = getStatsOptions(curStats.compilation.compiler);
-            return {
-                statsJson: curStats.toJson({
-                    all: !1,
-                    hash: !0,
-                    assets: !0,
-                    warnings: !0,
-                    warningsCount: !0,
-                    errors: !0,
-                    errorsCount: !0,
-                    errorDetails: !1,
-                    entrypoints: !0,
-                    children: !0,
-                    moduleTrace: !0,
-                    ...statsOptions
-                }),
+            let statsOptions = getStatsOptions(curStats.compilation.compiler), statsJson = curStats.toJson({
+                all: !1,
+                hash: !0,
+                assets: !0,
+                warnings: !0,
+                warningsCount: !0,
+                errors: !0,
+                errorsCount: !0,
+                errorDetails: !1,
+                entrypoints: !0,
+                children: !0,
+                moduleTrace: !0,
+                ...statsOptions
+            });
+            return statsJson ? {
+                statsJson,
                 root: curStats.compilation.compiler.options.context
-            };
+            } : null;
         }
         sendStats({ force = !1, compilationId }) {
             let result = this.getStats(compilationId);
@@ -6468,7 +6464,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
             rspackConfigs
         };
     }
-    let build_build = async (initOptions, { watch, compiler: customCompiler } = {})=>{
+    let RSPACK_BUILD_ERROR = 'Rspack build failed.', build_build = async (initOptions, { watch, compiler: customCompiler } = {})=>{
         let compiler, bundlerConfigs;
         let { context } = initOptions;
         if (customCompiler) compiler = customCompiler;
@@ -6493,7 +6489,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
         };
         let { stats } = await new Promise((resolve, reject)=>{
             compiler.run((err, stats)=>{
-                err ? reject(err) : (null == stats ? void 0 : stats.hasErrors()) ? reject(Error('Rspack build failed!')) : compiler.close((closeErr)=>{
+                err ? reject(err) : (null == stats ? void 0 : stats.hasErrors()) ? reject(Error(RSPACK_BUILD_ERROR)) : compiler.close((closeErr)=>{
                     closeErr && rslog_index_js_namespaceObject.logger.error(closeErr), resolve({
                         stats
                     });
@@ -6789,10 +6785,34 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
     }
     async function createRsbuild(options = {}) {
         let plugins;
-        let { rsbuildConfig = {} } = options, rsbuildOptions = {
+        let envs = options.loadEnv ? loadEnv({
+            cwd: options.cwd,
+            ...'boolean' == typeof options.loadEnv ? {} : options.loadEnv
+        }) : null, config = isFunction(options.rsbuildConfig) ? await options.rsbuildConfig() : options.rsbuildConfig || {};
+        !function(config, envs) {
+            var _config_performance;
+            if (null !== envs) {
+                if (config.source ||= {}, config.source.define = {
+                    ...envs.publicVars,
+                    ...config.source.define
+                }, 0 !== envs.filePaths.length && (config.dev ||= {}, config.dev.watchFiles = [
+                    ...config.dev.watchFiles ? castArray(config.dev.watchFiles) : [],
+                    {
+                        paths: envs.filePaths,
+                        type: 'reload-server'
+                    }
+                ], null === (_config_performance = config.performance) || void 0 === _config_performance ? void 0 : _config_performance.buildCache)) {
+                    let { buildCache } = config.performance;
+                    !0 === buildCache ? config.performance.buildCache = {
+                        buildDependencies: envs.filePaths
+                    } : (buildCache.buildDependencies ||= [], buildCache.buildDependencies.push(...envs.filePaths));
+                }
+            }
+        }(config, envs);
+        let resolvedOptions = {
             cwd: process.cwd(),
-            rsbuildConfig,
-            ...options
+            ...options,
+            rsbuildConfig: config
         }, pluginManager = (plugins = [], {
             getPlugins: (options = {
                 environment: RSBUILD_ALL_ENVIRONMENT_SYMBOL
@@ -6844,7 +6864,7 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
             isPluginExists: (pluginName, options = {
                 environment: RSBUILD_ALL_ENVIRONMENT_SYMBOL
             })=>!!plugins.find((plugin)=>plugin.instance.name === pluginName && isPluginMatchEnvironment(plugin.environment, options.environment))
-        }), context = await createContext(rsbuildOptions, rsbuildOptions.rsbuildConfig, rsbuildConfig.provider ? 'webpack' : 'rspack'), getPluginAPI = function({ context, pluginManager }) {
+        }), context = await createContext(resolvedOptions, config), getPluginAPI = function({ context, pluginManager }) {
             let { hooks } = context, publicContext = function(context) {
                 let exposedKeys = [
                     'version',
@@ -7025,10 +7045,10 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
         context.getPluginAPI = getPluginAPI;
         let globalPluginAPI = getPluginAPI();
         rslog_index_js_namespaceObject.logger.debug('add default plugins'), await applyDefaultPlugins(pluginManager, context), rslog_index_js_namespaceObject.logger.debug('add default plugins done');
-        let provider = rsbuildConfig.provider || rspackProvider, providerInstance = await provider({
+        let provider = config.provider || rspackProvider, providerInstance = await provider({
             context,
             pluginManager,
-            rsbuildOptions,
+            rsbuildOptions: resolvedOptions,
             helpers: provider_helpers_namespaceObject
         }), rsbuild = {
             build: async (...args)=>{
@@ -7086,19 +7106,21 @@ throw new Error('Failed to load Node.js addon: "${name}"\\n' + error);
                 'initConfigs',
                 'inspectConfig'
             ])
-        }, getFlattenedPlugins = async (pluginOptions)=>{
+        };
+        envs && (rsbuild.onCloseBuild(envs.cleanup), rsbuild.onCloseDevServer(envs.cleanup));
+        let getFlattenedPlugins = async (pluginOptions)=>{
             let plugins = pluginOptions;
             do plugins = (await Promise.all(plugins)).flat(Number.POSITIVE_INFINITY);
             while (plugins.some((v)=>(0, types_namespaceObject.isPromise)(v)));
             return plugins;
         };
-        if (rsbuildConfig.plugins) {
-            let plugins = await getFlattenedPlugins(rsbuildConfig.plugins);
+        if (config.plugins) {
+            let plugins = await getFlattenedPlugins(config.plugins);
             rsbuild.addPlugins(plugins);
         }
-        return rsbuildConfig.environments && await Promise.all(Object.entries(rsbuildConfig.environments).map(async ([name, config])=>{
-            if (!config.plugins || context.specifiedEnvironments && !context.specifiedEnvironments.includes(name)) return;
-            let plugins = await getFlattenedPlugins(config.plugins);
+        return config.environments && await Promise.all(Object.entries(config.environments).map(async ([name, environmentConfig])=>{
+            if (!environmentConfig.plugins || context.specifiedEnvironments && !context.specifiedEnvironments.includes(name)) return;
+            let plugins = await getFlattenedPlugins(environmentConfig.plugins);
             rsbuild.addPlugins(plugins, {
                 environment: name
             });
@@ -7432,13 +7454,13 @@ ${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.2.18\n`);
+            (!npm_execpath || npm_execpath.includes('npx-cli.js') || npm_execpath.includes('.bun')) && console.log(), rslog_index_js_namespaceObject.logger.greet(`  Rsbuild v1.2.19\n`);
         }();
         try {
             !function() {
                 let cli = cac_dist('rsbuild');
-                cli.help(), cli.version("1.2.18"), applyCommonOptions(cli);
-                let devCommand = cli.command('dev', 'starting the dev server'), 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');
+                cli.help(), cli.version("1.2.19"), 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 {
                         let rsbuild = await init({
@@ -7458,7 +7480,7 @@ ${section.body}` : section.body).join("\n\n"));
                         }));
                         buildInstance && (options.watch ? onBeforeRestartServer(buildInstance.close) : await buildInstance.close());
                     } catch (err) {
-                        rslog_index_js_namespaceObject.logger.error('Failed to build.'), rslog_index_js_namespaceObject.logger.error(err), process.exit(1);
+                        err instanceof Error && err.message === RSPACK_BUILD_ERROR || rslog_index_js_namespaceObject.logger.error('Failed to build.'), rslog_index_js_namespaceObject.logger.error(err), process.exit(1);
                     }
                 }), previewCommand.action(async (options)=>{
                     try {
@@ -7488,7 +7510,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_rslib_entry_version = "1.2.18";
+    let src_rslib_entry_version = "1.2.19";
 })();
 var __webpack_export_target__ = exports;
 for(var __webpack_i__ in __webpack_exports__)__webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];

package/dist/index.js

@@ -1458,43 +1458,39 @@ let configCache = {}, OVERRIDE_PATHS = [
         merged[key] = merge(x[key], y[key], childPath);
     }
     return merged;
-}, mergeRsbuildConfig = (...configs)=>2 === configs.length ? merge(configs[0], configs[1]) : configs.length < 2 ? configs[0] : configs.reduce((result, config)=>merge(result, config), {}), commonOpts = {}, getEnvDir = (cwd, envDir)=>envDir ? __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.isAbsolute(envDir) ? envDir : __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.join(cwd, envDir) : cwd;
+}, mergeRsbuildConfig = (...configs)=>2 === configs.length ? merge(configs[0], configs[1]) : configs.length < 2 ? configs[0] : configs.reduce((result, config)=>merge(result, config), {}), commonOpts = {}, getEnvDir = (cwd, envDir)=>envDir ? __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.isAbsolute(envDir) ? envDir : __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__.default.join(cwd, envDir) : cwd, init_loadConfig = async (root)=>{
+    var _config_server;
+    let { content: config, filePath } = await config_loadConfig({
+        cwd: root,
+        path: commonOpts.config,
+        envMode: commonOpts.envMode,
+        loader: commonOpts.configLoader
+    });
+    return config.dev ||= {}, config.source ||= {}, config.server ||= {}, commonOpts.base && (config.server.base = commonOpts.base), commonOpts.root && (config.root = root), commonOpts.mode && (config.mode = commonOpts.mode), !commonOpts.open || (null === (_config_server = config.server) || void 0 === _config_server ? void 0 : _config_server.open) || (config.server.open = commonOpts.open), commonOpts.host && (config.server.host = commonOpts.host), commonOpts.port && (config.server.port = commonOpts.port), void 0 === config.dev.cliShortcuts && (config.dev.cliShortcuts = !0), filePath && (config.dev.watchFiles = [
+        ...config.dev.watchFiles ? castArray(config.dev.watchFiles) : [],
+        {
+            paths: filePath,
+            type: 'reload-server'
+        }
+    ]), config;
+};
 async function init({ cliOptions, isRestart, isBuildWatch = !1 }) {
     cliOptions && (commonOpts = cliOptions);
     try {
-        var _config_server, _config_dev, _config_performance;
-        let cwd = process.cwd(), root = commonOpts.root ? getAbsolutePath(cwd, commonOpts.root) : cwd, envs = loadEnv({
-            cwd: getEnvDir(root, commonOpts.envDir),
-            mode: commonOpts.envMode
-        }), { content: config, filePath: configFilePath } = await config_loadConfig({
-            cwd: root,
-            path: commonOpts.config,
-            envMode: commonOpts.envMode,
-            loader: commonOpts.configLoader
-        });
-        if (config.source ||= {}, config.source.define = {
-            ...envs.publicVars,
-            ...config.source.define
-        }, commonOpts.base && (config.server ||= {}, config.server.base = commonOpts.base), commonOpts.root && (config.root = root), commonOpts.mode && (config.mode = commonOpts.mode), !commonOpts.open || (null === (_config_server = config.server) || void 0 === _config_server ? void 0 : _config_server.open) || (config.server ||= {}, config.server.open = commonOpts.open), commonOpts.host && (config.server ||= {}, config.server.host = commonOpts.host), commonOpts.port && (config.server ||= {}, config.server.port = commonOpts.port), (null === (_config_dev = config.dev) || void 0 === _config_dev ? void 0 : _config_dev.cliShortcuts) === void 0 && (config.dev ||= {}, config.dev.cliShortcuts = !0), (null === (_config_performance = config.performance) || void 0 === _config_performance ? void 0 : _config_performance.buildCache) && envs.filePaths.length > 0) {
-            let { buildCache } = config.performance;
-            !0 === buildCache ? config.performance.buildCache = {
-                buildDependencies: envs.filePaths
-            } : (buildCache.buildDependencies ||= [], buildCache.buildDependencies.push(...envs.filePaths));
-        }
-        let rsbuild = await createRsbuild({
+        let cwd = process.cwd(), root = commonOpts.root ? getAbsolutePath(cwd, commonOpts.root) : cwd, rsbuild = await createRsbuild({
             cwd: root,
-            rsbuildConfig: config,
-            environment: commonOpts.environment
+            rsbuildConfig: ()=>init_loadConfig(root),
+            environment: commonOpts.environment,
+            loadEnv: {
+                cwd: getEnvDir(root, commonOpts.envDir),
+                mode: commonOpts.envMode
+            }
         });
         return rsbuild.onBeforeCreateCompiler(()=>{
             let command = process.argv[2];
             if ('dev' === command || isBuildWatch) {
                 var _config_dev;
-                let files = [
-                    ...envs.filePaths
-                ];
-                configFilePath && files.push(configFilePath);
-                let config = rsbuild.getNormalizedConfig();
+                let files = [], config = rsbuild.getNormalizedConfig();
                 if (null === (_config_dev = config.dev) || void 0 === _config_dev ? void 0 : _config_dev.watchFiles) for (let watchFilesConfig of castArray(config.dev.watchFiles)){
                     if ('reload-server' !== watchFilesConfig.type) continue;
                     let paths = castArray(watchFilesConfig.paths);
@@ -1502,7 +1498,7 @@ async function init({ cliOptions, isRestart, isBuildWatch = !1 }) {
                 }
                 watchFilesForRestart(files, root, isBuildWatch);
             }
-        }), rsbuild.onCloseBuild(envs.cleanup), rsbuild.onCloseDevServer(envs.cleanup), rsbuild;
+        }), rsbuild;
     } catch (err) {
         if (isRestart) __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.error(err);
         else throw err;
@@ -2281,14 +2277,14 @@ async function updateEnvironmentContext(context, configs) {
         });
     }
 }
-async function createContext(options, userConfig, bundlerType) {
+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.2.18",
+        version: "1.2.19",
         rootPath,
         distPath: '',
         cachePath,
-        bundlerType,
+        bundlerType: userConfig.provider ? 'webpack' : 'rspack',
         environments: {},
         hooks: {
             onExit: createAsyncHook(),
@@ -5249,24 +5245,24 @@ class SocketServer {
     getStats(name) {
         let curStats = this.stats[name];
         if (!curStats) return null;
-        let statsOptions = getStatsOptions(curStats.compilation.compiler);
-        return {
-            statsJson: curStats.toJson({
-                all: !1,
-                hash: !0,
-                assets: !0,
-                warnings: !0,
-                warningsCount: !0,
-                errors: !0,
-                errorsCount: !0,
-                errorDetails: !1,
-                entrypoints: !0,
-                children: !0,
-                moduleTrace: !0,
-                ...statsOptions
-            }),
+        let statsOptions = getStatsOptions(curStats.compilation.compiler), statsJson = curStats.toJson({
+            all: !1,
+            hash: !0,
+            assets: !0,
+            warnings: !0,
+            warningsCount: !0,
+            errors: !0,
+            errorsCount: !0,
+            errorDetails: !1,
+            entrypoints: !0,
+            children: !0,
+            moduleTrace: !0,
+            ...statsOptions
+        });
+        return statsJson ? {
+            statsJson,
             root: curStats.compilation.compiler.options.context
-        };
+        } : null;
     }
     sendStats({ force = !1, compilationId }) {
         let result = this.getStats(compilationId);
@@ -6350,7 +6346,7 @@ async function createCompiler_createCompiler(options) {
         rspackConfigs
     };
 }
-let build_build = async (initOptions, { watch, compiler: customCompiler } = {})=>{
+let RSPACK_BUILD_ERROR = 'Rspack build failed.', build_build = async (initOptions, { watch, compiler: customCompiler } = {})=>{
     let compiler, bundlerConfigs;
     let { context } = initOptions;
     if (customCompiler) compiler = customCompiler;
@@ -6375,7 +6371,7 @@ let build_build = async (initOptions, { watch, compiler: customCompiler } = {})=
     };
     let { stats } = await new Promise((resolve, reject)=>{
         compiler.run((err, stats)=>{
-            err ? reject(err) : (null == stats ? void 0 : stats.hasErrors()) ? reject(Error('Rspack build failed!')) : compiler.close((closeErr)=>{
+            err ? reject(err) : (null == stats ? void 0 : stats.hasErrors()) ? reject(Error(RSPACK_BUILD_ERROR)) : compiler.close((closeErr)=>{
                 closeErr && __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.error(closeErr), resolve({
                     stats
                 });
@@ -6671,10 +6667,34 @@ async function applyDefaultPlugins(pluginManager, context) {
 }
 async function createRsbuild(options = {}) {
     let plugins;
-    let { rsbuildConfig = {} } = options, rsbuildOptions = {
+    let envs = options.loadEnv ? loadEnv({
+        cwd: options.cwd,
+        ...'boolean' == typeof options.loadEnv ? {} : options.loadEnv
+    }) : null, config = isFunction(options.rsbuildConfig) ? await options.rsbuildConfig() : options.rsbuildConfig || {};
+    !function(config, envs) {
+        var _config_performance;
+        if (null !== envs) {
+            if (config.source ||= {}, config.source.define = {
+                ...envs.publicVars,
+                ...config.source.define
+            }, 0 !== envs.filePaths.length && (config.dev ||= {}, config.dev.watchFiles = [
+                ...config.dev.watchFiles ? castArray(config.dev.watchFiles) : [],
+                {
+                    paths: envs.filePaths,
+                    type: 'reload-server'
+                }
+            ], null === (_config_performance = config.performance) || void 0 === _config_performance ? void 0 : _config_performance.buildCache)) {
+                let { buildCache } = config.performance;
+                !0 === buildCache ? config.performance.buildCache = {
+                    buildDependencies: envs.filePaths
+                } : (buildCache.buildDependencies ||= [], buildCache.buildDependencies.push(...envs.filePaths));
+            }
+        }
+    }(config, envs);
+    let resolvedOptions = {
         cwd: process.cwd(),
-        rsbuildConfig,
-        ...options
+        ...options,
+        rsbuildConfig: config
     }, pluginManager = (plugins = [], {
         getPlugins: (options = {
             environment: RSBUILD_ALL_ENVIRONMENT_SYMBOL
@@ -6726,7 +6746,7 @@ async function createRsbuild(options = {}) {
         isPluginExists: (pluginName, options = {
             environment: RSBUILD_ALL_ENVIRONMENT_SYMBOL
         })=>!!plugins.find((plugin)=>plugin.instance.name === pluginName && isPluginMatchEnvironment(plugin.environment, options.environment))
-    }), context = await createContext(rsbuildOptions, rsbuildOptions.rsbuildConfig, rsbuildConfig.provider ? 'webpack' : 'rspack'), getPluginAPI = function({ context, pluginManager }) {
+    }), context = await createContext(resolvedOptions, config), getPluginAPI = function({ context, pluginManager }) {
         let { hooks } = context, publicContext = function(context) {
             let exposedKeys = [
                 'version',
@@ -6907,10 +6927,10 @@ async function createRsbuild(options = {}) {
     context.getPluginAPI = getPluginAPI;
     let globalPluginAPI = getPluginAPI();
     __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.debug('add default plugins'), await applyDefaultPlugins(pluginManager, context), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.debug('add default plugins done');
-    let provider = rsbuildConfig.provider || rspackProvider, providerInstance = await provider({
+    let provider = config.provider || rspackProvider, providerInstance = await provider({
         context,
         pluginManager,
-        rsbuildOptions,
+        rsbuildOptions: resolvedOptions,
         helpers: provider_helpers_namespaceObject
     }), rsbuild = {
         build: async (...args)=>{
@@ -6968,19 +6988,21 @@ async function createRsbuild(options = {}) {
             'initConfigs',
             'inspectConfig'
         ])
-    }, getFlattenedPlugins = async (pluginOptions)=>{
+    };
+    envs && (rsbuild.onCloseBuild(envs.cleanup), rsbuild.onCloseDevServer(envs.cleanup));
+    let getFlattenedPlugins = async (pluginOptions)=>{
         let plugins = pluginOptions;
         do plugins = (await Promise.all(plugins)).flat(Number.POSITIVE_INFINITY);
         while (plugins.some((v)=>(0, __WEBPACK_EXTERNAL_MODULE_node_util_types_ce11fc49__.isPromise)(v)));
         return plugins;
     };
-    if (rsbuildConfig.plugins) {
-        let plugins = await getFlattenedPlugins(rsbuildConfig.plugins);
+    if (config.plugins) {
+        let plugins = await getFlattenedPlugins(config.plugins);
         rsbuild.addPlugins(plugins);
     }
-    return rsbuildConfig.environments && await Promise.all(Object.entries(rsbuildConfig.environments).map(async ([name, config])=>{
-        if (!config.plugins || context.specifiedEnvironments && !context.specifiedEnvironments.includes(name)) return;
-        let plugins = await getFlattenedPlugins(config.plugins);
+    return config.environments && await Promise.all(Object.entries(config.environments).map(async ([name, environmentConfig])=>{
+        if (!environmentConfig.plugins || context.specifiedEnvironments && !context.specifiedEnvironments.includes(name)) return;
+        let plugins = await getFlattenedPlugins(environmentConfig.plugins);
         rsbuild.addPlugins(plugins, {
             environment: name
         });
@@ -7313,13 +7335,13 @@ 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.2.18\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.2.19\n`);
     }();
     try {
         !function() {
             let cli = cac_dist('rsbuild');
-            cli.help(), cli.version("1.2.18"), applyCommonOptions(cli);
-            let devCommand = cli.command('dev', 'starting the dev server'), 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');
+            cli.help(), cli.version("1.2.19"), 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 {
                     let rsbuild = await init({
@@ -7339,7 +7361,7 @@ async function runCLI() {
                     }));
                     buildInstance && (options.watch ? onBeforeRestartServer(buildInstance.close) : await buildInstance.close());
                 } catch (err) {
-                    __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.error('Failed to build.'), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.error(err), process.exit(1);
+                    err instanceof Error && err.message === RSPACK_BUILD_ERROR || __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.error('Failed to build.'), __WEBPACK_EXTERNAL_MODULE__compiled_rslog_index_js_c302f6e3__.logger.error(err), process.exit(1);
                 }
             }), previewCommand.action(async (options)=>{
                 try {
@@ -7369,6 +7391,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.2.18";
+let src_version = "1.2.19";
 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/createContext.d.ts

@@ -1,4 +1,4 @@
-import type { BundlerType, InternalContext, NormalizedEnvironmentConfig, ResolvedCreateRsbuildOptions, RsbuildConfig, RsbuildContext } from './types';
+import type { InternalContext, NormalizedEnvironmentConfig, ResolvedCreateRsbuildOptions, RsbuildConfig, RsbuildContext } from './types';
 export declare function getBrowserslist(path: string): Promise<string[] | null>;
 export declare function getBrowserslistByEnvironment(path: string, config: NormalizedEnvironmentConfig): Promise<string[]>;
 export declare function updateEnvironmentContext(context: InternalContext, configs: Record<string, NormalizedEnvironmentConfig>): Promise<void>;
@@ -8,4 +8,4 @@ export declare function createPublicContext(context: RsbuildContext): Readonly<R
  * Generate the actual context used in the build,
  * which can have a lot of overhead and take some side effects.
  */
-export declare function createContext(options: ResolvedCreateRsbuildOptions, userConfig: RsbuildConfig, bundlerType: BundlerType): Promise<InternalContext>;
+export declare function createContext(options: ResolvedCreateRsbuildOptions, userConfig: RsbuildConfig): Promise<InternalContext>;

package/dist-types/index.d.ts

@@ -4,7 +4,7 @@
  */
 import { rspack } from '@rspack/core';
 import type * as Rspack from '@rspack/core';
-export { loadEnv } from './loadEnv';
+export { loadEnv, type LoadEnvOptions, type LoadEnvResult } from './loadEnv';
 export { createRsbuild } from './createRsbuild';
 export { loadConfig, defineConfig, type ConfigParams, type LoadConfigOptions, type LoadConfigResult, } from './config';
 export { runCLI } from './cli';

package/dist-types/loadEnv.d.ts

@@ -21,7 +21,7 @@ export type LoadEnvOptions = {
      */
     processEnv?: Record<string, string>;
 };
-export declare function loadEnv({ cwd, mode, prefixes, processEnv, }?: LoadEnvOptions): {
+export type LoadEnvResult = {
     /**
      * All env variables in the .env file
      */
@@ -60,3 +60,4 @@ export declare function loadEnv({ cwd, mode, prefixes, processEnv, }?: LoadEnvOp
      */
     cleanup: () => void;
 };
+export declare function loadEnv({ cwd, mode, prefixes, processEnv, }?: LoadEnvOptions): LoadEnvResult;

package/dist-types/provider/build.d.ts

@@ -1,3 +1,4 @@
 import type { Build, BuildOptions } from '../types';
 import type { InitConfigsOptions } from './initConfigs';
+export declare const RSPACK_BUILD_ERROR = "Rspack build failed.";
 export declare const build: (initOptions: InitConfigsOptions, { watch, compiler: customCompiler }?: BuildOptions) => Promise<ReturnType<Build>>;

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

@@ -1,4 +1,5 @@
 import type { Compiler, MultiCompiler } from '@rspack/core';
+import type { LoadEnvOptions } from '../loadEnv';
 import type * as providerHelpers from '../provider/helpers';
 import type { RsbuildDevServer } from '../server/devServer';
 import type { StartServerResult } from '../server/helper';
@@ -53,7 +54,8 @@ export type BuildOptions = {
 };
 export type Build = (options?: BuildOptions) => Promise<{
     /**
-     * Stop watching when in watch mode.
+     * Close the build and call the `onCloseBuild` hook.
+     * In watch mode, this method will stop watching.
      */
     close: () => Promise<void>;
     /**
@@ -110,10 +112,19 @@ export type CreateRsbuildOptions = {
     environment?: string[];
     /**
      * Rsbuild configurations.
+     * Passing a function to load the config asynchronously with custom logic.
      */
-    rsbuildConfig?: RsbuildConfig;
+    rsbuildConfig?: RsbuildConfig | (() => Promise<RsbuildConfig>);
+    /**
+     * Whether to call `loadEnv` to load environment variables and define them
+     * as global variables.
+     * @default false
+     */
+    loadEnv?: boolean | LoadEnvOptions;
+};
+export type ResolvedCreateRsbuildOptions = Required<Pick<CreateRsbuildOptions, 'cwd'>> & Pick<CreateRsbuildOptions, 'loadEnv' | 'environment'> & {
+    rsbuildConfig: RsbuildConfig;
 };
-export type ResolvedCreateRsbuildOptions = CreateRsbuildOptions & Required<Omit<CreateRsbuildOptions, 'environment'>>;
 export type CreateDevServer = (options?: CreateDevServerOptions) => Promise<RsbuildDevServer>;
 export type StartDevServer = (options?: StartDevServerOptions) => Promise<StartServerResult>;
 export type ProviderInstance<B extends 'rspack' | 'webpack' = 'rspack'> = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsbuild/core",
-  "version": "1.2.18",
+  "version": "1.2.19",
   "description": "The Rspack-based build tool.",
   "homepage": "https://rsbuild.dev",
   "bugs": {