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

package/dist/cjs/plugins/analyze/getHtmlTemplate.js

@@ -28,7 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var getHtmlTemplate_exports = {};
 __export(getHtmlTemplate_exports, {
-  getHtmlTemplate: () => getHtmlTemplate
+  getHtmlTemplate: () => getHtmlTemplate,
+  getModifyHtmlPartials: () => getModifyHtmlPartials
 });
 module.exports = __toCommonJS(getHtmlTemplate_exports);
 var import_path = __toESM(require("path"));
@@ -54,7 +55,36 @@ const findPartials = (dir, entryName, position) => {
   }
   return null;
 };
-const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
+const getModifyHtmlPartials = (partials) => {
+  const append = (type, ...script) => {
+    script.forEach((item) => {
+      partials[type].push(item);
+    });
+  };
+  const prepend = (type, ...script) => {
+    script.forEach((item) => {
+      partials[type].unshift(item);
+    });
+  };
+  return {
+    top: {
+      append: (...script) => append("top", ...script),
+      prepend: (...script) => prepend("top", ...script),
+      current: partials.top
+    },
+    head: {
+      append: (...script) => append("head", ...script),
+      prepend: (...script) => prepend("head", ...script),
+      current: partials.head
+    },
+    body: {
+      append: (...script) => append("body", ...script),
+      prepend: (...script) => prepend("body", ...script),
+      current: partials.body
+    }
+  };
+};
+const getHtmlTemplate = async (entrypoints, hooks, { appContext, config }) => {
   const { appDirectory, internalDirectory } = appContext;
   const { source: { configDir } } = config;
   const htmlDir = import_path.default.resolve(appDirectory, configDir || "", import_constants.HTML_PARTIALS_FOLDER);
@@ -67,24 +97,20 @@ const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
     if (customIndexTemplate) {
       htmlTemplates[entryName] = customIndexTemplate.file;
     } else {
-      const hookRunners = api.useHookRunners();
-      const { partials } = await hookRunners.htmlPartials({
+      const getPartialInitValue = (position) => {
+        const partial = findPartials(htmlDir, name, position);
+        return partial ? [
+          partial.content
+        ] : [];
+      };
+      const partials = {
+        top: getPartialInitValue("top"),
+        head: getPartialInitValue("head"),
+        body: getPartialInitValue("body")
+      };
+      await hooks.modifyHtmlPartials.call({
         entrypoint,
-        partials: [
-          "top",
-          "head",
-          "body"
-        ].reduce((previous, position) => {
-          const found = findPartials(htmlDir, name, position);
-          previous[position] = found ? [
-            found.content
-          ] : [];
-          return previous;
-        }, {
-          top: [],
-          head: [],
-          body: []
-        })
+        partials: getModifyHtmlPartials(partials)
       });
       const templatePath = import_path.default.resolve(internalDirectory, entryName, "index.html");
       import_utils.fs.outputFileSync(templatePath, templates.html(partials), "utf8");
@@ -96,13 +122,13 @@ const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
       }
     }
   }
-  api.setAppContext({
-    ...api.useAppContext(),
-    partialsByEntrypoint
-  });
-  return htmlTemplates;
+  return {
+    partialsByEntrypoint,
+    htmlTemplates
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getHtmlTemplate
+  getHtmlTemplate,
+  getModifyHtmlPartials
 });

package/dist/cjs/plugins/analyze/index.js

@@ -49,146 +49,144 @@ 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 ((0, import_utils2.checkIsBuildCommands)()) {
-            import_utils.fs.emptydirSync(appContext.internalDirectory);
-          }
-        } catch {
-        }
-        const apiOnly = await (0, import_utils.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 ((0, import_utils2.checkIsBuildCommands)()) {
+          import_utils.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 (0, import_utils.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 ((0, import_utils.isDevCommand)()) {
+        const { entry } = (0, import_utils.minimist)((0, import_utils.getArgv)());
+        checkedEntries = await (0, import_getSelectedEntries.getSelectedEntries)(typeof entry === "string" ? entry.split(",") : entry, entrypoints);
+      }
+      appContext = {
+        ...api.getAppContext(),
+        entrypoints,
+        checkedEntries,
+        apiOnly,
+        serverRoutes: routes,
+        htmlTemplates
+      };
+      api.updateAppContext(appContext);
+      if ((0, import_utils2.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 (0, import_builder.createBuilderGenerator)(bundler);
+        const builder = await createBuilderForModern({
+          normalizedConfig,
+          appContext
         });
-        debug(`html templates: %o`, htmlTemplates);
-        let checkedEntries = entrypoints.map((point) => point.entryName);
-        if ((0, import_utils.isDevCommand)()) {
-          const { entry } = (0, import_utils.minimist)((0, import_utils.getArgv)());
-          checkedEntries = await (0, import_getSelectedEntries.getSelectedEntries)(typeof entry === "string" ? entry.split(",") : entry, entrypoints);
-        }
-        appContext = {
-          ...api.useAppContext(),
-          entrypoints,
-          checkedEntries,
-          apiOnly,
-          serverRoutes: routes,
-          htmlTemplates
-        };
-        api.setAppContext(appContext);
-        if ((0, import_utils2.checkIsBuildCommands)()) {
-          await hookRunners.generateEntryCode({
-            entrypoints
-          });
-          const normalizedConfig = api.useResolvedConfigContext();
-          const createBuilderForModern = await (0, import_builder.createBuilderGenerator)(bundler);
-          const builder = await createBuilderForModern({
-            normalizedConfig,
-            appContext
-          });
-          builder.onBeforeBuild(async ({ bundlerConfigs, isFirstCompile }) => {
-            if (!isFirstCompile) {
-              return;
-            }
-            const hookRunners2 = api.useHookRunners();
-            await (0, import_routes.generateRoutes)(appContext);
-            await hookRunners2.beforeBuild({
-              bundlerConfigs
-            });
+        builder.onBeforeBuild(async ({ bundlerConfigs, isFirstCompile, environments, isWatch }) => {
+          if (!isFirstCompile) {
+            return;
+          }
+          await (0, import_routes.generateRoutes)(appContext);
+          await hooks.onBeforeBuild.call({
+            isFirstCompile,
+            isWatch,
+            environments,
+            bundlerConfigs
           });
-          builder.onAfterBuild(async ({ stats }) => {
-            const hookRunners2 = api.useHookRunners();
-            await hookRunners2.afterBuild({
-              stats
-            });
-            await (0, import_config2.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) {
-              (0, import_printInstructions.printInstructions)(hookRunners2, appContext, normalizedConfig);
-            }
+          await (0, import_config2.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) {
+            (0, import_printInstructions.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 = (0, import_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 = (0, import_config.initialNormalizedConfig)(resolved, appContext, bundler);
+      return config;
+    });
   }
 });

package/dist/cjs/plugins/deploy/index.js

@@ -45,20 +45,18 @@ var deploy_default = () => ({
   name: "@modern-js/plugin-deploy",
   setup: (api) => {
     const deployTarget = process.env.MODERNJS_DEPLOY || import_std_env.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());
+    });
   }
 });

package/dist/cjs/plugins/initialize/index.js

@@ -50,7 +50,7 @@ var initialize_default = ({ bundler }) => ({
       appContext = {
         ...appContext,
         port,
-        distDirectory: (0, import_utils.ensureAbsolutePath)(appContext.distDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
+        distDirectory: (0, import_utils.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 = (0, import_config.checkIsLegacyConfig)(resolved) ? (0, import_config.transformNormalizedConfig)(resolved) : resolved;

package/dist/cjs/plugins/serverBuild.js

@@ -50,39 +50,37 @@ 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 = import_path.default.resolve(distDirectory);
-        const serverDir = import_path.default.resolve(appDirectory, import_utils.SERVER_DIR);
-        const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
-        const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
-        const sourceDirs = [];
-        if (import_fs.default.existsSync(serverDir)) {
-          sourceDirs.push(serverDir);
-          if (import_fs.default.existsSync(sharedDir)) {
-            sourceDirs.push(sharedDir);
-          }
-        }
-        const { server } = modernConfig;
-        const { alias } = modernConfig.source;
-        const { babel } = modernConfig.tools;
-        if (sourceDirs.length > 0) {
-          await (0, import_server_utils.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 = import_path.default.resolve(distDirectory);
+      const serverDir = import_path.default.resolve(appDirectory, import_utils.SERVER_DIR);
+      const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
+      const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
+      const sourceDirs = [];
+      if (import_fs.default.existsSync(serverDir)) {
+        sourceDirs.push(serverDir);
+        if (import_fs.default.existsSync(sharedDir)) {
+          sourceDirs.push(sharedDir);
         }
       }
-    };
+      const { server } = modernConfig;
+      const { alias } = modernConfig.source;
+      const { babel } = modernConfig.tools;
+      if (sourceDirs.length > 0) {
+        await (0, import_server_utils.compile)(appDirectory, {
+          server,
+          alias,
+          babelConfig: babel
+        }, {
+          sourceDirs,
+          distDir,
+          tsconfigPath
+        });
+      }
+    });
   }
 });

package/dist/cjs/{new/run.js → run/index.js}

@@ -24,11 +24,11 @@ module.exports = __toCommonJS(run_exports);
 var import_cli = require("@modern-js/plugin-v2/cli");
 var import_run = require("@modern-js/plugin-v2/run");
 var import_utils = require("@modern-js/utils");
-var import_hooks = require("./compat/hooks");
-var import_constants = require("./constants");
-var import_getConfigFile = require("./getConfigFile");
-var import_loadPlugins = require("./loadPlugins");
-var import_utils2 = require("./utils");
+var import_hooks = require("../compat/hooks");
+var import_constants = require("../constants");
+var import_getConfigFile = require("../utils/getConfigFile");
+var import_isAutoLoadPlugins = require("../utils/isAutoLoadPlugins");
+var import_loadPlugins = require("../utils/loadPlugins");
 async function run({ cwd, initialLog, version, internalPlugins, packageJsonConfig, configFile }) {
   const command = process.argv[2];
   const cliParams = (0, import_utils.minimist)(process.argv.slice(2));
@@ -50,7 +50,7 @@ async function run({ cwd, initialLog, version, internalPlugins, packageJsonConfi
   }
   const appDirectory = await (0, import_cli.initAppDir)(cwd);
   const finalConfigFile = customConfigFile || (0, import_getConfigFile.getConfigFile)(configFile);
-  const autoLoadPlugins = await (0, import_utils2.getIsAutoLoadPlugins)(appDirectory, finalConfigFile);
+  const autoLoadPlugins = await (0, import_isAutoLoadPlugins.isAutoLoadPlugins)(appDirectory, finalConfigFile);
   const plugins = await (0, import_loadPlugins.loadInternalPlugins)(appDirectory, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.cli, internalPlugins === null || internalPlugins === void 0 ? void 0 : internalPlugins.autoLoad, autoLoadPlugins);
   await (0, import_run.run)({
     cwd,

package/dist/cjs/{new → utils}/getConfigFile.js

@@ -33,7 +33,7 @@ __export(getConfigFile_exports, {
 module.exports = __toCommonJS(getConfigFile_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_constants = require("./constants");
+var import_constants = require("../constants");
 const getConfigFile = (configFile) => (0, import_utils.findExists)(import_utils.CONFIG_FILE_EXTENSIONS.map((extension) => import_path.default.resolve(process.cwd(), `${configFile || import_constants.DEFAULT_CONFIG_FILE}${extension}`)));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/{new/context.js → utils/initAppContext.js}

@@ -26,11 +26,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var context_exports = {};
-__export(context_exports, {
+var initAppContext_exports = {};
+__export(initAppContext_exports, {
   initAppContext: () => initAppContext
 });
-module.exports = __toCommonJS(context_exports);
+module.exports = __toCommonJS(initAppContext_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 const initAppContext = ({ appDirectory, runtimeConfigFile, options, serverConfigFile, tempDir }) => {
@@ -46,7 +46,6 @@ const initAppContext = ({ appDirectory, runtimeConfigFile, options, serverConfig
     apiDirectory: import_path.default.resolve(appDirectory, apiDir),
     lambdaDirectory: import_path.default.resolve(appDirectory, apiDir, "lambda"),
     sharedDirectory: import_path.default.resolve(appDirectory, sharedDir),
-    distDirectory: distDir,
     serverPlugins: [],
     internalDirectory: import_path.default.resolve(appDirectory, tempDir || `./node_modules/.${metaName}`),
     htmlTemplates: {},

package/dist/cjs/{new/utils/index.js → utils/isAutoLoadPlugins.js}

@@ -16,13 +16,13 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var utils_exports = {};
-__export(utils_exports, {
-  getIsAutoLoadPlugins: () => getIsAutoLoadPlugins
+var isAutoLoadPlugins_exports = {};
+__export(isAutoLoadPlugins_exports, {
+  isAutoLoadPlugins: () => isAutoLoadPlugins
 });
-module.exports = __toCommonJS(utils_exports);
+module.exports = __toCommonJS(isAutoLoadPlugins_exports);
 var import_cli = require("@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 (0, import_cli.createLoadedConfig)(appDirectory, configFile, packageJsonConfig);
   const autoLoadPlugins = (_loaded_config = loaded.config) === null || _loaded_config === void 0 ? void 0 : _loaded_config.autoLoadPlugins;
@@ -30,5 +30,5 @@ async function getIsAutoLoadPlugins(appDirectory, configFile = "modern.config.ts
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getIsAutoLoadPlugins
+  isAutoLoadPlugins
 });

package/dist/cjs/utils/loadPlugins.js

@@ -19,18 +19,20 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var loadPlugins_exports = {};
 __export(loadPlugins_exports, {
   getServerPlugins: () => getServerPlugins,
+  loadInternalPlugins: () => loadInternalPlugins,
   loadServerPlugins: () => loadServerPlugins
 });
 module.exports = __toCommonJS(loadPlugins_exports);
 var import_prod_server = require("@modern-js/prod-server");
+var import_utils = require("@modern-js/utils");
+const debug = (0, import_utils.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;
@@ -40,8 +42,37 @@ async function loadServerPlugins(api, appDirectory, metaName) {
   const instances = await (0, import_prod_server.loadServerPlugins)(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 = (0, import_utils.tryResolve)(pkg, appDirectory);
+  let module2;
+  try {
+    module2 = await (0, import_utils.compatibleRequire)(path);
+  } catch (e) {
+    ({ default: module2 } = await (0, import_utils.dynamicImport)(path));
+  }
+  if (typeof module2 === "function") {
+    const result = module2(pluginOptions);
+    return result;
+  }
+  return module2;
+};
+const loadInternalPlugins = async (appDirectory, internalPlugins, autoLoad, autoLoadPlugins) => {
+  const plugins = [
+    ...autoLoadPlugins ? (0, import_utils.getInternalPlugins)(appDirectory, internalPlugins) : [],
+    ...autoLoad ? (0, import_utils.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;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getServerPlugins,
+  loadInternalPlugins,
   loadServerPlugins
 });

package/dist/cjs/utils/printInstructions.js

@@ -22,9 +22,9 @@ __export(printInstructions_exports, {
 });
 module.exports = __toCommonJS(printInstructions_exports);
 var import_utils = require("@modern-js/utils");
-const printInstructions = async (hookRunners, appContext, config) => {
+const printInstructions = async (hooks, appContext, config) => {
   const message = (0, import_utils.prettyInstructions)(appContext, config);
-  const { instructions } = await hookRunners.beforePrintInstructions({
+  const { instructions } = await hooks.onBeforePrintInstructions.call({
     instructions: message
   });
   import_utils.logger.log(instructions);