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

package/dist/esm/index.js

@@ -1,12 +1,255 @@
-import { appTools } from "./new/index";
-import { appTools as appTools2, initAppContext } from "./new/index";
-import { dev } from "./commands/dev";
-import { mergeConfig } from "@modern-js/core";
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
+import { createAsyncHook, createCollectAsyncHook } from "@modern-js/plugin-v2";
+import { castArray } from "@modern-js/uni-builder";
+import { cleanRequireCache, deprecatedCommands, emptyDir, getArgv, getCommand } from "@modern-js/utils";
+import { buildCommand, deployCommand, devCommand, inspectCommand, newCommand, serverCommand, upgradeCommand } from "./commands";
+import { compatPlugin } from "./compat";
+import { DEFAULT_RUNTIME_CONFIG_FILE, DEFAULT_SERVER_CONFIG_FILE } from "./constants";
+import { i18n } from "./locale";
+import analyzePlugin from "./plugins/analyze";
+import deployPlugin from "./plugins/deploy";
+import initializePlugin from "./plugins/initialize";
+import serverBuildPlugin from "./plugins/serverBuild";
+import { generateWatchFiles } from "./utils/generateWatchFiles";
+import { initAppContext } from "./utils/initAppContext";
+import { restart } from "./utils/restart";
+export * from "./defineConfig";
+var appTools = function() {
+  var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {
+    // default webpack to be compatible with original projects
+    bundler: "webpack"
+  };
+  return {
+    name: "@modern-js/app-tools",
+    usePlugins: [
+      compatPlugin(),
+      initializePlugin({
+        bundler: (options === null || options === void 0 ? void 0 : options.bundler) && [
+          "rspack",
+          "experimental-rspack"
+        ].includes(options.bundler) ? "rspack" : "webpack"
+      }),
+      analyzePlugin({
+        bundler: (options === null || options === void 0 ? void 0 : options.bundler) && [
+          "rspack",
+          "experimental-rspack"
+        ].includes(options.bundler) ? "rspack" : "webpack"
+      }),
+      serverBuildPlugin(),
+      deployPlugin()
+    ],
+    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: createAsyncHook(),
+      onAfterPrepare: createAsyncHook(),
+      deploy: createAsyncHook(),
+      _internalRuntimePlugins: createAsyncHook(),
+      _internalServerPlugins: createAsyncHook(),
+      checkEntryPoint: createAsyncHook(),
+      modifyEntrypoints: createAsyncHook(),
+      modifyFileSystemRoutes: createAsyncHook(),
+      modifyServerRoutes: createAsyncHook(),
+      generateEntryCode: createAsyncHook(),
+      onBeforeGenerateRoutes: createAsyncHook(),
+      onBeforePrintInstructions: createAsyncHook(),
+      registerDev: createCollectAsyncHook(),
+      registerBuildPlatform: createCollectAsyncHook(),
+      addRuntimeExports: createAsyncHook()
+    },
+    setup: function(api) {
+      var _userConfig_output;
+      var context = api.getAppContext();
+      var userConfig = api.getConfig();
+      var locale = getLocaleLanguage();
+      i18n.changeLanguage({
+        locale
+      });
+      api.updateAppContext(initAppContext({
+        appDirectory: context.appDirectory,
+        options: {},
+        serverConfigFile: DEFAULT_SERVER_CONFIG_FILE,
+        runtimeConfigFile: DEFAULT_RUNTIME_CONFIG_FILE,
+        tempDir: (_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir
+      }));
+      api.addCommand(function() {
+        var _ref = _async_to_generator(function(param) {
+          var program;
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                program = param.program;
+                return [
+                  4,
+                  devCommand(program, api)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  4,
+                  buildCommand(program, api)
+                ];
+              case 2:
+                _state.sent();
+                serverCommand(program, api);
+                deployCommand(program, api);
+                newCommand(program, locale);
+                inspectCommand(program, api);
+                upgradeCommand(program);
+                deprecatedCommands(program);
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(_) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.onPrepare(/* @__PURE__ */ _async_to_generator(function() {
+        var command, isSkipBuild, resolvedConfig, appContext;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              command = getCommand();
+              if (command === "deploy") {
+                isSkipBuild = [
+                  "-s",
+                  "--skip-build"
+                ].some(function(tag) {
+                  return getArgv().includes(tag);
+                });
+                if (isSkipBuild) {
+                  return [
+                    2
+                  ];
+                }
+              }
+              if (!(command === "dev" || command === "start" || command === "build" || command === "deploy"))
+                return [
+                  3,
+                  2
+                ];
+              resolvedConfig = api.getNormalizedConfig();
+              if (!resolvedConfig.output.cleanDistPath)
+                return [
+                  3,
+                  2
+                ];
+              appContext = api.getAppContext();
+              return [
+                4,
+                emptyDir(appContext.distDirectory)
+              ];
+            case 1:
+              _state.sent();
+              _state.label = 2;
+            case 2:
+              return [
+                2
+              ];
+          }
+        });
+      }));
+      api.addWatchFiles(/* @__PURE__ */ _async_to_generator(function() {
+        var appContext, config, files, watchFiles;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              appContext = api.getAppContext();
+              config = api.getNormalizedConfig();
+              return [
+                4,
+                generateWatchFiles(appContext, config.source.configDir)
+              ];
+            case 1:
+              files = _state.sent();
+              watchFiles = castArray(config.dev.watchFiles);
+              watchFiles.forEach(function(param) {
+                var type = param.type, paths = param.paths;
+                if (type === "reload-server") {
+                  var _files;
+                  (_files = files).push.apply(_files, _to_consumable_array(Array.isArray(paths) ? paths : [
+                    paths
+                  ]));
+                }
+              });
+              return [
+                2,
+                files
+              ];
+          }
+        });
+      }));
+      api.onFileChanged(function() {
+        var _ref = _async_to_generator(function(e) {
+          var filename, eventType, isPrivate, closeServer;
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                filename = e.filename, eventType = e.eventType, isPrivate = e.isPrivate;
+                if (!(!isPrivate && (eventType === "change" || eventType === "unlink")))
+                  return [
+                    3,
+                    4
+                  ];
+                return [
+                  4,
+                  import("./utils/createServer.js")
+                ];
+              case 1:
+                closeServer = _state.sent().closeServer;
+                return [
+                  4,
+                  closeServer()
+                ];
+              case 2:
+                _state.sent();
+                return [
+                  4,
+                  restart(api.getHooks(), filename)
+                ];
+              case 3:
+                _state.sent();
+                _state.label = 4;
+              case 4:
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(e) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.onBeforeRestart(function() {
+        cleanRequireCache([
+          require.resolve("./plugins/analyze")
+        ]);
+      });
+    }
+  };
+};
 import { defineConfig, defineLegacyConfig } from "./defineConfig";
+import { mergeConfig } from "@modern-js/core";
+import { dev } from "./commands/dev";
 export * from "./types";
 var src_default = appTools;
 export {
-  appTools2 as appTools,
+  appTools,
   src_default as default,
   defineConfig,
   defineLegacyConfig,

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
 };