@modern-js/app-tools 2.50.0 → 2.51.0

package/dist/esm/plugins/deploy/platforms/nodeEntry.js

@@ -0,0 +1,107 @@
+var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
+var _object_spread = require("@swc/helpers/_/_object_spread");
+var _ts_generator = require("@swc/helpers/_/_ts_generator");
+var fs = require("node:fs/promises");
+var path = require("node:path");
+var createProdServer = require("@modern-js/prod-server").createProdServer;
+p_genPluginImportsCode;
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV = "production";
+}
+function loadRoutes(routeFilepath) {
+  return _loadRoutes.apply(this, arguments);
+}
+function _loadRoutes() {
+  _loadRoutes = _async_to_generator._(function(routeFilepath) {
+    var content, routeSpec, error;
+    return _ts_generator._(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          _state.trys.push([
+            0,
+            3,
+            ,
+            4
+          ]);
+          return [
+            4,
+            fs.access(routeFilepath)
+          ];
+        case 1:
+          _state.sent();
+          return [
+            4,
+            fs.readFile(routeFilepath, "utf-8")
+          ];
+        case 2:
+          content = _state.sent();
+          routeSpec = JSON.parse(content);
+          return [
+            2,
+            routeSpec.routes || []
+          ];
+        case 3:
+          error = _state.sent();
+          console.warn("route.json not found or invalid, continuing with empty routes.");
+          return [
+            2,
+            []
+          ];
+        case 4:
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return _loadRoutes.apply(this, arguments);
+}
+function main() {
+  return _main.apply(this, arguments);
+}
+function _main() {
+  _main = _async_to_generator._(function() {
+    var routeFilepath, routes, dynamicProdOptions, prodServerOptions, app, port;
+    return _ts_generator._(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
+          return [
+            4,
+            loadRoutes(routeFilepath)
+          ];
+        case 1:
+          routes = _state.sent();
+          dynamicProdOptions = p_dynamicProdOptions;
+          prodServerOptions = _object_spread._({
+            pwd: __dirname,
+            routes,
+            disableCustomHook: true,
+            appContext: {
+              sharedDirectory: p_sharedDirectory,
+              apiDirectory: p_apiDirectory,
+              lambdaDirectory: p_lambdaDirectory
+            }
+          }, dynamicProdOptions);
+          return [
+            4,
+            createProdServer(prodServerOptions)
+          ];
+        case 2:
+          app = _state.sent();
+          port = process.env.PORT || 8080;
+          app.listen({
+            host: "::",
+            port
+          }, function() {
+            console.log("\x1B[32mServer is listening on http://[::]:".concat(port), "\x1B[0m");
+          });
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return _main.apply(this, arguments);
+}
+main();

package/dist/esm/plugins/deploy/platforms/vercel.js

@@ -0,0 +1,225 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import path from "node:path";
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse, getInternalPlugins } from "@modern-js/utils";
+import { isMainEntry } from "../../../utils/routes";
+import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
+import { handleDependencies } from "../dependencies";
+var createVercelPreset = function(appContext, modernConfig, needModernServer) {
+  var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverInternalPlugins = appContext.serverInternalPlugins, entrypoints = appContext.entrypoints;
+  var plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
+  var vercelOutput = path.join(appDirectory, ".vercel");
+  var outputDirectory = path.join(vercelOutput, "output");
+  var funcsDirectory = path.join(outputDirectory, "functions", "index.func");
+  var entryFilePath = path.join(funcsDirectory, "index.js");
+  return {
+    prepare: function prepare() {
+      return _async_to_generator(function() {
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              return [
+                4,
+                fse.remove(vercelOutput)
+              ];
+            case 1:
+              _state.sent();
+              return [
+                2
+              ];
+          }
+        });
+      })();
+    },
+    writeOutput: function writeOutput() {
+      return _async_to_generator(function() {
+        var config, mainEntryName, staticDirectory, destHtmlDirectory, outputHtmlDirectory;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              config = {
+                version: 3,
+                routes: [
+                  {
+                    src: "/static/(.*)",
+                    headers: {
+                      "cache-control": "s-maxage=31536000, immutable"
+                    },
+                    continue: true
+                  },
+                  {
+                    handle: "filesystem"
+                  }
+                ]
+              };
+              if (!needModernServer) {
+                mainEntryName = modernConfig.source.mainEntryName;
+                entrypoints.forEach(function(entry) {
+                  var isMain = isMainEntry(entry.entryName, mainEntryName);
+                  config.routes.push({
+                    src: "/".concat(isMain ? "" : entry.entryName, "(?:/.*)?"),
+                    headers: {
+                      "cache-control": "s-maxage=0"
+                    },
+                    dest: "/html/".concat(entry.entryName, "/index.html")
+                  });
+                });
+              } else {
+                config.routes.push({
+                  src: "/(.*)",
+                  dest: "/index"
+                });
+              }
+              return [
+                4,
+                fse.ensureDir(outputDirectory)
+              ];
+            case 1:
+              _state.sent();
+              return [
+                4,
+                fse.writeJSON(path.join(outputDirectory, "config.json"), config, {
+                  spaces: 2
+                })
+              ];
+            case 2:
+              _state.sent();
+              staticDirectory = path.join(outputDirectory, "static/static");
+              return [
+                4,
+                fse.copy(path.join(distDirectory, "static"), staticDirectory)
+              ];
+            case 3:
+              _state.sent();
+              if (!!needModernServer)
+                return [
+                  3,
+                  5
+                ];
+              destHtmlDirectory = path.join(distDirectory, "html");
+              outputHtmlDirectory = path.join(path.join(outputDirectory, "static"), "html");
+              return [
+                4,
+                fse.copy(destHtmlDirectory, outputHtmlDirectory)
+              ];
+            case 4:
+              _state.sent();
+              return [
+                3,
+                9
+              ];
+            case 5:
+              return [
+                4,
+                fse.ensureDir(funcsDirectory)
+              ];
+            case 6:
+              _state.sent();
+              return [
+                4,
+                fse.copy(distDirectory, funcsDirectory, {
+                  filter: function(src) {
+                    var distStaticDirectory = path.join(distDirectory, "static");
+                    return !src.includes(distStaticDirectory);
+                  }
+                })
+              ];
+            case 7:
+              _state.sent();
+              return [
+                4,
+                fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
+                  runtime: "nodejs16.x",
+                  handler: "index.js",
+                  launcherType: "Nodejs",
+                  shouldAddHelpers: false,
+                  supportsResponseStreaming: true
+                })
+              ];
+            case 8:
+              _state.sent();
+              _state.label = 9;
+            case 9:
+              return [
+                2
+              ];
+          }
+        });
+      })();
+    },
+    genEntry: function genEntry() {
+      return _async_to_generator(function() {
+        var _modernConfig_bff, serverConfig, pluginImportCode, dynamicProdOptions, serverAppContext, entryCode;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              if (!needModernServer) {
+                return [
+                  2
+                ];
+              }
+              serverConfig = {
+                bff: {
+                  prefix: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_bff = modernConfig.bff) === null || _modernConfig_bff === void 0 ? void 0 : _modernConfig_bff.prefix
+                },
+                output: {
+                  path: "."
+                }
+              };
+              pluginImportCode = genPluginImportsCode(plugins || []);
+              dynamicProdOptions = {
+                config: serverConfig,
+                serverConfigFile: DEFAULT_SERVER_CONFIG,
+                plugins
+              };
+              serverAppContext = serverAppContenxtTemplate(appContext);
+              return [
+                4,
+                fse.readFile(path.join(__dirname, "./vercelEntry.js"))
+              ];
+            case 1:
+              entryCode = _state.sent().toString();
+              entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+              return [
+                4,
+                fse.writeFile(entryFilePath, entryCode)
+              ];
+            case 2:
+              _state.sent();
+              return [
+                2
+              ];
+          }
+        });
+      })();
+    },
+    end: function end() {
+      return _async_to_generator(function() {
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              if (!needModernServer) {
+                return [
+                  2
+                ];
+              }
+              return [
+                4,
+                handleDependencies(appDirectory, funcsDirectory, [
+                  "@modern-js/prod-server"
+                ])
+              ];
+            case 1:
+              _state.sent();
+              return [
+                2
+              ];
+          }
+        });
+      })();
+    }
+  };
+};
+export {
+  createVercelPreset
+};

package/dist/esm/plugins/deploy/platforms/vercelEntry.js

@@ -0,0 +1,202 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var require_vercelEntry = __commonJS({
+  "src/plugins/deploy/platforms/vercelEntry.js"(exports, module) {
+    var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
+    var _object_spread = require("@swc/helpers/_/_object_spread");
+    var _ts_generator = require("@swc/helpers/_/_ts_generator");
+    var fs = require("node:fs/promises");
+    var path = require("node:path");
+    var createProdServer = require("@modern-js/prod-server").createProdServer;
+    p_genPluginImportsCode;
+    if (!process.env.NODE_ENV) {
+      process.env.NODE_ENV = "production";
+    }
+    var requestHandler = null;
+    var handlerCreationPromise = null;
+    function loadRoutes(routeFilepath) {
+      return _loadRoutes.apply(this, arguments);
+    }
+    function _loadRoutes() {
+      _loadRoutes = _async_to_generator._(function(routeFilepath) {
+        var content, routeSpec, error;
+        return _ts_generator._(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              _state.trys.push([
+                0,
+                3,
+                ,
+                4
+              ]);
+              return [
+                4,
+                fs.access(routeFilepath)
+              ];
+            case 1:
+              _state.sent();
+              return [
+                4,
+                fs.readFile(routeFilepath, "utf-8")
+              ];
+            case 2:
+              content = _state.sent();
+              routeSpec = JSON.parse(content);
+              return [
+                2,
+                routeSpec.routes || []
+              ];
+            case 3:
+              error = _state.sent();
+              console.warn("route.json not found or invalid, continuing with empty routes.");
+              return [
+                2,
+                []
+              ];
+            case 4:
+              return [
+                2
+              ];
+          }
+        });
+      });
+      return _loadRoutes.apply(this, arguments);
+    }
+    function initServer() {
+      return _initServer.apply(this, arguments);
+    }
+    function _initServer() {
+      _initServer = _async_to_generator._(function() {
+        var routeFilepath, routes, dynamicProdOptions, prodServerOptions, app;
+        return _ts_generator._(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
+              return [
+                4,
+                loadRoutes(routeFilepath)
+              ];
+            case 1:
+              routes = _state.sent();
+              dynamicProdOptions = p_dynamicProdOptions;
+              prodServerOptions = _object_spread._({
+                pwd: __dirname,
+                routes,
+                disableCustomHook: true,
+                appContext: {
+                  sharedDirectory: p_sharedDirectory,
+                  apiDirectory: p_apiDirectory,
+                  lambdaDirectory: p_lambdaDirectory
+                }
+              }, dynamicProdOptions);
+              return [
+                4,
+                createProdServer(prodServerOptions)
+              ];
+            case 2:
+              app = _state.sent();
+              return [
+                2,
+                app.getRequestListener()
+              ];
+          }
+        });
+      });
+      return _initServer.apply(this, arguments);
+    }
+    function createHandler() {
+      return _createHandler.apply(this, arguments);
+    }
+    function _createHandler() {
+      _createHandler = _async_to_generator._(function() {
+        return _ts_generator._(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              if (!handlerCreationPromise) {
+                handlerCreationPromise = _async_to_generator._(function() {
+                  var error;
+                  return _ts_generator._(this, function(_state2) {
+                    switch (_state2.label) {
+                      case 0:
+                        _state2.trys.push([
+                          0,
+                          2,
+                          ,
+                          3
+                        ]);
+                        return [
+                          4,
+                          initServer()
+                        ];
+                      case 1:
+                        requestHandler = _state2.sent();
+                        return [
+                          3,
+                          3
+                        ];
+                      case 2:
+                        error = _state2.sent();
+                        console.error("Error creating server:", error);
+                        process.exit(1);
+                        return [
+                          3,
+                          3
+                        ];
+                      case 3:
+                        return [
+                          2
+                        ];
+                    }
+                  });
+                })();
+              }
+              return [
+                4,
+                handlerCreationPromise
+              ];
+            case 1:
+              _state.sent();
+              return [
+                2,
+                requestHandler
+              ];
+          }
+        });
+      });
+      return _createHandler.apply(this, arguments);
+    }
+    createHandler();
+    module.exports = function() {
+      var _ref = _async_to_generator._(function(req, res) {
+        return _ts_generator._(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              if (!!requestHandler)
+                return [
+                  3,
+                  2
+                ];
+              return [
+                4,
+                createHandler()
+              ];
+            case 1:
+              _state.sent();
+              _state.label = 2;
+            case 2:
+              return [
+                2,
+                requestHandler(req, res)
+              ];
+          }
+        });
+      });
+      return function(req, res) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+  }
+});
+export default require_vercelEntry();

package/dist/esm/plugins/deploy/utils.js

@@ -0,0 +1,47 @@
+import path from "path";
+import { ROUTE_SPEC_FILE, fs as fse, isDepExists } from "@modern-js/utils";
+var serverAppContenxtTemplate = function(appContext) {
+  var appDirectory = appContext.appDirectory, sharedDirectory = appContext.sharedDirectory, apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory, metaName = appContext.metaName;
+  return {
+    sharedDirectory: 'path.join(__dirname, "'.concat(path.relative(appDirectory, sharedDirectory), '")'),
+    apiDirectory: 'path.join(__dirname, "'.concat(path.relative(appDirectory, apiDirectory), '")'),
+    lambdaDirectory: 'path.join(__dirname, "'.concat(path.relative(appDirectory, lambdaDirectory), '")'),
+    metaName
+  };
+};
+var getPluginsCode = function(plugins) {
+  return "[".concat(plugins.map(function(_, index) {
+    return "plugin_".concat(index, "()");
+  }).join(","), "]");
+};
+var genPluginImportsCode = function(plugins) {
+  return plugins.map(function(plugin, index) {
+    return "\n      let plugin_".concat(index, " = require('").concat(plugin, "')\n      plugin_").concat(index, " = plugin_").concat(index, ".default || plugin_").concat(index, "\n      ");
+  }).join(";\n");
+};
+var getProjectUsage = function(appDirectory, distDirectory) {
+  var routeJSON = path.join(distDirectory, ROUTE_SPEC_FILE);
+  var routes = fse.readJSONSync(routeJSON).routes;
+  var useSSR = false;
+  var useAPI = false;
+  routes.forEach(function(route) {
+    if (route.isSSR) {
+      useSSR = true;
+    }
+    if (route.isApi) {
+      useAPI = true;
+    }
+  });
+  var useWebServer = isDepExists(appDirectory, "@modern-js/plugin-server");
+  return {
+    useSSR,
+    useAPI,
+    useWebServer
+  };
+};
+export {
+  genPluginImportsCode,
+  getPluginsCode,
+  getProjectUsage,
+  serverAppContenxtTemplate
+};

package/dist/esm/utils/routes.js

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { fs, MAIN_ENTRY_NAME, ROUTE_SPEC_FILE } from "@modern-js/utils";
 var generateRoutes = function() {
   var _ref = _async_to_generator(function(appContext) {
     var serverRoutes, distDirectory, output;
@@ -32,7 +32,11 @@ var getPathWithoutExt = function(filename) {
   var extname = path.extname(filename);
   return filename.slice(0, -extname.length);
 };
+var isMainEntry = function(entryName, mainEntryName) {
+  return entryName === (mainEntryName || MAIN_ENTRY_NAME);
+};
 export {
   generateRoutes,
-  getPathWithoutExt
+  getPathWithoutExt,
+  isMainEntry
 };

package/dist/esm-node/analyze/getServerRoutes.js

@@ -1,6 +1,7 @@
 import path from "path";
 import fs from "fs";
-import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash, SERVER_WORKER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, removeTailSlash, SERVER_WORKER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+import { isMainEntry } from "../utils/routes";
 import { walkDirectory } from "./utils";
 const applyBaseUrl = (baseUrl, routes) => {
   if (baseUrl) {
@@ -73,14 +74,14 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
   const { packageName } = appContext;
   const workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   let htmlRoutes = entrypoints.reduce((previous, { entryName }) => {
-    const isMainEntry = entryName === (mainEntryName || MAIN_ENTRY_NAME);
-    const entryOptions = getEntryOptions(entryName, isMainEntry, ssr, ssrByEntries, packageName);
+    const isMain = isMainEntry(entryName, mainEntryName);
+    const entryOptions = getEntryOptions(entryName, isMain, ssr, ssrByEntries, packageName);
     const isSSR = Boolean(entryOptions);
     const isWorker = Boolean(workerSSR);
     const isStream = typeof entryOptions === "object" && (entryOptions.mode === "stream" || Boolean(entryOptions.preload));
     const { resHeaders } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
     let route = {
-      urlPath: `/${isMainEntry ? "" : entryName}`,
+      urlPath: `/${isMain ? "" : entryName}`,
       entryName,
       entryPath: removeLeadingSlash(path.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`)),
       isSPA: true,

package/dist/esm-node/commands/deploy.js

@@ -3,6 +3,7 @@ const deploy = async (api, options) => {
   const hookRunners = api.useHookRunners();
   await getServerInternalPlugins(api);
   await hookRunners.beforeDeploy(options);
+  await hookRunners.deploy(options);
   await hookRunners.afterDeploy(options);
 };
 export {

package/dist/esm-node/hooks.js

@@ -19,6 +19,7 @@ const hooks = {
   beforeBuild: createAsyncWorkflow(),
   afterBuild: createAsyncWorkflow(),
   beforeDeploy: createAsyncWorkflow(),
+  deploy: createAsyncWorkflow(),
   afterDeploy: createAsyncWorkflow(),
   beforeRestart: createAsyncWorkflow(),
   registerDev: createParallelWorkflow(),

package/dist/esm-node/index.js

@@ -8,6 +8,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";
@@ -81,7 +82,8 @@ const appTools = (options = {
       bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
     }),
     serverBuildPlugin(),
-    lintPlugin()
+    lintPlugin(),
+    deployPlugin()
   ],
   setup: (api) => {
     const appContext = api.useAppContext();