Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/src/cli/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export async function build(
const { environments } = await composeRsbuildEnvironments(config);
const rsbuildInstance = await createRsbuild({
callerName: 'rslib',
rsbuildConfig: {
config: {
mode: 'production',
root: config.root,
plugins: config.plugins,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/cli/inspect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export async function inspect(
const { environments } = await composeRsbuildEnvironments(config);
const rsbuildInstance = await createRsbuild({
callerName: 'rslib',
rsbuildConfig: {
config: {
mode: 'production',
root: config.root,
plugins: config.plugins,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/cli/mf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ async function initMFRsbuild(

const rsbuildInstance = await createRsbuild({
callerName: 'rslib',
rsbuildConfig: {
config: {
mode: 'development',
root: config.root,
plugins: config.plugins,
Expand Down
15 changes: 6 additions & 9 deletions tests/scripts/rsbuild.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ const updateConfigForTest = async (

const createRsbuild = async (
rsbuildOptions: CreateRsbuildOptions & {
rsbuildConfig?: RsbuildConfig;
config?: RsbuildConfig;
},
plugins: RsbuildPlugins = [],
) => {
const { createRsbuild: createRsbuildInner } = await import('@rsbuild/core');

rsbuildOptions.rsbuildConfig ||= {};
rsbuildOptions.rsbuildConfig.plugins = [
...(rsbuildOptions.rsbuildConfig.plugins || []),
rsbuildOptions.config ||= {};
rsbuildOptions.config.plugins = [
...(rsbuildOptions.config.plugins || []),
...(plugins || []),
];

Expand All @@ -109,7 +109,7 @@ export async function dev({
...options
}: CreateRsbuildOptions & {
plugins?: RsbuildPlugins;
rsbuildConfig?: RsbuildConfig;
config?: RsbuildConfig;
/**
* Playwright Page instance.
* This method will automatically goto the page.
Expand All @@ -119,10 +119,7 @@ export async function dev({
process.env.NODE_ENV = 'development';

options.callerName = 'rslib';
options.rsbuildConfig = await updateConfigForTest(
options.rsbuildConfig || {},
options.cwd,
);
options.config = await updateConfigForTest(options.config || {}, options.cwd);

const rsbuild = await createRsbuild(options, plugins);
const result = await rsbuild.startDevServer();
Expand Down
Loading