Skip to content

Commit a40932d

Browse files
authored
fix: server.port should be passed to rsbuild (#7897)
1 parent a65ff5b commit a40932d

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

packages/cli/builder/src/shared/devServer.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@ const defaultDevConfig = {
2020
export const transformToRsbuildServerOptions = (
2121
dev: NonNullable<BuilderConfig['dev']>,
2222
devServer: ToolsDevServerConfig,
23+
server?: BuilderConfig['server'],
2324
): {
2425
rsbuildDev: DevConfig;
2526
rsbuildServer: ServerConfig;
2627
} => {
2728
const { host, https, startUrl, beforeStartUrl, ...devConfig } = dev;
2829

29-
const port = process.env.PORT ? Number(process.env.PORT) : 8080;
30+
const port = process.env.PORT
31+
? Number(process.env.PORT)
32+
: (server?.port ?? 8080);
3033
const rsbuildDev: DevConfig = merge(defaultDevConfig, devConfig);
3134
// setupMiddlewares apply by @modern-js/server
3235
delete rsbuildDev.setupMiddlewares;

packages/cli/builder/src/shared/parseCommonConfig.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ export async function parseCommonConfig(
188188
const { rsbuildDev, rsbuildServer } = transformToRsbuildServerOptions(
189189
dev || {},
190190
devServer || {},
191+
builderConfig.server,
191192
);
192193

193194
rsbuildConfig.server = removeUndefinedKey(rsbuildServer);

packages/cli/builder/src/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ export type BuilderConfig = {
271271
};
272272
server?: {
273273
rsc?: boolean;
274+
port?: number;
274275
};
275276
performance?: RsbuildConfig['performance'];
276277
security?: Omit<SecurityConfig, 'sri'>;

0 commit comments

Comments
 (0)