Skip to content

Commit 5bdbba4

Browse files
committed
refactor: simplify Rstack config loader
1 parent 2a8b4cd commit 5bdbba4

7 files changed

Lines changed: 8 additions & 13 deletions

File tree

packages/rstack/src/config.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export const define: Define = {
105105
staged: (config) => setConfig('staged', config),
106106
};
107107

108-
export const loadRstackConfigWithMeta = async (): Promise<LoadedRstackConfig> => {
108+
export const loadRstackConfig = async (): Promise<LoadedRstackConfig> => {
109109
const state = getConfigState();
110110
state.configs = {};
111111

@@ -135,8 +135,3 @@ export const loadRstackConfigWithMeta = async (): Promise<LoadedRstackConfig> =>
135135
state.configs = {};
136136
}
137137
};
138-
139-
export const loadRstackConfig = async (): Promise<Configs> => {
140-
const { configs } = await loadRstackConfigWithMeta();
141-
return configs;
142-
};

packages/rstack/src/rsbuildConfig.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { mergeRsbuildConfig, type RsbuildConfigDefinition, type ConfigParams } from '@rsbuild/core';
2-
import { loadRstackConfigWithMeta, type Configs } from './config.js';
2+
import { loadRstackConfig, type Configs } from './config.js';
33

44
const resolveRsbuildConfig = async (configs: Configs, params: ConfigParams) => {
55
const appConfig = configs.app;
@@ -13,7 +13,7 @@ const resolveRsbuildConfig = async (configs: Configs, params: ConfigParams) => {
1313
};
1414

1515
const loadRsbuildConfig: RsbuildConfigDefinition = async (params) => {
16-
const { configs, filePath, dependencies } = await loadRstackConfigWithMeta();
16+
const { configs, filePath, dependencies } = await loadRstackConfig();
1717
const config = await resolveRsbuildConfig(configs, params);
1818

1919
if (!filePath) {

packages/rstack/src/rslibConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const resolveRslibConfig = async (configs: Configs, params: ConfigParams): Promi
1414
};
1515

1616
const loadRslibConfig = (async (params: ConfigParams) => {
17-
const configs = await loadRstackConfig();
17+
const { configs } = await loadRstackConfig();
1818
return resolveRslibConfig(configs, params);
1919
}) as RslibConfigDefinition;
2020

packages/rstack/src/rslintConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { loadRstackConfig } from './config.js';
22
import type { RslintConfig } from '@rslint/core';
33

4-
const configs = await loadRstackConfig();
4+
const { configs } = await loadRstackConfig();
55
const lintExports = configs.lint ?? [];
66

77
let lintConfig: RslintConfig;

packages/rstack/src/rspressConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ const resolveRspressConfig = async (configs: Configs): Promise<UserConfig> => {
1313
};
1414

1515
export default async (): Promise<UserConfig> => {
16-
const configs = await loadRstackConfig();
16+
const { configs } = await loadRstackConfig();
1717
return resolveRspressConfig(configs);
1818
};

packages/rstack/src/rstestConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const resolveRstestConfig = async (configs: Configs) => {
5656
};
5757

5858
const loadRstestConfig = (async (params: ConfigParams) => {
59-
const configs = await loadRstackConfig();
59+
const { configs } = await loadRstackConfig();
6060
const testConfig = await resolveRstestConfig(configs);
6161
return extendsConfig(configs, testConfig, params);
6262
}) as RstestConfigExport;

packages/rstack/src/staged.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export async function runStagedCLI(args: string[]): Promise<void> {
6565
return;
6666
}
6767

68-
const configs = await loadRstackConfig();
68+
const { configs } = await loadRstackConfig();
6969
const stagedConfig = configs.staged;
7070
if (!stagedConfig) {
7171
throw new Error(

0 commit comments

Comments
 (0)