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

package/bin/modern.js

@@ -10,7 +10,7 @@ if (!process.env.MODERN_JS_VERSION) {
   process.env.MODERN_JS_VERSION = version;
 }
 
-require('../dist/cjs/new/run.js').run({
+require('../dist/cjs/run/index.js').run({
   internalPlugins: {
     cli: INTERNAL_APP_TOOLS_PLUGINS,
     autoLoad: INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,

package/dist/cjs/commands/build.js

@@ -31,7 +31,6 @@ __export(build_exports, {
   build: () => build
 });
 module.exports = __toCommonJS(build_exports);
-var import_core = require("@modern-js/core");
 var import_utils = require("@modern-js/utils");
 var import_config = require("../utils/config");
 var import_loadPlugins = require("../utils/loadPlugins");
@@ -42,9 +41,9 @@ const build = async (api, options) => {
   if (options === null || options === void 0 ? void 0 : options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
-  let resolvedConfig = api.useResolvedConfigContext();
-  const appContext = api.useAppContext();
-  const hookRunners = api.useHookRunners();
+  const resolvedConfig = api.getNormalizedConfig();
+  const appContext = api.getAppContext();
+  const hooks = api.getHooks();
   await (0, import_loadPlugins.loadServerPlugins)(api, appContext.appDirectory, appContext.metaName);
   if (appContext.moduleType && appContext.moduleType === "module") {
     var _resolvedConfig_source1;
@@ -59,9 +58,12 @@ const build = async (api, options) => {
   const { apiOnly } = appContext;
   if (apiOnly) {
     const { appDirectory: appDirectory2, distDirectory: distDirectory2, serverConfigFile: serverConfigFile2 } = appContext;
-    await hookRunners.beforeBuild({
+    await hooks.onBeforeBuild.call({
+      environments: {},
       // "null" bundlerConfigs
-      bundlerConfigs: void 0
+      bundlerConfigs: void 0,
+      isFirstCompile: false,
+      isWatch: false
     });
     await (0, import_config.buildServerConfig)({
       appDirectory: appDirectory2,
@@ -69,17 +71,21 @@ const build = async (api, options) => {
       configFile: serverConfigFile2
     });
     await (0, import_routes.generateRoutes)(appContext);
-    await hookRunners.afterBuild({
+    await hooks.onAfterBuild.call({
+      environments: {},
       // "null" stats
-      stats: void 0
+      stats: void 0,
+      isFirstCompile: false,
+      isWatch: false
     });
     return;
   }
-  resolvedConfig = {
-    ...resolvedConfig,
-    cliOptions: options
-  };
-  import_core.ResolvedConfigContext.set(resolvedConfig);
+  api.modifyResolvedConfig((config) => {
+    return {
+      ...config,
+      cliOptions: options
+    };
+  });
   const { distDirectory, appDirectory, serverConfigFile } = appContext;
   await (0, import_config.buildServerConfig)({
     appDirectory,

package/dist/cjs/commands/deploy.js

@@ -23,12 +23,12 @@ __export(deploy_exports, {
 module.exports = __toCommonJS(deploy_exports);
 var import_loadPlugins = require("../utils/loadPlugins");
 const deploy = async (api, options) => {
-  const hookRunners = api.useHookRunners();
-  const { metaName } = api.useAppContext();
+  const hooks = api.getHooks();
+  const { metaName } = api.getAppContext();
   await (0, import_loadPlugins.getServerPlugins)(api, metaName);
-  await hookRunners.beforeDeploy(options);
-  await hookRunners.deploy(options);
-  await hookRunners.afterDeploy(options);
+  await hooks.onBeforeDeploy.call(options);
+  await hooks.deploy.call();
+  await hooks.onAfterDeploy.call(options);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/commands/dev.js

@@ -32,7 +32,6 @@ __export(dev_exports, {
 });
 module.exports = __toCommonJS(dev_exports);
 var import_node_path = __toESM(require("node:path"));
-var import_core = require("@modern-js/core");
 var import_prod_server = require("@modern-js/prod-server");
 var import_server = require("@modern-js/server");
 var import_utils = require("@modern-js/utils");
@@ -47,9 +46,9 @@ const dev = async (api, options, devServerOptions) => {
   if (options.analyze) {
     process.env.BUNDLE_ANALYZE = "true";
   }
-  let normalizedConfig = api.useResolvedConfigContext();
-  const appContext = api.useAppContext();
-  const hookRunners = api.useHookRunners();
+  const normalizedConfig = api.getNormalizedConfig();
+  const appContext = api.getAppContext();
+  const hooks = api.getHooks();
   if (appContext.moduleType && appContext.moduleType === "module") {
     var _normalizedConfig_source1;
     const { registerEsm } = await import("../esm/register-esm.mjs");
@@ -60,11 +59,12 @@ const dev = async (api, options, devServerOptions) => {
     });
   }
   await (0, import_register.registerCompiler)(appContext.appDirectory, appContext.distDirectory, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias);
-  normalizedConfig = {
-    ...normalizedConfig,
-    cliOptions: options
-  };
-  import_core.ResolvedConfigContext.set(normalizedConfig);
+  api.modifyResolvedConfig((config) => {
+    return {
+      ...config,
+      cliOptions: options
+    };
+  });
   const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes } = appContext;
   await (0, import_config.buildServerConfig)({
     appDirectory,
@@ -74,7 +74,7 @@ const dev = async (api, options, devServerOptions) => {
   });
   const meta = (0, import_utils.getMeta)(metaName);
   const serverConfigPath = import_node_path.default.resolve(appDirectory, import_utils.SERVER_DIR, `${meta}.server`);
-  await hookRunners.beforeDev();
+  await hooks.onBeforeDev.call();
   if (!appContext.builder && !apiOnly) {
     throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
@@ -113,7 +113,7 @@ const dev = async (api, options, devServerOptions) => {
       port,
       host
     }, () => {
-      (0, import_printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
+      (0, import_printInstructions.printInstructions)(hooks, appContext, normalizedConfig);
     });
   } else {
     const { server, afterListen } = await (0, import_server.createDevServer)({

package/dist/cjs/commands/index.js

@@ -41,8 +41,8 @@ var import_uni_builder = require("@modern-js/uni-builder");
 var import_utils = require("@modern-js/utils");
 var import_locale = require("../locale");
 const devCommand = async (program, api) => {
-  const runner = api.useHookRunners();
-  const devToolMetas = await runner.registerDev();
+  const hooks = api.getHooks();
+  const devToolMetas = await hooks.registerDev.call();
   const devProgram = program.command("dev").alias("start").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.dev.describe)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("-e --entry [entry...]", import_locale.i18n.t(import_locale.localeKeys.command.dev.entry)).option("--analyze", import_locale.i18n.t(import_locale.localeKeys.command.shared.analyze)).option("--api-only", import_locale.i18n.t(import_locale.localeKeys.command.dev.apiOnly)).option("--web-only", import_locale.i18n.t(import_locale.localeKeys.command.dev.webOnly)).action(async (options) => {
     const { dev } = await import("./dev.js");
     await dev(api, options);
@@ -53,7 +53,7 @@ const devCommand = async (program, api) => {
     }
     for (const subCmd of meta.subCommands) {
       devProgram.command(subCmd).action(async (options = {}) => {
-        const { appDirectory } = api.useAppContext();
+        const { appDirectory } = api.getAppContext();
         const { isTypescript } = await import("@modern-js/utils");
         await meta.action(options, {
           isTsProject: isTypescript(appDirectory)
@@ -63,8 +63,8 @@ const devCommand = async (program, api) => {
   }
 };
 const buildCommand = async (program, api) => {
-  const runner = api.useHookRunners();
-  const platformBuilders = await runner.registerBuildPlatform();
+  const hooks = api.getHooks();
+  const platformBuilders = await hooks.registerBuildPlatform.call();
   const buildProgram = program.command("build").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.build.describe)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--analyze", import_locale.i18n.t(import_locale.localeKeys.command.shared.analyze)).action(async (options) => {
     const { build } = await import("./build.js");
     await build(api, options);
@@ -73,7 +73,7 @@ const buildCommand = async (program, api) => {
     const platforms = (0, import_uni_builder.castArray)(platformBuilder.platform);
     for (const platform of platforms) {
       buildProgram.command(platform).action(async () => {
-        const { appDirectory } = api.useAppContext();
+        const { appDirectory } = api.getAppContext();
         const { isTypescript } = await import("@modern-js/utils");
         await platformBuilder.build(platform, {
           isTsProject: isTypescript(appDirectory)

package/dist/cjs/commands/inspect.js

@@ -22,7 +22,7 @@ __export(inspect_exports, {
 });
 module.exports = __toCommonJS(inspect_exports);
 const inspect = async (api, options) => {
-  const appContext = api.useAppContext();
+  const appContext = api.getAppContext();
   if (!appContext.builder) {
     throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }

package/dist/cjs/commands/serve.js

@@ -38,9 +38,9 @@ var import_loadPlugins = require("../utils/loadPlugins");
 var import_printInstructions = require("../utils/printInstructions");
 const start = async (api) => {
   var _userConfig_source, _userConfig_output_distPath;
-  const appContext = api.useAppContext();
-  const userConfig = api.useResolvedConfigContext();
-  const hookRunners = api.useHookRunners();
+  const appContext = api.getAppContext();
+  const userConfig = api.getNormalizedConfig();
+  const hooks = api.getHooks();
   const { distDirectory, appDirectory, internalDirectory, port, metaName, serverRoutes, serverConfigFile } = appContext;
   import_utils.logger.info(`Starting production server...`);
   const apiOnly = await (0, import_utils.isApiOnly)(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory);
@@ -77,7 +77,7 @@ const start = async (api) => {
     runMode
   });
   app.listen(port, async () => {
-    await (0, import_printInstructions.printInstructions)(hookRunners, appContext, userConfig);
+    await (0, import_printInstructions.printInstructions)(hooks, appContext, userConfig);
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/{new/compat → compat}/hooks.js

@@ -22,6 +22,7 @@ __export(hooks_exports, {
   handleSetupResult: () => handleSetupResult
 });
 module.exports = __toCommonJS(hooks_exports);
+var import_getHtmlTemplate = require("../plugins/analyze/getHtmlTemplate");
 var import_utils = require("./utils");
 function getHookRunners(context) {
   const { hooks } = context;
@@ -80,7 +81,13 @@ function getHookRunners(context) {
       return hooks.modifyResolvedConfig.call(params);
     },
     htmlPartials: async (params) => {
-      return hooks.modifyHtmlPartials.call(params);
+      await hooks.modifyHtmlPartials.call({
+        entrypoint: params.entrypoint,
+        partials: (0, import_getHtmlTemplate.getModifyHtmlPartials)(params.partials)
+      });
+      return {
+        partials: params.partials
+      };
     },
     commands: async (params) => {
       return hooks.addCommand.call(params);
@@ -91,7 +98,7 @@ function getHookRunners(context) {
     prepare: async () => {
       return hooks.onPrepare.call();
     },
-    filedChange: async (params) => {
+    fileChange: async (params) => {
       return hooks.onFileChanged.call(params);
     },
     beforeCreateCompiler: async (params) => {
@@ -127,20 +134,20 @@ function getHookRunners(context) {
     /**
     * @deprecated
     */
-    registerDev: async (params) => {
-      return hooks.registerDev.call(params);
+    registerDev: async () => {
+      return hooks.registerDev.call();
     },
     /**
     * @deprecated
     */
-    registerBuildPlatform: async (params) => {
-      return hooks.registerBuildPlatform.call(params);
+    registerBuildPlatform: async () => {
+      return hooks.registerBuildPlatform.call();
     },
     /**
     * @deprecated
     */
-    addRuntimeExports: async (params) => {
-      return hooks.addRuntimeExports.call(params);
+    addRuntimeExports: async () => {
+      return hooks.addRuntimeExports.call();
     }
   };
 }

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

@@ -51,7 +51,10 @@ const compatPlugin = () => ({
   registryHooks: {
     appendEntryCode: (0, import_plugin_v2.createCollectAsyncHook)()
   },
-  setup: (_api) => {
+  setup: (api) => {
+    api.updateAppContext({
+      toolsType: "app-tools"
+    });
   }
 });
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -41,7 +41,7 @@ function transformHookRunner(hookRunnerName) {
       return "addCommand";
     case "watchFiles":
       return "addWatchFiles";
-    case "filedChange":
+    case "fileChange":
       return "onFileChanged";
     case "beforeCreateCompiler":
       return "onBeforeCreateCompiler";
@@ -75,6 +75,15 @@ function transformHookParams(hookRunnerName, params) {
       return {
         resolved: params
       };
+    case "htmlPartials":
+      return {
+        partials: {
+          top: params.partials.top.current,
+          head: params.partials.head.current,
+          body: params.partials.body.current
+        },
+        entrypoint: params.entrypoint
+      };
     default:
       return params;
   }

package/dist/cjs/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,25 +18,171 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
-  appTools: () => import_new.appTools,
+  appTools: () => appTools,
   default: () => src_default,
   defineConfig: () => import_defineConfig.defineConfig,
   defineLegacyConfig: () => import_defineConfig.defineLegacyConfig,
   dev: () => import_dev.dev,
-  initAppContext: () => import_new2.initAppContext,
+  initAppContext: () => import_initAppContext.initAppContext,
   mergeConfig: () => import_core.mergeConfig
 });
 module.exports = __toCommonJS(src_exports);
-var import_new = require("./new/index");
-var import_new2 = require("./new/index");
+var import_language_detector = require("@modern-js/plugin-i18n/language-detector");
+var import_plugin_v2 = require("@modern-js/plugin-v2");
+var import_uni_builder = require("@modern-js/uni-builder");
+var import_utils = require("@modern-js/utils");
+var import_commands = require("./commands");
+var import_compat = require("./compat");
+var import_constants = require("./constants");
+var import_locale = require("./locale");
+var import_analyze = __toESM(require("./plugins/analyze"));
+var import_deploy = __toESM(require("./plugins/deploy"));
+var import_initialize = __toESM(require("./plugins/initialize"));
+var import_serverBuild = __toESM(require("./plugins/serverBuild"));
+var import_generateWatchFiles = require("./utils/generateWatchFiles");
+var import_initAppContext = require("./utils/initAppContext");
+var import_restart = require("./utils/restart");
+__reExport(src_exports, require("./defineConfig"), module.exports);
 var import_defineConfig = require("./defineConfig");
 var import_core = require("@modern-js/core");
 var import_dev = require("./commands/dev");
 __reExport(src_exports, require("./types"), module.exports);
-var src_default = import_new.appTools;
+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_initialize.default)({
+      bundler: (options === null || options === void 0 ? void 0 : options.bundler) && [
+        "rspack",
+        "experimental-rspack"
+      ].includes(options.bundler) ? "rspack" : "webpack"
+    }),
+    (0, import_analyze.default)({
+      bundler: (options === null || options === void 0 ? void 0 : options.bundler) && [
+        "rspack",
+        "experimental-rspack"
+      ].includes(options.bundler) ? "rspack" : "webpack"
+    }),
+    (0, import_serverBuild.default)(),
+    (0, import_deploy.default)()
+  ],
+  post: [
+    "@modern-js/plugin-initialize",
+    "@modern-js/plugin-analyze",
+    "@modern-js/plugin-ssr",
+    "@modern-js/plugin-document",
+    "@modern-js/plugin-state",
+    "@modern-js/plugin-router",
+    "@modern-js/plugin-router-v5",
+    "@modern-js/plugin-polyfill"
+  ],
+  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.createCollectAsyncHook)(),
+    registerBuildPlatform: (0, import_plugin_v2.createCollectAsyncHook)(),
+    addRuntimeExports: (0, import_plugin_v2.createAsyncHook)()
+  },
+  setup: (api) => {
+    var _userConfig_output;
+    const context = api.getAppContext();
+    const userConfig = api.getConfig();
+    const locale = (0, import_language_detector.getLocaleLanguage)();
+    import_locale.i18n.changeLanguage({
+      locale
+    });
+    api.updateAppContext((0, import_initAppContext.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
+    }));
+    api.addCommand(async ({ program }) => {
+      await (0, import_commands.devCommand)(program, api);
+      await (0, import_commands.buildCommand)(program, api);
+      (0, import_commands.serverCommand)(program, api);
+      (0, import_commands.deployCommand)(program, api);
+      (0, import_commands.newCommand)(program, locale);
+      (0, import_commands.inspectCommand)(program, api);
+      (0, import_commands.upgradeCommand)(program);
+      (0, import_utils.deprecatedCommands)(program);
+    });
+    api.onPrepare(async () => {
+      const command = (0, import_utils.getCommand)();
+      if (command === "deploy") {
+        const isSkipBuild = [
+          "-s",
+          "--skip-build"
+        ].some((tag) => {
+          return (0, import_utils.getArgv)().includes(tag);
+        });
+        if (isSkipBuild) {
+          return;
+        }
+      }
+      if (command === "dev" || command === "start" || command === "build" || command === "deploy") {
+        const resolvedConfig = api.getNormalizedConfig();
+        if (resolvedConfig.output.cleanDistPath) {
+          const appContext = api.getAppContext();
+          await (0, import_utils.emptyDir)(appContext.distDirectory);
+        }
+      }
+    });
+    api.addWatchFiles(async () => {
+      const appContext = api.getAppContext();
+      const config = api.getNormalizedConfig();
+      const files = await (0, import_generateWatchFiles.generateWatchFiles)(appContext, config.source.configDir);
+      const watchFiles = (0, import_uni_builder.castArray)(config.dev.watchFiles);
+      watchFiles.forEach(({ type, paths }) => {
+        if (type === "reload-server") {
+          files.push(...Array.isArray(paths) ? paths : [
+            paths
+          ]);
+        }
+      });
+      return files;
+    });
+    api.onFileChanged(async (e) => {
+      const { filename, eventType, isPrivate } = e;
+      if (!isPrivate && (eventType === "change" || eventType === "unlink")) {
+        const { closeServer } = await import("./utils/createServer.js");
+        await closeServer();
+        await (0, import_restart.restart)(api.getHooks(), filename);
+      }
+    });
+    api.onBeforeRestart(() => {
+      (0, import_utils.cleanRequireCache)([
+        require.resolve("./plugins/analyze")
+      ]);
+    });
+  }
+});
+var src_default = appTools;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   appTools,
@@ -43,5 +191,6 @@ var src_default = import_new.appTools;
   dev,
   initAppContext,
   mergeConfig,
+  ...require("./defineConfig"),
   ...require("./types")
 });

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

@@ -55,10 +55,10 @@ const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint)
   }
   return false;
 });
-const getBundleEntry = async (hookRunners, appContext, config) => {
+const getBundleEntry = async (hooks, appContext, config) => {
   const { appDirectory, packageName } = appContext;
   const { disableDefaultEntries, entries, entriesDir, mainEntryName } = config.source;
-  const defaults = disableDefaultEntries ? [] : await (0, import_getFileSystemEntry.getFileSystemEntry)(hookRunners, appContext, config);
+  const defaults = disableDefaultEntries ? [] : await (0, import_getFileSystemEntry.getFileSystemEntry)(hooks, appContext, config);
   if (entries) {
     Object.keys(entries).forEach((name) => {
       const value = entries[name];

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

@@ -39,8 +39,8 @@ var import_isDefaultExportFunction = require("./isDefaultExportFunction");
 const hasIndex = (dir) => (0, import_utils.findExists)(import_utils.JS_EXTENSIONS.map((ext) => import_path.default.resolve(dir, `${import_constants.INDEX_FILE_NAME}${ext}`)));
 const hasEntry = (dir) => (0, import_utils.findExists)(import_utils.JS_EXTENSIONS.map((ext) => import_path.default.resolve(dir, `${import_constants.ENTRY_FILE_NAME}${ext}`)));
 const hasServerEntry = (dir) => (0, import_utils.findExists)(import_utils.JS_EXTENSIONS.map((ext) => import_path.default.resolve(dir, `${import_constants.ENTRY_FILE_NAME}.server${ext}`)));
-const isBundleEntry = async (hookRunners, dir, enableCustomEntry) => {
-  const { entry } = await hookRunners.checkEntryPoint({
+const isBundleEntry = async (hooks, dir, enableCustomEntry) => {
+  const { entry } = await hooks.checkEntryPoint.call({
     path: dir,
     entry: false
   });
@@ -53,7 +53,7 @@ const isBundleEntry = async (hookRunners, dir, enableCustomEntry) => {
   }
   return hasIndex(dir);
 };
-const scanDir = async (hookRunners, dirs, enableCustomEntry) => {
+const scanDir = async (hooks, dirs, enableCustomEntry) => {
   const entries = await Promise.all(dirs.map(async (dir) => {
     const indexFile = hasIndex(dir);
     const customBootstrap = (0, import_isDefaultExportFunction.isDefaultExportFunction)(indexFile) ? indexFile : false;
@@ -70,7 +70,7 @@ const scanDir = async (hookRunners, dirs, enableCustomEntry) => {
         customBootstrap
       };
     }
-    const entryFile = (await hookRunners.checkEntryPoint({
+    const entryFile = (await hooks.checkEntryPoint.call({
       path: dir,
       entry: false
     })).entry;
@@ -104,7 +104,7 @@ const scanDir = async (hookRunners, dirs, enableCustomEntry) => {
   }
   return entries;
 };
-const getFileSystemEntry = async (hookRunners, appContext, config) => {
+const getFileSystemEntry = async (hooks, appContext, config) => {
   const { appDirectory } = appContext;
   const { source: { entriesDir, disableEntryDirs, enableCustomEntry } } = config;
   let disabledDirs = [];
@@ -114,19 +114,19 @@ const getFileSystemEntry = async (hookRunners, appContext, config) => {
   const src = (0, import_utils.ensureAbsolutePath)(appDirectory, entriesDir || "");
   if (import_fs.default.existsSync(src)) {
     if (import_fs.default.statSync(src).isDirectory()) {
-      if (await isBundleEntry(hookRunners, src, enableCustomEntry)) {
-        return scanDir(hookRunners, [
+      if (await isBundleEntry(hooks, src, enableCustomEntry)) {
+        return scanDir(hooks, [
           src
         ], enableCustomEntry);
       }
       const dirs = [];
       await Promise.all(import_fs.default.readdirSync(src).map(async (filename) => {
         const file = import_path.default.join(src, filename);
-        if (import_fs.default.statSync(file).isDirectory() && await isBundleEntry(hookRunners, file, enableCustomEntry) && !disabledDirs.includes(file)) {
+        if (import_fs.default.statSync(file).isDirectory() && await isBundleEntry(hooks, file, enableCustomEntry) && !disabledDirs.includes(file)) {
           dirs.push(file);
         }
       }));
-      return scanDir(hookRunners, dirs, enableCustomEntry);
+      return scanDir(hooks, dirs, enableCustomEntry);
     } else {
       throw Error(`source.entriesDir accept a directory.`);
     }