@modern-js/app-tools 2.63.0 → 2.63.1

package/dist/esm-node/plugins/analyze/index.js

@@ -16,147 +16,145 @@ var analyze_default = ({ bundler }) => ({
   setup: (api) => {
     let pagesDir = [];
     let nestedRouteEntries = [];
-    return {
-      async prepare() {
-        var _resolvedConfig_source;
-        let appContext = api.useAppContext();
-        const resolvedConfig = api.useResolvedConfigContext();
-        const hookRunners = api.useHookRunners();
-        try {
-          if (checkIsBuildCommands()) {
-            fs.emptydirSync(appContext.internalDirectory);
-          }
-        } catch {
-        }
-        const apiOnly = await isApiOnly(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir, appContext.apiDirectory);
-        await hookRunners.addRuntimeExports();
-        if (apiOnly) {
-          const { routes: routes2 } = await hookRunners.modifyServerRoutes({
-            routes: []
-          });
-          debug(`server routes: %o`, routes2);
-          appContext = {
-            ...api.useAppContext(),
-            apiOnly,
-            serverRoutes: routes2
-          };
-          api.setAppContext(appContext);
-          return;
+    api.onPrepare(async () => {
+      var _resolvedConfig_source;
+      let appContext = api.getAppContext();
+      const resolvedConfig = api.getNormalizedConfig();
+      const hooks = api.getHooks();
+      try {
+        if (checkIsBuildCommands()) {
+          fs.emptydirSync(appContext.internalDirectory);
         }
-        const [{ getBundleEntry }, { getServerRoutes }, { getHtmlTemplate }] = await Promise.all([
-          import("./getBundleEntry.js"),
-          import("./getServerRoutes.js"),
-          import("./getHtmlTemplate.js")
-        ]);
-        const { entrypoints } = await hookRunners.modifyEntrypoints({
-          entrypoints: await getBundleEntry(hookRunners, appContext, resolvedConfig)
+      } catch {
+      }
+      const apiOnly = await isApiOnly(appContext.appDirectory, (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.entriesDir, appContext.apiDirectory);
+      await hooks.addRuntimeExports.call();
+      if (apiOnly) {
+        const { routes: routes2 } = await hooks.modifyServerRoutes.call({
+          routes: []
         });
-        debug(`entrypoints: %o`, entrypoints);
-        const initialRoutes = getServerRoutes(entrypoints, {
-          appContext,
-          config: resolvedConfig
+        debug(`server routes: %o`, routes2);
+        api.updateAppContext({
+          apiOnly,
+          serverRoutes: routes2
         });
-        const { routes } = await hookRunners.modifyServerRoutes({
-          routes: initialRoutes
+        return;
+      }
+      const [{ getBundleEntry }, { getServerRoutes }, { getHtmlTemplate }] = await Promise.all([
+        import("./getBundleEntry.js"),
+        import("./getServerRoutes.js"),
+        import("./getHtmlTemplate.js")
+      ]);
+      const { entrypoints } = await hooks.modifyEntrypoints.call({
+        entrypoints: await getBundleEntry(hooks, appContext, resolvedConfig)
+      });
+      debug(`entrypoints: %o`, entrypoints);
+      const initialRoutes = getServerRoutes(entrypoints, {
+        appContext,
+        config: resolvedConfig
+      });
+      const { routes } = await hooks.modifyServerRoutes.call({
+        routes: initialRoutes
+      });
+      debug(`server routes: %o`, routes);
+      appContext = {
+        ...api.getAppContext(),
+        entrypoints,
+        serverRoutes: routes
+      };
+      api.updateAppContext(appContext);
+      nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
+      pagesDir = entrypoints.map((point) => point.entry).filter((entry) => entry && !path.extname(entry)).concat(nestedRouteEntries);
+      const { partialsByEntrypoint, htmlTemplates } = await getHtmlTemplate(entrypoints, hooks, {
+        appContext,
+        config: resolvedConfig
+      });
+      debug(`html templates: %o`, htmlTemplates);
+      api.updateAppContext({
+        partialsByEntrypoint
+      });
+      let checkedEntries = entrypoints.map((point) => point.entryName);
+      if (isDevCommand()) {
+        const { entry } = minimist(getArgv());
+        checkedEntries = await getSelectedEntries(typeof entry === "string" ? entry.split(",") : entry, entrypoints);
+      }
+      appContext = {
+        ...api.getAppContext(),
+        entrypoints,
+        checkedEntries,
+        apiOnly,
+        serverRoutes: routes,
+        htmlTemplates
+      };
+      api.updateAppContext(appContext);
+      if (checkIsBuildCommands()) {
+        await hooks.generateEntryCode.call({
+          entrypoints
         });
-        debug(`server routes: %o`, routes);
-        appContext = {
-          ...api.useAppContext(),
-          entrypoints,
-          serverRoutes: routes
-        };
-        api.setAppContext(appContext);
-        nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
-        pagesDir = entrypoints.map((point) => point.entry).filter((entry) => entry && !path.extname(entry)).concat(nestedRouteEntries);
-        const htmlTemplates = await getHtmlTemplate(entrypoints, api, {
-          appContext,
-          config: resolvedConfig
+        const normalizedConfig = api.getNormalizedConfig();
+        const createBuilderForModern = await createBuilderGenerator(bundler);
+        const builder = await createBuilderForModern({
+          normalizedConfig,
+          appContext
         });
-        debug(`html templates: %o`, htmlTemplates);
-        let checkedEntries = entrypoints.map((point) => point.entryName);
-        if (isDevCommand()) {
-          const { entry } = minimist(getArgv());
-          checkedEntries = await getSelectedEntries(typeof entry === "string" ? entry.split(",") : entry, entrypoints);
-        }
-        appContext = {
-          ...api.useAppContext(),
-          entrypoints,
-          checkedEntries,
-          apiOnly,
-          serverRoutes: routes,
-          htmlTemplates
-        };
-        api.setAppContext(appContext);
-        if (checkIsBuildCommands()) {
-          await hookRunners.generateEntryCode({
-            entrypoints
-          });
-          const normalizedConfig = api.useResolvedConfigContext();
-          const createBuilderForModern = await createBuilderGenerator(bundler);
-          const builder = await createBuilderForModern({
-            normalizedConfig,
-            appContext
-          });
-          builder.onBeforeBuild(async ({ bundlerConfigs, isFirstCompile }) => {
-            if (!isFirstCompile) {
-              return;
-            }
-            const hookRunners2 = api.useHookRunners();
-            await generateRoutes(appContext);
-            await hookRunners2.beforeBuild({
-              bundlerConfigs
-            });
+        builder.onBeforeBuild(async ({ bundlerConfigs, isFirstCompile, environments, isWatch }) => {
+          if (!isFirstCompile) {
+            return;
+          }
+          await generateRoutes(appContext);
+          await hooks.onBeforeBuild.call({
+            isFirstCompile,
+            isWatch,
+            environments,
+            bundlerConfigs
           });
-          builder.onAfterBuild(async ({ stats }) => {
-            const hookRunners2 = api.useHookRunners();
-            await hookRunners2.afterBuild({
-              stats
-            });
-            await emitResolvedConfig(appContext.appDirectory, normalizedConfig);
+        });
+        builder.onAfterBuild(async ({ stats, environments, isFirstCompile, isWatch }) => {
+          await hooks.onAfterBuild.call({
+            stats,
+            environments,
+            isFirstCompile,
+            isWatch
           });
-          builder.onDevCompileDone(async ({ isFirstCompile }) => {
-            const hookRunners2 = api.useHookRunners();
-            hookRunners2.afterDev({
-              isFirstCompile
-            });
-            if (isFirstCompile) {
-              printInstructions(hookRunners2, appContext, normalizedConfig);
-            }
+          await emitResolvedConfig(appContext.appDirectory, normalizedConfig);
+        });
+        builder.onDevCompileDone(async ({ isFirstCompile }) => {
+          hooks.onAfterDev.call({
+            isFirstCompile
           });
-          builder.onBeforeCreateCompiler(async ({ bundlerConfigs }) => {
-            const hookRunners2 = api.useHookRunners();
-            await hookRunners2.beforeCreateCompiler({
-              bundlerConfigs
-            });
+          if (isFirstCompile) {
+            printInstructions(hooks, appContext, normalizedConfig);
+          }
+        });
+        builder.onBeforeCreateCompiler(async ({ bundlerConfigs, environments }) => {
+          await hooks.onBeforeCreateCompiler.call({
+            environments,
+            bundlerConfigs
           });
-          builder.onAfterCreateCompiler(async ({ compiler }) => {
-            const hookRunners2 = api.useHookRunners();
-            await hookRunners2.afterCreateCompiler({
-              compiler
-            });
+        });
+        builder.onAfterCreateCompiler(async ({ compiler, environments }) => {
+          await hooks.onAfterCreateCompiler.call({
+            environments,
+            compiler
           });
-          builder.addPlugins(resolvedConfig.builderPlugins);
-          appContext = {
-            ...api.useAppContext(),
-            builder
-          };
-          api.setAppContext(appContext);
-        }
-      },
-      watchFiles() {
-        return {
-          files: pagesDir,
-          isPrivate: true
-        };
-      },
-      resolvedConfig({ resolved }) {
-        const appContext = api.useAppContext();
-        const config = initialNormalizedConfig(resolved, appContext, bundler);
-        return {
-          resolved: config
-        };
+        });
+        builder.addPlugins(resolvedConfig.builderPlugins);
+        api.updateAppContext({
+          builder
+        });
       }
-    };
+    });
+    api.addWatchFiles(() => {
+      return {
+        files: pagesDir,
+        isPrivate: true
+      };
+    });
+    api.modifyResolvedConfig((resolved) => {
+      const appContext = api.getAppContext();
+      const config = initialNormalizedConfig(resolved, appContext, bundler);
+      return config;
+    });
   }
 });
 export {

package/dist/esm-node/plugins/deploy/index.js

@@ -22,21 +22,19 @@ var deploy_default = () => ({
   name: "@modern-js/plugin-deploy",
   setup: (api) => {
     const deployTarget = process.env.MODERNJS_DEPLOY || provider || "node";
-    return {
-      async deploy() {
-        const appContext = api.useAppContext();
-        const { metaName } = appContext;
-        if (metaName !== "modern-js" && !process.env.MODERNJS_DEPLOY) {
-          return;
-        }
-        const modernConfig = api.useResolvedConfigContext();
-        const deployPreset = await getDeployPreset(appContext, modernConfig, deployTarget);
-        (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare());
-        (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput());
-        (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry());
-        (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end());
+    api.deploy(async () => {
+      const appContext = api.getAppContext();
+      const { metaName } = appContext;
+      if (metaName !== "modern-js" && !process.env.MODERNJS_DEPLOY) {
+        return;
       }
-    };
+      const modernConfig = api.getNormalizedConfig();
+      const deployPreset = await getDeployPreset(appContext, modernConfig, deployTarget);
+      (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare());
+      (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput());
+      (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry());
+      (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end) && await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end());
+    });
   }
 });
 export {

package/dist/esm-node/plugins/initialize/index.js

@@ -27,7 +27,7 @@ var initialize_default = ({ bundler }) => ({
       appContext = {
         ...appContext,
         port,
-        distDirectory: ensureAbsolutePath(appContext.distDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
+        distDirectory: ensureAbsolutePath(appContext.appDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
       };
       api.updateAppContext(appContext);
       const normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;

package/dist/esm-node/utils/printInstructions.js

@@ -1,5 +1,12 @@
 import { logger, prettyInstructions } from "@modern-js/utils";
-const printInstructions = async (hookRunners, appContext, config) => {
+const printInstructions = async (hooks, appContext, config) => {
+  const message = prettyInstructions(appContext, config);
+  const { instructions } = await hooks.onBeforePrintInstructions.call({
+    instructions: message
+  });
+  logger.log(instructions);
+};
+const printInstructionsCompat = async (hookRunners, appContext, config) => {
   const message = prettyInstructions(appContext, config);
   const { instructions } = await hookRunners.beforePrintInstructions({
     instructions: message
@@ -7,5 +14,6 @@ const printInstructions = async (hookRunners, appContext, config) => {
   logger.log(instructions);
 };
 export {
-  printInstructions
+  printInstructions,
+  printInstructionsCompat
 };

package/dist/esm-node/utils/restart.js

@@ -1,5 +1,6 @@
 import { cli } from "@modern-js/plugin-v2/cli";
-import { chalk, clearConsole, getFullArgv, logger, program } from "@modern-js/utils";
+import { chalk, clearConsole, getFullArgv, logger } from "@modern-js/utils";
+import { program } from "@modern-js/utils/commander";
 async function restart(hooksRunner, filename) {
   clearConsole();
   logger.info(`Restart because ${chalk.yellow(filename)} is changed...

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

@@ -1,3 +1,4 @@
 import type { RsbuildPlugin } from '@modern-js/uni-builder';
+import type { Bundler } from '../../types';
 import type { BuilderOptions } from '../shared';
-export declare const builderPluginAdapterCopy: (options: BuilderOptions<'shared'>) => RsbuildPlugin;
+export declare const builderPluginAdapterCopy: <B extends Bundler>(options: BuilderOptions<B>) => RsbuildPlugin;

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

@@ -1,2 +1,3 @@
-import type { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
-export declare function createBuilderProviderConfig<B extends Bundler>(resolveConfig: AppNormalizedConfig<B>, appContext: IAppContext): Omit<AppNormalizedConfig<B>, 'plugins'>;
+import type { AppNormalizedConfig, Bundler } from '../../types';
+import type { AppToolsContext } from '../../types/new';
+export declare function createBuilderProviderConfig<B extends Bundler>(resolveConfig: AppNormalizedConfig<B>, appContext: AppToolsContext<B>): Omit<AppNormalizedConfig<B>, 'plugins'>;

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

@@ -1,7 +1,8 @@
 /// <reference types="node" />
 import type { Rspack, RspackChain } from '@rsbuild/core';
-import type { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
-export declare function createPublicPattern(appContext: IAppContext, config: AppNormalizedConfig, chain: RspackChain): {
+import type { AppNormalizedConfig, Bundler } from '../../types';
+import type { AppToolsContext } from '../../types/new';
+export declare function createPublicPattern<B extends Bundler>(appContext: AppToolsContext<B>, config: AppNormalizedConfig, chain: RspackChain): {
     info: (file: {
         sourceFilename: string;
     }) => {
@@ -13,4 +14,4 @@ export declare function createPublicPattern(appContext: IAppContext, config: App
     noErrorOnMissing: boolean;
     transform: (content: Buffer, absoluteFrom: string) => string | Buffer;
 };
-export declare function createUploadPattern<B extends Bundler>(appContext: IAppContext, config: AppNormalizedConfig<B>): Rspack.CopyRspackPluginOptions['patterns']['0'];
+export declare function createUploadPattern<B extends Bundler>(appContext: AppToolsContext<B>, config: AppNormalizedConfig<B>): Rspack.CopyRspackPluginOptions['patterns']['0'];

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

@@ -1,6 +1,6 @@
-import type { IAppContext } from '@modern-js/core';
 import type { AppNormalizedConfig, Bundler } from '../../types';
-export declare function getBuilderEnvironments<B extends Bundler>(normalizedConfig: AppNormalizedConfig<'shared'>, appContext: IAppContext, tempBuilderConfig: Omit<AppNormalizedConfig<B>, 'plugins'>): {
+import type { AppToolsContext } from '../../types/new';
+export declare function getBuilderEnvironments<B extends Bundler>(normalizedConfig: AppNormalizedConfig<B>, appContext: AppToolsContext<B>, tempBuilderConfig: Omit<AppNormalizedConfig<B>, 'plugins'>): {
     environments: {
         [name: string]: import("@rsbuild/core").EnvironmentConfig;
     };

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

@@ -1 +1 @@
-export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack/index.js").createRspackBuilderForModern>;
+export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack/index.js").createRspackBuilderForModern | typeof import("./builder-webpack/index.js").createWebpackBuilderForModern>;

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

@@ -1,5 +1,6 @@
-import type { AppNormalizedConfig, IAppContext } from '../../types';
-export declare function createCopyInfo(appContext: IAppContext, config: AppNormalizedConfig<'shared'>): {
+import type { AppNormalizedConfig, Bundler } from '../../types';
+import type { AppToolsContext } from '../../types/new';
+export declare function createCopyInfo<B extends Bundler>(appContext: AppToolsContext<B>, config: AppNormalizedConfig<B>): {
     configDir: string;
     uploadDir: string;
     publicDir: string;

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

@@ -1,5 +1,6 @@
-import type { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
+import type { AppNormalizedConfig, Bundler } from '../../types';
+import type { AppToolsContext } from '../../types/new';
 export type BuilderOptions<B extends Bundler> = {
     normalizedConfig: AppNormalizedConfig<B>;
-    appContext: IAppContext;
+    appContext: AppToolsContext<B>;
 };

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/new/context.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/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;