@modern-js/app-tools 2.69.5 → 3.0.0-alpha.0

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

@@ -1,10 +1,8 @@
-import type { CLIPluginAPI } from '@modern-js/plugin-v2';
-import { type Command } from '@modern-js/utils';
+import type { CLIPluginAPI } from '@modern-js/plugin';
+import type { Command } from '@modern-js/utils';
 import type { AppTools } from '../types';
-export declare const devCommand: (program: Command, api: CLIPluginAPI<AppTools<"shared">>) => Promise<void>;
-export declare const buildCommand: (program: Command, api: CLIPluginAPI<AppTools<"shared">>) => Promise<void>;
-export declare const serverCommand: (program: Command, api: CLIPluginAPI<AppTools<"shared">>) => void;
-export declare const deployCommand: (program: Command, api: CLIPluginAPI<AppTools<"shared">>) => void;
-export declare const newCommand: (program: Command, locale: string) => void;
-export declare const inspectCommand: (program: Command, api: CLIPluginAPI<AppTools<"shared">>) => void;
-export declare const upgradeCommand: (program: Command) => void;
+export declare const devCommand: (program: Command, api: CLIPluginAPI<AppTools>) => Promise<void>;
+export declare const buildCommand: (program: Command, api: CLIPluginAPI<AppTools>) => Promise<void>;
+export declare const serverCommand: (program: Command, api: CLIPluginAPI<AppTools>) => void;
+export declare const deployCommand: (program: Command, api: CLIPluginAPI<AppTools>) => void;
+export declare const inspectCommand: (program: Command, api: CLIPluginAPI<AppTools>) => void;

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

@@ -1,4 +1,4 @@
-import type { CLIPluginAPI } from '@modern-js/plugin-v2';
+import type { CLIPluginAPI } from '@modern-js/plugin';
 import type { AppTools } from '../types';
 import type { InspectOptions } from '../utils/types';
-export declare const inspect: (api: CLIPluginAPI<AppTools<"shared">>, options: InspectOptions) => Promise<import("@rsbuild/core").InspectConfigResult<"rspack">>;
+export declare const inspect: (api: CLIPluginAPI<AppTools>, options: InspectOptions) => Promise<import("@rsbuild/core").InspectConfigResult<"rspack">>;

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

@@ -1,8 +1,8 @@
-import type { CLIPluginAPI } from '@modern-js/plugin-v2';
+import type { CLIPluginAPI } from '@modern-js/plugin';
 import { createProdServer } from '@modern-js/prod-server';
 import type { AppTools } from '../types';
 type ExtraServerOptions = {
     launcher?: typeof createProdServer;
 };
-export declare const serve: (api: CLIPluginAPI<AppTools<"shared">>, serverOptions?: ExtraServerOptions) => Promise<void>;
+export declare const serve: (api: CLIPluginAPI<AppTools>, serverOptions?: ExtraServerOptions) => Promise<void>;
 export {};

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

@@ -1,7 +1,7 @@
-import type { InternalContext } from '@modern-js/plugin-v2';
+import type { InternalContext } from '@modern-js/plugin';
 import type { AppTools } from '../types';
 /**
  * old plugin useHookRunners function result
  */
-export declare function getHookRunners(context: InternalContext<AppTools<'shared'>>): Record<string, any>;
+export declare function getHookRunners(context: InternalContext<AppTools>): Record<string, any>;
 export declare function handleSetupResult(setupResult: Record<string, (...args: any) => any>, api: Record<string, any>): void;

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

@@ -1,2 +1,2 @@
-import type { AppTools, CliPluginFuture } from '../types';
-export declare const compatPlugin: () => CliPluginFuture<AppTools<"shared">>;
+import type { AppTools, CliPlugin } from '../types';
+export declare const compatPlugin: () => CliPlugin<AppTools>;

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

@@ -1,4 +1,3 @@
-import type { AppLegacyUserConfig, AppUserConfig } from '../types';
-import type { AppToolsContext } from '../types/new';
-export declare function createDefaultConfig(appContext: AppToolsContext<'shared'>): AppUserConfig<'webpack'> | AppUserConfig<'rspack'>;
-export declare function createLegacyDefaultConfig(appContext: AppToolsContext<'shared'>): AppLegacyUserConfig;
+import type { AppUserConfig } from '../types';
+import type { AppToolsContext } from '../types/plugin';
+export declare function createDefaultConfig(appContext: AppToolsContext): AppUserConfig;

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

@@ -1,3 +1,2 @@
-export * from './legacy';
 export * from './initialize';
 export * from './default';

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

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

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

@@ -1,5 +1,4 @@
 import type { AppNormalizedConfig } from '../../types';
-import type { AppToolsContext } from '../../types/new';
-export declare function initHtmlConfig(config: AppNormalizedConfig<'shared'>, appContext: AppToolsContext<'shared'>): AppNormalizedConfig<'shared'>['html'];
-export declare function initSourceConfig(config: AppNormalizedConfig<'shared'>, appContext: AppToolsContext<'shared'>, bundler: 'webpack' | 'rspack'): void;
-export declare function createBuilderModuleScope(config: AppNormalizedConfig<'webpack'>): (string | RegExp)[] | undefined;
+import type { AppToolsContext } from '../../types/plugin';
+export declare function initHtmlConfig(config: AppNormalizedConfig, appContext: AppToolsContext): AppNormalizedConfig['html'];
+export declare function initSourceConfig(config: AppNormalizedConfig, appContext: AppToolsContext): void;

package/dist/types/constants.d.ts

@@ -1,5 +1,2 @@
-export declare const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
-export declare const STATE_PLUGIN_NAME = "@modern-js/plugin-state";
 export declare const DEFAULT_CONFIG_FILE = "modern.config";
-export declare const DEFAULT_SERVER_CONFIG_FILE = "modern.server-runtime.config";
 export declare const DEFAULT_RUNTIME_CONFIG_FILE = "modern.runtime";

package/dist/types/defineConfig.d.ts

@@ -1,12 +1,11 @@
-import type { UserConfigExport } from '@modern-js/core';
-import type { AppLegacyUserConfig, AppUserConfig } from './types';
+import type { AppUserConfig } from './types';
+export type ConfigParams = {
+    env: string;
+    command: string;
+};
+export type UserConfigExport<Config> = Config | ((env: ConfigParams) => Config | Promise<Config>);
 /**
  * This function helps you to autocomplete configuration types.
  * It accepts a direct config object, or a function that returns a config.
  */
-export declare const defineConfig: <B extends "rspack" | "webpack" = "webpack">(config: UserConfigExport<AppUserConfig<B>>) => UserConfigExport<AppUserConfig<B>>;
-/**
- * @deprecated Please use `defineConfig` instead.
- * `defineLegacyConfig` will be removed in the future major version.
- */
-export declare const defineLegacyConfig: (config: AppLegacyUserConfig) => AppLegacyUserConfig;
+export declare const defineConfig: (config: UserConfigExport<AppUserConfig>) => UserConfigExport<import("./types").AppToolsUserConfig>;

package/dist/types/exports/server.d.ts

@@ -1,5 +1 @@
-import type { UnstableMiddlewareContext, UnstableNext } from '@modern-js/types';
-export type { ServerPlugin, ServerPluginLegacy } from '@modern-js/server-core';
-export type RenderMiddlewareContext = UnstableMiddlewareContext;
-export type RenderNext = UnstableNext;
-export { defineServerConfig as defineConfig } from '../utils/config';
+export type { ServerPlugin } from '@modern-js/server-core';

package/dist/types/index.d.ts

@@ -1,10 +1,8 @@
-import type { AppTools, AppToolsOptions, CliPluginFuture } from './types';
+import type { AppTools, CliPlugin } from './types';
 import { initAppContext } from './utils/initAppContext';
 export * from './defineConfig';
-export declare const appTools: (options?: AppToolsOptions) => CliPluginFuture<AppTools<"shared">>;
-export { defineConfig, defineLegacyConfig } from './defineConfig';
-export { mergeConfig } from '@modern-js/core';
-export type { RuntimeUserConfig } from './types/config';
+export declare const appTools: () => CliPlugin<AppTools>;
+export { defineConfig } from './defineConfig';
 export { dev } from './commands/dev';
 export { serve } from './commands/serve';
 export type { DevOptions } from './utils/types';
@@ -12,3 +10,4 @@ export { generateWatchFiles } from './utils/generateWatchFiles';
 export * from './types';
 export { initAppContext };
 export default appTools;
+export { mergeConfig } from '@modern-js/plugin/cli';

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

@@ -1,4 +1,4 @@
-import { I18n } from '@modern-js/plugin-i18n';
+import { I18n } from '@modern-js/i18n-utils';
 declare const i18n: I18n;
 declare const localeKeys: {
     command: {

package/dist/types/plugins/analyze/constants.d.ts

@@ -1,4 +1,3 @@
-export declare const INDEX_FILE_NAME = "index";
 export declare const ENTRY_FILE_NAME = "entry";
 export declare const HTML_PARTIALS_FOLDER = "html";
 export declare const HTML_PARTIALS_EXTENSIONS: string[];

package/dist/types/plugins/analyze/getBundleEntry.d.ts

@@ -1,4 +1,4 @@
 import type { Entrypoint } from '@modern-js/types';
 import type { AppNormalizedConfig } from '../../types';
-import type { AppToolsContext, AppToolsHooks } from '../../types/new';
-export declare const getBundleEntry: (hooks: AppToolsHooks<"shared">, appContext: AppToolsContext<"shared">, config: AppNormalizedConfig<"shared">) => Promise<Entrypoint[]>;
+import type { AppToolsContext, AppToolsHooks } from '../../types/plugin';
+export declare const getBundleEntry: (hooks: AppToolsHooks, appContext: AppToolsContext, config: AppNormalizedConfig) => Promise<Entrypoint[]>;

package/dist/types/plugins/analyze/getFileSystemEntry.d.ts

@@ -1,7 +1,7 @@
 import type { Entrypoint } from '@modern-js/types';
 import type { AppNormalizedConfig } from '../../types';
-import type { AppToolsContext, AppToolsHooks } from '../../types/new';
+import type { AppToolsContext, AppToolsHooks } from '../../types/plugin';
 export type { Entrypoint };
 export declare const hasEntry: (dir: string) => string | false;
 export declare const hasServerEntry: (dir: string) => string | false;
-export declare const getFileSystemEntry: (hooks: AppToolsHooks<"shared">, appContext: AppToolsContext<"shared">, config: AppNormalizedConfig<"shared">) => Promise<Entrypoint[]>;
+export declare const getFileSystemEntry: (hooks: AppToolsHooks, appContext: AppToolsContext, config: AppNormalizedConfig) => Promise<Entrypoint[]>;

package/dist/types/plugins/analyze/getHtmlTemplate.d.ts

@@ -1,6 +1,6 @@
 import type { Entrypoint, HtmlPartials, HtmlTemplates } from '@modern-js/types';
 import type { AppNormalizedConfig } from '../../types';
-import type { AppToolsContext, AppToolsHooks } from '../../types/new';
+import type { AppToolsContext, AppToolsHooks } from '../../types/plugin';
 export declare const getModifyHtmlPartials: (partials: Record<keyof HtmlPartials, string[]>) => {
     top: {
         append: (...script: string[]) => void;
@@ -18,9 +18,9 @@ export declare const getModifyHtmlPartials: (partials: Record<keyof HtmlPartials
         current: string[];
     };
 };
-export declare const getHtmlTemplate: (entrypoints: Entrypoint[], hooks: AppToolsHooks<"shared">, { appContext, config, }: {
-    appContext: AppToolsContext<"shared">;
-    config: AppNormalizedConfig<"shared">;
+export declare const getHtmlTemplate: (entrypoints: Entrypoint[], hooks: AppToolsHooks, { appContext, config, }: {
+    appContext: AppToolsContext;
+    config: AppNormalizedConfig;
 }) => Promise<{
     partialsByEntrypoint: Record<string, HtmlPartials>;
     htmlTemplates: HtmlTemplates;

package/dist/types/plugins/analyze/getServerRoutes.d.ts

@@ -1,8 +1,8 @@
 import type { Entrypoint, ServerRoute } from '@modern-js/types';
 import type { AppNormalizedConfig } from '../../types';
-import type { AppToolsContext } from '../../types/new';
+import type { AppToolsContext } from '../../types/plugin';
 export declare const getServerRoutes: (entrypoints: Entrypoint[], { appContext, config, }: {
-    appContext: AppToolsContext<"shared">;
-    config: AppNormalizedConfig<"shared">;
+    appContext: AppToolsContext;
+    config: AppNormalizedConfig;
 }) => ServerRoute[];
 export declare const getProdServerRoutes: (distDirectory: string) => any;

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

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

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

@@ -1,3 +1,3 @@
-import type { AppTools, CliPluginFuture } from '../../types';
-declare const _default: () => CliPluginFuture<AppTools<"shared">>;
+import type { AppTools, CliPlugin } from '../../types';
+declare const _default: () => CliPlugin<AppTools>;
 export default _default;

package/dist/types/plugins/deploy/platforms/platform.d.ts

@@ -1,6 +1,6 @@
 import type { AppToolsNormalizedConfig } from '../../../types';
-import type { AppToolsContext } from '../../../types/new';
-export type CreatePreset = (appContext: AppToolsContext<'shared'>, config: AppToolsNormalizedConfig, needModernServer?: boolean) => DeployPreset;
+import type { AppToolsContext } from '../../../types/plugin';
+export type CreatePreset = (appContext: AppToolsContext, config: AppToolsNormalizedConfig, needModernServer?: boolean) => DeployPreset;
 type DeployPreset = {
     prepare?: () => Promise<void>;
     writeOutput?: () => Promise<void>;

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

@@ -1,4 +1,4 @@
-import type { AppToolsContext } from '../../types/new';
+import type { AppToolsContext } from '../../types/plugin';
 export type ServerAppContext = {
     sharedDirectory: string;
     apiDirectory: string;
@@ -6,7 +6,7 @@ export type ServerAppContext = {
     metaName: string;
     bffRuntimeFramework: string;
 };
-export declare const serverAppContenxtTemplate: (appContext: AppToolsContext<"shared">) => {
+export declare const serverAppContenxtTemplate: (appContext: AppToolsContext) => {
     sharedDirectory: string;
     apiDirectory: string;
     lambdaDirectory: string;

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

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

package/dist/types/plugins/serverBuild.d.ts

@@ -1,3 +1,3 @@
-import type { AppTools, CliPluginFuture } from '../types';
-declare const _default: () => CliPluginFuture<AppTools<"shared">>;
+import type { AppTools, CliPlugin } from '../types';
+declare const _default: () => CliPlugin<AppTools>;
 export default _default;

package/dist/types/plugins/serverRuntime.d.ts

@@ -1,3 +1,3 @@
-import type { AppTools, CliPluginFuture } from '../types';
-declare const _default: () => CliPluginFuture<AppTools<"shared">>;
+import type { AppTools, CliPlugin } from '../types';
+declare const _default: () => CliPlugin<AppTools>;
 export default _default;

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

@@ -4,22 +4,17 @@ export interface RunOptions {
     cwd?: string;
     configFile?: string;
     metaName?: string;
-    packageJsonConfig?: string;
     statePluginName?: string;
-    internalPlugins?: {
-        cli?: InternalPlugins;
-        autoLoad?: InternalPlugins;
-    };
+    internalPlugins?: InternalPlugins;
     initialLog?: string;
     version: string;
 }
-export declare function createRunOptions({ cwd, initialLog, metaName, version, internalPlugins, packageJsonConfig, statePluginName, configFile, }: RunOptions): Promise<{
+export declare function createRunOptions({ cwd, initialLog, metaName, version, internalPlugins, configFile, }: RunOptions): Promise<{
     cwd: string | undefined;
     initialLog: string;
     configFile: string;
     metaName: string;
-    packageJsonConfig: string;
-    internalPlugins: import("@modern-js/plugin-v2").Plugin[];
+    internalPlugins: import("@modern-js/plugin").Plugin[];
     handleSetupResult: typeof handleSetupResult;
 }>;
 export declare function run(options: RunOptions): Promise<void>;

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

@@ -11,7 +11,6 @@ export interface MicroFrontend {
      */
     externalBasicLibrary?: boolean;
     moduleApp?: string;
-    disableComponentCompat?: boolean;
 }
 export interface DeployUserConfig {
     /**

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

@@ -1,15 +1,56 @@
-import type { UniBuilderConfig } from '@modern-js/uni-builder';
-type BuilderDevConfig = Required<UniBuilderConfig>['dev'];
+import type { BuilderConfig } from '@modern-js/builder';
+import type { SetupMiddlewares } from '@modern-js/server';
+import type { CorsOptions } from '@modern-js/server';
+import type { ServerConfig } from '@rsbuild/core';
+type BuilderDevConfig = NonNullable<BuilderConfig['dev']>;
 export type DevProxyOptions = string | Record<string, string>;
-export interface DevUserConfig extends BuilderDevConfig {
+export interface DevServerUserConfig {
     /**
-     * Used to configure a global proxy based on whistle in the development environment,
-     * which can be used to view and modify HTTP/HTTPS requests, responses, and can also be used as a proxy server.
+     * Configure CORS for the dev server.
+     * - object: enable CORS with the specified options.
+     * - true: enable CORS with default options (allow all origins, not recommended).
+     * - false: disable CORS.
+     * @default
+     * ```js
+     * { origin: defaultAllowedOrigins }
+     * ```
+     * where `defaultAllowedOrigins` includes:
+     * - `localhost`
+     * - `127.0.0.1`
      *
-     * @requires `proxy` plugin.
-     * This configuration is provided by `proxy` plugin.
-     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @link https://github.com/expressjs/cors
      */
-    proxy?: string | Record<string, string>;
+    cors?: boolean | CorsOptions;
+    /**
+     * Whether to enable gzip compression for served static assets.
+     */
+    compress?: ServerConfig['compress'];
+    /**
+     * Adds headers to all responses.
+     */
+    headers?: ServerConfig['headers'];
+    /**
+     * The index.html page will likely have to be served in place of any 404 responses.
+     */
+    historyApiFallback?: ServerConfig['historyApiFallback'];
+    /**
+     * Proxying some URLs.
+     */
+    proxy?: ServerConfig['proxy'];
+    /**
+     * Whether to watch files change in directories such as `mock/`, `server/`, `api/`.
+     */
+    watch?: boolean;
 }
+/**
+ * setupMiddlewares is a special field, it will not be passed to Rsbuild.
+ * Although its name is the same as in Rsbuild, it is consumed by Modern.js.
+ */
+export type DevUserConfig = Omit<BuilderDevConfig, 'setupMiddlewares'> & {
+    setupMiddlewares?: SetupMiddlewares;
+    /**
+     * Dev server specific options.
+     */
+    server?: DevServerUserConfig;
+};
 export {};

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

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

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

@@ -1,3 +1,3 @@
-import type { UniBuilderConfig } from '@modern-js/uni-builder';
+import type { BuilderConfig } from '@modern-js/builder';
 import type { UnwrapBuilderConfig } from '../utils';
-export type HtmlUserConfig = UnwrapBuilderConfig<UniBuilderConfig, 'html'>;
+export type HtmlUserConfig = UnwrapBuilderConfig<BuilderConfig, 'html'>;

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

@@ -1,7 +1,8 @@
+import type { RsbuildPlugin } from '@modern-js/builder';
+import type { CLIPlugin, CLIPluginExtends } from '@modern-js/plugin';
 import type { BffUserConfig, ServerUserConfig } from '@modern-js/server-core';
-import type { LooseRsbuildPlugin, UniBuilderPlugin } from '@modern-js/uni-builder';
 import type { RsbuildConfig } from '@rsbuild/core';
-import type { Bundler } from '../utils';
+import type { AppToolsExtendAPI, AppToolsExtendContext, AppToolsExtendHooks } from '../plugin';
 import type { DeployUserConfig } from './deploy';
 import type { DevUserConfig } from './dev';
 import type { ExperimentsUserConfig } from './experiments';
@@ -14,13 +15,7 @@ import type { SourceUserConfig } from './source';
 import type { TestingUserConfig } from './testing';
 import type { ToolsUserConfig } from './tools';
 export * from './output';
-export interface RuntimeUserConfig {
-    [name: string]: any;
-}
-export interface RuntimeByEntriesUserConfig {
-    [name: string]: RuntimeUserConfig;
-}
-export interface AppToolsUserConfig<B extends Bundler> {
+export interface AppToolsUserConfig {
     resolve?: ResolveUserConfig;
     server?: ServerUserConfig;
     source?: SourceUserConfig;
@@ -34,18 +29,19 @@ export interface AppToolsUserConfig<B extends Bundler> {
     bff?: BffUserConfig;
     dev?: DevUserConfig;
     deploy?: DeployUserConfig;
-    runtime?: RuntimeUserConfig;
-    runtimeByEntries?: RuntimeByEntriesUserConfig;
     html?: HtmlUserConfig;
-    tools?: ToolsUserConfig<B>;
+    tools?: ToolsUserConfig;
     security?: SecurityUserConfig;
     testing?: TestingUserConfig;
-    builderPlugins?: Array<LooseRsbuildPlugin | UniBuilderPlugin>;
+    builderPlugins?: Array<RsbuildPlugin>;
     performance?: PerformanceUserConfig;
     environments?: RsbuildConfig['environments'];
+    plugins?: CliPlugin<AppTools>[];
 }
 interface SharedNormalizedConfig<RawConfig> {
     cliOptions?: Record<string, any>;
     _raw: RawConfig;
 }
-export type AppToolsNormalizedConfig<Config = AppToolsUserConfig<'shared'>> = Required<Config> & SharedNormalizedConfig<Config>;
+export type AppToolsNormalizedConfig<Config = AppToolsUserConfig> = Required<Config> & SharedNormalizedConfig<Config>;
+export type AppTools = Required<CLIPluginExtends<AppToolsUserConfig, AppToolsNormalizedConfig, AppToolsExtendContext, AppToolsExtendAPI, AppToolsExtendHooks>>;
+export type CliPlugin<Extends extends CLIPluginExtends> = CLIPlugin<Extends>;

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

@@ -1,23 +1,23 @@
-import type { SSGConfig } from '@modern-js/types';
-import type { UniBuilderConfig } from '@modern-js/uni-builder';
+import type { BuilderConfig } from '@modern-js/builder';
+import type { SSGConfig, SSGMultiEntryOptions } from '@modern-js/types';
 import type { UnwrapBuilderConfig } from '../utils';
-export interface OutputUserConfig extends UnwrapBuilderConfig<UniBuilderConfig, 'output'> {
+export interface OutputUserConfig extends UnwrapBuilderConfig<BuilderConfig, 'output'> {
     /**
      * Enable SSG for self-controlled routing or conventional routing.
      * @default false
      */
     ssg?: SSGConfig;
+    /**
+     * Specify SSG configuration by entries for multi-entry apps.
+     * Takes precedence over `ssg` when provided.
+     */
+    ssgByEntries?: SSGMultiEntryOptions;
     /**
      * When using convention-based routing, the framework will split js and css based on the route to load on demand.
      * If your project does not want to split js and css based on routes, you can set this option to false.
      * @default true
      */
     splitRouteChunks?: boolean;
-    /**
-     * Used to control whether to inject the polyfill of the Node module into the code.
-     * @default true
-     */
-    disableNodePolyfill?: boolean;
     /**
      * Used to control whether to inject convention-based routing information into the HTML.
      * @default true

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

@@ -1,3 +1,3 @@
-import type { UniBuilderConfig } from '@modern-js/uni-builder';
+import type { BuilderConfig } from '@modern-js/builder';
 import type { UnwrapBuilderConfig } from '../utils';
-export type PerformanceUserConfig = UnwrapBuilderConfig<UniBuilderConfig, 'performance'>;
+export type PerformanceUserConfig = UnwrapBuilderConfig<BuilderConfig, 'performance'>;

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

@@ -1,2 +1,2 @@
-import type { UniBuilderConfig } from '@modern-js/uni-builder';
-export type ResolveUserConfig = UniBuilderConfig['resolve'];
+import type { BuilderConfig } from '@modern-js/builder';
+export type ResolveUserConfig = BuilderConfig['resolve'];

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

@@ -1,2 +1,2 @@
-import type { UniBuilderConfig } from '@modern-js/uni-builder';
-export type SecurityUserConfig = Required<UniBuilderConfig>['security'];
+import type { BuilderConfig } from '@modern-js/builder';
+export type SecurityUserConfig = Required<BuilderConfig>['security'];

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

@@ -1,4 +1,4 @@
-import type { UniBuilderConfig } from '@modern-js/uni-builder';
+import type { BuilderConfig } from '@modern-js/builder';
 export type Entry = string | {
     /**
      * The entry file path.
@@ -8,19 +8,13 @@ export type Entry = string | {
      * Disable framework's behavior of automatically generating entry code.
      */
     disableMount?: boolean;
-    /**
-     * @deprecated
-     * Using customEntry instead.
-     * Specify the file path of custom bootstrap.
-     */
-    customBootstrap?: string;
     /**
      * use src/{entryName}/entry.tsx to custom entry
      */
     customEntry?: boolean;
 };
 export type Entries = Record<string, Entry>;
-export interface SourceUserConfig extends NonNullable<UniBuilderConfig['source']> {
+export interface SourceUserConfig extends NonNullable<BuilderConfig['source']> {
     /**
      * Used to configure custom page entries.
      */
@@ -36,11 +30,6 @@ export interface SourceUserConfig extends NonNullable<UniBuilderConfig['source']
      * @default false
      */
     enableAsyncEntry?: boolean;
-    /**
-     * Enable use entry.tsx to custom entry
-     * @default false
-     */
-    enableCustomEntry?: boolean;
     /**
      * Used to disable the functionality of automatically identifying page entry points based on directory structure.
      * @default false
@@ -51,18 +40,8 @@ export interface SourceUserConfig extends NonNullable<UniBuilderConfig['source']
      * You can customize the directory used for identifying page entries with this option.
      */
     entriesDir?: string;
-    /**
-     * By default, framework identifies the application entry point based on the `src` directory.
-     * You can use this option to prevent some directories from being recognized as application entry points.
-     */
-    disableEntryDirs?: string[];
     /**
      * Customize the directory of the framework configuration files.
      */
     configDir?: string;
-    /**
-     * @deprecated designSystem is no longer required.
-     * If you are using Tailwind CSS, you can now use the `theme` option of Tailwind CSS, they are the same.
-     */
-    designSystem?: Record<string, any>;
 }

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

@@ -1,18 +1,8 @@
-import type { PluginEsbuildOptions } from '@modern-js/rsbuild-plugin-esbuild';
+import type { BuilderConfig } from '@modern-js/builder';
 import type { JestConfig } from '@modern-js/types';
-import type { UniBuilderConfig } from '@modern-js/uni-builder';
-import type { PluginSwcOptions } from '@rsbuild/plugin-webpack-swc';
-import type { Bundler, UnwrapBuilderConfig } from '../utils';
-export type Tailwindcss = Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
-type BuilderToolsConfig = UnwrapBuilderConfig<UniBuilderConfig, 'tools'>;
-export interface ToolsUserConfig<B extends Bundler = 'webpack'> extends Omit<BuilderToolsConfig, 'swc'> {
-    /**
-     * Used to custom Tailwind CSS configurations.
-     * @requires `tailwindcss` plugin.
-     * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin.
-     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
-     */
-    tailwindcss?: Tailwindcss;
+import type { UnwrapBuilderConfig } from '../utils';
+type BuilderToolsConfig = UnwrapBuilderConfig<BuilderConfig, 'tools'>;
+export interface ToolsUserConfig extends Omit<BuilderToolsConfig, 'swc'> {
     /**
      * Used to custom Jest configurations.
      * @requires `test` plugin.
@@ -26,13 +16,6 @@ export interface ToolsUserConfig<B extends Bundler = 'webpack'> extends Omit<Bui
      * The configuration of `swc` is provided by `swc` plugin.
      * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
      */
-    swc?: B extends 'shared' ? undefined : B extends 'webpack' ? PluginSwcOptions<'outer'> : BuilderToolsConfig['swc'];
-    /**
-     * Used to custom Esbuild configurations.
-     * @requires `esbuild` plugin.
-     * The configuration of `esbuild` is provided by `esbuild` plugin.
-     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
-     */
-    esbuild?: PluginEsbuildOptions;
+    swc?: BuilderToolsConfig['swc'];
 }
 export {};