@modern-js/app-tools 2.3.1-alpha.2 → 2.5.0-alpha.0

package/dist/types/builder/index.d.ts

@@ -1,18 +1 @@
-import { BuilderInstance, BuilderTarget, CreateBuilderOptions } from '@modern-js/builder';
-import { BuilderConfig, BuilderWebpackProvider } from '@modern-js/builder-webpack-provider';
-import type { IAppContext } from '@modern-js/core';
-import type { AppNormalizedConfig } from '../types';
-import { PluginCompatModernOptions } from './builderPlugins/compatModern';
-export type BuilderOptions = {
-  target?: BuilderTarget | BuilderTarget[];
-  normalizedConfig: AppNormalizedConfig;
-  appContext: IAppContext;
-  compatPluginConfig?: PluginCompatModernOptions;
-};
-export declare function createBuilderForModern({
-  normalizedConfig,
-  appContext,
-  compatPluginConfig
-}: BuilderOptions): Promise<BuilderInstance<BuilderWebpackProvider>>;
-export declare function createBuilderProviderConfig(normalizedConfig: AppNormalizedConfig, appContext: IAppContext): BuilderConfig;
-export declare function createBuilderOptions(target: BuilderTarget | BuilderTarget[], appContext: IAppContext): CreateBuilderOptions;
+export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack").createRspackBuilderForModern | typeof import("./builder-webpack").createWebpackBuilderForModern>;

package/dist/types/builder/shared/builderPlugins/adapterModern.d.ts

@@ -0,0 +1,13 @@
+import { BuilderPlugin, DefaultBuilderPluginAPI } from '@modern-js/builder-shared';
+import { BuilderConfig as RspackBuilderConfig, NormalizedConfig as RspackNormalizedConfig } from '@modern-js/builder-rspack-provider';
+import { BuilderConfig as WebpackBuilderConfig, NormalizedConfig as WebpackNormalizedConfig } from '@modern-js/builder-webpack-provider';
+import type { BuilderOptions } from '../types';
+import type { Bundler } from '../../../types';
+type BuilderConfig = RspackBuilderConfig | WebpackBuilderConfig;
+type NormalizedConfig = RspackNormalizedConfig | WebpackNormalizedConfig;
+type BuilderPluginAPI = DefaultBuilderPluginAPI<BuilderConfig, NormalizedConfig>;
+export declare const builderPluginAdapterModern: <B extends Bundler>(options: BuilderOptions<B>) => BuilderPlugin<BuilderPluginAPI>;
+/** register builder hooks callback */
+
+export declare function applyCallbacks<B extends Bundler>(api: BuilderPluginAPI, options: BuilderOptions<B>): void;
+export {};

package/dist/types/builder/{webpackPlugins/htmlAsyncChunkPlugin.d.ts → shared/bundlerPlugins/HtmlAsyncChunkPlugin.d.ts}

@@ -1,8 +1,9 @@
 import type { webpack } from '@modern-js/builder-webpack-provider';
+import type { Rspack } from '@modern-js/builder-rspack-provider';
 import type HtmlWebpackPlugin from '@modern-js/builder-webpack-provider/html-webpack-plugin';
 export declare class HtmlAsyncChunkPlugin {
   name: string;
   htmlWebpackPlugin: typeof HtmlWebpackPlugin;
   constructor(htmlWebpackPlugin: typeof HtmlWebpackPlugin);
-  apply(compiler: webpack.Compiler): void;
+  apply(compiler: webpack.Compiler | Rspack.Compiler): void;
 }

package/dist/types/builder/{webpackPlugins/htmlBottomTemplate.d.ts → shared/bundlerPlugins/HtmlBottomTemplate.d.ts}

@@ -1,4 +1,5 @@
 import type { webpack } from '@modern-js/builder-webpack-provider';
+import type { Rspack } from '@modern-js/builder-rspack-provider';
 import type HtmlWebpackPlugin from '@modern-js/builder-webpack-provider/html-webpack-plugin';
 export declare class BottomTemplatePlugin {
   htmlWebpackPlugin: typeof HtmlWebpackPlugin;
@@ -6,5 +7,5 @@ export declare class BottomTemplatePlugin {
   bodyRegExp: RegExp;
   name: string;
   constructor(htmlWebpackPlugin: typeof HtmlWebpackPlugin);
-  apply(compiler: webpack.Compiler): void;
+  apply(compiler: Rspack.Compiler | webpack.Compiler): void;
 }

package/dist/types/builder/{share.d.ts → shared/createCopyPattern.d.ts}

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { WebpackChain } from '@modern-js/builder-webpack-provider';
-import { AppNormalizedConfig, IAppContext } from '../types';
+import { AppNormalizedConfig, IAppContext } from '../../types';
 export declare function createCopyPattern(appContext: IAppContext, config: AppNormalizedConfig, patternsType: 'upload' | 'public', chain?: WebpackChain): {
   info: (file: {
     sourceFilename: string;

package/dist/types/builder/shared/index.d.ts

@@ -0,0 +1,3 @@
+export * from './createCopyPattern';
+export * from './types';
+export * from './builderPlugins/adapterModern';

package/dist/types/builder/shared/loaders/serverModuleLoader.d.ts

@@ -0,0 +1,4 @@
+import type { webpack } from '@modern-js/builder-webpack-provider';
+import type { Rspack } from '@modern-js/builder-rspack-provider';
+declare function loader(this: webpack.LoaderContext<void> | Rspack.LoaderContext): string;
+export default loader;

package/dist/types/builder/shared/types.d.ts

@@ -0,0 +1,16 @@
+import type { BuilderPluginAPI as WebpackBuilderPluginAPI } from '@modern-js/builder-webpack-provider';
+import type { BuilderPluginAPI as RspackBuilderPluginAPI } from '@modern-js/builder-rspack-provider';
+import { BuilderInstance } from '@modern-js/builder-shared';
+import { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
+type Parameter<T extends (arg: any) => void> = Parameters<T>[0];
+type FnParameter<T extends {
+  [p: string]: (arg: any) => void;
+}> = { [P in keyof T]: Parameter<T[P]> };
+type BuilderPluginCallbacks<B extends Bundler> = FnParameter<Partial<Pick<B extends 'rspack' ? RspackBuilderPluginAPI : WebpackBuilderPluginAPI, 'onAfterBuild' | 'onAfterCreateCompiler' | 'onAfterStartDevServer' | 'onBeforeBuild' | 'onBeforeCreateCompiler' | 'onBeforeStartDevServer' | 'onDevCompileDone' | 'onExit'>>>;
+export type BuilderOptions<B extends Bundler> = {
+  normalizedConfig: AppNormalizedConfig<B>;
+  appContext: IAppContext;
+} & BuilderPluginCallbacks<B>;
+export type ModifyBuilderConfig<B extends Bundler> = (config: AppNormalizedConfig<B>) => Promise<void> | void;
+export type ModifyBuilderInstance = (builder: BuilderInstance) => Promise<void> | void;
+export {};

package/dist/types/commands/build.d.ts

@@ -1,4 +1,4 @@
 import { PluginAPI } from '@modern-js/core';
 import type { BuildOptions } from '../utils/types';
 import type { AppTools } from '../types';
-export declare const build: (api: PluginAPI<AppTools>, options?: BuildOptions) => Promise<void>;
+export declare const build: (api: PluginAPI<AppTools<'shared'>>, options?: BuildOptions) => Promise<void>;

package/dist/types/commands/deploy.d.ts

@@ -1,3 +1,3 @@
 import type { PluginAPI } from '@modern-js/core';
 import type { AppTools } from '../types';
-export declare const deploy: (api: PluginAPI<AppTools>, options: any) => Promise<void>;
+export declare const deploy: (api: PluginAPI<AppTools<'shared'>>, options: any) => Promise<void>;

package/dist/types/commands/dev.d.ts

@@ -1,4 +1,4 @@
 import { PluginAPI } from '@modern-js/core';
 import { DevOptions } from '../utils/types';
 import type { AppTools } from '../types';
-export declare const dev: (api: PluginAPI<AppTools>, options: DevOptions) => Promise<void>;
+export declare const dev: (api: PluginAPI<AppTools<'shared'>>, options: DevOptions) => Promise<void>;

package/dist/types/commands/inspect.d.ts

@@ -1,7 +1,7 @@
 import type { PluginAPI } from '@modern-js/core';
 import type { InspectOptions } from '../utils/types';
 import type { AppTools } from '../types';
-export declare const inspect: (api: PluginAPI<AppTools>, options: InspectOptions) => Promise<{
+export declare const inspect: (api: PluginAPI<AppTools<'shared'>>, options: InspectOptions) => Promise<{
   builderConfig: string;
   bundlerConfigs: string[];
   origin: {

package/dist/types/commands/serve.d.ts

@@ -1,3 +1,3 @@
 import type { PluginAPI } from '@modern-js/core';
 import type { AppTools } from '../types';
-export declare const start: (api: PluginAPI<AppTools>) => Promise<void>;
+export declare const start: (api: PluginAPI<AppTools<'shared'>>) => Promise<void>;

package/dist/types/config/default.d.ts

@@ -1,3 +1,3 @@
 import { IAppContext, AppUserConfig, AppLegacyUserConfig } from '../types';
-export declare function createDefaultConfig(appContext: IAppContext): AppUserConfig;
+export declare function createDefaultConfig(appContext: IAppContext, bundler: 'webpack' | 'rspack'): AppUserConfig<'webpack'> | AppUserConfig<'rspack'>;
 export declare function createLegacyDefaultConfig(appContext: IAppContext): AppLegacyUserConfig;

package/dist/types/config/index.d.ts

@@ -1,2 +1,3 @@
-export { createDefaultConfig, createLegacyDefaultConfig } from './default';
-export { initialNormalizedConfig, checkIsLegacyConfig } from './initial';
+export * from './legacy';
+export * from './initialize';
+export * from './default';

package/dist/types/config/initialize/index.d.ts

@@ -0,0 +1,2 @@
+import type { AppNormalizedConfig, IAppContext } from '../../types';
+export declare function initialNormalizedConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext, bundler: 'webpack' | 'rspack'): AppNormalizedConfig<'shared'>;

package/dist/types/config/{initial → initialize}/inits.d.ts

@@ -1,4 +1,4 @@
 import { AppNormalizedConfig, IAppContext } from '../../types';
-export declare function initHtmlConfig(config: AppNormalizedConfig, appContext: IAppContext): import("@modern-js/builder-shared").SharedHtmlConfig;
-export declare function initSourceConfig(config: AppNormalizedConfig, appContext: IAppContext): void;
-export declare function initToolsConfig(config: AppNormalizedConfig): void;
+export declare function initHtmlConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext): import("@modern-js/builder-shared").SharedHtmlConfig;
+export declare function initSourceConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext, bundler: 'webpack' | 'rspack'): void;
+export declare function initToolsConfig(config: AppNormalizedConfig<'webpack'>): void;

package/dist/types/config/{initial → legacy}/createHtmlConfig.d.ts

@@ -1,2 +1,2 @@
 import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
-export declare function createHtmlConfig(config: Readonly<AppLegacyNormalizedConfig>): AppNormalizedConfig['html'];
+export declare function createHtmlConfig(config: Readonly<AppLegacyNormalizedConfig>): AppNormalizedConfig<'webpack'>['html'];

package/dist/types/config/{initial → legacy}/createOutputConfig.d.ts

@@ -1,2 +1,2 @@
 import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
-export declare function createOutputConfig(config: Readonly<AppLegacyNormalizedConfig>): AppNormalizedConfig['output'];
+export declare function createOutputConfig(config: Readonly<AppLegacyNormalizedConfig>): AppNormalizedConfig<'webpack'>['output'];

package/dist/types/config/{initial → legacy}/createSourceConfig.d.ts

@@ -1,2 +1,2 @@
 import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
-export declare function createSourceConfig(config: AppLegacyNormalizedConfig): AppNormalizedConfig['source'];
+export declare function createSourceConfig(config: AppLegacyNormalizedConfig): AppNormalizedConfig<'webpack'>['source'];

package/dist/types/config/{initial → legacy}/createToolsConfig.d.ts

@@ -1,2 +1,2 @@
 import { AppLegacyNormalizedConfig, AppNormalizedConfig } from '../../types';
-export declare function createToolsConfig(config: AppLegacyNormalizedConfig): AppNormalizedConfig['tools'];
+export declare function createToolsConfig(config: AppLegacyNormalizedConfig): AppNormalizedConfig<'webpack'>['tools'];

package/dist/types/config/legacy/index.d.ts

@@ -0,0 +1,3 @@
+import type { AppLegacyNormalizedConfig, AppLegacyUserConfig, AppNormalizedConfig, AppUserConfig } from '../../types';
+export declare function transformNormalizedConfig(config: AppLegacyNormalizedConfig): AppNormalizedConfig<'webpack'>;
+export declare function checkIsLegacyConfig(config: AppLegacyUserConfig | AppUserConfig): config is AppLegacyUserConfig;

package/dist/types/defineConfig.d.ts

@@ -1,6 +1,6 @@
 import type { UserConfigExport } from '@modern-js/core';
-import type { AppUserConfig, AppLegacyUserConfig } from './types';
-export declare const defineConfig: (config: UserConfigExport<AppUserConfig>) => UserConfigExport<AppUserConfig>;
+import type { AppLegacyUserConfig, AppUserConfig } from './types';
+export declare const defineConfig: <B extends "webpack" | "rspack" = "webpack">(config: UserConfigExport<AppUserConfig<B>>) => UserConfigExport<AppUserConfig<B>>;
 /**
  * @deprecated
  * Using defineConfig first.

package/dist/types/index.d.ts

@@ -4,9 +4,13 @@ import { AppTools } from './types';
 export * from './defineConfig';
 export * from './types';
 export type { RuntimeUserConfig } from './types/config';
-export declare const devCommand: (program: Command, api: PluginAPI<AppTools>) => Promise<void>;
-export declare const buildCommand: (program: Command, api: PluginAPI<AppTools>) => Promise<void>;
+export declare const devCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
+export declare const buildCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
+interface AppToolsOptions {
+  /** Specify the use what kind of bundler to compiler, default: `webpack` */
+  bundler?: 'experimental-rspack' | 'webpack';
+}
 
-declare const _default: () => CliPlugin<AppTools>;
+declare const _default: (options?: AppToolsOptions) => CliPlugin<AppTools<'shared'>>;
 
 export default _default;

package/dist/types/initialize/index.d.ts

@@ -1,5 +1,9 @@
-import { CliPlugin, AppTools } from '../types';
+import type { CliPlugin, AppTools } from '../types';
 
-declare const _default: () => CliPlugin<AppTools>;
+declare const _default: ({
+  bundler
+}: {
+  bundler: 'rspack' | 'webpack';
+}) => CliPlugin<AppTools<'shared'>>;
 
 export default _default;

package/dist/types/types/config/deploy.d.ts

@@ -5,5 +5,4 @@ export interface MicroFrontend {
 }
 export interface DeployUserConfig {
   microFrontend?: boolean | MicroFrontend;
-}
-export type DeployNormalizedConfig = DeployUserConfig;
+}

package/dist/types/types/config/dev.d.ts

@@ -1,5 +1,5 @@
-import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
-type BuilderDevConfig = Required<BuilderConfig>['dev'];
+import type { SharedBuilderConfig } from '@modern-js/builder-shared';
+type BuilderDevConfig = Required<SharedBuilderConfig>['dev'];
 export type DevProxyOptions = string | Record<string, string>;
 export interface DevUserConfig extends BuilderDevConfig {
   /**
@@ -9,5 +9,4 @@ export interface DevUserConfig extends BuilderDevConfig {
    */
   proxy?: string | Record<string, string>;
 }
-export type DevNormalizedConfig = DevUserConfig;
 export {};

package/dist/types/types/config/experiments.d.ts

@@ -1,4 +1,3 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
 export type BuilderExperimentsConfig = Required<BuilderConfig>['experiments'];
-export type ExperimentsUserConfig = BuilderExperimentsConfig;
-export type ExperimentsNormalizedConfig = ExperimentsUserConfig;
+export type ExperimentsUserConfig = BuilderExperimentsConfig;

package/dist/types/types/config/html.d.ts

@@ -1,4 +1,6 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
-export type BuilderHtmlConfig = Required<BuilderConfig>['html'];
-export type HtmlUserConfig = BuilderHtmlConfig;
-export type HtmlNormalizedConfig = HtmlUserConfig;
+import type { BuilderConfig as RsBuilderConfig } from '@modern-js/builder-rspack-provider';
+import { UnwrapBuilderConfig } from '../utils';
+export type { SharedHtmlConfig } from '@modern-js/builder-shared';
+export type HtmlUserConfig = UnwrapBuilderConfig<BuilderConfig, 'html'>;
+export type RsHtmlUserConfig = UnwrapBuilderConfig<RsBuilderConfig, 'html'>;

package/dist/types/types/config/index.d.ts

@@ -1,16 +1,14 @@
-import type { UserConfig } from '@modern-js/core';
-import type { ServerUserConfig, ServerNormalizedConfig, BffUserConfig, BffNormalizedConfig } from '@modern-js/server-core';
+import type { ServerUserConfig, BffUserConfig } from '@modern-js/server-core';
 import type { BuilderPlugin } from '@modern-js/builder-webpack-provider';
-import type { AppToolsHooks } from '../hooks';
-import type { OutputNormalizedConfig, OutputUserConfig } from './output';
-import type { SourceNormalizedConfig, SourceUserConfig } from './source';
-import type { DevNormalizedConfig, DevUserConfig } from './dev';
-import type { ToolsNormalizedConfig, ToolsUserConfig } from './tools';
-import type { HtmlNormalizedConfig, HtmlUserConfig } from './html';
-import type { SecurityNormalizedConfig, SecurityUserConfig } from './security';
-import type { DeployNormalizedConfig, DeployUserConfig } from './deploy';
-import type { ExperimentsUserConfig, ExperimentsNormalizedConfig } from './experiments';
-import type { PerformanceNormalizedConfig, PerformanceUserConfig } from './performance';
+import type { OutputUserConfig, RsOutputUserConfig, SharedOutputConfig } from './output';
+import type { RsSourceUserConfig, SharedSourceConfig, SourceUserConfig } from './source';
+import type { DevUserConfig } from './dev';
+import type { RsToolsUserConfig, SharedToolsConfig, ToolsUserConfig } from './tools';
+import type { HtmlUserConfig, RsHtmlUserConfig, SharedHtmlConfig } from './html';
+import type { SecurityUserConfig } from './security';
+import type { DeployUserConfig } from './deploy';
+import type { ExperimentsUserConfig } from './experiments';
+import type { PerformanceUserConfig, RsPerformanceConfig, SharedPerformanceConfig } from './performance';
 export * from './output';
 export interface RuntimeUserConfig {
   [name: string]: any;
@@ -18,22 +16,10 @@ export interface RuntimeUserConfig {
 export interface RuntimeByEntriesUserConfig {
   [name: string]: RuntimeUserConfig;
 }
-export type RuntimeNormalizedConfig = RuntimeUserConfig;
-export type RuntimeByEntriesNormalizedConfig = RuntimeByEntriesUserConfig;
-export interface AppToolsUserConfig {
-  source?: SourceUserConfig;
-  output?: OutputUserConfig;
+export type SharedUserConfig = {
   server?: ServerUserConfig;
-  dev?: DevUserConfig;
-  deploy?: DeployUserConfig;
-  html?: HtmlUserConfig;
-  tools?: ToolsUserConfig;
-  runtime?: RuntimeUserConfig;
-  security?: SecurityUserConfig;
-  runtimeByEntries?: RuntimeByEntriesUserConfig;
-  performance?: PerformanceUserConfig;
-  experiments?: ExperimentsUserConfig;
-  builderPlugins?: BuilderPlugin[];
+  source?: SharedSourceConfig;
+  output?: SharedOutputConfig;
   /**
    * The configuration of `bff` is provided by `bff` plugin.
    * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
@@ -41,26 +27,33 @@ export interface AppToolsUserConfig {
    */
 
   bff?: BffUserConfig;
+  dev?: DevUserConfig;
+  deploy?: DeployUserConfig;
+  runtime?: RuntimeUserConfig;
+  runtimeByEntries?: RuntimeByEntriesUserConfig;
+  html?: SharedHtmlConfig;
+  tools?: SharedToolsConfig;
+  builderPlugins?: BuilderPlugin[];
+  performance?: SharedPerformanceConfig;
+};
+export interface AppToolsUserConfig extends SharedUserConfig {
+  source?: SourceUserConfig;
+  output?: OutputUserConfig;
+  html?: HtmlUserConfig;
+  tools?: ToolsUserConfig;
+  security?: SecurityUserConfig;
+  performance?: PerformanceUserConfig;
+  experiments?: ExperimentsUserConfig;
+}
+export interface RsAppToolsUserConfig extends SharedUserConfig {
+  source?: RsSourceUserConfig;
+  output?: RsOutputUserConfig;
+  html?: RsHtmlUserConfig;
+  tools?: RsToolsUserConfig;
+  performance?: RsPerformanceConfig;
 }
-export type AppToolsNormalizedConfig = {
-  source: SourceNormalizedConfig;
-  bff: BffNormalizedConfig;
-  dev: DevNormalizedConfig;
-  deploy: DeployNormalizedConfig;
-  html: HtmlNormalizedConfig;
-  runtime: RuntimeNormalizedConfig;
-  runtimeByEntries: RuntimeByEntriesNormalizedConfig;
-  output: OutputNormalizedConfig;
-  security: SecurityNormalizedConfig;
-  server: ServerNormalizedConfig;
-  tools: ToolsNormalizedConfig;
-  performance: PerformanceNormalizedConfig;
-  experiments: ExperimentsNormalizedConfig;
-  builderPlugins: BuilderPlugin[];
+interface SharedNormalizedConfig<RawConfig> {
   cliOptions?: Record<string, any>;
-  _raw: UserConfig<{
-    hooks: AppToolsHooks;
-    userConfig: AppToolsUserConfig;
-    normalizedConfig: AppToolsNormalizedConfig;
-  }>;
-};
+  _raw: RawConfig;
+}
+export type AppToolsNormalizedConfig<Config = SharedUserConfig> = Required<Config> & SharedNormalizedConfig<Config>;

package/dist/types/types/config/output.d.ts

@@ -1,10 +1,15 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
-export type BuilderOutputConfig = Required<BuilderConfig>['output'];
-export interface OutputUserConfig extends BuilderOutputConfig {
+import type { BuilderConfig as RsBuilderConfig } from '@modern-js/builder-rspack-provider';
+import type { SharedOutputConfig as BuilderSharedOutputConfig } from '@modern-js/builder-shared';
+import { UnwrapBuilderConfig } from '../utils';
+export type BuilderOutputConfig = UnwrapBuilderConfig<BuilderConfig, 'output'>;
+export type RsBuilderOutputConfig = UnwrapBuilderConfig<RsBuilderConfig, 'output'>;
+export interface SharedOutputConfig extends BuilderSharedOutputConfig {
   ssg?: SSGConfig;
   disableNodePolyfill?: boolean;
 }
-export type OutputNormalizedConfig = OutputUserConfig;
+export interface OutputUserConfig extends BuilderOutputConfig, SharedOutputConfig {}
+export interface RsOutputUserConfig extends RsBuilderOutputConfig, SharedOutputConfig {}
 export type SSGRouteOptions = string | {
   url: string;
   output?: string;

package/dist/types/types/config/performance.d.ts

@@ -1,4 +1,7 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
-export type BuilderPerformanceConfig = Required<BuilderConfig>['performance'];
-export type PerformanceUserConfig = BuilderPerformanceConfig;
-export type PerformanceNormalizedConfig = PerformanceUserConfig;
+import type { BuilderConfig as RsBuilderConfig } from '@modern-js/builder-rspack-provider';
+import { UnwrapBuilderConfig } from '../utils';
+export type { SharedPerformanceConfig } from '@modern-js/builder-shared';
+export type BuilderPerformanceConfig = UnwrapBuilderConfig<BuilderConfig, 'performance'>;
+export type RsPerformanceConfig = UnwrapBuilderConfig<RsBuilderConfig, 'performance'>;
+export type PerformanceUserConfig = BuilderPerformanceConfig;

package/dist/types/types/config/security.d.ts

@@ -1,4 +1,4 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
-export type BuilderSecurityConfig = Required<BuilderConfig>['security'];
-export type SecurityUserConfig = BuilderSecurityConfig;
-export type SecurityNormalizedConfig = SecurityUserConfig;
+import { UnwrapBuilderConfig } from '../utils';
+export type BuilderSecurityConfig = UnwrapBuilderConfig<BuilderConfig, 'security'>;
+export type SecurityUserConfig = BuilderSecurityConfig;

package/dist/types/types/config/source.d.ts

@@ -1,12 +1,15 @@
 import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
-export type BuilderSourceConfig = Required<BuilderConfig>['source'];
+import type { BuilderConfig as RsBuilderConfig } from '@modern-js/builder-rspack-provider';
+import type { SharedSourceConfig as BuilderSharedSourceConfig } from '@modern-js/builder-shared';
+export type BuilderSourceConfig = NonNullable<BuilderConfig['source']>;
+export type RsBuilderSourceConfig = NonNullable<RsBuilderConfig['source']>;
 export type Entry = string | {
   entry: string;
   disableMount?: boolean;
   customBootstrap?: string;
 };
 export type Entries = Record<string, Entry>;
-export interface SourceUserConfig extends BuilderSourceConfig {
+export interface SharedSourceConfig extends BuilderSharedSourceConfig {
   entries?: Entries;
   enableAsyncEntry?: boolean;
   disableDefaultEntries?: boolean;
@@ -21,4 +24,5 @@ export interface SourceUserConfig extends BuilderSourceConfig {
 
   designSystem?: Record<string, any>;
 }
-export type SourceNormalizedConfig = SourceUserConfig;
+export interface SourceUserConfig extends BuilderSourceConfig, SharedSourceConfig {}
+export interface RsSourceUserConfig extends RsBuilderSourceConfig, SharedSourceConfig {}

package/dist/types/types/config/tools.d.ts

@@ -2,7 +2,13 @@ import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
 import type { JestConfig } from '@modern-js/core';
 import type { PluginSwcOptions } from '@modern-js/builder-plugin-swc';
 import type { PluginEsbuildOptions } from '@modern-js/builder-plugin-esbuild';
-export type BuilderToolsConfig = Required<BuilderConfig>['tools'];
+import type { BuilderConfig as RsBuilderConfig } from '@modern-js/builder-rspack-provider';
+import type { SharedToolsConfig as BuilderSharedToolsConfig } from '@modern-js/builder-shared';
+import type { UnwrapBuilderConfig } from '../utils';
+export type BuilderToolsConfig = UnwrapBuilderConfig<BuilderConfig, 'tools'> & {
+  esbuild?: PluginEsbuildOptions;
+};
+export type RsBuilderToolsConfig = UnwrapBuilderConfig<RsBuilderConfig, 'tools'>;
 /**
  * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin.
  * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
@@ -10,10 +16,9 @@ export type BuilderToolsConfig = Required<BuilderConfig>['tools'];
  */
 
 export type Tailwindcss = Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
-export interface ToolsUserConfig extends BuilderToolsConfig {
+export interface SharedToolsConfig extends BuilderSharedToolsConfig {
   tailwindcss?: Tailwindcss;
   jest?: JestConfig | ((jestConfig: JestConfig) => JestConfig);
-  esbuild?: PluginEsbuildOptions;
   /**
    * The configuration of `swc` is provided by `swc` plugin.
    * @requires `swc` plugin
@@ -21,4 +26,5 @@ export interface ToolsUserConfig extends BuilderToolsConfig {
 
   swc?: PluginSwcOptions;
 }
-export type ToolsNormalizedConfig = ToolsUserConfig;
+export interface ToolsUserConfig extends BuilderToolsConfig, SharedToolsConfig {}
+export interface RsToolsUserConfig extends SharedToolsConfig, RsBuilderToolsConfig {}

package/dist/types/types/hooks.d.ts

@@ -3,6 +3,8 @@ import type { AsyncWaterfall, AsyncWorkflow, ParallelWorkflow } from '@modern-js
 import type { Entrypoint, HtmlPartials, NestedRoute, PageRoute, RouteLegacy, ServerRoute } from '@modern-js/types';
 import type { RegisterBuildPlatformResult, DevToolData } from '@modern-js/core';
 import type { Stats, MultiStats } from '@modern-js/builder-shared';
+import type { Rspack } from '@modern-js/builder-rspack-provider';
+import { Bundler } from './utils';
 export interface ImportSpecifier {
   local?: string;
   imported?: string;
@@ -17,7 +19,7 @@ export interface RuntimePlugin {
   options: string;
   args?: string;
 }
-export type AppToolsHooks = {
+export type AppToolsHooks<B extends Bundler = 'webpack'> = {
   modifyEntryExport: AsyncWaterfall<{
     entrypoint: Entrypoint;
     exportStatement: string;
@@ -60,16 +62,16 @@ export type AppToolsHooks = {
   beforeDev: AsyncWorkflow<void, unknown>;
   afterDev: AsyncWorkflow<void, unknown>;
   beforeCreateCompiler: AsyncWorkflow<{
-    bundlerConfigs: webpack.Configuration[];
+    bundlerConfigs?: B extends 'rspack' ? Rspack.Configuration[] : webpack.Configuration[];
   }, unknown>;
   afterCreateCompiler: AsyncWorkflow<{
-    compiler?: webpack.Compiler | webpack.MultiCompiler;
+    compiler?: B extends 'rspack' ? Rspack.Compiler : webpack.Compiler | webpack.MultiCompiler;
   }, unknown>;
   beforePrintInstructions: AsyncWaterfall<{
     instructions: string;
   }>;
   beforeBuild: AsyncWorkflow<{
-    bundlerConfigs?: webpack.Configuration[];
+    bundlerConfigs?: B extends 'rspack' ? Rspack.Configuration[] : webpack.Configuration[];
   }, unknown>;
   afterBuild: AsyncWorkflow<{
     stats?: Stats | MultiStats;

package/dist/types/types/index.d.ts

@@ -1,23 +1,35 @@
 import type { NormalizedConfig, UserConfig } from '@modern-js/core';
-import type { AppToolsUserConfig, AppToolsNormalizedConfig } from './config';
+import type { AppToolsUserConfig, AppToolsNormalizedConfig, SharedUserConfig, RsAppToolsUserConfig } from './config';
 import type { AppToolsHooks } from './hooks';
 import type { AppToolsLegacyUserConfig, AppToolsLegacyNormalizedConfig } from './legacyConfig';
+import { Bundler, FromConfig } from './utils';
 export * from './hooks';
 export * from './config';
 export * from './legacyConfig';
+export type { webpack } from '@modern-js/builder-webpack-provider';
+export type { Rspack } from '@modern-js/builder-rspack-provider';
+export type { Bundler } from './utils';
 export type { ServerUserConfig, ServerNormalizedConfig, BffUserConfig, BffNormalizedConfig, SSR, SSRByEntries } from '@modern-js/server-core';
 export type { IAppContext, PluginAPI, CliPlugin, NormalizedConfig, UserConfig } from '@modern-js/core';
-export type AppTools = {
-  hooks: AppToolsHooks;
-  userConfig: AppToolsUserConfig;
-  normalizedConfig: AppToolsNormalizedConfig;
+export type AppTools<B extends Bundler = 'webpack'> = {
+  hooks: AppToolsHooks<B>;
+  userConfig: FromConfig<B, {
+    rspack: RsAppToolsUserConfig;
+    webpack: AppToolsUserConfig;
+    shared: SharedUserConfig;
+  }>;
+  normalizedConfig: FromConfig<B, {
+    rspack: AppToolsNormalizedConfig<RsAppToolsUserConfig>;
+    webpack: AppToolsNormalizedConfig<AppToolsUserConfig>;
+    shared: AppToolsNormalizedConfig<SharedUserConfig>;
+  }>;
 };
 export type LegacyAppTools = {
   hooks: AppToolsHooks;
   userConfig: AppToolsLegacyUserConfig;
   normalizedConfig: AppToolsLegacyNormalizedConfig;
 };
-export type AppNormalizedConfig = NormalizedConfig<AppTools>;
+export type AppNormalizedConfig<B extends Bundler = 'webpack'> = NormalizedConfig<AppTools<B>>;
 export type AppLegacyNormalizedConfig = NormalizedConfig<LegacyAppTools>;
-export type AppUserConfig = UserConfig<AppTools>;
+export type AppUserConfig<B extends Bundler = 'webpack'> = UserConfig<AppTools<B>>;
 export type AppLegacyUserConfig = UserConfig<LegacyAppTools>;

package/dist/types/types/utils.d.ts

@@ -0,0 +1,7 @@
+export type UnwrapBuilderConfig<Config, Key extends keyof Config> = Required<Config>[Key];
+export type Bundler = 'rspack' | 'webpack' | 'shared';
+export type FromConfig<B extends Bundler, Config extends {
+  rspack: Rspack;
+  webpack: Webpack;
+  shared: Shared;
+}, Rspack = {}, Webpack = {}, Shared = {}> = B extends 'shared' ? Config['shared'] : B extends 'rspack' ? Config['rspack'] : Config['webpack'];

package/dist/types/utils/config.d.ts

@@ -19,4 +19,4 @@ export declare const buildServerConfig: ({
  */
 
 export declare const safeReplacer: () => (key: string, value: unknown) => unknown;
-export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: AppNormalizedConfig) => Promise<void>;
+export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: AppNormalizedConfig<'shared'>) => Promise<void>;

package/dist/types/utils/getServerInternalPlugins.d.ts

@@ -1,2 +1,2 @@
 import { AppTools, PluginAPI } from '../types';
-export declare function getServerInternalPlugins(api: PluginAPI<AppTools>): Promise<Record<string, string>>;
+export declare function getServerInternalPlugins(api: PluginAPI<AppTools<'shared'>>): Promise<Record<string, string>>;

package/dist/types/utils/printInstructions.d.ts

@@ -1,3 +1,3 @@
 import type { IAppContext, CliHooksRunner } from '@modern-js/core';
 import type { AppNormalizedConfig, AppTools } from '../types';
-export declare const printInstructions: (hookRunners: CliHooksRunner<AppTools>, appContext: IAppContext, config: AppNormalizedConfig) => Promise<void>;
+export declare const printInstructions: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<void>;