@modern-js/app-tools 2.53.1-alpha.3 → 2.54.0

package/dist/esm/commands/index.js

@@ -1,3 +1,411 @@
-export * from "./dev";
-export * from "./build";
-export * from "./serve";
+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 { newAction, upgradeAction } from "@modern-js/utils";
+import { castArray } from "@rsbuild/shared";
+import { i18n, localeKeys } from "../locale";
+var devCommand = function() {
+  var _ref = _async_to_generator(function(program, api) {
+    var runner, devToolMetas, devProgram, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, meta, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, subCmd;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          runner = api.useHookRunners();
+          return [
+            4,
+            runner.registerDev()
+          ];
+        case 1:
+          devToolMetas = _state.sent();
+          devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(function() {
+            var _ref2 = _async_to_generator(function(options) {
+              var dev;
+              return _ts_generator(this, function(_state2) {
+                switch (_state2.label) {
+                  case 0:
+                    return [
+                      4,
+                      import("./dev")
+                    ];
+                  case 1:
+                    dev = _state2.sent().dev;
+                    return [
+                      4,
+                      dev(api, options)
+                    ];
+                  case 2:
+                    _state2.sent();
+                    return [
+                      2
+                    ];
+                }
+              });
+            });
+            return function(options) {
+              return _ref2.apply(this, arguments);
+            };
+          }());
+          _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+          try {
+            for (_iterator = devToolMetas[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+              meta = _step.value;
+              if (!meta.subCommands) {
+                continue;
+              }
+              _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+              try {
+                for (_iterator1 = meta.subCommands[Symbol.iterator](); !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+                  subCmd = _step1.value;
+                  devProgram.command(subCmd).action(/* @__PURE__ */ _async_to_generator(function() {
+                    var options, appDirectory, isTypescript;
+                    var _arguments = arguments;
+                    return _ts_generator(this, function(_state2) {
+                      switch (_state2.label) {
+                        case 0:
+                          options = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : {};
+                          appDirectory = api.useAppContext().appDirectory;
+                          return [
+                            4,
+                            import("@modern-js/utils")
+                          ];
+                        case 1:
+                          isTypescript = _state2.sent().isTypescript;
+                          return [
+                            4,
+                            runner.beforeDevTask(meta)
+                          ];
+                        case 2:
+                          _state2.sent();
+                          return [
+                            4,
+                            meta.action(options, {
+                              isTsProject: isTypescript(appDirectory)
+                            })
+                          ];
+                        case 3:
+                          _state2.sent();
+                          return [
+                            2
+                          ];
+                      }
+                    });
+                  }));
+                }
+              } catch (err) {
+                _didIteratorError1 = true;
+                _iteratorError1 = err;
+              } finally {
+                try {
+                  if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                    _iterator1.return();
+                  }
+                } finally {
+                  if (_didIteratorError1) {
+                    throw _iteratorError1;
+                  }
+                }
+              }
+            }
+          } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+          } finally {
+            try {
+              if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+              }
+            } finally {
+              if (_didIteratorError) {
+                throw _iteratorError;
+              }
+            }
+          }
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return function devCommand2(program, api) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var buildCommand = function() {
+  var _ref = _async_to_generator(function(program, api) {
+    var runner, platformBuilders, buildProgram, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _loop, _iterator, _step;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          runner = api.useHookRunners();
+          return [
+            4,
+            runner.registerBuildPlatform()
+          ];
+        case 1:
+          platformBuilders = _state.sent();
+          buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action(function() {
+            var _ref2 = _async_to_generator(function(options) {
+              var build;
+              return _ts_generator(this, function(_state2) {
+                switch (_state2.label) {
+                  case 0:
+                    return [
+                      4,
+                      import("./build")
+                    ];
+                  case 1:
+                    build = _state2.sent().build;
+                    return [
+                      4,
+                      build(api, options)
+                    ];
+                  case 2:
+                    _state2.sent();
+                    return [
+                      2
+                    ];
+                }
+              });
+            });
+            return function(options) {
+              return _ref2.apply(this, arguments);
+            };
+          }());
+          _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+          try {
+            _loop = function() {
+              var platformBuilder = _step.value;
+              var platforms = castArray(platformBuilder.platform);
+              var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
+              try {
+                var _loop2 = function() {
+                  var platform = _step1.value;
+                  buildProgram.command(platform).action(/* @__PURE__ */ _async_to_generator(function() {
+                    var appDirectory, isTypescript;
+                    return _ts_generator(this, function(_state2) {
+                      switch (_state2.label) {
+                        case 0:
+                          appDirectory = api.useAppContext().appDirectory;
+                          return [
+                            4,
+                            import("@modern-js/utils")
+                          ];
+                        case 1:
+                          isTypescript = _state2.sent().isTypescript;
+                          return [
+                            4,
+                            runner.beforeBuildPlatform(platformBuilders)
+                          ];
+                        case 2:
+                          _state2.sent();
+                          return [
+                            4,
+                            platformBuilder.build(platform, {
+                              isTsProject: isTypescript(appDirectory)
+                            })
+                          ];
+                        case 3:
+                          _state2.sent();
+                          return [
+                            2
+                          ];
+                      }
+                    });
+                  }));
+                };
+                for (var _iterator2 = platforms[Symbol.iterator](), _step1; !(_iteratorNormalCompletion2 = (_step1 = _iterator2.next()).done); _iteratorNormalCompletion2 = true)
+                  _loop2();
+              } catch (err) {
+                _didIteratorError2 = true;
+                _iteratorError2 = err;
+              } finally {
+                try {
+                  if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+                    _iterator2.return();
+                  }
+                } finally {
+                  if (_didIteratorError2) {
+                    throw _iteratorError2;
+                  }
+                }
+              }
+            };
+            for (_iterator = platformBuilders[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true)
+              _loop();
+          } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+          } finally {
+            try {
+              if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+              }
+            } finally {
+              if (_didIteratorError) {
+                throw _iteratorError;
+              }
+            }
+          }
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return function buildCommand2(program, api) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var serverCommand = function(program, api) {
+  program.command("serve").usage("[options]").description(i18n.t(localeKeys.command.serve.describe)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(/* @__PURE__ */ _async_to_generator(function() {
+    var start;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          return [
+            4,
+            import("./serve")
+          ];
+        case 1:
+          start = _state.sent().start;
+          return [
+            4,
+            start(api)
+          ];
+        case 2:
+          _state.sent();
+          return [
+            2
+          ];
+      }
+    });
+  }));
+};
+var deployCommand = function(program, api) {
+  program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(function() {
+    var _ref = _async_to_generator(function(options) {
+      var build, deploy;
+      return _ts_generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            if (!!options.skipBuild)
+              return [
+                3,
+                3
+              ];
+            return [
+              4,
+              import("./build")
+            ];
+          case 1:
+            build = _state.sent().build;
+            return [
+              4,
+              build(api)
+            ];
+          case 2:
+            _state.sent();
+            _state.label = 3;
+          case 3:
+            return [
+              4,
+              import("./deploy")
+            ];
+          case 4:
+            deploy = _state.sent().deploy;
+            return [
+              4,
+              deploy(api, options)
+            ];
+          case 5:
+            _state.sent();
+            process.exit(0);
+            return [
+              2
+            ];
+        }
+      });
+    });
+    return function(options) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+};
+var newCommand = function(program, locale) {
+  program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--config-file <configFile>", i18n.t(localeKeys.command.shared.config)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).option("--no-need-install", i18n.t(localeKeys.command.shared.noNeedInstall)).action(function() {
+    var _ref = _async_to_generator(function(options) {
+      return _ts_generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            return [
+              4,
+              newAction(_object_spread_props(_object_spread({}, options), {
+                locale: options.lang || locale
+              }), "mwa")
+            ];
+          case 1:
+            _state.sent();
+            return [
+              2
+            ];
+        }
+      });
+    });
+    return function(options) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+};
+var inspectCommand = function(program, api) {
+  program.command("inspect").description("inspect the internal configs").option("--env <env>", i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(function() {
+    var _ref = _async_to_generator(function(options) {
+      var inspect;
+      return _ts_generator(this, function(_state) {
+        switch (_state.label) {
+          case 0:
+            return [
+              4,
+              import("./inspect")
+            ];
+          case 1:
+            inspect = _state.sent().inspect;
+            inspect(api, options);
+            return [
+              2
+            ];
+        }
+      });
+    });
+    return function(options) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+};
+var upgradeCommand = function(program) {
+  program.command("upgrade").allowUnknownOption().option("-h --help", "Show help").action(/* @__PURE__ */ _async_to_generator(function() {
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          return [
+            4,
+            upgradeAction()
+          ];
+        case 1:
+          _state.sent();
+          return [
+            2
+          ];
+      }
+    });
+  }));
+};
+export {
+  buildCommand,
+  deployCommand,
+  devCommand,
+  inspectCommand,
+  newCommand,
+  serverCommand,
+  upgradeCommand
+};

package/dist/esm/commands/serve.js

@@ -2,20 +2,21 @@ 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 { logger, isApiOnly, getTargetDir } from "@modern-js/utils";
+import path from "path";
+import { logger, isApiOnly, getTargetDir, getMeta, SERVER_DIR } from "@modern-js/utils";
 import { createProdServer } from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
-import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
+import { loadServerPlugins } from "../utils/loadPlugins";
 var start = function() {
   var _ref = _async_to_generator(function(api) {
-    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, distDirectory, appDirectory, port, serverConfigFile, metaName, serverRoutes, apiOnly, runMode, serverInternalPlugins, app;
+    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, distDirectory, appDirectory, 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();
-          distDirectory = appContext.distDirectory, appDirectory = appContext.appDirectory, port = appContext.port, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes;
+          distDirectory = appContext.distDirectory, appDirectory = appContext.appDirectory, port = appContext.port, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes, serverConfigFile = appContext.serverConfigFile;
           logger.info("Starting production server...");
           return [
             4,
@@ -26,12 +27,14 @@ var start = function() {
           if (apiOnly) {
             runMode = "apiOnly";
           }
+          meta = getMeta(metaName);
+          serverConfigPath = path.resolve(distDirectory, SERVER_DIR, "".concat(meta, ".server"));
           return [
             4,
-            getServerInternalPlugins(api)
+            loadServerPlugins(api, appDirectory)
           ];
         case 2:
-          serverInternalPlugins = _state.sent();
+          pluginInstances = _state.sent();
           return [
             4,
             createProdServer({
@@ -44,14 +47,15 @@ var start = function() {
                 }, userConfig.output || {})
               }),
               routes: serverRoutes,
+              plugins: pluginInstances,
+              serverConfigFile,
+              serverConfigPath,
               appContext: {
                 appDirectory,
                 sharedDirectory: getTargetDir(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
                 apiDirectory: getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
                 lambdaDirectory: getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
               },
-              serverConfigFile,
-              internalPlugins: serverInternalPlugins,
               runMode
             })
           ];

package/dist/esm/hooks.js

@@ -7,10 +7,15 @@ var hooks = {
   modifyAsyncEntry: createAsyncWaterfall(),
   modifyFileSystemRoutes: createAsyncWaterfall(),
   modifyServerRoutes: createAsyncWaterfall(),
+  /** add entry point info to entrypoints array */
+  modifyEntrypoints: createAsyncWaterfall(),
+  /** add entry type */
+  checkEntryPoint: createAsyncWaterfall(),
   htmlPartials: createAsyncWaterfall(),
   beforeGenerateRoutes: createAsyncWaterfall(),
   addDefineTypes: createAsyncWaterfall(),
   collectServerPlugins: createAsyncWaterfall(),
+  _internalServerPlugins: createAsyncWaterfall(),
   beforeDev: createAsyncWorkflow(),
   afterDev: createAsyncWorkflow(),
   beforeCreateCompiler: createAsyncWorkflow(),