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

package/dist/cjs/utils/restart.js

@@ -23,12 +23,13 @@ __export(restart_exports, {
 module.exports = __toCommonJS(restart_exports);
 var import_cli = require("@modern-js/plugin-v2/cli");
 var import_utils = require("@modern-js/utils");
-async function restart(hooksRunner, filename) {
+var import_commander = require("@modern-js/utils/commander");
+async function restart(hooks, filename) {
   (0, import_utils.clearConsole)();
   import_utils.logger.info(`Restart because ${import_utils.chalk.yellow(filename)} is changed...
 `);
   let hasGetError = false;
-  await hooksRunner.beforeRestart();
+  await hooks.onBeforeRestart.call();
   try {
     await import_cli.cli.init(import_cli.cli.getPrevInitOptions());
   } catch (err) {
@@ -36,7 +37,7 @@ async function restart(hooksRunner, filename) {
     hasGetError = true;
   } finally {
     if (!hasGetError) {
-      import_utils.program.parse((0, import_utils.getFullArgv)());
+      import_commander.program.parse((0, import_utils.getFullArgv)());
     }
   }
 }

package/dist/esm/commands/build.js

@@ -2,7 +2,6 @@ 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 _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { ResolvedConfigContext } from "@modern-js/core";
 import { logger } from "@modern-js/utils";
 import { buildServerConfig } from "../utils/config";
 import { loadServerPlugins } from "../utils/loadPlugins";
@@ -10,16 +9,16 @@ import { registerCompiler } from "../utils/register";
 import { generateRoutes } from "../utils/routes";
 var build = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var _resolvedConfig_source, resolvedConfig, appContext, hookRunners, _resolvedConfig_source1, registerEsm, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
+    var _resolvedConfig_source, resolvedConfig, appContext, hooks, _resolvedConfig_source1, registerEsm, apiOnly, appDirectory, distDirectory, serverConfigFile, distDirectory1, appDirectory1, serverConfigFile1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           if (options === null || options === void 0 ? void 0 : options.analyze) {
             process.env.BUNDLE_ANALYZE = "true";
           }
-          resolvedConfig = api.useResolvedConfigContext();
-          appContext = api.useAppContext();
-          hookRunners = api.useHookRunners();
+          resolvedConfig = api.getNormalizedConfig();
+          appContext = api.getAppContext();
+          hooks = api.getHooks();
           return [
             4,
             loadServerPlugins(api, appContext.appDirectory, appContext.metaName)
@@ -64,9 +63,12 @@ var build = function() {
           appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverConfigFile = appContext.serverConfigFile;
           return [
             4,
-            hookRunners.beforeBuild({
+            hooks.onBeforeBuild.call({
+              environments: {},
               // "null" bundlerConfigs
-              bundlerConfigs: void 0
+              bundlerConfigs: void 0,
+              isFirstCompile: false,
+              isWatch: false
             })
           ];
         case 6:
@@ -89,9 +91,12 @@ var build = function() {
           _state.sent();
           return [
             4,
-            hookRunners.afterBuild({
+            hooks.onAfterBuild.call({
+              environments: {},
               // "null" stats
-              stats: void 0
+              stats: void 0,
+              isFirstCompile: false,
+              isWatch: false
             })
           ];
         case 9:
@@ -100,10 +105,11 @@ var build = function() {
             2
           ];
         case 10:
-          resolvedConfig = _object_spread_props(_object_spread({}, resolvedConfig), {
-            cliOptions: options
+          api.modifyResolvedConfig(function(config) {
+            return _object_spread_props(_object_spread({}, config), {
+              cliOptions: options
+            });
           });
-          ResolvedConfigContext.set(resolvedConfig);
           distDirectory1 = appContext.distDirectory, appDirectory1 = appContext.appDirectory, serverConfigFile1 = appContext.serverConfigFile;
           return [
             4,

package/dist/esm/commands/deploy.js

@@ -3,12 +3,12 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { getServerPlugins } from "../utils/loadPlugins";
 var deploy = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var hookRunners, metaName;
+    var hooks, metaName;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          hookRunners = api.useHookRunners();
-          metaName = api.useAppContext().metaName;
+          hooks = api.getHooks();
+          metaName = api.getAppContext().metaName;
           return [
             4,
             getServerPlugins(api, metaName)
@@ -17,19 +17,19 @@ var deploy = function() {
           _state.sent();
           return [
             4,
-            hookRunners.beforeDeploy(options)
+            hooks.onBeforeDeploy.call(options)
           ];
         case 2:
           _state.sent();
           return [
             4,
-            hookRunners.deploy(options)
+            hooks.deploy.call()
           ];
         case 3:
           _state.sent();
           return [
             4,
-            hookRunners.afterDeploy(options)
+            hooks.onAfterDeploy.call(options)
           ];
         case 4:
           _state.sent();

package/dist/esm/commands/dev.js

@@ -3,7 +3,6 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 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";
@@ -15,16 +14,16 @@ import { registerCompiler } from "../utils/register";
 import { generateRoutes } from "../utils/routes";
 var dev = function() {
   var _ref = _async_to_generator(function(api, options, devServerOptions) {
-    var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev, normalizedConfig, appContext, hookRunners, _normalizedConfig_source1, registerEsm, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, meta, serverConfigPath, pluginInstances, serverOptions, host, server, _ref2, server1, afterListen;
+    var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev, normalizedConfig, appContext, hooks, _normalizedConfig_source1, registerEsm, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, meta, serverConfigPath, pluginInstances, serverOptions, host, server, _ref2, server1, afterListen;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           if (options.analyze) {
             process.env.BUNDLE_ANALYZE = "true";
           }
-          normalizedConfig = api.useResolvedConfigContext();
-          appContext = api.useAppContext();
-          hookRunners = api.useHookRunners();
+          normalizedConfig = api.getNormalizedConfig();
+          appContext = api.getAppContext();
+          hooks = api.getHooks();
           if (!(appContext.moduleType && appContext.moduleType === "module"))
             return [
               3,
@@ -54,10 +53,11 @@ var dev = function() {
           ];
         case 4:
           _state.sent();
-          normalizedConfig = _object_spread_props(_object_spread({}, normalizedConfig), {
-            cliOptions: options
+          api.modifyResolvedConfig(function(config) {
+            return _object_spread_props(_object_spread({}, config), {
+              cliOptions: options
+            });
           });
-          ResolvedConfigContext.set(normalizedConfig);
           appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes;
           return [
             4,
@@ -74,7 +74,7 @@ var dev = function() {
           serverConfigPath = path.resolve(appDirectory, SERVER_DIR, "".concat(meta, ".server"));
           return [
             4,
-            hookRunners.beforeDev()
+            hooks.onBeforeDev.call()
           ];
         case 6:
           _state.sent();
@@ -132,7 +132,7 @@ var dev = function() {
             port,
             host
           }, function() {
-            printInstructions(hookRunners, appContext, normalizedConfig);
+            printInstructions(hooks, appContext, normalizedConfig);
           });
           return [
             3,

package/dist/esm/commands/index.js

@@ -7,14 +7,14 @@ import { newAction, upgradeAction } from "@modern-js/utils";
 import { i18n, localeKeys } from "../locale";
 var devCommand = function() {
   var _ref = _async_to_generator(function(program, api) {
-    var runner, devToolMetas, devProgram, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step;
+    var hooks, devToolMetas, devProgram, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          runner = api.useHookRunners();
+          hooks = api.getHooks();
           return [
             4,
-            runner.registerDev()
+            hooks.registerDev.call()
           ];
         case 1:
           devToolMetas = _state.sent();
@@ -64,7 +64,7 @@ var devCommand = function() {
                       switch (_state2.label) {
                         case 0:
                           options = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : {};
-                          appDirectory = api.useAppContext().appDirectory;
+                          appDirectory = api.getAppContext().appDirectory;
                           return [
                             4,
                             import("@modern-js/utils")
@@ -129,14 +129,14 @@ var devCommand = function() {
 }();
 var buildCommand = function() {
   var _ref = _async_to_generator(function(program, api) {
-    var runner, platformBuilders, buildProgram, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step;
+    var hooks, platformBuilders, buildProgram, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          runner = api.useHookRunners();
+          hooks = api.getHooks();
           return [
             4,
-            runner.registerBuildPlatform()
+            hooks.registerBuildPlatform.call()
           ];
         case 1:
           platformBuilders = _state.sent();
@@ -182,7 +182,7 @@ var buildCommand = function() {
                     return _ts_generator(this, function(_state2) {
                       switch (_state2.label) {
                         case 0:
-                          appDirectory = api.useAppContext().appDirectory;
+                          appDirectory = api.getAppContext().appDirectory;
                           return [
                             4,
                             import("@modern-js/utils")

package/dist/esm/commands/inspect.js

@@ -4,7 +4,7 @@ var inspect = function() {
   var _ref = _async_to_generator(function(api, options) {
     var appContext;
     return _ts_generator(this, function(_state) {
-      appContext = api.useAppContext();
+      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/commands/serve.js

@@ -9,13 +9,13 @@ import { loadServerPlugins } from "../utils/loadPlugins";
 import { printInstructions } from "../utils/printInstructions";
 var start = function() {
   var _ref = _async_to_generator(function(api) {
-    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, distDirectory, appDirectory, internalDirectory, port, metaName, serverRoutes, serverConfigFile, apiOnly, runMode, meta, serverConfigPath, pluginInstances, app;
+    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hooks, distDirectory, appDirectory, internalDirectory, port, metaName, serverRoutes, serverConfigFile, apiOnly, runMode, meta, serverConfigPath, pluginInstances, app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          appContext = api.useAppContext();
-          userConfig = api.useResolvedConfigContext();
-          hookRunners = api.useHookRunners();
+          appContext = api.getAppContext();
+          userConfig = api.getNormalizedConfig();
+          hooks = api.getHooks();
           distDirectory = appContext.distDirectory, appDirectory = appContext.appDirectory, internalDirectory = appContext.internalDirectory, port = appContext.port, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes, serverConfigFile = appContext.serverConfigFile;
           logger.info("Starting production server...");
           return [
@@ -69,7 +69,7 @@ var start = function() {
                 case 0:
                   return [
                     4,
-                    printInstructions(hookRunners, appContext, userConfig)
+                    printInstructions(hooks, appContext, userConfig)
                   ];
                 case 1:
                   _state2.sent();

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

@@ -1,5 +1,6 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { getModifyHtmlPartials } from "../plugins/analyze/getHtmlTemplate";
 import { transformHookParams, transformHookResult, transformHookRunner } from "./utils";
 function getHookRunners(context) {
   var hooks = context.hooks;
@@ -189,10 +190,24 @@ function getHookRunners(context) {
     htmlPartials: function() {
       var _ref = _async_to_generator(function(params) {
         return _ts_generator(this, function(_state) {
-          return [
-            2,
-            hooks.modifyHtmlPartials.call(params)
-          ];
+          switch (_state.label) {
+            case 0:
+              return [
+                4,
+                hooks.modifyHtmlPartials.call({
+                  entrypoint: params.entrypoint,
+                  partials: getModifyHtmlPartials(params.partials)
+                })
+              ];
+            case 1:
+              _state.sent();
+              return [
+                2,
+                {
+                  partials: params.partials
+                }
+              ];
+          }
         });
       });
       return function(params) {
@@ -228,7 +243,7 @@ function getHookRunners(context) {
         ];
       });
     }),
-    filedChange: function() {
+    fileChange: function() {
       var _ref = _async_to_generator(function(params) {
         return _ts_generator(this, function(_state) {
           return [
@@ -359,51 +374,36 @@ function getHookRunners(context) {
     /**
     * @deprecated
     */
-    registerDev: function() {
-      var _ref = _async_to_generator(function(params) {
-        return _ts_generator(this, function(_state) {
-          return [
-            2,
-            hooks.registerDev.call(params)
-          ];
-        });
+    registerDev: /* @__PURE__ */ _async_to_generator(function() {
+      return _ts_generator(this, function(_state) {
+        return [
+          2,
+          hooks.registerDev.call()
+        ];
       });
-      return function(params) {
-        return _ref.apply(this, arguments);
-      };
-    }(),
+    }),
     /**
     * @deprecated
     */
-    registerBuildPlatform: function() {
-      var _ref = _async_to_generator(function(params) {
-        return _ts_generator(this, function(_state) {
-          return [
-            2,
-            hooks.registerBuildPlatform.call(params)
-          ];
-        });
+    registerBuildPlatform: /* @__PURE__ */ _async_to_generator(function() {
+      return _ts_generator(this, function(_state) {
+        return [
+          2,
+          hooks.registerBuildPlatform.call()
+        ];
       });
-      return function(params) {
-        return _ref.apply(this, arguments);
-      };
-    }(),
+    }),
     /**
     * @deprecated
     */
-    addRuntimeExports: function() {
-      var _ref = _async_to_generator(function(params) {
-        return _ts_generator(this, function(_state) {
-          return [
-            2,
-            hooks.addRuntimeExports.call(params)
-          ];
-        });
+    addRuntimeExports: /* @__PURE__ */ _async_to_generator(function() {
+      return _ts_generator(this, function(_state) {
+        return [
+          2,
+          hooks.addRuntimeExports.call()
+        ];
       });
-      return function(params) {
-        return _ref.apply(this, arguments);
-      };
-    }()
+    })
   };
 }
 function handleSetupResult(setupResult, api) {

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

@@ -32,7 +32,10 @@ var compatPlugin = function() {
     registryHooks: {
       appendEntryCode: createCollectAsyncHook()
     },
-    setup: function(_api) {
+    setup: function(api) {
+      api.updateAppContext({
+        toolsType: "app-tools"
+      });
     }
   };
 };

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

@@ -16,7 +16,7 @@ function transformHookRunner(hookRunnerName) {
       return "addCommand";
     case "watchFiles":
       return "addWatchFiles";
-    case "filedChange":
+    case "fileChange":
       return "onFileChanged";
     case "beforeCreateCompiler":
       return "onBeforeCreateCompiler";
@@ -50,6 +50,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;
   }