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

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

@@ -17,72 +17,69 @@ function initialize_default(param) {
       "@modern-js/plugin-polyfill"
     ],
     setup: function setup(api) {
-      var config = function() {
-        var appContext = api.useAppContext();
-        var userConfig = api.useConfigContext();
-        api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
+      api.config(function() {
+        var appContext = api.getAppContext();
+        var userConfig = api.getConfig();
+        api.updateAppContext({
           bundlerType: bundler
-        }));
+        });
         return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext);
-      };
-      return {
-        config,
-        resolvedConfig: function resolvedConfig(param2) {
-          var resolved = param2.resolved;
-          return _async_to_generator(function() {
-            var _resolved_output_distPath, appContext, userConfig, port, normalizedConfig, _normalizedConfig_autoLoadPlugins;
-            return _ts_generator(this, function(_state) {
-              switch (_state.label) {
-                case 0:
-                  appContext = api.useAppContext();
-                  userConfig = api.useConfigContext();
-                  return [
-                    4,
-                    getServerPort(resolved)
-                  ];
-                case 1:
-                  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")
-                  });
-                  api.setAppContext(appContext);
-                  normalizedConfig = checkIsLegacyConfig(resolved) ? transformNormalizedConfig(resolved) : resolved;
-                  resolved._raw = userConfig;
-                  resolved.server = _object_spread_props(_object_spread({}, normalizedConfig.server || {}), {
-                    port
-                  });
-                  resolved.autoLoadPlugins = (_normalizedConfig_autoLoadPlugins = normalizedConfig.autoLoadPlugins) !== null && _normalizedConfig_autoLoadPlugins !== void 0 ? _normalizedConfig_autoLoadPlugins : false;
-                  stabilizeConfig(resolved, normalizedConfig, [
-                    "source",
-                    "bff",
-                    "dev",
-                    "html",
-                    "output",
-                    "tools",
-                    "testing",
-                    "plugins",
-                    "builderPlugins",
-                    "runtime",
-                    "runtimeByEntries",
-                    "deploy",
-                    "performance"
-                  ]);
-                  if (bundler === "webpack") {
-                    resolved.security = normalizedConfig.security || {};
-                    resolved.experiments = normalizedConfig.experiments;
-                  }
-                  return [
-                    2,
-                    {
-                      resolved
-                    }
-                  ];
-              }
-            });
-          })();
-        }
-      };
+      });
+      api.modifyResolvedConfig(function() {
+        var _ref = _async_to_generator(function(resolved) {
+          var _resolved_output_distPath, appContext, userConfig, port, normalizedConfig, _normalizedConfig_autoLoadPlugins;
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                appContext = api.getAppContext();
+                userConfig = api.getConfig();
+                return [
+                  4,
+                  getServerPort(resolved)
+                ];
+              case 1:
+                port = _state.sent();
+                appContext = _object_spread_props(_object_spread({}, appContext), {
+                  port,
+                  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;
+                resolved._raw = userConfig;
+                resolved.server = _object_spread_props(_object_spread({}, normalizedConfig.server || {}), {
+                  port
+                });
+                resolved.autoLoadPlugins = (_normalizedConfig_autoLoadPlugins = normalizedConfig.autoLoadPlugins) !== null && _normalizedConfig_autoLoadPlugins !== void 0 ? _normalizedConfig_autoLoadPlugins : false;
+                stabilizeConfig(resolved, normalizedConfig, [
+                  "source",
+                  "bff",
+                  "dev",
+                  "html",
+                  "output",
+                  "tools",
+                  "testing",
+                  "plugins",
+                  "builderPlugins",
+                  "runtime",
+                  "runtimeByEntries",
+                  "deploy",
+                  "performance"
+                ]);
+                if (bundler === "webpack") {
+                  resolved.security = normalizedConfig.security || {};
+                  resolved.experiments = normalizedConfig.experiments;
+                }
+                return [
+                  2,
+                  resolved
+                ];
+            }
+          });
+        });
+        return function(resolved) {
+          return _ref.apply(this, arguments);
+        };
+      }());
     }
   };
 }

package/dist/esm/plugins/serverBuild.js

@@ -21,63 +21,59 @@ function serverBuild_default() {
   return {
     name: "@modern-js/server-build",
     setup: function setup(api) {
-      return {
-        afterBuild: function afterBuild() {
-          return _async_to_generator(function() {
-            var _api_useAppContext, appDirectory, distDirectory, metaName, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, alias, babel;
-            return _ts_generator(this, function(_state) {
-              switch (_state.label) {
-                case 0:
-                  _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory, metaName = _api_useAppContext.metaName;
-                  if (!checkHasCache(appDirectory) && !checkHasConfig(appDirectory, metaName)) {
-                    return [
-                      2
-                    ];
-                  }
-                  modernConfig = api.useResolvedConfigContext();
-                  distDir = path.resolve(distDirectory);
-                  serverDir = path.resolve(appDirectory, SERVER_DIR);
-                  sharedDir = path.resolve(appDirectory, SHARED_DIR);
-                  tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
-                  sourceDirs = [];
-                  if (fs.existsSync(serverDir)) {
-                    sourceDirs.push(serverDir);
-                    if (fs.existsSync(sharedDir)) {
-                      sourceDirs.push(sharedDir);
-                    }
-                  }
-                  server = modernConfig.server;
-                  alias = modernConfig.source.alias;
-                  babel = modernConfig.tools.babel;
-                  if (!(sourceDirs.length > 0))
-                    return [
-                      3,
-                      2
-                    ];
-                  return [
-                    4,
-                    compile(appDirectory, {
-                      server,
-                      alias,
-                      babelConfig: babel
-                    }, {
-                      sourceDirs,
-                      distDir,
-                      tsconfigPath
-                    })
-                  ];
-                case 1:
-                  _state.sent();
-                  _state.label = 2;
-                case 2:
-                  return [
-                    2
-                  ];
+      api.onAfterBuild(/* @__PURE__ */ _async_to_generator(function() {
+        var _api_getAppContext, appDirectory, distDirectory, metaName, modernConfig, distDir, serverDir, sharedDir, tsconfigPath, sourceDirs, server, alias, babel;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              _api_getAppContext = api.getAppContext(), appDirectory = _api_getAppContext.appDirectory, distDirectory = _api_getAppContext.distDirectory, metaName = _api_getAppContext.metaName;
+              if (!checkHasCache(appDirectory) && !checkHasConfig(appDirectory, metaName)) {
+                return [
+                  2
+                ];
               }
-            });
-          })();
-        }
-      };
+              modernConfig = api.getNormalizedConfig();
+              distDir = path.resolve(distDirectory);
+              serverDir = path.resolve(appDirectory, SERVER_DIR);
+              sharedDir = path.resolve(appDirectory, SHARED_DIR);
+              tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+              sourceDirs = [];
+              if (fs.existsSync(serverDir)) {
+                sourceDirs.push(serverDir);
+                if (fs.existsSync(sharedDir)) {
+                  sourceDirs.push(sharedDir);
+                }
+              }
+              server = modernConfig.server;
+              alias = modernConfig.source.alias;
+              babel = modernConfig.tools.babel;
+              if (!(sourceDirs.length > 0))
+                return [
+                  3,
+                  2
+                ];
+              return [
+                4,
+                compile(appDirectory, {
+                  server,
+                  alias,
+                  babelConfig: babel
+                }, {
+                  sourceDirs,
+                  distDir,
+                  tsconfigPath
+                })
+              ];
+            case 1:
+              _state.sent();
+              _state.label = 2;
+            case 2:
+              return [
+                2
+              ];
+          }
+        });
+      }));
     }
   };
 }

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

@@ -3,11 +3,11 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { initAppDir } from "@modern-js/plugin-v2/cli";
 import { run as CLIPluginRun } from "@modern-js/plugin-v2/run";
 import { minimist } from "@modern-js/utils";
-import { handleSetupResult } from "./compat/hooks";
-import { PACKAGE_JSON_CONFIG_NAME } from "./constants";
-import { getConfigFile } from "./getConfigFile";
-import { loadInternalPlugins } from "./loadPlugins";
-import { getIsAutoLoadPlugins } from "./utils";
+import { handleSetupResult } from "../compat/hooks";
+import { PACKAGE_JSON_CONFIG_NAME } from "../constants";
+import { getConfigFile } from "../utils/getConfigFile";
+import { isAutoLoadPlugins } from "../utils/isAutoLoadPlugins";
+import { loadInternalPlugins } from "../utils/loadPlugins";
 function run(_) {
   return _run.apply(this, arguments);
 }
@@ -44,7 +44,7 @@ function _run() {
           finalConfigFile = customConfigFile || getConfigFile(configFile);
           return [
             4,
-            getIsAutoLoadPlugins(appDirectory, finalConfigFile)
+            isAutoLoadPlugins(appDirectory, finalConfigFile)
           ];
         case 2:
           autoLoadPlugins = _state.sent();

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

@@ -1,6 +1,6 @@
 import path from "path";
 import { CONFIG_FILE_EXTENSIONS, findExists } from "@modern-js/utils";
-import { DEFAULT_CONFIG_FILE } from "./constants";
+import { DEFAULT_CONFIG_FILE } from "../constants";
 var getConfigFile = function(configFile) {
   return findExists(CONFIG_FILE_EXTENSIONS.map(function(extension) {
     return path.resolve(process.cwd(), "".concat(configFile || DEFAULT_CONFIG_FILE).concat(extension));

package/dist/esm/{new/context.js → utils/initAppContext.js}

@@ -1,19 +1,19 @@
 import path from "path";
-import { address } from "@modern-js/utils";
+import { fs, address } from "@modern-js/utils";
 var initAppContext = function(param) {
   var appDirectory = param.appDirectory, runtimeConfigFile = param.runtimeConfigFile, options = param.options, serverConfigFile = param.serverConfigFile, tempDir = param.tempDir;
   var _ref = options || {}, _ref_metaName = _ref.metaName, metaName = _ref_metaName === void 0 ? "modern-js" : _ref_metaName, _ref_apiDir = _ref.apiDir, apiDir = _ref_apiDir === void 0 ? "api" : _ref_apiDir, _ref_distDir = _ref.distDir, distDir = _ref_distDir === void 0 ? "" : _ref_distDir, _ref_sharedDir = _ref.sharedDir, sharedDir = _ref_sharedDir === void 0 ? "shared" : _ref_sharedDir;
+  var pkgPath = path.resolve(appDirectory, "./package.json");
   return {
     metaName,
     runtimeConfigFile,
     serverConfigFile,
     ip: address.ip(),
     port: 0,
-    moduleType: require(path.resolve(appDirectory, "./package.json")).type || "commonjs",
+    moduleType: fs.existsSync(pkgPath) ? require(pkgPath).type || "commonjs" : "commonjs",
     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/{new/utils/index.js → utils/isAutoLoadPlugins.js}

@@ -1,11 +1,11 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createLoadedConfig } from "@modern-js/plugin-v2/cli";
-function getIsAutoLoadPlugins(appDirectory) {
-  return _getIsAutoLoadPlugins.apply(this, arguments);
+function isAutoLoadPlugins(appDirectory) {
+  return _isAutoLoadPlugins.apply(this, arguments);
 }
-function _getIsAutoLoadPlugins() {
-  _getIsAutoLoadPlugins = _async_to_generator(function(appDirectory) {
+function _isAutoLoadPlugins() {
+  _isAutoLoadPlugins = _async_to_generator(function(appDirectory) {
     var configFile, packageJsonConfig, _loaded_config, loaded, autoLoadPlugins;
     var _arguments = arguments;
     return _ts_generator(this, function(_state) {
@@ -26,8 +26,8 @@ function _getIsAutoLoadPlugins() {
       }
     });
   });
-  return _getIsAutoLoadPlugins.apply(this, arguments);
+  return _isAutoLoadPlugins.apply(this, arguments);
 }
 export {
-  getIsAutoLoadPlugins
+  isAutoLoadPlugins
 };

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