Skip to content

Commit 8ea102e

Browse files
committed
fix
1 parent d65cf0f commit 8ea102e

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

packages/core/src/types/config.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ export type ToolsHtmlPluginConfig = ConfigChainWithContext<
7676
}
7777
>;
7878

79+
// equivalent to import('webpack-merge').merge
80+
export type WebpackMerge = <Configuration extends object>(
81+
firstConfiguration: Configuration | Configuration[],
82+
...configurations: Configuration[]
83+
) => Configuration;
84+
7985
export type ModifyRspackConfigUtils = ModifyChainUtils & {
8086
addRules: (rules: RspackRule | RspackRule[]) => void;
8187
appendRules: (rules: RspackRule | RspackRule[]) => void;
@@ -86,7 +92,7 @@ export type ModifyRspackConfigUtils = ModifyChainUtils & {
8692
plugins: BundlerPluginInstance | BundlerPluginInstance[],
8793
) => void;
8894
removePlugin: (pluginName: string) => void;
89-
mergeConfig: typeof import('webpack-merge').merge;
95+
mergeConfig: WebpackMerge;
9096
rspack: typeof rspack;
9197
};
9298

packages/core/src/types/plugin.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import type {
1010
NormalizedConfig,
1111
NormalizedEnvironmentConfig,
1212
RsbuildConfig,
13+
WebpackMerge,
1314
} from './config';
1415
import type { RsbuildContext } from './context';
1516
import type {
@@ -159,7 +160,7 @@ export type ModifyWebpackConfigUtils = ModifyWebpackChainUtils & {
159160
plugins: WebpackPluginInstance | WebpackPluginInstance[],
160161
) => void;
161162
removePlugin: (pluginName: string) => void;
162-
mergeConfig: typeof import('webpack-merge').merge;
163+
mergeConfig: WebpackMerge;
163164
};
164165

165166
export type ModifyWebpackChainFn = (

0 commit comments

Comments
 (0)