@modern-js/app-tools 2.63.0 → 2.63.1-alpha.0

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

@@ -1,10 +1,10 @@
-import type { PluginAPI } from '@modern-js/core';
+import type { CLIPluginAPI } from '@modern-js/plugin-v2';
 import { type Command } from '@modern-js/utils';
 import type { AppTools } from '../types';
-export declare const devCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
-export declare const buildCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => Promise<void>;
-export declare const serverCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => void;
-export declare const deployCommand: (program: Command, api: PluginAPI<AppTools<'shared'>>) => void;
+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: PluginAPI<AppTools<'shared'>>) => void;
+export declare const inspectCommand: (program: Command, api: CLIPluginAPI<AppTools<'shared'>>) => void;
 export declare const upgradeCommand: (program: Command) => void;

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

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

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

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

package/dist/types/{new/compat → compat}/hooks.d.ts

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

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

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

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

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

@@ -1,4 +1,5 @@
-import type { AppNormalizedConfig, IAppContext } from '../../types';
-export declare function initHtmlConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext): AppNormalizedConfig<'shared'>['html'];
-export declare function initSourceConfig(config: AppNormalizedConfig<'shared'>, appContext: IAppContext, bundler: 'webpack' | 'rspack'): void;
+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;

package/dist/types/index.d.ts

@@ -1,10 +1,12 @@
-import { appTools } from './new/index';
-export { appTools };
-export { initAppContext } from './new/index';
+import type { AppTools, AppToolsOptions, CliPluginFuture } 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 { dev } from './commands/dev';
 export type { DevOptions } from './utils/types';
 export * from './types';
+export { initAppContext };
 export default appTools;

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

@@ -1,4 +1,4 @@
-import type { CliHooksRunner } from '@modern-js/core';
 import type { Entrypoint } from '@modern-js/types';
-import type { AppNormalizedConfig, AppTools, IAppContext } from '../../types';
-export declare const getBundleEntry: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<Entrypoint[]>;
+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[]>;

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

@@ -1,5 +1,5 @@
-import type { CliHooksRunner } from '@modern-js/core';
 import type { Entrypoint } from '@modern-js/types';
-import type { AppNormalizedConfig, AppTools, IAppContext } from '../../types';
+import type { AppNormalizedConfig } from '../../types';
+import type { AppToolsContext, AppToolsHooks } from '../../types/new';
 export type { Entrypoint };
-export declare const getFileSystemEntry: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<Entrypoint[]>;
+export declare const getFileSystemEntry: (hooks: AppToolsHooks<'shared'>, appContext: AppToolsContext<'shared'>, config: AppNormalizedConfig<'shared'>) => Promise<Entrypoint[]>;

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

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

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

@@ -1,7 +1,7 @@
-import type { IAppContext } from '@modern-js/core';
 import type { Entrypoint, ServerRoute } from '@modern-js/types';
 import type { AppNormalizedConfig } from '../../types';
+import type { AppToolsContext } from '../../types/new';
 export declare const getServerRoutes: (entrypoints: Entrypoint[], { appContext, config, }: {
-    appContext: IAppContext;
+    appContext: AppToolsContext<'shared'>;
     config: AppNormalizedConfig<'shared'>;
 }) => ServerRoute[];

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

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

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

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

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

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

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

@@ -1,11 +1,11 @@
-import type { IAppContext } from '@modern-js/core';
+import type { AppToolsContext } from '../../types/new';
 export type ServerAppContext = {
     sharedDirectory: string;
     apiDirectory: string;
     lambdaDirectory: string;
     metaName: string;
 };
-export declare const serverAppContenxtTemplate: (appContext: IAppContext) => {
+export declare const serverAppContenxtTemplate: (appContext: AppToolsContext<'shared'>) => {
     sharedDirectory: string;
     apiDirectory: string;
     lambdaDirectory: string;

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

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

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

@@ -5,6 +5,7 @@ import type { AppToolsHooks } from './hooks';
 import type { AppToolsLegacyNormalizedConfig, AppToolsLegacyUserConfig } from './legacyConfig';
 import type { AppToolsExtendAPI, AppToolsExtendContext, AppToolsExtendHooks } from './new';
 import type { Bundler } from './utils';
+export type { CLIPluginExtends };
 export * from './hooks';
 export * from './config';
 export * from './legacyConfig';
@@ -33,3 +34,4 @@ export type AppToolsOptions = {
      * */
     bundler?: 'rspack' | 'webpack' | 'experimental-rspack';
 };
+export type { AppToolsExtendAPI, AppToolsExtendContext, AppToolsExtendHooks, AppToolsContext, AppToolsHooks as AppToolsFeatureHooks, } from './new';

package/dist/types/types/new.d.ts

@@ -1,8 +1,9 @@
 import type { DevToolData, RegisterBuildPlatformResult } from '@modern-js/core';
-import type { AppContext, InternalContext, PluginHook, PluginHookTap, TransformFunction } from '@modern-js/plugin-v2';
-import type { Entrypoint, NestedRouteForCli, PageRoute, RouteLegacy, ServerPlugin, ServerRoute } from '@modern-js/types';
+import type { AppContext, AsyncHook, CollectAsyncHook, InternalContext, PluginHook, PluginHookTap, TransformFunction } from '@modern-js/plugin-v2';
+import type { Hooks } from '@modern-js/plugin-v2/cli';
+import type { Entrypoint, HtmlPartials, HtmlTemplates, NestedRouteForCli, PageRoute, RouteLegacy, ServerPlugin, ServerRoute } from '@modern-js/types';
 import type { AppTools } from '.';
-import type { getHookRunners } from '../new/compat/hooks';
+import type { getHookRunners } from '../compat/hooks';
 import type { AppToolsNormalizedConfig, AppToolsUserConfig } from './config';
 import type { RuntimePlugin } from './hooks';
 import type { Bundler } from './utils';
@@ -40,22 +41,9 @@ export type BeforeGenerateRoutesFn = TransformFunction<{
 export type BeforePrintInstructionsFn = TransformFunction<{
     instructions: string;
 }>;
-export type RegisterDevFn = (params: {
-    name: string;
-    entry: string;
-    type: string;
-    config: any;
-}) => Promise<DevToolData> | DevToolData;
-export type RegisterBuildPlatformFn = (params: {
-    name: string;
-    entry: string;
-    type: string;
-    config: any;
-}) => Promise<RegisterBuildPlatformResult> | RegisterBuildPlatformResult;
-export type AddRuntimeExportsFn = (params: {
-    entrypoint: Entrypoint;
-    exports: string[];
-}) => Promise<void> | void;
+export type RegisterDevFn = () => Promise<DevToolData> | DevToolData;
+export type RegisterBuildPlatformFn = () => Promise<RegisterBuildPlatformResult> | RegisterBuildPlatformResult;
+export type AddRuntimeExportsFn = () => Promise<void> | void;
 export interface AppToolsExtendAPI<B extends Bundler = 'webpack'> {
     onBeforeConfig: PluginHookTap<BeforeConfigFn>;
     onAfterPrepare: PluginHookTap<AfterPrepareFn>;
@@ -102,33 +90,33 @@ export interface AppToolsExtendAPI<B extends Bundler = 'webpack'> {
     useHookRunners: () => ReturnType<typeof getHookRunners>;
 }
 export interface AppToolsExtendHooks extends Record<string, PluginHook<(...args: any[]) => any>> {
-    onBeforeConfig: PluginHook<BeforeConfigFn>;
-    onAfterPrepare: PluginHook<AfterPrepareFn>;
-    deploy: PluginHook<DeplpoyFn>;
-    _internalRuntimePlugins: PluginHook<InternalRuntimePluginsFn>;
-    _internalServerPlugins: PluginHook<InternalServerPluginsFn>;
-    checkEntryPoint: PluginHook<CheckEntryPointFn>;
-    modifyEntrypoints: PluginHook<ModifyEntrypointsFn>;
-    modifyFileSystemRoutes: PluginHook<ModifyFileSystemRoutesFn>;
-    modifyServerRoutes: PluginHook<ModifyServerRoutesFn>;
-    generateEntryCode: PluginHook<GenerateEntryCodeFn>;
-    onBeforeGenerateRoutes: PluginHook<BeforeGenerateRoutesFn>;
+    onBeforeConfig: AsyncHook<BeforeConfigFn>;
+    onAfterPrepare: AsyncHook<AfterPrepareFn>;
+    deploy: AsyncHook<DeplpoyFn>;
+    _internalRuntimePlugins: AsyncHook<InternalRuntimePluginsFn>;
+    _internalServerPlugins: AsyncHook<InternalServerPluginsFn>;
+    checkEntryPoint: AsyncHook<CheckEntryPointFn>;
+    modifyEntrypoints: AsyncHook<ModifyEntrypointsFn>;
+    modifyFileSystemRoutes: AsyncHook<ModifyFileSystemRoutesFn>;
+    modifyServerRoutes: AsyncHook<ModifyServerRoutesFn>;
+    generateEntryCode: AsyncHook<GenerateEntryCodeFn>;
+    onBeforeGenerateRoutes: AsyncHook<BeforeGenerateRoutesFn>;
     /**
      * @deprecated
      */
-    onBeforePrintInstructions: PluginHook<BeforePrintInstructionsFn>;
+    onBeforePrintInstructions: AsyncHook<BeforePrintInstructionsFn>;
     /**
      * @deprecated
      */
-    registerDev: PluginHook<RegisterDevFn>;
+    registerDev: CollectAsyncHook<RegisterDevFn>;
     /**
      * @deprecated
      */
-    registerBuildPlatform: PluginHook<RegisterBuildPlatformFn>;
+    registerBuildPlatform: CollectAsyncHook<RegisterBuildPlatformFn>;
     /**
      * @deprecated
      */
-    addRuntimeExports: PluginHook<AddRuntimeExportsFn>;
+    addRuntimeExports: AsyncHook<AddRuntimeExportsFn>;
 }
 export type AppToolsExtendContext<B extends Bundler = 'webpack'> = {
     metaName: string;
@@ -138,8 +126,32 @@ export type AppToolsExtendContext<B extends Bundler = 'webpack'> = {
     internalSrcAlias: string;
     apiDirectory: string;
     lambdaDirectory: string;
+    serverConfigFile: string;
     serverPlugins: ServerPlugin[];
     moduleType: 'module' | 'commonjs';
+    /** Information for entry points */
+    entrypoints: Entrypoint[];
+    /** Selected entry points */
+    checkedEntries: string[];
+    /** Information for server routes */
+    serverRoutes: ServerRoute[];
+    /** Whether to use api only mode */
+    apiOnly: boolean;
     _internalContext: InternalContext<AppTools<B>>;
+    /**
+     * Information for HTML templates by entry
+     * @private
+     */
+    partialsByEntrypoint?: Record<string, HtmlPartials>;
+    /**
+     * Information for HTML templates
+     * @private
+     */
+    htmlTemplates: HtmlTemplates;
+    /**
+     * @deprecated compat old plugin, default is app tools
+     */
+    toolsType?: string;
 };
 export type AppToolsContext<B extends Bundler = 'webpack'> = AppContext<AppTools<B>> & AppToolsExtendContext<B>;
+export type AppToolsHooks<B extends Bundler = 'webpack'> = Hooks<AppToolsUserConfig<B>, AppToolsNormalizedConfig> & AppToolsExtendHooks;

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

@@ -1,3 +1,3 @@
-import type { IAppContext } from '../types';
+import type { AppToolsContext } from '../types/new';
 export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
-export declare function generateWatchFiles(appContext: IAppContext, configDir?: string): Promise<string[]>;
+export declare function generateWatchFiles(appContext: AppToolsContext<'shared'>, configDir?: string): Promise<string[]>;

package/dist/types/{new/context.d.ts → utils/initAppContext.d.ts}

@@ -20,7 +20,6 @@ export declare const initAppContext: ({ appDirectory, runtimeConfigFile, options
     apiDirectory: string;
     lambdaDirectory: string;
     sharedDirectory: string;
-    distDirectory: string;
     serverPlugins: never[];
     internalDirectory: string;
     htmlTemplates: {};

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

@@ -0,0 +1 @@
+export declare function isAutoLoadPlugins(appDirectory: string, configFile?: string, packageJsonConfig?: string): Promise<boolean>;

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

@@ -1,5 +1,15 @@
+import type { CLIPluginAPI } from '@modern-js/plugin-v2';
+import type { Plugin } from '@modern-js/plugin-v2';
 import type { ServerPlugin as ServerPluginInstance } from '@modern-js/server-core';
 import type { ServerPlugin } from '@modern-js/types';
-import type { AppTools, PluginAPI } from '../types';
-export declare function getServerPlugins(api: PluginAPI<AppTools<'shared'>>, metaName?: string): Promise<ServerPlugin[]>;
-export declare function loadServerPlugins(api: PluginAPI<AppTools<'shared'>>, appDirectory: string, metaName: string): Promise<ServerPluginInstance[]>;
+import type { InternalPlugins } from '@modern-js/types';
+import type { AppTools } from '../types';
+export declare function getServerPlugins(api: CLIPluginAPI<AppTools<'shared'>>, metaName?: string): Promise<ServerPlugin[]>;
+export declare function loadServerPlugins(api: CLIPluginAPI<AppTools<'shared'>>, appDirectory: string, metaName: string): Promise<ServerPluginInstance[]>;
+/**
+ * Load internal plugins which in @modern-js scope and user's custom plugins.
+ * @param appDirectory - Application root directory.
+ * @param internalPlugins - Internal plugins.
+ * @returns Plugin Objects has been required.
+ */
+export declare const loadInternalPlugins: (appDirectory: string, internalPlugins?: InternalPlugins, autoLoad?: InternalPlugins, autoLoadPlugins?: boolean) => Promise<Plugin[]>;

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

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

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

@@ -1,3 +1,2 @@
-import type { ToRunners } from '@modern-js/core';
-import type { AppToolsHooks } from '../types/hooks';
-export declare function restart(hooksRunner: ToRunners<AppToolsHooks>, filename: string): Promise<void>;
+import type { AppToolsHooks } from '../types/new';
+export declare function restart(hooks: AppToolsHooks<'shared'>, filename: string): Promise<void>;

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

@@ -1,4 +1,5 @@
 import type { IAppContext } from '@modern-js/core';
-export declare const generateRoutes: (appContext: IAppContext) => Promise<void>;
+import type { AppToolsContext } from '../types/new';
+export declare const generateRoutes: (appContext: AppToolsContext<'shared'> | IAppContext) => Promise<void>;
 export declare const getPathWithoutExt: (filename: string) => string;
 export declare const isMainEntry: (entryName: string, mainEntryName?: string) => boolean;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.0",
+  "version": "2.63.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -35,9 +35,9 @@
       "default": "./dist/cjs/index.js"
     },
     "./cli/run": {
-      "types": "./dist/types/new/run.d.ts",
-      "jsnext:source": "./src/new/run.ts",
-      "default": "./dist/cjs/new/run.js"
+      "types": "./dist/types/run/index.d.ts",
+      "jsnext:source": "./src/run/index.ts",
+      "default": "./dist/cjs/run/index.js"
     },
     "./types": {
       "types": "./lib/types.d.ts",
@@ -64,7 +64,7 @@
         "./dist/types/index.d.ts"
       ],
       "cli/run": [
-        "./dist/types/new/run.d.ts"
+        "./dist/types/run/index.d.ts"
       ],
       "types": [
         "./lib/types.d.ts"
@@ -85,8 +85,8 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.26.0",
-    "@rsbuild/core": "~1.1.5",
-    "@rsbuild/plugin-node-polyfill": "~1.2.0",
+    "@rsbuild/core": "1.1.8",
+    "@rsbuild/plugin-node-polyfill": "1.2.0",
     "@swc/helpers": "0.5.13",
     "@vercel/nft": "^0.26.4",
     "es-module-lexer": "^1.1.0",
@@ -96,23 +96,23 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/plugin-v2": "2.63.0",
-    "@modern-js/node-bundle-require": "2.63.0",
     "@modern-js/core": "2.63.0",
+    "@modern-js/node-bundle-require": "2.63.0",
     "@modern-js/plugin": "2.63.0",
     "@modern-js/plugin-i18n": "2.63.0",
-    "@modern-js/plugin-data-loader": "2.63.0",
-    "@modern-js/rsbuild-plugin-esbuild": "2.63.0",
+    "@modern-js/plugin-v2": "2.63.0",
     "@modern-js/prod-server": "2.63.0",
+    "@modern-js/rsbuild-plugin-esbuild": "2.63.0",
     "@modern-js/server": "2.63.0",
     "@modern-js/server-core": "2.63.0",
     "@modern-js/server-utils": "2.63.0",
     "@modern-js/types": "2.63.0",
     "@modern-js/uni-builder": "2.63.0",
-    "@modern-js/utils": "2.63.0"
+    "@modern-js/utils": "2.63.0",
+    "@modern-js/plugin-data-loader": "2.63.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-webpack-swc": "~1.0.8",
+    "@rsbuild/plugin-webpack-swc": "1.0.9",
     "@types/babel__traverse": "7.20.6",
     "@types/jest": "^29",
     "@types/node": "^16",
@@ -139,8 +139,7 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "provenance": true
+    "access": "public"
   },
   "scripts": {
     "new": "modern-lib new",

package/dist/cjs/hooks.js

@@ -1,60 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var hooks_exports = {};
-__export(hooks_exports, {
-  hooks: () => hooks
-});
-module.exports = __toCommonJS(hooks_exports);
-var import_plugin = require("@modern-js/plugin");
-const hooks = {
-  _internalRuntimePlugins: (0, import_plugin.createAsyncWaterfall)(),
-  modifyFileSystemRoutes: (0, import_plugin.createAsyncWaterfall)(),
-  modifyServerRoutes: (0, import_plugin.createAsyncWaterfall)(),
-  /** add entry point info to entrypoints array */
-  modifyEntrypoints: (0, import_plugin.createAsyncWaterfall)(),
-  /** add entry type */
-  checkEntryPoint: (0, import_plugin.createAsyncWaterfall)(),
-  generateEntryCode: (0, import_plugin.createAsyncWorkflow)(),
-  htmlPartials: (0, import_plugin.createAsyncWaterfall)(),
-  beforeGenerateRoutes: (0, import_plugin.createAsyncWaterfall)(),
-  _internalServerPlugins: (0, import_plugin.createAsyncWaterfall)(),
-  beforeDev: (0, import_plugin.createAsyncWorkflow)(),
-  afterDev: (0, import_plugin.createAsyncWorkflow)(),
-  beforeCreateCompiler: (0, import_plugin.createAsyncWorkflow)(),
-  afterCreateCompiler: (0, import_plugin.createAsyncWorkflow)(),
-  beforePrintInstructions: (0, import_plugin.createAsyncWaterfall)(),
-  beforeBuild: (0, import_plugin.createAsyncWorkflow)(),
-  afterBuild: (0, import_plugin.createAsyncWorkflow)(),
-  beforeDeploy: (0, import_plugin.createAsyncWorkflow)(),
-  deploy: (0, import_plugin.createAsyncWorkflow)(),
-  afterDeploy: (0, import_plugin.createAsyncWorkflow)(),
-  beforeRestart: (0, import_plugin.createAsyncWorkflow)(),
-  /**
-  * @deprecated
-  */
-  registerDev: (0, import_plugin.createParallelWorkflow)(),
-  /**
-  * @deprecated
-  */
-  registerBuildPlatform: (0, import_plugin.createParallelWorkflow)()
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  hooks
-});

package/dist/cjs/new/index.js

@@ -1,79 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var new_exports = {};
-__export(new_exports, {
-  appTools: () => appTools,
-  initAppContext: () => import_context.initAppContext
-});
-module.exports = __toCommonJS(new_exports);
-var import_plugin_v2 = require("@modern-js/plugin-v2");
-var import_old = require("../old");
-var import_compat = require("./compat");
-var import_constants = require("./constants");
-var import_context = require("./context");
-__reExport(new_exports, require("../defineConfig"), module.exports);
-const appTools = (options = {
-  // default webpack to be compatible with original projects
-  bundler: "webpack"
-}) => ({
-  name: "@modern-js/app-tools",
-  usePlugins: [
-    (0, import_compat.compatPlugin)(),
-    (0, import_old.appTools)(options)
-  ],
-  post: [
-    "@modern-js/app-tools-old"
-  ],
-  registryHooks: {
-    onBeforeConfig: (0, import_plugin_v2.createAsyncHook)(),
-    onAfterPrepare: (0, import_plugin_v2.createAsyncHook)(),
-    deploy: (0, import_plugin_v2.createAsyncHook)(),
-    _internalRuntimePlugins: (0, import_plugin_v2.createAsyncHook)(),
-    _internalServerPlugins: (0, import_plugin_v2.createAsyncHook)(),
-    checkEntryPoint: (0, import_plugin_v2.createAsyncHook)(),
-    modifyEntrypoints: (0, import_plugin_v2.createAsyncHook)(),
-    modifyFileSystemRoutes: (0, import_plugin_v2.createAsyncHook)(),
-    modifyServerRoutes: (0, import_plugin_v2.createAsyncHook)(),
-    generateEntryCode: (0, import_plugin_v2.createAsyncHook)(),
-    onBeforeGenerateRoutes: (0, import_plugin_v2.createAsyncHook)(),
-    onBeforePrintInstructions: (0, import_plugin_v2.createAsyncHook)(),
-    registerDev: (0, import_plugin_v2.createAsyncHook)(),
-    registerBuildPlatform: (0, import_plugin_v2.createAsyncHook)(),
-    addRuntimeExports: (0, import_plugin_v2.createAsyncHook)()
-  },
-  setup: (api) => {
-    var _userConfig_output;
-    const context = api.getAppContext();
-    const userConfig = api.getConfig();
-    api.updateAppContext((0, import_context.initAppContext)({
-      appDirectory: context.appDirectory,
-      options: {},
-      serverConfigFile: import_constants.DEFAULT_SERVER_CONFIG_FILE,
-      runtimeConfigFile: import_constants.DEFAULT_RUNTIME_CONFIG_FILE,
-      tempDir: (_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir
-    }));
-  }
-});
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  appTools,
-  initAppContext,
-  ...require("../defineConfig")
-});