@bleedingdev/modern-js-app-tools 3.9.0-ultramodern.8 → 3.9.3-ultramodern.1

package/dist/esm-node/utils/loadPlugins.mjs

@@ -1,13 +1,14 @@
 import "node:module";
+import node_path from "node:path";
 import { loadServerPlugins } from "@modern-js/server-core/node";
-import { compatibleRequire, createDebugger, dynamicImport, getInternalPlugins, tryResolve } from "@modern-js/utils";
+import { compatibleRequire, createDebugger, getInternalPlugins, tryResolve } from "@modern-js/utils";
 const debug = createDebugger('load-plugins');
 async function getServerPlugins(api, metaName = 'modern-js') {
     const hooks = api.getHooks();
     const { plugins } = await hooks._internalServerPlugins.call({
         plugins: []
     });
-    const filtedPlugins = plugins.filter((plugin)=>plugin.name.includes(metaName));
+    const filtedPlugins = plugins.filter((plugin)=>node_path.isAbsolute(plugin.name) || plugin.name.includes(metaName));
     api.updateAppContext({
         serverPlugins: filtedPlugins
     });
@@ -22,12 +23,7 @@ const resolveCliPlugin = async (p, appDirectory)=>{
     const pkg = 'string' == typeof p ? p : p[0];
     const pluginOptions = 'string' == typeof p ? void 0 : p[1];
     const path = tryResolve(pkg, appDirectory);
-    let module;
-    try {
-        module = await compatibleRequire(path);
-    } catch (e) {
-        ({ default: module } = await dynamicImport(path));
-    }
+    const module = await compatibleRequire(path);
     if ('function' == typeof module) {
         const result = module(pluginOptions);
         return result;

package/dist/esm-node/utils/register.mjs

@@ -59,7 +59,7 @@ const resolveTsRuntimeRegisterMode = ()=>{
     return 'unsupported';
 };
 const setupTsRuntime = async (appDir, distDir, alias, options = {})=>{
-    if ('unsupported' === resolveTsRuntimeRegisterMode()) throw new Error(`UltraModern.js requires Node.js >=26.7.0 with native TypeScript support; detected v${process.versions.node}. Legacy TypeScript runtime transpilers are unsupported.`);
+    if ('unsupported' === resolveTsRuntimeRegisterMode()) throw new Error(`UltraModern.js requires Node.js >=26.10.0 with native TypeScript support; detected v${process.versions.node}. Legacy TypeScript runtime transpilers are unsupported.`);
     const tsconfigPath = resolveServerTsconfig(appDir, options.tsconfigPath);
     const isTsProject = await fs.pathExists(tsconfigPath);
     if (!isTsProject) return;

package/dist/types/builder/generator/adapterCopy.d.ts

@@ -1,3 +1,15 @@
-import type { RsbuildPlugin } from '@modern-js/builder';
+import type { RsbuildPlugin, Rspack } from '@modern-js/builder';
 import type { BuilderOptions } from '../shared/index.js';
+/**
+ * The copy plugin registers each pattern context as a context dependency even
+ * when the directory is absent. The watcher reports an absent context as
+ * removed right after the first build, which rebuilds every dev session once.
+ * Watch an absent context, and its absent parents, as missing instead: their
+ * later creation still rebuilds and copies.
+ */
+export declare class MissingCopyContextPlugin {
+    private readonly contexts;
+    constructor(contexts: readonly string[]);
+    apply(compiler: Rspack.Compiler): void;
+}
 export declare const builderPluginAdapterCopy: (options: BuilderOptions) => RsbuildPlugin;

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

@@ -1,3 +1,4 @@
 export declare function createBuilderGenerator(): Promise<typeof import("./builder-rspack/index.js").createRspackBuilderForModern>;
 export { parseRspackConfig } from '@modern-js/builder';
+export { getBundleEntry } from '../plugins/analyze/getBundleEntry.js';
 export { builderPluginAdapterBasic, builderPluginAdapterHooks, } from './shared/builderPlugins/index.js';

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

@@ -1,3 +1,5 @@
+import type { AppContext, CLIPluginExtends } from '@modern-js/plugin/cli';
 import type { RsbuildPlugin } from '@rsbuild/core';
-import type { BuilderOptions } from '../types.js';
-export declare const builderPluginAdapterBasic: (options: BuilderOptions) => RsbuildPlugin;
+export declare const builderPluginAdapterBasic: <Options extends {
+    appContext: Pick<AppContext<CLIPluginExtends>, 'metaName'>;
+}>(options: Options) => RsbuildPlugin;

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

@@ -1,5 +1,5 @@
 import { type Rspack } from '@modern-js/builder';
-import { type RsbuildPlugin } from '@rsbuild/core';
+import { type RsbuildPlugin, type RspackChain } from '@rsbuild/core';
 import type { AppNormalizedConfig } from '../../../types/index.js';
 import type { AppToolsContext } from '../../../types/plugin.js';
 import type { BuilderOptions } from '../types.js';
@@ -12,3 +12,4 @@ export declare const builderPluginAdapterSSR: (options: BuilderOptions) => Rsbui
  * so the caller leaves the config untouched.
  */
 export declare function getSSRLazyCompilation(current: unknown, normalizedConfig: AppNormalizedConfig, appContext: AppToolsContext, eagerRouteComponentFilesByEntry: BuilderOptions['eagerRouteComponentFilesByEntry']): Rspack.LazyCompilationOptions | undefined;
+export declare function applySSRLoaderEntry(chain: RspackChain, optinos: BuilderOptions, isServer: boolean, isServiceWorker: boolean): Promise<void>;

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

@@ -1,3 +1,11 @@
+import type { Hooks } from '@modern-js/plugin/cli';
 import type { RsbuildPlugin } from '@rsbuild/core';
-import type { BuilderOptions } from '../types.js';
-export declare const builderPluginAdapterHooks: (options: BuilderOptions) => RsbuildPlugin;
+export declare const builderPluginAdapterHooks: <Options extends {
+    appContext: {
+        _internalContext: {
+            pluginAPI?: {
+                getHooks(): Readonly<Pick<Hooks<{}, {}, {}, {}>, 'modifyBundlerChain' | 'modifyRsbuildConfig' | 'modifyRspackConfig'>>;
+            };
+        };
+    };
+}>(options: Options) => RsbuildPlugin;

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

@@ -26,6 +26,21 @@ export declare function aggregateEagerRouteComponentFiles(byEntry: EagerRouteCom
  * (defaulting to lazy when the user did not provide one).
  */
 export declare function buildSSRLazyCompilationTest(eagerRouteFiles: Set<string>, userTest?: LazyCompilationTest): LazyCompilationTestFn;
+/**
+ * Build the default dev `lazyCompilation.test`: a dynamic import is lazy only
+ * when it targets the app's own source. Everything else compiles eagerly:
+ * - the generated `<internalDirectory>/<entry>/index.jsx`, which
+ *   `bootstrap.jsx` imports as the async entry boundary Module Federation
+ *   needs to initialize shared scopes, not a code-split point;
+ * - framework and dependency modules (outside `appDirectory` or under
+ *   `node_modules`), such as plugin-i18n's backend, utils and react-i18next.
+ * Each lazy module costs one on-demand compile and HMR cycle on the first page
+ * load. Back-to-back cycles for framework imports raced on loaded CI runners
+ * ("Cannot read properties of undefined (reading 'call')"), and the app never
+ * rendered.
+ * Typed `object` so it is assignable to Rspack's `(module: Module) => boolean`.
+ */
+export declare function buildDefaultLazyCompilationTest(appDirectory: string, internalDirectory: string): (m: object) => boolean;
 export type SSRLazyPlan = {
     apply: false;
     unresolvedByEntry?: Map<string, string[]>;

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

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

package/dist/types/index.d.ts

@@ -1,9 +1,8 @@
+import { type PolicyDefaultsOptions } from '@modern-js/app-tools-extensions/policy-defaults';
 import type { AppTools, CliPlugin } from './types/index.js';
 import { initAppContext } from './utils/initAppContext.js';
 export * from './defineConfig.js';
-export declare const appTools: () => CliPlugin<AppTools>;
-export { build } from './commands/build.js';
-export { deploy } from './commands/deploy.js';
+export declare const appTools: (options?: PolicyDefaultsOptions) => CliPlugin<AppTools>;
 export { dev } from './commands/dev.js';
 export { serve } from './commands/serve.js';
 export { defineConfig } from './defineConfig.js';
@@ -11,7 +10,7 @@ export { type ResolveModernRsbuildConfigOptions, resolveModernRsbuildConfig, } f
 export * from './types/index.js';
 export { closeServer } from './utils/createServer.js';
 export { generateWatchFiles } from './utils/generateWatchFiles.js';
-export type { BuildOptions, DeployOptions, DevOptions } from './utils/types.js';
+export type { DeployOptions, DevOptions } from './utils/types.js';
 export { initAppContext };
 export default appTools;
 export { mergeConfig } from '@modern-js/plugin/cli';

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

@@ -1,4 +1,5 @@
-import type { Entrypoint } from '@modern-js/types';
-import type { AppNormalizedConfig } from '../../types/index.js';
-import type { AppToolsContext, AppToolsHooks } from '../../types/plugin.js';
-export declare const getBundleEntry: (hooks: AppToolsHooks, appContext: AppToolsContext, config: AppNormalizedConfig) => Promise<Entrypoint[]>;
+import type { AppContext, CLIPluginExtends } from '@modern-js/plugin/cli';
+import type { Entrypoint } from '@modern-js/types/cli/base';
+import type { AppToolsNormalizedConfig } from '../../types/config/base.js';
+import type { AppToolsExtendHooksBase } from '../../types/plugin-base.js';
+export declare const getBundleEntry: (hooks: Pick<AppToolsExtendHooksBase<never>, 'checkEntryPoint'>, appContext: Pick<AppContext<CLIPluginExtends>, 'appDirectory' | 'packageName'>, config: Pick<AppToolsNormalizedConfig, 'source'>) => Promise<Entrypoint[]>;

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

@@ -1,7 +1,8 @@
-import type { Entrypoint } from '@modern-js/types';
-import type { AppNormalizedConfig } from '../../types/index.js';
-import type { AppToolsContext, AppToolsHooks } from '../../types/plugin.js';
+import type { AppContext, CLIPluginExtends } from '@modern-js/plugin/cli';
+import type { Entrypoint } from '@modern-js/types/cli/base';
+import type { AppToolsNormalizedConfig } from '../../types/config/base.js';
+import type { AppToolsExtendHooksBase } from '../../types/plugin-base.js';
 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, appContext: AppToolsContext, config: AppNormalizedConfig) => Promise<Entrypoint[]>;
+export declare const getFileSystemEntry: (hooks: Pick<AppToolsExtendHooksBase<never>, 'checkEntryPoint'>, appContext: Pick<AppContext<CLIPluginExtends>, 'appDirectory'>, config: Pick<AppToolsNormalizedConfig, 'source'>) => Promise<Entrypoint[]>;

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

@@ -3,8 +3,8 @@ export declare const replaceWithAlias: (base: string, filePath: string, alias: s
 export declare const parseModule: ({ source, filename, }: {
     source: string;
     filename: string;
-}) => Promise<readonly [imports: readonly import("es-module-lexer").ImportSpecifier[], exports: readonly import("es-module-lexer").ExportSpecifier[], facade: boolean, hasModuleSyntax: boolean]>;
+}) => Promise<readonly [imports: readonly import("es-module-lexer").Import[], exports: readonly import("es-module-lexer").Export[], facade: boolean, hasModuleSyntax: boolean]>;
 export declare const getServerCombinedModuleFile: (internalDirectory: string, entryName: string) => string;
-export declare const checkIsBuildCommands: (contextCommand?: string) => boolean;
+export declare const checkIsBuildCommands: () => boolean;
 export declare const checkIsServeCommand: () => boolean;
 export declare const isSubDirOrEqual: (parent: string, child: string) => boolean;

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

@@ -1,6 +1,3 @@
-import type { AppTools, AppToolsNormalizedConfig, CliPlugin } from '../../types/index.js';
-import type { DeployTarget } from '../../types/config/deploy.js';
-export declare const getSupportedDeployTargets: () => DeployTarget[];
-export declare const resolveDeployTarget: (modernConfig: AppToolsNormalizedConfig, envDeployTarget?: string | undefined, detectedProvider?: import("std-env").ProviderName) => string;
+import type { AppTools, CliPlugin } from '../../types/index.js';
 export default _default;
 declare function _default(): CliPlugin<AppTools>;

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

@@ -6,7 +6,7 @@ export declare const serverAppContextTemplate: (appContext: AppToolsContext) =>
     apiDirectory: string;
     lambdaDirectory: string;
     metaName: string;
-    bffRuntimeFramework: "hono";
+    bffRuntimeFramework: keyof import("@modern-js/plugin/server").BffRuntimeRegistry;
 };
 export type PluginItem = [string, Record<string, any> | undefined];
 export declare const genPluginImportsCode: (plugins: PluginItem[], isESM?: boolean) => string;

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

@@ -13,4 +13,4 @@ export declare const getProjectUsage: (appDirectory: string, distDirectory: stri
 };
 export declare const getTemplatePath: (file: string) => string;
 export declare const readTemplate: (file: string) => Promise<string>;
-export declare const resolveESMDependency: (entry: string) => Promise<string | undefined>;
+export declare const resolveESMDependency: (entry: string, fromDirectory?: string) => Promise<string>;

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

@@ -1,4 +1,4 @@
-import type { InternalPlugins } from '@modern-js/types';
+import type { InternalPlugins } from '@modern-js/types/common';
 import { handleSetupResult } from '../compat/hooks.js';
 export interface RunOptions {
     cwd?: string;

package/dist/types/server-plugin.d.ts

@@ -0,0 +1,10 @@
+/**
+ * The fork's default server policy (localised loaders, error responses,
+ * telemetry, module-federation CSS and asset headers, static serving).
+ *
+ * It is exposed from `@modern-js/app-tools` so a plain `appTools()` app can
+ * load it by a specifier it is guaranteed to be able to resolve: every app
+ * declares `@modern-js/app-tools`, but not necessarily
+ * `@modern-js/server-runtime-extensions`.
+ */
+export { default } from '@modern-js/server-runtime-extensions/server-plugin';

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

@@ -0,0 +1,58 @@
+import type { CLIPlugin, CLIPluginExtends } from '@modern-js/plugin/cli';
+import type { BffUserConfig, ServerUserConfig } from '@modern-js/server-core/config-types';
+import type { NestedRoute, PageRoute } from '@modern-js/types/cli/base';
+import type { RsbuildConfig } from '@rsbuild/core';
+import type { AppToolsExtendAPIBase, AppToolsExtendContextBase, AppToolsExtendHooksBase } from '../plugin-base.js';
+import type { DeployUserConfig } from './deploy.js';
+import type { DevUserConfig } from './dev.js';
+import type { ExperimentsUserConfig } from './experiments.js';
+import type { HtmlUserConfig } from './html.js';
+import type { OutputUserConfig } from './output.js';
+import type { PerformanceUserConfig } from './performance.js';
+import type { ResolveUserConfig } from './resolve.js';
+import type { SecurityUserConfig } from './security.js';
+import type { SourceUserConfig } from './source.js';
+import type { TestingUserConfig } from './testing.js';
+import type { ToolsUserConfig } from './tools.js';
+export * from './output.js';
+export type AppToolsBuilderPlugins = NonNullable<RsbuildConfig['plugins']>;
+export interface AppToolsUserConfigBase<Routes> {
+    resolve?: ResolveUserConfig;
+    server?: ServerUserConfig;
+    source?: SourceUserConfig;
+    output?: OutputUserConfig;
+    experiments?: ExperimentsUserConfig;
+    /**
+     * The configuration of `bff` is provided by `bff` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     * @requires `bff` plugin
+     */
+    bff?: BffUserConfig;
+    dev?: DevUserConfig;
+    deploy?: DeployUserConfig;
+    html?: HtmlUserConfig;
+    tools?: ToolsUserConfig;
+    security?: SecurityUserConfig;
+    testing?: TestingUserConfig;
+    builderPlugins?: AppToolsBuilderPlugins;
+    performance?: PerformanceUserConfig;
+    environments?: RsbuildConfig['environments'];
+    splitChunks?: RsbuildConfig['splitChunks'];
+    plugins?: CliPlugin<AppToolsBase<Routes>>[];
+}
+interface SharedNormalizedConfig<RawConfig> {
+    cliOptions?: Record<string, any>;
+    _raw: RawConfig;
+}
+export type AppToolsNormalizedConfig<Config = AppToolsUserConfig> = Required<Config> & SharedNormalizedConfig<Config>;
+/** Renderer packages opt into JSX element typing through their owned type entry. */
+export interface CLIElementTypes {
+}
+export type CLIElement = CLIElementTypes[keyof CLIElementTypes];
+export type CLIFileSystemRoute<Element> = NestedRoute<string, Element> | PageRoute<Element>;
+export type AppToolsBase<Routes> = Required<CLIPluginExtends<AppToolsUserConfigBase<Routes>, AppToolsNormalizedConfig<AppToolsUserConfigBase<Routes>>, AppToolsExtendContextBase<AppToolsBase<Routes>>, AppToolsExtendAPIBase<AppToolsBase<Routes>, Routes>, AppToolsExtendHooksBase<Routes>>>;
+export type AppTools = AppToolsBase<CLIFileSystemRoute<CLIElement>>;
+export type AppToolsUserConfig = AppToolsUserConfigBase<CLIFileSystemRoute<CLIElement>>;
+export type AppUserConfig = AppToolsUserConfig;
+export type AppNormalizedConfig = AppToolsNormalizedConfig;
+export type CliPlugin<Extends extends CLIPluginExtends> = CLIPlugin<Extends>;

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

@@ -1,4 +1,4 @@
-import type { CloudflareWorkerArtifactConfig, CloudflareWorkerD1DatabaseConfig, CloudflareWorkerPublicAssetConfig, CloudflareWorkerSecurityConfig, CloudflareWorkerServiceBindingConfig, DeployTarget, JsonValue } from '@modern-js/app-tools-extensions/config';
+import type { CloudflareWorkerDeployConfig, DeployTarget } from '@modern-js/app-tools-extensions/config';
 export type { CloudflareWorkerArtifactConfig, CloudflareWorkerD1DatabaseConfig, CloudflareWorkerPublicAssetConfig, CloudflareWorkerSecurityConfig, CloudflareWorkerSecurityCorsConfig, CloudflareWorkerSecurityCspConfig, CloudflareWorkerSecurityCspMode, CloudflareWorkerSecurityNoindexConfig, CloudflareWorkerServiceBindingConfig, CloudflareWorkerServiceBindingFragmentConfig, DeployTarget, JsonValue, } from '@modern-js/app-tools-extensions/config';
 export interface MicroFrontend {
     /**
@@ -26,53 +26,5 @@ export interface DeployUserConfig {
      * @default false
      */
     microFrontend?: boolean | MicroFrontend;
-    worker?: {
-        name?: string;
-        /**
-         * Cloudflare Workers compatibility date for generated wrangler config.
-         * Use YYYY-MM-DD. Defaults to the date validated against the bundled
-         * Wrangler version used by UltraModern generated workspaces.
-         */
-        compatibilityDate?: string;
-        ssr?: boolean;
-        security?: CloudflareWorkerSecurityConfig;
-        /**
-         * Raw Wrangler-compatible config merged into `.output/wrangler.json`.
-         * Framework-owned worker invariants still win for `main`, the assets
-         * binding/directory/run mode, and required compatibility flags.
-         */
-        wrangler?: Record<string, JsonValue>;
-        /**
-         * Additional app-root files or directories to stage under `.output`.
-         * Use this for provider resources such as migrations or generated config.
-         */
-        artifacts?: CloudflareWorkerArtifactConfig[];
-        /**
-         * Additional app-root files or directories to serve as Cloudflare Worker
-         * Static Assets under `.output/public`. Use `to: '.'` to copy a
-         * source directory's contents into the public asset root.
-         */
-        publicAssets?: CloudflareWorkerPublicAssetConfig[];
-        /**
-         * First-class Cloudflare D1 bindings. Modern.js writes these to
-         * `wrangler.json` as `d1_databases` and stages configured migration
-         * directories into `.output`.
-         */
-        d1Databases?: CloudflareWorkerD1DatabaseConfig[];
-        /**
-         * First-class Cloudflare service bindings. Modern.js writes these to
-         * `wrangler.json` as `services`; when a binding also has `prefix`,
-         * the generated Worker dispatches matching requests through
-         * `env[binding].fetch(request)`.
-         */
-        services?: CloudflareWorkerServiceBindingConfig[];
-        /**
-         * Dist output paths that must not be copied into Cloudflare public assets.
-         * Entries are slash-normalized path prefixes relative to the app dist root.
-         * Top-level `api` and `shared` dist directories are excluded when matching
-         * source directories exist in the app root because they conventionally
-         * contain server-only implementation code.
-         */
-        publicAssetExcludes?: string[];
-    };
+    worker?: CloudflareWorkerDeployConfig;
 }

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

@@ -1,5 +1,5 @@
 import type { BuilderConfig } from '@modern-js/builder';
-import type { CorsOptions, SetupMiddlewares } from '@modern-js/server';
+import type { CorsOptions, SetupMiddlewares } from '@modern-js/server/config-types';
 import type { ServerConfig } from '@rsbuild/core';
 type BuilderDevConfig = NonNullable<BuilderConfig['dev']>;
 export type DevProxyOptions = string | Record<string, string>;

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

@@ -1,48 +1,24 @@
-import type { CLIPlugin, CLIPluginExtends } from '@modern-js/plugin';
-import type { BffUserConfig, ServerUserConfig } from '@modern-js/server-core';
-import type { RsbuildConfig } from '@rsbuild/core';
+import type { CLIPlugin, CLIPluginExtends } from '@modern-js/plugin/cli';
+import type { NestedRouteForCli, PageRoute } from '@modern-js/types/cli';
+import type { PluginSvgrOptions } from '@rsbuild/plugin-svgr';
+import type { ReactNode } from 'react';
 import type { AppToolsExtendAPI, AppToolsExtendContext, AppToolsExtendHooks } from '../plugin.js';
-import type { DeployUserConfig } from './deploy.js';
-import type { DevUserConfig } from './dev.js';
-import type { ExperimentsUserConfig } from './experiments.js';
-import type { HtmlUserConfig } from './html.js';
-import type { OutputUserConfig } from './output.js';
-import type { PerformanceUserConfig } from './performance.js';
-import type { ResolveUserConfig } from './resolve.js';
-import type { SecurityUserConfig } from './security.js';
-import type { SourceUserConfig } from './source.js';
-import type { TestingUserConfig } from './testing.js';
-import type { ToolsUserConfig } from './tools.js';
+import type { AppToolsUserConfigBase, AppToolsNormalizedConfig as BaseNormalizedConfig } from './base.js';
+declare module '@modern-js/builder/types' {
+    interface BuilderSvgOptions {
+        options: PluginSvgrOptions;
+    }
+}
+declare module './base' {
+    interface CLIElementTypes {
+        react: ReactNode;
+    }
+}
+export type { AppToolsBuilderPlugins } from './base.js';
 export * from './output.js';
-export type AppToolsBuilderPlugins = NonNullable<RsbuildConfig['plugins']>;
-export interface AppToolsUserConfig {
-    resolve?: ResolveUserConfig;
-    server?: ServerUserConfig;
-    source?: SourceUserConfig;
-    output?: OutputUserConfig;
-    experiments?: ExperimentsUserConfig;
-    /**
-     * The configuration of `bff` is provided by `bff` plugin.
-     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
-     * @requires `bff` plugin
-     */
-    bff?: BffUserConfig;
-    dev?: DevUserConfig;
-    deploy?: DeployUserConfig;
-    html?: HtmlUserConfig;
-    tools?: ToolsUserConfig;
-    security?: SecurityUserConfig;
-    testing?: TestingUserConfig;
-    builderPlugins?: AppToolsBuilderPlugins;
-    performance?: PerformanceUserConfig;
-    environments?: RsbuildConfig['environments'];
-    splitChunks?: RsbuildConfig['splitChunks'];
+export interface AppToolsUserConfig extends Omit<AppToolsUserConfigBase<NestedRouteForCli | PageRoute>, 'plugins'> {
     plugins?: CliPlugin<AppTools>[];
 }
-interface SharedNormalizedConfig<RawConfig> {
-    cliOptions?: Record<string, any>;
-    _raw: RawConfig;
-}
-export type AppToolsNormalizedConfig<Config = AppToolsUserConfig> = Required<Config> & SharedNormalizedConfig<Config>;
+export type AppToolsNormalizedConfig<Config = AppToolsUserConfig> = BaseNormalizedConfig<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,5 +1,5 @@
 import type { BuilderConfig } from '@modern-js/builder';
-import type { SSGConfig, SSGMultiEntryOptions } from '@modern-js/types';
+import type { SSGConfig, SSGMultiEntryOptions } from '@modern-js/types/cli/base';
 import type { UnwrapBuilderConfig } from '../utils.js';
 export interface OutputUserConfig extends UnwrapBuilderConfig<BuilderConfig, 'output'> {
     /**
@@ -33,4 +33,4 @@ export interface OutputUserConfig extends UnwrapBuilderConfig<BuilderConfig, 'ou
      */
     tempDir?: string;
 }
-export type { SSGConfig, SSGMultiEntryOptions, SSGRouteOptions, SSGSingleEntryOptions, } from '@modern-js/types';
+export type { SSGConfig, SSGMultiEntryOptions, SSGRouteOptions, SSGSingleEntryOptions, } from '@modern-js/types/cli/base';

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

@@ -1,4 +1,4 @@
-import type { TestConfig } from '@modern-js/types';
+import type { TestConfig } from '@modern-js/types/cli/base';
 export interface TestingUserConfig {
     /**
      * Decide which transformer will be used to compile file

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

@@ -1,5 +1,5 @@
 import type { BuilderConfig } from '@modern-js/builder';
-import type { JestConfig } from '@modern-js/types';
+import type { JestConfig } from '@modern-js/types/cli/base';
 import type { UnwrapBuilderConfig } from '../utils.js';
 type BuilderToolsConfig = UnwrapBuilderConfig<BuilderConfig, 'tools'>;
 export interface ToolsUserConfig extends Omit<BuilderToolsConfig, 'swc'> {