@modern-js/app-tools 2.63.0 → 2.63.1

package/dist/esm/commands/dev.js

@@ -10,7 +10,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";
 var dev = function() {
@@ -132,7 +132,7 @@ var dev = function() {
             port,
             host
           }, function() {
-            printInstructions(hookRunners, appContext, normalizedConfig);
+            printInstructionsCompat(hookRunners, appContext, normalizedConfig);
           });
           return [
             3,

package/dist/esm/commands/serve.js

@@ -6,7 +6,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";
 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;
@@ -69,7 +69,7 @@ var start = function() {
                 case 0:
                   return [
                     4,
-                    printInstructions(hookRunners, appContext, userConfig)
+                    printInstructionsCompat(hookRunners, appContext, userConfig)
                   ];
                 case 1:
                   _state2.sent();

package/dist/esm/new/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 [
@@ -391,19 +406,14 @@ function getHookRunners(context) {
     /**
     * @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/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/new/context.js

@@ -14,7 +14,6 @@ var initAppContext = function(param) {
     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/.".concat(metaName)),
     htmlTemplates: {},

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

@@ -28,7 +28,7 @@ var ifAlreadyExists = function(entrypoints, checked) {
   });
 };
 var getBundleEntry = function() {
-  var _ref = _async_to_generator(function(hookRunners, appContext, config) {
+  var _ref = _async_to_generator(function(hooks, appContext, config) {
     var appDirectory, packageName, _config_source, disableDefaultEntries, entries, entriesDir, mainEntryName, defaults, _tmp, entriesDirAbs, found;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -48,7 +48,7 @@ var getBundleEntry = function() {
         case 1:
           return [
             4,
-            getFileSystemEntry(hookRunners, appContext, config)
+            getFileSystemEntry(hooks, appContext, config)
           ];
         case 2:
           _tmp = _state.sent();
@@ -93,7 +93,7 @@ var getBundleEntry = function() {
       }
     });
   });
-  return function getBundleEntry2(hookRunners, appContext, config) {
+  return function getBundleEntry2(hooks, appContext, config) {
     return _ref.apply(this, arguments);
   };
 }();

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

@@ -21,14 +21,14 @@ var hasServerEntry = function(dir) {
   }));
 };
 var isBundleEntry = function() {
-  var _ref = _async_to_generator(function(hookRunners, dir, enableCustomEntry) {
+  var _ref = _async_to_generator(function(hooks, dir, enableCustomEntry) {
     var entry, customEntry;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           return [
             4,
-            hookRunners.checkEntryPoint({
+            hooks.checkEntryPoint.call({
               path: dir,
               entry: false
             })
@@ -55,12 +55,12 @@ var isBundleEntry = function() {
       }
     });
   });
-  return function isBundleEntry2(hookRunners, dir, enableCustomEntry) {
+  return function isBundleEntry2(hooks, dir, enableCustomEntry) {
     return _ref.apply(this, arguments);
   };
 }();
 var scanDir = function() {
-  var _ref = _async_to_generator(function(hookRunners, dirs, enableCustomEntry) {
+  var _ref = _async_to_generator(function(hooks, dirs, enableCustomEntry) {
     var entries;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -93,7 +93,7 @@ var scanDir = function() {
                       }
                       return [
                         4,
-                        hookRunners.checkEntryPoint({
+                        hooks.checkEntryPoint.call({
                           path: dir,
                           entry: false
                         })
@@ -155,12 +155,12 @@ var scanDir = function() {
       }
     });
   });
-  return function scanDir2(hookRunners, dirs, enableCustomEntry) {
+  return function scanDir2(hooks, dirs, enableCustomEntry) {
     return _ref.apply(this, arguments);
   };
 }();
 var getFileSystemEntry = function() {
-  var _ref = _async_to_generator(function(hookRunners, appContext, config) {
+  var _ref = _async_to_generator(function(hooks, appContext, config) {
     var appDirectory, _config_source, entriesDir, disableEntryDirs, enableCustomEntry, disabledDirs, src, dirs;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -186,13 +186,13 @@ var getFileSystemEntry = function() {
             ];
           return [
             4,
-            isBundleEntry(hookRunners, src, enableCustomEntry)
+            isBundleEntry(hooks, src, enableCustomEntry)
           ];
         case 1:
           if (_state.sent()) {
             return [
               2,
-              scanDir(hookRunners, [
+              scanDir(hooks, [
                 src
               ], enableCustomEntry)
             ];
@@ -215,7 +215,7 @@ var getFileSystemEntry = function() {
                         ];
                       return [
                         4,
-                        isBundleEntry(hookRunners, file, enableCustomEntry)
+                        isBundleEntry(hooks, file, enableCustomEntry)
                       ];
                     case 1:
                       _tmp = _state2.sent();
@@ -239,7 +239,7 @@ var getFileSystemEntry = function() {
           _state.sent();
           return [
             2,
-            scanDir(hookRunners, dirs, enableCustomEntry)
+            scanDir(hooks, dirs, enableCustomEntry)
           ];
         case 3:
           throw Error("source.entriesDir accept a directory.");
@@ -257,7 +257,7 @@ var getFileSystemEntry = function() {
       }
     });
   });
-  return function getFileSystemEntry2(hookRunners, appContext, config) {
+  return function getFileSystemEntry2(hooks, appContext, config) {
     return _ref.apply(this, arguments);
   };
 }();

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

@@ -1,6 +1,5 @@
 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 { _ as _ts_values } from "@swc/helpers/_/_ts_values";
 import path from "path";
@@ -30,8 +29,85 @@ var findPartials = function(dir, entryName, position) {
   }
   return null;
 };
+var getModifyHtmlPartials = function(partials) {
+  var append = function(type) {
+    for (var _len = arguments.length, script = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      script[_key - 1] = arguments[_key];
+    }
+    script.forEach(function(item) {
+      partials[type].push(item);
+    });
+  };
+  var prepend = function(type) {
+    for (var _len = arguments.length, script = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      script[_key - 1] = arguments[_key];
+    }
+    script.forEach(function(item) {
+      partials[type].unshift(item);
+    });
+  };
+  return {
+    top: {
+      append: function() {
+        for (var _len = arguments.length, script = new Array(_len), _key = 0; _key < _len; _key++) {
+          script[_key] = arguments[_key];
+        }
+        return append.apply(void 0, [
+          "top"
+        ].concat(_to_consumable_array(script)));
+      },
+      prepend: function() {
+        for (var _len = arguments.length, script = new Array(_len), _key = 0; _key < _len; _key++) {
+          script[_key] = arguments[_key];
+        }
+        return prepend.apply(void 0, [
+          "top"
+        ].concat(_to_consumable_array(script)));
+      },
+      current: partials.top
+    },
+    head: {
+      append: function() {
+        for (var _len = arguments.length, script = new Array(_len), _key = 0; _key < _len; _key++) {
+          script[_key] = arguments[_key];
+        }
+        return append.apply(void 0, [
+          "head"
+        ].concat(_to_consumable_array(script)));
+      },
+      prepend: function() {
+        for (var _len = arguments.length, script = new Array(_len), _key = 0; _key < _len; _key++) {
+          script[_key] = arguments[_key];
+        }
+        return prepend.apply(void 0, [
+          "head"
+        ].concat(_to_consumable_array(script)));
+      },
+      current: partials.head
+    },
+    body: {
+      append: function() {
+        for (var _len = arguments.length, script = new Array(_len), _key = 0; _key < _len; _key++) {
+          script[_key] = arguments[_key];
+        }
+        return append.apply(void 0, [
+          "body"
+        ].concat(_to_consumable_array(script)));
+      },
+      prepend: function() {
+        for (var _len = arguments.length, script = new Array(_len), _key = 0; _key < _len; _key++) {
+          script[_key] = arguments[_key];
+        }
+        return prepend.apply(void 0, [
+          "body"
+        ].concat(_to_consumable_array(script)));
+      },
+      current: partials.body
+    }
+  };
+};
 var getHtmlTemplate = function() {
-  var _ref = _async_to_generator(function(entrypoints, api, param) {
+  var _ref = _async_to_generator(function(entrypoints, hooks, param) {
     var appContext, config, appDirectory, internalDirectory, configDir, htmlDir, htmlTemplates, partialsByEntrypoint, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step, err;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -52,7 +128,7 @@ var getHtmlTemplate = function() {
             8
           ]);
           _loop = function() {
-            var entrypoint, entryName, isMainEntry, name, customIndexTemplate, hookRunners, partials, templatePath, bottomTemplate;
+            var entrypoint, entryName, isMainEntry, name, customIndexTemplate, getPartialInitValue, partials, templatePath, bottomTemplate;
             return _ts_generator(this, function(_state2) {
               switch (_state2.label) {
                 case 0:
@@ -71,30 +147,26 @@ var getHtmlTemplate = function() {
                     3
                   ];
                 case 1:
-                  hookRunners = api.useHookRunners();
+                  getPartialInitValue = function(position) {
+                    var partial = findPartials(htmlDir, name, position);
+                    return partial ? [
+                      partial.content
+                    ] : [];
+                  };
+                  partials = {
+                    top: getPartialInitValue("top"),
+                    head: getPartialInitValue("head"),
+                    body: getPartialInitValue("body")
+                  };
                   return [
                     4,
-                    hookRunners.htmlPartials({
+                    hooks.modifyHtmlPartials.call({
                       entrypoint,
-                      partials: [
-                        "top",
-                        "head",
-                        "body"
-                      ].reduce(function(previous, position) {
-                        var found = findPartials(htmlDir, name, position);
-                        previous[position] = found ? [
-                          found.content
-                        ] : [];
-                        return previous;
-                      }, {
-                        top: [],
-                        head: [],
-                        body: []
-                      })
+                      partials: getModifyHtmlPartials(partials)
                     })
                   ];
                 case 2:
-                  partials = _state2.sent().partials;
+                  _state2.sent();
                   templatePath = path.resolve(internalDirectory, entryName, "index.html");
                   fs.outputFileSync(templatePath, templates.html(partials), "utf8");
                   htmlTemplates[entryName] = templatePath;
@@ -159,20 +231,21 @@ var getHtmlTemplate = function() {
             7
           ];
         case 8:
-          api.setAppContext(_object_spread_props(_object_spread({}, api.useAppContext()), {
-            partialsByEntrypoint
-          }));
           return [
             2,
-            htmlTemplates
+            {
+              partialsByEntrypoint,
+              htmlTemplates
+            }
           ];
       }
     });
   });
-  return function getHtmlTemplate2(entrypoints, api, _) {
+  return function getHtmlTemplate2(entrypoints, hooks, _) {
     return _ref.apply(this, arguments);
   };
 }();
 export {
-  getHtmlTemplate
+  getHtmlTemplate,
+  getModifyHtmlPartials
 };