@modern-js/app-tools 2.48.6 → 2.49.1-alpha.0

package/dist/esm/commands/dev.js

@@ -4,14 +4,17 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ResolvedConfigContext } from "@modern-js/core";
 import { DEFAULT_DEV_HOST } from "@modern-js/utils";
+import { createDevServer } from "@modern-js/server";
+import { initProdMiddlewares } from "@modern-js/prod-server";
+import { registerCompiler } from "../utils/register";
 import { printInstructions } from "../utils/printInstructions";
-import { setServer, createServer, injectDataLoaderPlugin } from "../utils/createServer";
+import { setServer } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var dev = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var devServerOptions, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
+    var devServerOptions, _normalizedConfig_source, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
     var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -23,11 +26,17 @@ var dev = function() {
           normalizedConfig = api.useResolvedConfigContext();
           appContext = api.useAppContext();
           hookRunners = api.useHookRunners();
+          return [
+            4,
+            registerCompiler(appContext.appDirectory, appContext.distDirectory, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias)
+          ];
+        case 1:
+          _state.sent();
           normalizedConfig = _object_spread_props(_object_spread({}, normalizedConfig), {
             cliOptions: options
           });
           ResolvedConfigContext.set(normalizedConfig);
-          appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName;
+          appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes;
           return [
             4,
             buildServerConfig({
@@ -37,13 +46,13 @@ var dev = function() {
               watch: true
             })
           ];
-        case 1:
+        case 2:
           _state.sent();
           return [
             4,
             hookRunners.beforeDev()
           ];
-        case 2:
+        case 3:
           _state.sent();
           if (!appContext.builder && !apiOnly) {
             throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
@@ -52,81 +61,68 @@ var dev = function() {
             4,
             generateRoutes(appContext)
           ];
-        case 3:
+        case 4:
           _state.sent();
           return [
             4,
             getServerInternalPlugins(api)
           ];
-        case 4:
+        case 5:
           serverInternalPlugins = _state.sent();
           serverOptions = _object_spread({
+            metaName,
             dev: _object_spread({
               port,
               https: normalizedConfig.dev.https,
               host: normalizedConfig.dev.host
             }, (_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer),
             appContext: {
-              metaName,
-              appDirectory: appContext.appDirectory,
-              sharedDirectory: appContext.sharedDirectory,
+              appDirectory,
               apiDirectory: appContext.apiDirectory,
-              lambdaDirectory: appContext.lambdaDirectory
+              lambdaDirectory: appContext.lambdaDirectory,
+              sharedDirectory: appContext.sharedDirectory
             },
+            routes: serverRoutes,
             pwd: appDirectory,
             config: normalizedConfig,
             serverConfigFile,
-            internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
+            internalPlugins: serverInternalPlugins
           }, devServerOptions);
           if (!apiOnly)
             return [
               3,
-              6
+              7
             ];
           return [
             4,
-            createServer(_object_spread_props(_object_spread({}, serverOptions), {
-              compiler: null
-            }))
+            createDevServer(serverOptions, initProdMiddlewares)
           ];
-        case 5:
+        case 6:
           app = _state.sent();
           host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
           app.listen({
             port,
             host
           }, function() {
-            var _ref2 = _async_to_generator(function(err) {
-              return _ts_generator(this, function(_state2) {
-                if (err) {
-                  throw err;
-                }
-                printInstructions(hookRunners, appContext, normalizedConfig);
-                return [
-                  2
-                ];
-              });
-            });
-            return function(err) {
-              return _ref2.apply(this, arguments);
-            };
-          }());
+            printInstructions(hookRunners, appContext, normalizedConfig);
+          });
           return [
             3,
-            8
+            9
           ];
-        case 6:
+        case 7:
           return [
             4,
             appContext.builder.startDevServer({
-              serverOptions
+              serverOptions,
+              initProdMiddlewares
             })
           ];
-        case 7:
+        case 8:
           server = _state.sent().server;
           setServer(server);
-          _state.label = 8;
-        case 8:
+          _state.label = 9;
+        case 9:
           return [
             2
           ];

package/dist/esm/commands/serve.js

@@ -3,20 +3,19 @@ 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 server from "@modern-js/prod-server";
+import { createProdServer } from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
-import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var start = function() {
   var _ref = _async_to_generator(function(api) {
-    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, metaName, apiOnly, serverInternalPlugins, app;
+    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, distDirectory, appDirectory, port, serverConfigFile, metaName, serverRoutes, apiOnly, runMode, serverInternalPlugins, app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           appContext = api.useAppContext();
           userConfig = api.useResolvedConfigContext();
           hookRunners = api.useHookRunners();
-          appDirectory = appContext.appDirectory, port = appContext.port, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName;
+          distDirectory = appContext.distDirectory, appDirectory = appContext.appDirectory, port = appContext.port, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes;
           logger.info("Starting production server...");
           return [
             4,
@@ -24,6 +23,9 @@ var start = function() {
           ];
         case 1:
           apiOnly = _state.sent();
+          if (apiOnly) {
+            runMode = "apiOnly";
+          }
           return [
             4,
             getServerInternalPlugins(api)
@@ -32,51 +34,45 @@ var start = function() {
           serverInternalPlugins = _state.sent();
           return [
             4,
-            server({
-              pwd: appDirectory,
+            createProdServer({
+              metaName,
+              pwd: distDirectory,
               config: _object_spread_props(_object_spread({}, userConfig), {
                 dev: userConfig.dev,
                 output: _object_spread({
                   path: (_userConfig_output_distPath = userConfig.output.distPath) === null || _userConfig_output_distPath === void 0 ? void 0 : _userConfig_output_distPath.root
                 }, userConfig.output || {})
               }),
+              routes: serverRoutes,
               appContext: {
-                metaName,
+                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: injectDataLoaderPlugin(serverInternalPlugins),
-              apiOnly
+              internalPlugins: serverInternalPlugins,
+              runMode
             })
           ];
         case 3:
           app = _state.sent();
-          app.listen(port, function() {
-            var _ref2 = _async_to_generator(function(err) {
-              return _ts_generator(this, function(_state2) {
-                switch (_state2.label) {
-                  case 0:
-                    if (err) {
-                      throw err;
-                    }
-                    return [
-                      4,
-                      printInstructions(hookRunners, appContext, userConfig)
-                    ];
-                  case 1:
-                    _state2.sent();
-                    return [
-                      2
-                    ];
-                }
-              });
+          app.listen(port, /* @__PURE__ */ _async_to_generator(function() {
+            return _ts_generator(this, function(_state2) {
+              switch (_state2.label) {
+                case 0:
+                  return [
+                    4,
+                    printInstructions(hookRunners, appContext, userConfig)
+                  ];
+                case 1:
+                  _state2.sent();
+                  return [
+                    2
+                  ];
+              }
             });
-            return function(err) {
-              return _ref2.apply(this, arguments);
-            };
-          }());
+          }));
           return [
             2
           ];

package/dist/esm/index.js

@@ -12,6 +12,7 @@ import initializePlugin from "./initialize";
 import { hooks } from "./hooks";
 import { i18n, localeKeys } from "./locale";
 import serverBuildPlugin from "./plugins/serverBuild";
+import deployPlugin from "./plugins/deploy";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
 import { mergeConfig } from "@modern-js/core";
@@ -295,7 +296,8 @@ var appTools = function() {
         bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
       }),
       serverBuildPlugin(),
-      lintPlugin()
+      lintPlugin(),
+      deployPlugin()
     ],
     setup: function(api) {
       var appContext = api.useAppContext();