@rsbuild/core 2.1.3 → 2.1.4

package/dist/756.js

@@ -3500,7 +3500,7 @@ function createPublicContext(context) {
 async function createContext(options, userConfig, logger) {
     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;
     return {
-        version: "2.1.3",
+        version: "2.1.4",
         rootPath,
         distPath: '',
         cachePath,
@@ -9874,7 +9874,12 @@ let DEFAULT_CONFIG_FILE_NAMES = [
     'rsbuild.config.mjs',
     'rsbuild.config.cts',
     'rsbuild.config.cjs'
-], getConfigExport = (module)=>module && 'object' == typeof module && 'default' in module ? module.default : module, tryFreshImport = async (configFileURL)=>{
+], canReadExport = (module)=>null !== module && ('object' == typeof module || 'function' == typeof module), getConfigExport = (configModule, exportName, configFilePath)=>{
+    if (!1 === exportName) return {};
+    if ('default' === exportName) return canReadExport(configModule) && 'default' in configModule ? configModule.default : configModule;
+    if (canReadExport(configModule) && Object.hasOwn(configModule, exportName)) return configModule[exportName];
+    throw Error(`Cannot find export ${color.yellow(exportName)} in config file: ${color.dim(configFilePath)}`);
+}, tryFreshImport = async (configFileURL)=>{
     try {
         let { freshImport } = await import("./fresh-import.js");
         return await freshImport(configFileURL);
@@ -9884,15 +9889,32 @@ let DEFAULT_CONFIG_FILE_NAMES = [
 }, loadConfigWithNative = async (configFilePath)=>{
     let configFileURL = pathToFileURL(configFilePath).href, freshImportResult = await tryFreshImport(configFileURL);
     return freshImportResult ? {
-        configExport: getConfigExport(freshImportResult.result),
+        configModule: freshImportResult.result,
         dependencies: freshImportResult.dependencies.sort()
     } : {
-        configExport: getConfigExport(await import(`${configFileURL}?t=${Date.now()}`)),
+        configModule: await import(`${configFileURL}?t=${Date.now()}`),
+        dependencies: []
+    };
+}, loadConfigWithJiti = async (configFilePath, exportName)=>{
+    let { createJiti } = await import("../compiled/jiti/lib/jiti.mjs"), jiti = createJiti(import.meta.filename, {
+        moduleCache: !1,
+        interopDefault: !0,
+        nativeModules: [
+            "typescript"
+        ]
+    });
+    return 'default' === exportName ? {
+        configExport: await jiti.import(configFilePath, {
+            default: !0
+        }),
+        dependencies: []
+    } : {
+        configExport: getConfigExport(await jiti.import(configFilePath), exportName, configFilePath),
         dependencies: []
     };
 };
-async function loadConfig_loadConfig({ cwd = process.cwd(), path, configFileNames, envMode, meta, loader = 'auto', command } = {}) {
-    let configExport, configFilePath = ((root, customConfig, configFileNames = DEFAULT_CONFIG_FILE_NAMES)=>{
+async function loadConfig_loadConfig({ cwd = process.cwd(), path, configFileNames, envMode, meta, loader = 'auto', command, exportName = 'default' } = {}) {
+    let loadedConfig, configFilePath = ((root, customConfig, configFileNames = DEFAULT_CONFIG_FILE_NAMES)=>{
         if (customConfig) {
             let customConfigPath = external_node_path_isAbsolute(customConfig) ? customConfig : join(root, customConfig);
             if (node_fs.existsSync(customConfigPath)) return customConfigPath;
@@ -9909,30 +9931,29 @@ async function loadConfig_loadConfig({ cwd = process.cwd(), path, configFileName
         filePath: configFilePath,
         dependencies: []
     };
-    let dependencies = [], applyMetaInfo = (config)=>(config._privateMeta = {
+    let applyMetaInfo = (config)=>(config._privateMeta = {
             configFilePath
         }, config);
-    if ('native' === loader || 'auto' === loader && (process.features.typescript || process.versions.bun || process.versions.deno) || /\.(?:js|mjs|cjs)$/.test(configFilePath)) try {
-        ({ configExport, dependencies } = await loadConfigWithNative(configFilePath));
-    } catch (err) {
-        let errorMessage = `Failed to load file with native loader: ${color.dim(configFilePath)}`;
-        if ('native' === loader) throw src_logger.error(errorMessage), err;
-        src_logger.debug(`${errorMessage}, fallback to jiti.`), src_logger.debug(err);
-    }
-    if (void 0 === configExport) try {
-        let { createJiti } = await import("../compiled/jiti/lib/jiti.mjs"), jiti = createJiti(import.meta.filename, {
-            moduleCache: !1,
-            interopDefault: !0,
-            nativeModules: [
-                "typescript"
-            ]
-        });
-        configExport = await jiti.import(configFilePath, {
-            default: !0
+    if ('native' === loader || 'auto' === loader && (process.features.typescript || process.versions.bun || process.versions.deno) || /\.(?:js|mjs|cjs)$/.test(configFilePath)) {
+        let result;
+        try {
+            result = await loadConfigWithNative(configFilePath);
+        } catch (err) {
+            let errorMessage = `Failed to load file with native loader: ${color.dim(configFilePath)}`;
+            if ('native' === loader) throw src_logger.error(errorMessage), err;
+            src_logger.debug(`${errorMessage}, fallback to jiti.`), src_logger.debug(err);
+        }
+        result && (loadedConfig = {
+            configExport: getConfigExport(result.configModule, exportName, configFilePath),
+            dependencies: result.dependencies
         });
+    }
+    if (!loadedConfig) try {
+        loadedConfig = await loadConfigWithJiti(configFilePath, exportName);
     } catch (err) {
         throw src_logger.error(`Failed to load file with jiti: ${color.dim(configFilePath)}`), err;
     }
+    let { configExport, dependencies } = loadedConfig;
     if ('function' == typeof configExport) {
         let nodeEnv = process.env.NODE_ENV || '', configParams = {
             env: nodeEnv,
@@ -9940,14 +9961,14 @@ async function loadConfig_loadConfig({ cwd = process.cwd(), path, configFileName
             envMode: envMode || nodeEnv,
             meta
         }, result = await configExport(configParams);
-        if (void 0 === result) throw Error(`${color.dim('[rsbuild:loadConfig]')} The config function must return a config object.`);
+        if (void 0 === result) throw Error('The config function must return a config object.');
         return {
             content: applyMetaInfo(result),
             filePath: configFilePath,
             dependencies
         };
     }
-    if (!isObject(configExport)) throw Error(`${color.dim('[rsbuild:loadConfig]')} The config must be an object or a function that returns an object, get ${color.yellow(configExport)}`);
+    if (!isObject(configExport)) throw Error(`The config must be an object or a function that returns an object, get ${color.yellow(String(configExport))}`);
     return src_logger.debug('configuration loaded from:', configFilePath), {
         content: applyMetaInfo(configExport),
         filePath: configFilePath,
@@ -10086,7 +10107,7 @@ let applyServerOptions = (command)=>{
 };
 function setupCommands(argv) {
     let cli = ((name = "")=>new CAC(name))('rsbuild');
-    cli.version("2.1.3"), 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.1.4"), 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: [
@@ -10150,7 +10171,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.1.3\n`);
+    src_logger.greet(`${'npx' === npm_lifecycle_event || isBun || NODE_RUN_SCRIPT_NAME ? '\n' : ''}Rsbuild v2.1.4\n`);
 }
 function setupLogLevel(argv) {
     if (argv.length <= 3) return;
@@ -10172,5 +10193,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.1.3";
+let src_version = "2.1.4";
 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-types/loadConfig.d.ts

@@ -39,11 +39,16 @@ export type LoadConfigOptions = {
    * The command passed to the config function.
    * @default process.argv[2]
    */ command?: string;
+    /**
+   * The export name to read from the config file.
+   * Set to `false` to execute the config file without reading exports.
+   * @default 'default'
+   */ exportName?: string | false;
 };
-export type LoadConfigResult = {
+export type LoadConfigResult<Config = RsbuildConfig> = {
     /**
    * The loaded configuration object.
-   */ content: RsbuildConfig;
+   */ content: Config;
     /**
    * The path to the loaded configuration file.
    * Return `null` if the configuration file is not found.
@@ -61,4 +66,4 @@ export declare function defineConfig(config: RsbuildConfigSyncFn): RsbuildConfig
 export declare function defineConfig(config: RsbuildConfigAsyncFn): RsbuildConfigAsyncFn;
 export declare function defineConfig(config: RsbuildConfigDefinition): RsbuildConfigDefinition;
 export type ConfigLoader = 'auto' | 'jiti' | 'native';
-export declare function loadConfig({ cwd, path, configFileNames, envMode, meta, loader, command }?: LoadConfigOptions): Promise<LoadConfigResult>;
+export declare function loadConfig<Config = RsbuildConfig>({ cwd, path, configFileNames, envMode, meta, loader, command, exportName }?: LoadConfigOptions): Promise<LoadConfigResult<Config>>;

package/package.json

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