@modern-js/app-tools 2.63.0 → 2.63.1

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

@@ -37,95 +37,91 @@ function deploy_default() {
     name: "@modern-js/plugin-deploy",
     setup: function(api) {
       var deployTarget = process.env.MODERNJS_DEPLOY || provider || "node";
-      return {
-        deploy: function deploy() {
-          return _async_to_generator(function() {
-            var appContext, metaName, modernConfig, deployPreset, _tmp, _tmp1, _tmp2, _tmp3;
-            return _ts_generator(this, function(_state) {
-              switch (_state.label) {
-                case 0:
-                  appContext = api.useAppContext();
-                  metaName = appContext.metaName;
-                  if (metaName !== "modern-js" && !process.env.MODERNJS_DEPLOY) {
-                    return [
-                      2
-                    ];
-                  }
-                  modernConfig = api.useResolvedConfigContext();
-                  return [
-                    4,
-                    getDeployPreset(appContext, modernConfig, deployTarget)
-                  ];
-                case 1:
-                  deployPreset = _state.sent();
-                  _tmp = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare;
-                  if (!_tmp)
-                    return [
-                      3,
-                      3
-                    ];
-                  return [
-                    4,
-                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare()
-                  ];
-                case 2:
-                  _tmp = _state.sent();
-                  _state.label = 3;
-                case 3:
-                  _tmp;
-                  _tmp1 = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput;
-                  if (!_tmp1)
-                    return [
-                      3,
-                      5
-                    ];
-                  return [
-                    4,
-                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput()
-                  ];
-                case 4:
-                  _tmp1 = _state.sent();
-                  _state.label = 5;
-                case 5:
-                  _tmp1;
-                  _tmp2 = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry;
-                  if (!_tmp2)
-                    return [
-                      3,
-                      7
-                    ];
-                  return [
-                    4,
-                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry()
-                  ];
-                case 6:
-                  _tmp2 = _state.sent();
-                  _state.label = 7;
-                case 7:
-                  _tmp2;
-                  _tmp3 = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end;
-                  if (!_tmp3)
-                    return [
-                      3,
-                      9
-                    ];
-                  return [
-                    4,
-                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end()
-                  ];
-                case 8:
-                  _tmp3 = _state.sent();
-                  _state.label = 9;
-                case 9:
-                  _tmp3;
-                  return [
-                    2
-                  ];
+      api.deploy(/* @__PURE__ */ _async_to_generator(function() {
+        var appContext, metaName, modernConfig, deployPreset, _tmp, _tmp1, _tmp2, _tmp3;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              appContext = api.getAppContext();
+              metaName = appContext.metaName;
+              if (metaName !== "modern-js" && !process.env.MODERNJS_DEPLOY) {
+                return [
+                  2
+                ];
               }
-            });
-          })();
-        }
-      };
+              modernConfig = api.getNormalizedConfig();
+              return [
+                4,
+                getDeployPreset(appContext, modernConfig, deployTarget)
+              ];
+            case 1:
+              deployPreset = _state.sent();
+              _tmp = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare;
+              if (!_tmp)
+                return [
+                  3,
+                  3
+                ];
+              return [
+                4,
+                deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare()
+              ];
+            case 2:
+              _tmp = _state.sent();
+              _state.label = 3;
+            case 3:
+              _tmp;
+              _tmp1 = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput;
+              if (!_tmp1)
+                return [
+                  3,
+                  5
+                ];
+              return [
+                4,
+                deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput()
+              ];
+            case 4:
+              _tmp1 = _state.sent();
+              _state.label = 5;
+            case 5:
+              _tmp1;
+              _tmp2 = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry;
+              if (!_tmp2)
+                return [
+                  3,
+                  7
+                ];
+              return [
+                4,
+                deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry()
+              ];
+            case 6:
+              _tmp2 = _state.sent();
+              _state.label = 7;
+            case 7:
+              _tmp2;
+              _tmp3 = deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end;
+              if (!_tmp3)
+                return [
+                  3,
+                  9
+                ];
+              return [
+                4,
+                deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.end()
+              ];
+            case 8:
+              _tmp3 = _state.sent();
+              _state.label = 9;
+            case 9:
+              _tmp3;
+              return [
+                2
+              ];
+          }
+        });
+      }));
     }
   };
 }

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

@@ -41,7 +41,7 @@ function initialize_default(param) {
                 port = _state.sent();
                 appContext = _object_spread_props(_object_spread({}, appContext), {
                   port,
-                  distDirectory: ensureAbsolutePath(appContext.distDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
+                  distDirectory: ensureAbsolutePath(appContext.appDirectory, ((_resolved_output_distPath = resolved.output.distPath) === null || _resolved_output_distPath === void 0 ? void 0 : _resolved_output_distPath.root) || "dist")
                 });
                 api.updateAppContext(appContext);
                 normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;

package/dist/esm/utils/printInstructions.js

@@ -2,6 +2,32 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { logger, prettyInstructions } from "@modern-js/utils";
 var printInstructions = function() {
+  var _ref = _async_to_generator(function(hooks, appContext, config) {
+    var message, instructions;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          message = prettyInstructions(appContext, config);
+          return [
+            4,
+            hooks.onBeforePrintInstructions.call({
+              instructions: message
+            })
+          ];
+        case 1:
+          instructions = _state.sent().instructions;
+          logger.log(instructions);
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return function printInstructions2(hooks, appContext, config) {
+    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) {
@@ -23,10 +49,11 @@ var printInstructions = function() {
       }
     });
   });
-  return function printInstructions2(hookRunners, appContext, config) {
+  return function printInstructionsCompat2(hookRunners, appContext, config) {
     return _ref.apply(this, arguments);
   };
 }();
 export {
-  printInstructions
+  printInstructions,
+  printInstructionsCompat
 };

package/dist/esm/utils/restart.js

@@ -1,7 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { cli } from "@modern-js/plugin-v2/cli";
-import { chalk, clearConsole, getFullArgv, logger, program } from "@modern-js/utils";
+import { chalk, clearConsole, getFullArgv, logger } from "@modern-js/utils";
+import { program } from "@modern-js/utils/commander";
 function restart(hooksRunner, filename) {
   return _restart.apply(this, arguments);
 }

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

@@ -6,7 +6,7 @@ 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 { printInstructions } from "../utils/printInstructions";
+import { printInstructionsCompat } from "../utils/printInstructions";
 import { registerCompiler } from "../utils/register";
 import { generateRoutes } from "../utils/routes";
 const dev = async (api, options, devServerOptions) => {
@@ -80,7 +80,7 @@ const dev = async (api, options, devServerOptions) => {
       port,
       host
     }, () => {
-      printInstructions(hookRunners, appContext, normalizedConfig);
+      printInstructionsCompat(hookRunners, appContext, normalizedConfig);
     });
   } else {
     const { server, afterListen } = await createDevServer({

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

@@ -2,7 +2,7 @@ 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 { printInstructions } from "../utils/printInstructions";
+import { printInstructionsCompat } from "../utils/printInstructions";
 const start = async (api) => {
   var _userConfig_source, _userConfig_output_distPath;
   const appContext = api.useAppContext();
@@ -44,7 +44,7 @@ const start = async (api) => {
     runMode
   });
   app.listen(port, async () => {
-    await printInstructions(hookRunners, appContext, userConfig);
+    await printInstructionsCompat(hookRunners, appContext, userConfig);
   });
 };
 export {

package/dist/esm-node/new/compat/hooks.js

@@ -1,3 +1,4 @@
+import { getModifyHtmlPartials } from "../../plugins/analyze/getHtmlTemplate";
 import { transformHookParams, transformHookResult, transformHookRunner } from "./utils";
 function getHookRunners(context) {
   const { hooks } = context;
@@ -56,7 +57,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: getModifyHtmlPartials(params.partials)
+      });
+      return {
+        partials: params.partials
+      };
     },
     commands: async (params) => {
       return hooks.addCommand.call(params);
@@ -67,7 +74,7 @@ function getHookRunners(context) {
     prepare: async () => {
       return hooks.onPrepare.call();
     },
-    filedChange: async (params) => {
+    fileChange: async (params) => {
       return hooks.onFileChanged.call(params);
     },
     beforeCreateCompiler: async (params) => {
@@ -115,8 +122,8 @@ function getHookRunners(context) {
     /**
     * @deprecated
     */
-    addRuntimeExports: async (params) => {
-      return hooks.addRuntimeExports.call(params);
+    addRuntimeExports: async () => {
+      return hooks.addRuntimeExports.call();
     }
   };
 }

package/dist/esm-node/new/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;
   }

package/dist/esm-node/new/context.js

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

package/dist/esm-node/plugins/analyze/getBundleEntry.js

@@ -22,10 +22,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 getFileSystemEntry(hookRunners, appContext, config);
+  const defaults = disableDefaultEntries ? [] : await getFileSystemEntry(hooks, appContext, config);
   if (entries) {
     Object.keys(entries).forEach((name) => {
       const value = entries[name];

package/dist/esm-node/plugins/analyze/getFileSystemEntry.js

@@ -6,8 +6,8 @@ import { isDefaultExportFunction } from "./isDefaultExportFunction";
 const hasIndex = (dir) => findExists(JS_EXTENSIONS.map((ext) => path.resolve(dir, `${INDEX_FILE_NAME}${ext}`)));
 const hasEntry = (dir) => findExists(JS_EXTENSIONS.map((ext) => path.resolve(dir, `${ENTRY_FILE_NAME}${ext}`)));
 const hasServerEntry = (dir) => findExists(JS_EXTENSIONS.map((ext) => path.resolve(dir, `${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
   });
@@ -20,7 +20,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 = isDefaultExportFunction(indexFile) ? indexFile : false;
@@ -37,7 +37,7 @@ const scanDir = async (hookRunners, dirs, enableCustomEntry) => {
         customBootstrap
       };
     }
-    const entryFile = (await hookRunners.checkEntryPoint({
+    const entryFile = (await hooks.checkEntryPoint.call({
       path: dir,
       entry: false
     })).entry;
@@ -71,7 +71,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 = [];
@@ -81,19 +81,19 @@ const getFileSystemEntry = async (hookRunners, appContext, config) => {
   const src = ensureAbsolutePath(appDirectory, entriesDir || "");
   if (fs.existsSync(src)) {
     if (fs.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(fs.readdirSync(src).map(async (filename) => {
         const file = path.join(src, filename);
-        if (fs.statSync(file).isDirectory() && await isBundleEntry(hookRunners, file, enableCustomEntry) && !disabledDirs.includes(file)) {
+        if (fs.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.`);
     }

package/dist/esm-node/plugins/analyze/getHtmlTemplate.js

@@ -21,7 +21,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 = path.resolve(appDirectory, configDir || "", HTML_PARTIALS_FOLDER);
@@ -34,24 +63,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 = path.resolve(internalDirectory, entryName, "index.html");
       fs.outputFileSync(templatePath, templates.html(partials), "utf8");
@@ -63,12 +88,12 @@ const getHtmlTemplate = async (entrypoints, api, { appContext, config }) => {
       }
     }
   }
-  api.setAppContext({
-    ...api.useAppContext(),
-    partialsByEntrypoint
-  });
-  return htmlTemplates;
+  return {
+    partialsByEntrypoint,
+    htmlTemplates
+  };
 };
 export {
-  getHtmlTemplate
+  getHtmlTemplate,
+  getModifyHtmlPartials
 };