fix: allow config file without exports

Author: chenjiahan

examples/app-react/rstack.config.ts

@@ -10,6 +10,3 @@ define.app(async () => {
 define.test({
   setupFiles: ['./tests/rstest.setup.ts'],
 });
-
-// TODO: remove
-export default {};

examples/app-vanilla/rstack.config.ts

@@ -4,6 +4,3 @@ define.test({
   testEnvironment: 'happy-dom',
   setupFiles: ['./tests/rstest.setup.ts'],
 });
-
-// TODO: remove
-export default {};

examples/lib-node/rstack.config.ts

@@ -3,6 +3,3 @@ import { define } from 'rstack';
 define.lib({
   lib: [{ syntax: ['node 20'], dts: true }],
 });
-
-// TODO: remove
-export default {};

packages/rstack/src/define.ts packages/rstack/src/config.tspackages/rstack/src/define.ts renamed to packages/rstack/src/config.ts

@@ -1,4 +1,4 @@
-import type { RsbuildConfigDefinition } from '@rsbuild/core';
+import { loadConfig, type RsbuildConfigDefinition } from '@rsbuild/core';
 import type { ConfigParams as RslibConfigParams, RslibConfig } from '@rslib/core';
 import type { RstestConfigExport } from '@rstest/core';
 import type { Configuration as StagedConfig } from 'lint-staged';
@@ -68,3 +68,18 @@ export const define: Define = {
   test: (config) => setConfig('test', config),
   staged: (config) => setConfig('staged', config),
 };
+
+export const loadRstackConfig = () => {
+  return loadConfig({
+    loader: 'native',
+    exportName: false,
+    configFileNames: [
+      'rstack.config.ts',
+      'rstack.config.js',
+      'rstack.config.mts',
+      'rstack.config.mjs',
+      'rstack.config.cts',
+      'rstack.config.cjs',
+    ],
+  });
+};

packages/rstack/src/constants.ts

@@ -1,2 +1,2 @@
-export { define } from './define.js';
+export { define } from './config.js';
 export { runCLI } from './cli/index.js';

packages/rstack/src/index.ts

@@ -1,6 +1,5 @@
-import { loadConfig, type RsbuildConfigDefinition, type ConfigParams } from '@rsbuild/core';
-import { getConfig, clearConfig } from './define.js';
-import { configFileNames } from './constants.js';
+import type { RsbuildConfigDefinition, ConfigParams } from '@rsbuild/core';
+import { getConfig, clearConfig, loadRstackConfig } from './config.js';
 
 const resolveRsbuildConfig = async (params: ConfigParams) => {
   const appConfig = getConfig('app');
@@ -14,11 +13,7 @@ const resolveRsbuildConfig = async (params: ConfigParams) => {
 };
 
 const loadRsbuildConfig: RsbuildConfigDefinition = async (params) => {
-  await loadConfig({
-    loader: 'native',
-    configFileNames,
-  });
-
+  await loadRstackConfig();
   const appConfig = await resolveRsbuildConfig(params);
   clearConfig();
   return appConfig;

packages/rstack/src/rsbuildConfig.ts

@@ -1,8 +1,6 @@
-import { loadConfig } from '@rsbuild/core';
 import type { ConfigParams, RslibConfig } from '@rslib/core';
-import type { RslibConfigDefinition } from './define.js';
-import { getConfig, clearConfig } from './define.js';
-import { configFileNames } from './constants.js';
+import type { RslibConfigDefinition } from './config.js';
+import { getConfig, clearConfig, loadRstackConfig } from './config.js';
 
 const resolveRslibConfig = async (params: ConfigParams): Promise<RslibConfig> => {
   const libConfig = getConfig('lib');
@@ -17,11 +15,7 @@ const resolveRslibConfig = async (params: ConfigParams): Promise<RslibConfig> =>
 };
 
 const loadRslibConfig = (async (params: ConfigParams) => {
-  await loadConfig({
-    loader: 'native',
-    configFileNames,
-  });
-
+  await loadRstackConfig();
   const libConfig = await resolveRslibConfig(params);
   clearConfig();
   return libConfig;

packages/rstack/src/rslibConfig.ts

@@ -1,7 +1,6 @@
-import { loadConfig, type ConfigParams } from '@rsbuild/core';
+import type { ConfigParams } from '@rsbuild/core';
 import type { RstestConfig, RstestConfigExport } from '@rstest/core';
-import { getConfig, clearConfig } from './define.js';
-import { configFileNames } from './constants.js';
+import { getConfig, clearConfig, loadRstackConfig } from './config.js';
 
 const extendsConfig = async (testConfig: RstestConfig, params: ConfigParams) => {
   if ('extends' in testConfig) {
@@ -36,11 +35,7 @@ const resolveRstestConfig = async () => {
 };
 
 const loadRstestConfig = (async (params: ConfigParams) => {
-  await loadConfig({
-    loader: 'native',
-    configFileNames,
-  });
-
+  await loadRstackConfig();
   const testConfig = await resolveRstestConfig();
   const finalConfig = extendsConfig(testConfig, params);
 

packages/rstack/src/rstestConfig.ts

@@ -1,7 +1,5 @@
-import { loadConfig } from '@rsbuild/core';
 import lintStaged from 'lint-staged';
-import { configFileNames } from './constants.js';
-import { clearConfig, getConfig } from './define.js';
+import { clearConfig, getConfig, loadRstackConfig } from './config.js';
 
 const stagedHelpMessage = `Rstack v${RSTACK_VERSION}
 
@@ -15,10 +13,7 @@ Options:
 
 async function loadStagedConfig() {
   try {
-    await loadConfig({
-      loader: 'native',
-      configFileNames,
-    });
+    await loadRstackConfig();
     return getConfig('staged');
   } finally {
     clearConfig();