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

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/plugins/serverBuild.js

@@ -17,40 +17,38 @@ function checkHasConfig(appDir, metaName = "modern-js") {
 var serverBuild_default = () => ({
   name: "@modern-js/server-build",
   setup(api) {
-    return {
-      async afterBuild() {
-        const { appDirectory, distDirectory, metaName } = api.useAppContext();
-        if (!checkHasCache(appDirectory) && !checkHasConfig(appDirectory, metaName)) {
-          return;
-        }
-        const modernConfig = api.useResolvedConfigContext();
-        const distDir = path.resolve(distDirectory);
-        const serverDir = path.resolve(appDirectory, SERVER_DIR);
-        const sharedDir = path.resolve(appDirectory, SHARED_DIR);
-        const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-        const sourceDirs = [];
-        if (fs.existsSync(serverDir)) {
-          sourceDirs.push(serverDir);
-          if (fs.existsSync(sharedDir)) {
-            sourceDirs.push(sharedDir);
-          }
-        }
-        const { server } = modernConfig;
-        const { alias } = modernConfig.source;
-        const { babel } = modernConfig.tools;
-        if (sourceDirs.length > 0) {
-          await compile(appDirectory, {
-            server,
-            alias,
-            babelConfig: babel
-          }, {
-            sourceDirs,
-            distDir,
-            tsconfigPath
-          });
+    api.onAfterBuild(async () => {
+      const { appDirectory, distDirectory, metaName } = api.getAppContext();
+      if (!checkHasCache(appDirectory) && !checkHasConfig(appDirectory, metaName)) {
+        return;
+      }
+      const modernConfig = api.getNormalizedConfig();
+      const distDir = path.resolve(distDirectory);
+      const serverDir = path.resolve(appDirectory, SERVER_DIR);
+      const sharedDir = path.resolve(appDirectory, SHARED_DIR);
+      const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+      const sourceDirs = [];
+      if (fs.existsSync(serverDir)) {
+        sourceDirs.push(serverDir);
+        if (fs.existsSync(sharedDir)) {
+          sourceDirs.push(sharedDir);
         }
       }
-    };
+      const { server } = modernConfig;
+      const { alias } = modernConfig.source;
+      const { babel } = modernConfig.tools;
+      if (sourceDirs.length > 0) {
+        await compile(appDirectory, {
+          server,
+          alias,
+          babelConfig: babel
+        }, {
+          sourceDirs,
+          distDir,
+          tsconfigPath
+        });
+      }
+    });
   }
 });
 export {

package/dist/esm-node/{new/run.js → run/index.js}

@@ -1,11 +1,11 @@
 import { initAppDir } from "@modern-js/plugin-v2/cli";
 import { run as CLIPluginRun } from "@modern-js/plugin-v2/run";
 import { minimist } from "@modern-js/utils";
-import { handleSetupResult } from "./compat/hooks";
-import { PACKAGE_JSON_CONFIG_NAME } from "./constants";
-import { getConfigFile } from "./getConfigFile";
-import { loadInternalPlugins } from "./loadPlugins";
-import { getIsAutoLoadPlugins } from "./utils";
+import { handleSetupResult } from "../compat/hooks";
+import { PACKAGE_JSON_CONFIG_NAME } from "../constants";
+import { getConfigFile } from "../utils/getConfigFile";
+import { isAutoLoadPlugins } from "../utils/isAutoLoadPlugins";
+import { loadInternalPlugins } from "../utils/loadPlugins";
 async function run({ cwd, initialLog, version, internalPlugins, packageJsonConfig, configFile }) {
   const command = process.argv[2];
   const cliParams = minimist(process.argv.slice(2));
@@ -27,7 +27,7 @@ async function run({ cwd, initialLog, version, internalPlugins, packageJsonConfi
   }
   const appDirectory = await initAppDir(cwd);
   const finalConfigFile = customConfigFile || getConfigFile(configFile);
-  const autoLoadPlugins = await getIsAutoLoadPlugins(appDirectory, finalConfigFile);
+  const autoLoadPlugins = await isAutoLoadPlugins(appDirectory, finalConfigFile);
   const plugins = await loadInternalPlugins(appDirectory, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.cli, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.autoLoad, autoLoadPlugins);
   await CLIPluginRun({
     cwd,

package/dist/esm-node/{new → utils}/getConfigFile.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { CONFIG_FILE_EXTENSIONS, findExists } from "@modern-js/utils";
-import { DEFAULT_CONFIG_FILE } from "./constants";
+import { DEFAULT_CONFIG_FILE } from "../constants";
 const getConfigFile = (configFile) => findExists(CONFIG_FILE_EXTENSIONS.map((extension) => path.resolve(process.cwd(), `${configFile || DEFAULT_CONFIG_FILE}${extension}`)));
 export {
   getConfigFile

package/dist/esm-node/{new/context.js → utils/initAppContext.js}

@@ -13,7 +13,6 @@ const initAppContext = ({ appDirectory, runtimeConfigFile, options, serverConfig
     apiDirectory: path.resolve(appDirectory, apiDir),
     lambdaDirectory: path.resolve(appDirectory, apiDir, "lambda"),
     sharedDirectory: path.resolve(appDirectory, sharedDir),
-    distDirectory: distDir,
     serverPlugins: [],
     internalDirectory: path.resolve(appDirectory, tempDir || `./node_modules/.${metaName}`),
     htmlTemplates: {},

package/dist/esm-node/{new/utils/index.js → utils/isAutoLoadPlugins.js}

@@ -1,10 +1,10 @@
 import { createLoadedConfig } from "@modern-js/plugin-v2/cli";
-async function getIsAutoLoadPlugins(appDirectory, configFile = "modern.config.ts", packageJsonConfig = "ModernConfig") {
+async function isAutoLoadPlugins(appDirectory, configFile = "modern.config.ts", packageJsonConfig = "ModernConfig") {
   var _loaded_config;
   const loaded = await createLoadedConfig(appDirectory, configFile, packageJsonConfig);
   const autoLoadPlugins = (_loaded_config = loaded.config) === null || _loaded_config === void 0 ? void 0 : _loaded_config.autoLoadPlugins;
   return autoLoadPlugins || false;
 }
 export {
-  getIsAutoLoadPlugins
+  isAutoLoadPlugins
 };

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

@@ -1,12 +1,13 @@
 import { loadServerPlugins as loadServerPluginInstances } from "@modern-js/prod-server";
+import { compatibleRequire, createDebugger, dynamicImport, getInternalPlugins, tryResolve } from "@modern-js/utils";
+const debug = createDebugger("load-plugins");
 async function getServerPlugins(api, metaName = "modern-js") {
-  const runner = api.useHookRunners();
-  const { plugins } = await runner._internalServerPlugins({
+  const hooks = api.getHooks();
+  const { plugins } = await hooks._internalServerPlugins.call({
     plugins: []
   });
   const filtedPlugins = plugins.filter((plugin) => plugin.name.includes(metaName));
-  api.setAppContext({
-    ...api.useAppContext(),
+  api.updateAppContext({
     serverPlugins: filtedPlugins
   });
   return filtedPlugins;
@@ -16,7 +17,36 @@ async function loadServerPlugins(api, appDirectory, metaName) {
   const instances = await loadServerPluginInstances(plugins, appDirectory);
   return instances;
 }
+const resolveCliPlugin = async (p, appDirectory) => {
+  const pkg = typeof p === "string" ? p : p[0];
+  const pluginOptions = typeof p === "string" ? void 0 : p[1];
+  const path = tryResolve(pkg, appDirectory);
+  let module;
+  try {
+    module = await compatibleRequire(path);
+  } catch (e) {
+    ({ default: module } = await dynamicImport(path));
+  }
+  if (typeof module === "function") {
+    const result = module(pluginOptions);
+    return result;
+  }
+  return module;
+};
+const loadInternalPlugins = async (appDirectory, internalPlugins, autoLoad, autoLoadPlugins) => {
+  const plugins = [
+    ...autoLoadPlugins ? getInternalPlugins(appDirectory, internalPlugins) : [],
+    ...autoLoad ? getInternalPlugins(appDirectory, autoLoad) : []
+  ];
+  const loadedPlugins = await Promise.all(plugins.map((plugin) => {
+    const loadedPlugin = resolveCliPlugin(plugin, appDirectory);
+    debug(`resolve plugin %s: %s`, plugin, loadedPlugin);
+    return loadedPlugin;
+  }));
+  return loadedPlugins;
+};
 export {
   getServerPlugins,
+  loadInternalPlugins,
   loadServerPlugins
 };

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

@@ -1,7 +1,7 @@
 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 hookRunners.beforePrintInstructions({
+  const { instructions } = await hooks.onBeforePrintInstructions.call({
     instructions: message
   });
   logger.log(instructions);

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

@@ -1,11 +1,12 @@
 import { cli } from "@modern-js/plugin-v2/cli";
-import { chalk, clearConsole, getFullArgv, logger, program } from "@modern-js/utils";
-async function restart(hooksRunner, filename) {
+import { chalk, clearConsole, getFullArgv, logger } from "@modern-js/utils";
+import { program } from "@modern-js/utils/commander";
+async function restart(hooks, filename) {
   clearConsole();
   logger.info(`Restart because ${chalk.yellow(filename)} is changed...
 `);
   let hasGetError = false;
-  await hooksRunner.beforeRestart();
+  await hooks.onBeforeRestart.call();
   try {
     await cli.init(cli.getPrevInitOptions());
   } catch (err) {

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/commands/build.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 { BuildOptions } from '../utils/types';
-export declare const build: (api: PluginAPI<AppTools<'shared'>>, options?: BuildOptions) => Promise<void>;
+export declare const build: (api: CLIPluginAPI<AppTools<'shared'>>, options?: BuildOptions) => Promise<void>;

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

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

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

@@ -1,8 +1,8 @@
-import { type PluginAPI } from '@modern-js/core';
+import type { CLIPluginAPI } from '@modern-js/plugin-v2';
 import { type ApplyPlugins } from '@modern-js/server';
 import type { AppTools } from '../types';
 import type { DevOptions } from '../utils/types';
 export interface ExtraServerOptions {
     applyPlugins?: ApplyPlugins;
 }
-export declare const dev: (api: PluginAPI<AppTools<'shared'>>, options: DevOptions, devServerOptions?: ExtraServerOptions) => Promise<void>;
+export declare const dev: (api: CLIPluginAPI<AppTools<'shared'>>, options: DevOptions, devServerOptions?: ExtraServerOptions) => Promise<void>;