@modern-js/app-tools 2.63.1 → 2.63.3

package/dist/esm/utils/loadPlugins.js

@@ -1,23 +1,24 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { loadServerPlugins as loadServerPluginInstances } from "@modern-js/prod-server";
+import { compatibleRequire, createDebugger, dynamicImport, getInternalPlugins, tryResolve } from "@modern-js/utils";
+var debug = createDebugger("load-plugins");
 function getServerPlugins(api) {
   return _getServerPlugins.apply(this, arguments);
 }
 function _getServerPlugins() {
   _getServerPlugins = _async_to_generator(function(api) {
-    var metaName, runner, plugins, filtedPlugins;
+    var metaName, hooks, plugins, filtedPlugins;
     var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           metaName = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : "modern-js";
-          runner = api.useHookRunners();
+          hooks = api.getHooks();
           return [
             4,
-            runner._internalServerPlugins({
+            hooks._internalServerPlugins.call({
               plugins: []
             })
           ];
@@ -26,9 +27,9 @@ function _getServerPlugins() {
           filtedPlugins = plugins.filter(function(plugin) {
             return plugin.name.includes(metaName);
           });
-          api.setAppContext(_object_spread_props(_object_spread({}, api.useAppContext()), {
+          api.updateAppContext({
             serverPlugins: filtedPlugins
-          }));
+          });
           return [
             2,
             filtedPlugins
@@ -68,7 +69,94 @@ function _loadServerPlugins() {
   });
   return _loadServerPlugins.apply(this, arguments);
 }
+var resolveCliPlugin = function() {
+  var _ref = _async_to_generator(function(p, appDirectory) {
+    var pkg, pluginOptions, path, module, e, ref, result;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          pkg = typeof p === "string" ? p : p[0];
+          pluginOptions = typeof p === "string" ? void 0 : p[1];
+          path = tryResolve(pkg, appDirectory);
+          _state.label = 1;
+        case 1:
+          _state.trys.push([
+            1,
+            3,
+            ,
+            5
+          ]);
+          return [
+            4,
+            compatibleRequire(path)
+          ];
+        case 2:
+          module = _state.sent();
+          return [
+            3,
+            5
+          ];
+        case 3:
+          e = _state.sent();
+          return [
+            4,
+            dynamicImport(path)
+          ];
+        case 4:
+          ref = _state.sent(), module = ref.default, ref;
+          return [
+            3,
+            5
+          ];
+        case 5:
+          if (typeof module === "function") {
+            result = module(pluginOptions);
+            return [
+              2,
+              result
+            ];
+          }
+          return [
+            2,
+            module
+          ];
+      }
+    });
+  });
+  return function resolveCliPlugin2(p, appDirectory) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var loadInternalPlugins = function() {
+  var _ref = _async_to_generator(function(appDirectory, internalPlugins, autoLoad, autoLoadPlugins) {
+    var plugins, loadedPlugins;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          plugins = _to_consumable_array(autoLoadPlugins ? getInternalPlugins(appDirectory, internalPlugins) : []).concat(_to_consumable_array(autoLoad ? getInternalPlugins(appDirectory, autoLoad) : []));
+          return [
+            4,
+            Promise.all(plugins.map(function(plugin) {
+              var loadedPlugin = resolveCliPlugin(plugin, appDirectory);
+              debug("resolve plugin %s: %s", plugin, loadedPlugin);
+              return loadedPlugin;
+            }))
+          ];
+        case 1:
+          loadedPlugins = _state.sent();
+          return [
+            2,
+            loadedPlugins
+          ];
+      }
+    });
+  });
+  return function loadInternalPlugins2(appDirectory, internalPlugins, autoLoad, autoLoadPlugins) {
+    return _ref.apply(this, arguments);
+  };
+}();
 export {
   getServerPlugins,
+  loadInternalPlugins,
   loadServerPlugins
 };

package/dist/esm/utils/printInstructions.js

@@ -27,33 +27,6 @@ var printInstructions = function() {
     return _ref.apply(this, arguments);
   };
 }();
-var printInstructionsCompat = function() {
-  var _ref = _async_to_generator(function(hookRunners, appContext, config) {
-    var message, instructions;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          message = prettyInstructions(appContext, config);
-          return [
-            4,
-            hookRunners.beforePrintInstructions({
-              instructions: message
-            })
-          ];
-        case 1:
-          instructions = _state.sent().instructions;
-          logger.log(instructions);
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return function printInstructionsCompat2(hookRunners, appContext, config) {
-    return _ref.apply(this, arguments);
-  };
-}();
 export {
-  printInstructions,
-  printInstructionsCompat
+  printInstructions
 };

package/dist/esm/utils/restart.js

@@ -3,11 +3,11 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { cli } from "@modern-js/plugin-v2/cli";
 import { chalk, clearConsole, getFullArgv, logger } from "@modern-js/utils";
 import { program } from "@modern-js/utils/commander";
-function restart(hooksRunner, filename) {
+function restart(hooks, filename) {
   return _restart.apply(this, arguments);
 }
 function _restart() {
-  _restart = _async_to_generator(function(hooksRunner, filename) {
+  _restart = _async_to_generator(function(hooks, filename) {
     var hasGetError, err;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -17,7 +17,7 @@ function _restart() {
           hasGetError = false;
           return [
             4,
-            hooksRunner.beforeRestart()
+            hooks.onBeforeRestart.call()
           ];
         case 1:
           _state.sent();

package/dist/esm-node/commands/build.js

@@ -1,4 +1,3 @@
-import { ResolvedConfigContext } from "@modern-js/core";
 import { logger } from "@modern-js/utils";
 import { buildServerConfig } from "../utils/config";
 import { loadServerPlugins } from "../utils/loadPlugins";
@@ -9,9 +8,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 loadServerPlugins(api, appContext.appDirectory, appContext.metaName);
   if (appContext.moduleType && appContext.moduleType === "module") {
     var _resolvedConfig_source1;
@@ -26,9 +25,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 buildServerConfig({
       appDirectory: appDirectory2,
@@ -36,17 +38,21 @@ const build = async (api, options) => {
       configFile: serverConfigFile2
     });
     await 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
-  };
-  ResolvedConfigContext.set(resolvedConfig);
+  api.modifyResolvedConfig((config) => {
+    return {
+      ...config,
+      cliOptions: options
+    };
+  });
   const { distDirectory, appDirectory, serverConfigFile } = appContext;
   await buildServerConfig({
     appDirectory,

package/dist/esm-node/commands/deploy.js

@@ -1,11 +1,11 @@
 import { getServerPlugins } from "../utils/loadPlugins";
 const deploy = async (api, options) => {
-  const hookRunners = api.useHookRunners();
-  const { metaName } = api.useAppContext();
+  const hooks = api.getHooks();
+  const { metaName } = api.getAppContext();
   await 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);
 };
 export {
   deploy

package/dist/esm-node/commands/dev.js

@@ -1,12 +1,11 @@
 import path from "node:path";
-import { ResolvedConfigContext } from "@modern-js/core";
 import { applyPlugins } from "@modern-js/prod-server";
 import { createDevServer } from "@modern-js/server";
 import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta, logger } from "@modern-js/utils";
 import { buildServerConfig } from "../utils/config";
 import { setServer } from "../utils/createServer";
 import { loadServerPlugins } from "../utils/loadPlugins";
-import { printInstructionsCompat } from "../utils/printInstructions";
+import { printInstructions } from "../utils/printInstructions";
 import { registerCompiler } from "../utils/register";
 import { generateRoutes } from "../utils/routes";
 const dev = async (api, options, devServerOptions) => {
@@ -14,9 +13,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");
@@ -27,11 +26,12 @@ const dev = async (api, options, devServerOptions) => {
     });
   }
   await 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
-  };
-  ResolvedConfigContext.set(normalizedConfig);
+  api.modifyResolvedConfig((config) => {
+    return {
+      ...config,
+      cliOptions: options
+    };
+  });
   const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes } = appContext;
   await buildServerConfig({
     appDirectory,
@@ -41,7 +41,7 @@ const dev = async (api, options, devServerOptions) => {
   });
   const meta = getMeta(metaName);
   const serverConfigPath = path.resolve(appDirectory, 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`");
   }
@@ -80,7 +80,7 @@ const dev = async (api, options, devServerOptions) => {
       port,
       host
     }, () => {
-      printInstructionsCompat(hookRunners, appContext, normalizedConfig);
+      printInstructions(hooks, appContext, normalizedConfig);
     });
   } else {
     const { server, afterListen } = await createDevServer({

package/dist/esm-node/commands/index.js

@@ -2,8 +2,8 @@ import { castArray } from "@modern-js/uni-builder";
 import { newAction, upgradeAction } from "@modern-js/utils";
 import { i18n, localeKeys } from "../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(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(async (options) => {
     const { dev } = await import("./dev.js");
     await dev(api, options);
@@ -14,7 +14,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)
@@ -24,8 +24,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(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action(async (options) => {
     const { build } = await import("./build.js");
     await build(api, options);
@@ -34,7 +34,7 @@ const buildCommand = async (program, api) => {
     const platforms = 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/esm-node/commands/inspect.js

@@ -1,5 +1,5 @@
 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/esm-node/commands/serve.js

@@ -2,12 +2,12 @@ import path from "path";
 import { createProdServer } from "@modern-js/prod-server";
 import { SERVER_DIR, getMeta, getTargetDir, isApiOnly, logger } from "@modern-js/utils";
 import { loadServerPlugins } from "../utils/loadPlugins";
-import { printInstructionsCompat } from "../utils/printInstructions";
+import { printInstructions } from "../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;
   logger.info(`Starting production server...`);
   const apiOnly = await 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);
@@ -44,7 +44,7 @@ const start = async (api) => {
     runMode
   });
   app.listen(port, async () => {
-    await printInstructionsCompat(hookRunners, appContext, userConfig);
+    await printInstructions(hooks, appContext, userConfig);
   });
 };
 export {

package/dist/esm-node/{new/compat → compat}/hooks.js

@@ -1,4 +1,4 @@
-import { getModifyHtmlPartials } from "../../plugins/analyze/getHtmlTemplate";
+import { getModifyHtmlPartials } from "../plugins/analyze/getHtmlTemplate";
 import { transformHookParams, transformHookResult, transformHookRunner } from "./utils";
 function getHookRunners(context) {
   const { hooks } = context;
@@ -47,6 +47,14 @@ function getHookRunners(context) {
       const result = await (hooks === null || hooks === void 0 ? void 0 : hooks.appendEntryCode.call(params));
       return result;
     },
+    // test plugin hooks
+    jestConfig: async (utils) => {
+      const result = await (hooks === null || hooks === void 0 ? void 0 : hooks.jestConfig.call(utils, (utils2) => utils2));
+      return result;
+    },
+    afterTest: async () => {
+      return hooks.afterTest.call();
+    },
     /**
     * common hooks
     */
@@ -110,14 +118,14 @@ 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
@@ -136,7 +144,14 @@ function handleSetupResult(setupResult, api) {
     if (typeof fn === "function") {
       const newAPI = transformHookRunner(key);
       if (api[newAPI]) {
-        api[newAPI](async (params) => transformHookResult(key, await fn(transformHookParams(key, params))));
+        api[newAPI](async (...params) => {
+          const { isMultiple, params: transformParams } = transformHookParams(key, params);
+          if (isMultiple) {
+            return transformHookResult(key, await fn(...transformParams));
+          } else {
+            return transformHookResult(key, await fn(transformParams));
+          }
+        });
       }
     }
   });

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

@@ -1,4 +1,4 @@
-import { createCollectAsyncHook } from "@modern-js/plugin-v2";
+import { createAsyncHook, createCollectAsyncHook } from "@modern-js/plugin-v2";
 import { getHookRunners } from "./hooks";
 const compatPlugin = () => ({
   name: "@modern-js/app-tools-compat",
@@ -26,9 +26,14 @@ const compatPlugin = () => ({
     };
   },
   registryHooks: {
-    appendEntryCode: createCollectAsyncHook()
+    appendEntryCode: createCollectAsyncHook(),
+    jestConfig: createAsyncHook(),
+    afterTest: createAsyncHook()
   },
-  setup: (_api) => {
+  setup: (api) => {
+    api.updateAppContext({
+      toolsType: "app-tools"
+    });
   }
 });
 export {

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

@@ -1,3 +1,4 @@
+import { getModifyHtmlPartials } from "../plugins/analyze/getHtmlTemplate";
 function transformHookRunner(hookRunnerName) {
   switch (hookRunnerName) {
     case "beforeConfig":
@@ -48,25 +49,45 @@ function transformHookParams(hookRunnerName, params) {
   switch (hookRunnerName) {
     case "resolvedConfig":
       return {
-        resolved: params
+        isMultiple: false,
+        params: {
+          resolved: params[0]
+        }
       };
     case "htmlPartials":
       return {
-        partials: {
-          top: params.partials.top.current,
-          head: params.partials.head.current,
-          body: params.partials.body.current
-        },
-        entrypoint: params.entrypoint
+        isMultiple: false,
+        params: {
+          partials: {
+            top: params[0].partials.top.current,
+            head: params[0].partials.head.current,
+            body: params[0].partials.body.current
+          },
+          entrypoint: params[0].entrypoint
+        }
       };
+    case "jestConfig": {
+      return {
+        isMultiple: true,
+        params
+      };
+    }
     default:
-      return params;
+      return {
+        isMultiple: false,
+        params: params[0]
+      };
   }
 }
 function transformHookResult(hookRunnerName, result) {
   switch (hookRunnerName) {
     case "resolvedConfig":
       return result.resolved;
+    case "htmlPartials":
+      return {
+        partials: getModifyHtmlPartials(result.partials),
+        entrypoint: result.entrypoint
+      };
     default:
       return result;
   }

package/dist/esm-node/config/default.js

@@ -4,7 +4,12 @@ function createDefaultConfig(appContext) {
   const dev = {
     // `dev.port` should not have a default value
     // because we will use `server.port` by default
-    port: void 0
+    port: void 0,
+    cliShortcuts: {
+      help: false,
+      // does not support restart server and print urls yet
+      custom: (shortcuts = []) => shortcuts.filter(({ key }) => key !== "r" && key !== "u")
+    }
   };
   const output = {
     distPath: {

package/dist/esm-node/config/legacy/index.js

@@ -21,7 +21,6 @@ function transformNormalizedConfig(config) {
     server,
     cliOptions,
     testing,
-    devtools: {},
     builderPlugins: [],
     plugins,
     security: {},