@modern-js/app-tools 2.49.3-alpha.7 → 2.49.3-alpha.9

package/dist/cjs/plugins/deploy/index.js

@@ -53,7 +53,6 @@ var deploy_default = () => ({
         const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
         const { useSSR, useAPI, useWebServer } = (0, import_utils2.getProjectUsage)(appDirectory, distDirectory);
         const needModernServer = useSSR || useAPI || useWebServer;
-        const configContext = api.useResolvedConfigContext();
         let outputDirectory = import_path.default.join(appDirectory, ".output");
         let funcsDirectory = outputDirectory;
         let staticDirectory = import_path.default.join(outputDirectory, "static");
@@ -69,7 +68,7 @@ var deploy_default = () => ({
             entrypoints.forEach((entry) => {
               const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
               routes.push({
-                src: `/${isMain ? "" : entry.entryName}/*`,
+                src: `/${isMain ? "" : `${entry.entryName}/`}*`,
                 dest: `/html/${entry.entryName}/index.html`,
                 status: 200
               });
@@ -80,14 +79,13 @@ var deploy_default = () => ({
               dest: `/.netlify/functions/index`,
               status: 200
             });
+            throw new Error("Currently on the Netlify platform, only CSR projects are supporte, Support for SSR and BFF projects will be available later");
           }
           console.log("routes", routes, needModernServer);
           const redirectContent = routes.map((route) => {
             return `${route.src} ${route.dest} ${route.status}`;
           }).join("\n");
           console.log("redirectContent", redirectContent);
-          const redirectFilePath = import_path.default.join(distDirectory, "_redirects");
-          await import_utils.fs.writeFile(redirectFilePath, redirectContent);
           await import_utils.fs.remove(outputDirectory);
           await import_utils.fs.ensureDir(funcsDirectory);
           await import_utils.fs.copy(distDirectory, funcsDirectory, {
@@ -96,12 +94,14 @@ var deploy_default = () => ({
               return !src.includes(distStaticDirectory);
             }
           });
+          const redirectFilePath = import_path.default.join(distDirectory, "_redirects");
+          await import_utils.fs.writeFile(redirectFilePath, redirectContent);
         }
         if (deployTarget === "vercel") {
           const vercelOutput = import_path.default.join(appDirectory, ".vercel");
           await import_utils.fs.remove(vercelOutput);
           outputDirectory = import_path.default.join(vercelOutput, "output");
-          const config2 = {
+          const config = {
             version: 3,
             routes: [
               {
@@ -119,7 +119,7 @@ var deploy_default = () => ({
           if (!needModernServer) {
             entrypoints.forEach((entry) => {
               const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
-              config2.routes.push({
+              config.routes.push({
                 src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
                 headers: {
                   "cache-control": "s-maxage=0"
@@ -128,13 +128,13 @@ var deploy_default = () => ({
               });
             });
           } else {
-            config2.routes.push({
+            config.routes.push({
               src: "/(.*)",
               dest: `/index`
             });
           }
           await import_utils.fs.ensureDir(outputDirectory);
-          await import_utils.fs.writeJSON(import_path.default.join(outputDirectory, "config.json"), config2, {
+          await import_utils.fs.writeJSON(import_path.default.join(outputDirectory, "config.json"), config, {
             spaces: 2
           });
           staticDirectory = import_path.default.join(outputDirectory, "static/static");
@@ -161,13 +161,6 @@ var deploy_default = () => ({
             });
           }
         }
-        const { bff } = configContext;
-        const config = {
-          output: {
-            path: "."
-          },
-          bff
-        };
         const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
         const serverAppContext = {
           sharedDirectory: `path.join(__dirname, "${import_path.default.relative(appDirectory, sharedDirectory)}")`,
@@ -179,7 +172,7 @@ var deploy_default = () => ({
         console.log("deployTarget111111111", deployTarget);
         switch (deployTarget) {
           case "node": {
-            const { genNodeEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/node")));
+            const { genNodeEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/node")));
             code = genNodeEntry({
               plugins,
               config: modernConfig,
@@ -188,8 +181,8 @@ var deploy_default = () => ({
             break;
           }
           case "vercel": {
-            const { genVercelEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/vercel")));
-            code = genVercelEntry({
+            const { genVercelEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/vercel")));
+            code = await genVercelEntry({
               plugins,
               config: modernConfig,
               appContext: serverAppContext
@@ -197,7 +190,7 @@ var deploy_default = () => ({
             break;
           }
           case "netlify": {
-            const { genNetlifyEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/netlify")));
+            const { genNetlifyEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/netlify")));
             code = genNetlifyEntry({
               plugins,
               config: modernConfig,

package/dist/cjs/plugins/deploy/platforms/platform.js

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var platform_exports = {};
+module.exports = __toCommonJS(platform_exports);

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

@@ -0,0 +1,57 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var vercel_exports = {};
+__export(vercel_exports, {
+  genVercelEntry: () => genVercelEntry
+});
+module.exports = __toCommonJS(vercel_exports);
+var import_node_path = __toESM(require("node:path"));
+var import_utils = require("@modern-js/utils");
+var import_utils2 = require("../utils");
+async function genVercelEntry({ config, plugins, appContext } = {}) {
+  const defaultConfig = {
+    output: {
+      path: "."
+    }
+  };
+  const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
+  const dynamicProdOptions = {
+    config: `${JSON.stringify(config || defaultConfig)}`,
+    serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
+    plugins: `${(0, import_utils2.getPluginsCode)(plugins || [])}`,
+    appContext: `${appContext ? (0, import_utils2.severAppContextTemplate)(appContext) : "undefined"}`
+  };
+  let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./vercelEntry.js"))).toString();
+  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", import_utils.ROUTE_SPEC_FILE).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions));
+  return entryCode;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  genVercelEntry
+});

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

@@ -0,0 +1,55 @@
+"use strict";
+const fs = require("node:fs/promises");
+const path = require("node:path");
+const { createProdServer } = require("@modern-js/prod-server");
+p_genPluginImportsCode;
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV = "production";
+}
+let requestHandler = null;
+let handlerCreationPromise = null;
+async function loadRoutes(routeFilepath) {
+  try {
+    await fs.access(routeFilepath);
+    const content = await fs.readFile(routeFilepath, "utf-8");
+    const routeSpec = JSON.parse(content);
+    return routeSpec.routes || [];
+  } catch (error) {
+    console.warn("route.json not found or invalid, continuing with empty routes.");
+    return [];
+  }
+}
+async function initServer() {
+  const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
+  const routes = await loadRoutes(routeFilepath);
+  const dynamicProdOptions = p_dynamicProdOptions;
+  const prodServerOptions = {
+    pwd: __dirname,
+    routes,
+    disableCustomHook: true,
+    ...dynamicProdOptions
+  };
+  const app = await createProdServer(prodServerOptions);
+  return app.getRequestListener();
+}
+async function createHandler() {
+  if (!handlerCreationPromise) {
+    handlerCreationPromise = (async () => {
+      try {
+        requestHandler = await initServer();
+      } catch (error) {
+        console.error("Error creating server:", error);
+        process.exit(1);
+      }
+    })();
+  }
+  await handlerCreationPromise;
+  return requestHandler;
+}
+createHandler();
+module.exports = async (req, res) => {
+  if (!requestHandler) {
+    await createHandler();
+  }
+  return requestHandler(req, res);
+};

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

@@ -18,7 +18,7 @@ function deploy_default() {
       return {
         beforeDeploy: function beforeDeploy() {
           return _async_to_generator(function() {
-            var appContext, modernConfig, mainEntryName, appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints, _getProjectUsage, useSSR, useAPI, useWebServer, needModernServer, configContext, outputDirectory, funcsDirectory, staticDirectory, netlifyOutput, routes, redirectContent, redirectFilePath, vercelOutput, config, destHtmlDirectory, outputHtmlDirectory, bff, config1, plugins, serverAppContext, code, genNodeEntry, genVercelEntry, genNetlifyEntry, entryFilePath;
+            var appContext, modernConfig, mainEntryName, appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints, _getProjectUsage, useSSR, useAPI, useWebServer, needModernServer, outputDirectory, funcsDirectory, staticDirectory, netlifyOutput, routes, redirectContent, redirectFilePath, vercelOutput, config, destHtmlDirectory, outputHtmlDirectory, plugins, serverAppContext, code, genNodeEntry, genVercelEntry, genNetlifyEntry, entryFilePath;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -28,7 +28,6 @@ function deploy_default() {
                   appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverInternalPlugins = appContext.serverInternalPlugins, sharedDirectory = appContext.sharedDirectory, apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory, metaName = appContext.metaName, entrypoints = appContext.entrypoints;
                   _getProjectUsage = getProjectUsage(appDirectory, distDirectory), useSSR = _getProjectUsage.useSSR, useAPI = _getProjectUsage.useAPI, useWebServer = _getProjectUsage.useWebServer;
                   needModernServer = useSSR || useAPI || useWebServer;
-                  configContext = api.useResolvedConfigContext();
                   outputDirectory = path.join(appDirectory, ".output");
                   funcsDirectory = outputDirectory;
                   staticDirectory = path.join(outputDirectory, "static");
@@ -63,7 +62,7 @@ function deploy_default() {
                     entrypoints.forEach(function(entry) {
                       var isMain = isMainEntry(entry.entryName, mainEntryName);
                       routes.push({
-                        src: "/".concat(isMain ? "" : entry.entryName, "/*"),
+                        src: "/".concat(isMain ? "" : "".concat(entry.entryName, "/"), "*"),
                         dest: "/html/".concat(entry.entryName, "/index.html"),
                         status: 200
                       });
@@ -74,30 +73,24 @@ function deploy_default() {
                       dest: "/.netlify/functions/index",
                       status: 200
                     });
+                    throw new Error("Currently on the Netlify platform, only CSR projects are supporte, Support for SSR and BFF projects will be available later");
                   }
                   console.log("routes", routes, needModernServer);
                   redirectContent = routes.map(function(route) {
                     return "".concat(route.src, " ").concat(route.dest, " ").concat(route.status);
                   }).join("\n");
                   console.log("redirectContent", redirectContent);
-                  redirectFilePath = path.join(distDirectory, "_redirects");
-                  return [
-                    4,
-                    fse.writeFile(redirectFilePath, redirectContent)
-                  ];
-                case 4:
-                  _state.sent();
                   return [
                     4,
                     fse.remove(outputDirectory)
                   ];
-                case 5:
+                case 4:
                   _state.sent();
                   return [
                     4,
                     fse.ensureDir(funcsDirectory)
                   ];
-                case 6:
+                case 5:
                   _state.sent();
                   return [
                     4,
@@ -108,6 +101,13 @@ function deploy_default() {
                       }
                     })
                   ];
+                case 6:
+                  _state.sent();
+                  redirectFilePath = path.join(distDirectory, "_redirects");
+                  return [
+                    4,
+                    fse.writeFile(redirectFilePath, redirectContent)
+                  ];
                 case 7:
                   _state.sent();
                   _state.label = 8;
@@ -228,13 +228,6 @@ function deploy_default() {
                   _state.sent();
                   _state.label = 18;
                 case 18:
-                  bff = configContext.bff;
-                  config1 = {
-                    output: {
-                      path: "."
-                    },
-                    bff
-                  };
                   plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
                   serverAppContext = {
                     sharedDirectory: 'path.join(__dirname, "'.concat(path.relative(appDirectory, sharedDirectory), '")'),
@@ -258,17 +251,17 @@ function deploy_default() {
                     case "netlify":
                       return [
                         3,
-                        23
+                        24
                       ];
                   }
                   return [
                     3,
-                    25
+                    26
                   ];
                 case 19:
                   return [
                     4,
-                    import("./entrys/node")
+                    import("./platforms/node")
                   ];
                 case 20:
                   genNodeEntry = _state.sent().genNodeEntry;
@@ -279,30 +272,35 @@ function deploy_default() {
                   });
                   return [
                     3,
-                    26
+                    27
                   ];
                 case 21:
                   return [
                     4,
-                    import("./entrys/vercel")
+                    import("./platforms/vercel")
                   ];
                 case 22:
                   genVercelEntry = _state.sent().genVercelEntry;
-                  code = genVercelEntry({
-                    plugins,
-                    config: modernConfig,
-                    appContext: serverAppContext
-                  });
                   return [
-                    3,
-                    26
+                    4,
+                    genVercelEntry({
+                      plugins,
+                      config: modernConfig,
+                      appContext: serverAppContext
+                    })
                   ];
                 case 23:
+                  code = _state.sent();
                   return [
-                    4,
-                    import("./entrys/netlify")
+                    3,
+                    27
                   ];
                 case 24:
+                  return [
+                    4,
+                    import("./platforms/netlify")
+                  ];
+                case 25:
                   genNetlifyEntry = _state.sent().genNetlifyEntry;
                   code = genNetlifyEntry({
                     plugins,
@@ -311,25 +309,25 @@ function deploy_default() {
                   });
                   return [
                     3,
-                    26
+                    27
                   ];
-                case 25:
+                case 26:
                   {
                     code = 'throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");';
                   }
-                  _state.label = 26;
-                case 26:
+                  _state.label = 27;
+                case 27:
                   entryFilePath = path.join(funcsDirectory, "index.js");
                   if (!needModernServer)
                     return [
                       3,
-                      29
+                      30
                     ];
                   return [
                     4,
                     fse.writeFile(entryFilePath, code)
                   ];
-                case 27:
+                case 28:
                   _state.sent();
                   return [
                     4,
@@ -337,10 +335,10 @@ function deploy_default() {
                       "@modern-js/prod-server"
                     ])
                   ];
-                case 28:
-                  _state.sent();
-                  _state.label = 29;
                 case 29:
+                  _state.sent();
+                  _state.label = 30;
+                case 30:
                   return [
                     2
                   ];

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

@@ -0,0 +1,47 @@
+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 } from "@modern-js/utils";
+import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
+function genVercelEntry() {
+  return _genVercelEntry.apply(this, arguments);
+}
+function _genVercelEntry() {
+  _genVercelEntry = _async_to_generator(function() {
+    var _ref, config, plugins, appContext, defaultConfig, pluginImportCode, dynamicProdOptions, entryCode;
+    var _arguments = arguments;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          _ref = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : {}, config = _ref.config, plugins = _ref.plugins, appContext = _ref.appContext;
+          defaultConfig = {
+            output: {
+              path: "."
+            }
+          };
+          pluginImportCode = genPluginImportsCode(plugins || []);
+          dynamicProdOptions = {
+            config: "".concat(JSON.stringify(config || defaultConfig)),
+            serverConfigFile: DEFAULT_SERVER_CONFIG,
+            plugins: "".concat(getPluginsCode(plugins || [])),
+            appContext: "".concat(appContext ? severAppContextTemplate(appContext) : "undefined")
+          };
+          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", ROUTE_SPEC_FILE).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions));
+          return [
+            2,
+            entryCode
+          ];
+      }
+    });
+  });
+  return _genVercelEntry.apply(this, arguments);
+}
+export {
+  genVercelEntry
+};

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

@@ -0,0 +1,197 @@
+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
+              }, 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-node/plugins/deploy/index.js

@@ -20,7 +20,6 @@ var deploy_default = () => ({
         const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
         const { useSSR, useAPI, useWebServer } = getProjectUsage(appDirectory, distDirectory);
         const needModernServer = useSSR || useAPI || useWebServer;
-        const configContext = api.useResolvedConfigContext();
         let outputDirectory = path.join(appDirectory, ".output");
         let funcsDirectory = outputDirectory;
         let staticDirectory = path.join(outputDirectory, "static");
@@ -36,7 +35,7 @@ var deploy_default = () => ({
             entrypoints.forEach((entry) => {
               const isMain = isMainEntry(entry.entryName, mainEntryName);
               routes.push({
-                src: `/${isMain ? "" : entry.entryName}/*`,
+                src: `/${isMain ? "" : `${entry.entryName}/`}*`,
                 dest: `/html/${entry.entryName}/index.html`,
                 status: 200
               });
@@ -47,14 +46,13 @@ var deploy_default = () => ({
               dest: `/.netlify/functions/index`,
               status: 200
             });
+            throw new Error("Currently on the Netlify platform, only CSR projects are supporte, Support for SSR and BFF projects will be available later");
           }
           console.log("routes", routes, needModernServer);
           const redirectContent = routes.map((route) => {
             return `${route.src} ${route.dest} ${route.status}`;
           }).join("\n");
           console.log("redirectContent", redirectContent);
-          const redirectFilePath = path.join(distDirectory, "_redirects");
-          await fse.writeFile(redirectFilePath, redirectContent);
           await fse.remove(outputDirectory);
           await fse.ensureDir(funcsDirectory);
           await fse.copy(distDirectory, funcsDirectory, {
@@ -63,12 +61,14 @@ var deploy_default = () => ({
               return !src.includes(distStaticDirectory);
             }
           });
+          const redirectFilePath = path.join(distDirectory, "_redirects");
+          await fse.writeFile(redirectFilePath, redirectContent);
         }
         if (deployTarget === "vercel") {
           const vercelOutput = path.join(appDirectory, ".vercel");
           await fse.remove(vercelOutput);
           outputDirectory = path.join(vercelOutput, "output");
-          const config2 = {
+          const config = {
             version: 3,
             routes: [
               {
@@ -86,7 +86,7 @@ var deploy_default = () => ({
           if (!needModernServer) {
             entrypoints.forEach((entry) => {
               const isMain = isMainEntry(entry.entryName, mainEntryName);
-              config2.routes.push({
+              config.routes.push({
                 src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
                 headers: {
                   "cache-control": "s-maxage=0"
@@ -95,13 +95,13 @@ var deploy_default = () => ({
               });
             });
           } else {
-            config2.routes.push({
+            config.routes.push({
               src: "/(.*)",
               dest: `/index`
             });
           }
           await fse.ensureDir(outputDirectory);
-          await fse.writeJSON(path.join(outputDirectory, "config.json"), config2, {
+          await fse.writeJSON(path.join(outputDirectory, "config.json"), config, {
             spaces: 2
           });
           staticDirectory = path.join(outputDirectory, "static/static");
@@ -128,13 +128,6 @@ var deploy_default = () => ({
             });
           }
         }
-        const { bff } = configContext;
-        const config = {
-          output: {
-            path: "."
-          },
-          bff
-        };
         const plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
         const serverAppContext = {
           sharedDirectory: `path.join(__dirname, "${path.relative(appDirectory, sharedDirectory)}")`,
@@ -146,7 +139,7 @@ var deploy_default = () => ({
         console.log("deployTarget111111111", deployTarget);
         switch (deployTarget) {
           case "node": {
-            const { genNodeEntry } = await import("./entrys/node");
+            const { genNodeEntry } = await import("./platforms/node");
             code = genNodeEntry({
               plugins,
               config: modernConfig,
@@ -155,8 +148,8 @@ var deploy_default = () => ({
             break;
           }
           case "vercel": {
-            const { genVercelEntry } = await import("./entrys/vercel");
-            code = genVercelEntry({
+            const { genVercelEntry } = await import("./platforms/vercel");
+            code = await genVercelEntry({
               plugins,
               config: modernConfig,
               appContext: serverAppContext
@@ -164,7 +157,7 @@ var deploy_default = () => ({
             break;
           }
           case "netlify": {
-            const { genNetlifyEntry } = await import("./entrys/netlify");
+            const { genNetlifyEntry } = await import("./platforms/netlify");
             code = genNetlifyEntry({
               plugins,
               config: modernConfig,

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

@@ -0,0 +1,23 @@
+import path from "node:path";
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse } from "@modern-js/utils";
+import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
+async function genVercelEntry({ config, plugins, appContext } = {}) {
+  const defaultConfig = {
+    output: {
+      path: "."
+    }
+  };
+  const pluginImportCode = genPluginImportsCode(plugins || []);
+  const dynamicProdOptions = {
+    config: `${JSON.stringify(config || defaultConfig)}`,
+    serverConfigFile: DEFAULT_SERVER_CONFIG,
+    plugins: `${getPluginsCode(plugins || [])}`,
+    appContext: `${appContext ? severAppContextTemplate(appContext) : "undefined"}`
+  };
+  let entryCode = (await fse.readFile(path.join(__dirname, "./vercelEntry.js"))).toString();
+  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", ROUTE_SPEC_FILE).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions));
+  return entryCode;
+}
+export {
+  genVercelEntry
+};

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

@@ -0,0 +1,63 @@
+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) {
+    const fs = require("node:fs/promises");
+    const path = require("node:path");
+    const { createProdServer } = require("@modern-js/prod-server");
+    p_genPluginImportsCode;
+    if (!process.env.NODE_ENV) {
+      process.env.NODE_ENV = "production";
+    }
+    let requestHandler = null;
+    let handlerCreationPromise = null;
+    async function loadRoutes(routeFilepath) {
+      try {
+        await fs.access(routeFilepath);
+        const content = await fs.readFile(routeFilepath, "utf-8");
+        const routeSpec = JSON.parse(content);
+        return routeSpec.routes || [];
+      } catch (error) {
+        console.warn("route.json not found or invalid, continuing with empty routes.");
+        return [];
+      }
+    }
+    async function initServer() {
+      const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
+      const routes = await loadRoutes(routeFilepath);
+      const dynamicProdOptions = p_dynamicProdOptions;
+      const prodServerOptions = {
+        pwd: __dirname,
+        routes,
+        disableCustomHook: true,
+        ...dynamicProdOptions
+      };
+      const app = await createProdServer(prodServerOptions);
+      return app.getRequestListener();
+    }
+    async function createHandler() {
+      if (!handlerCreationPromise) {
+        handlerCreationPromise = (async () => {
+          try {
+            requestHandler = await initServer();
+          } catch (error) {
+            console.error("Error creating server:", error);
+            process.exit(1);
+          }
+        })();
+      }
+      await handlerCreationPromise;
+      return requestHandler;
+    }
+    createHandler();
+    module.exports = async (req, res) => {
+      if (!requestHandler) {
+        await createHandler();
+      }
+      return requestHandler(req, res);
+    };
+  }
+});
+export default require_vercelEntry();

package/dist/types/plugins/deploy/platforms/platform.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/plugins/deploy/{entrys → platforms}/vercel.d.ts

@@ -2,4 +2,4 @@ export declare function genVercelEntry({ config, plugins, appContext, }?: {
     config?: Record<string, any>;
     plugins?: string[];
     appContext?: Record<string, any>;
-}): string;
+}): Promise<string>;

package/dist/types/plugins/deploy/platforms/vercelEntry.d.ts

@@ -0,0 +1,2 @@
+declare function _exports(req: any, res: any): Promise<any>;
+export = _exports;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.3-alpha.7",
+  "version": "2.49.3-alpha.9",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -80,20 +80,20 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.49.2",
-    "@modern-js/prod-server": "2.49.2",
-    "@modern-js/plugin": "2.49.2",
     "@modern-js/node-bundle-require": "2.49.2",
-    "@modern-js/plugin-i18n": "2.49.2",
-    "@modern-js/rsbuild-plugin-esbuild": "2.49.2",
+    "@modern-js/plugin-data-loader": "2.49.2",
+    "@modern-js/plugin-lint": "2.49.2",
+    "@modern-js/plugin": "2.49.2",
+    "@modern-js/core": "2.49.2",
     "@modern-js/server": "2.49.2",
-    "@modern-js/server-core": "2.49.2",
+    "@modern-js/plugin-i18n": "2.49.2",
     "@modern-js/server-utils": "2.49.2",
+    "@modern-js/prod-server": "2.49.2",
+    "@modern-js/server-core": "2.49.2",
+    "@modern-js/rsbuild-plugin-esbuild": "2.49.2",
     "@modern-js/types": "2.49.2",
-    "@modern-js/uni-builder": "2.49.2",
     "@modern-js/utils": "2.49.2",
-    "@modern-js/plugin-lint": "2.49.2",
-    "@modern-js/plugin-data-loader": "2.49.2"
+    "@modern-js/uni-builder": "2.49.2"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.6.10",

package/dist/cjs/plugins/deploy/entrys/vercel.js

@@ -1,94 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var vercel_exports = {};
-__export(vercel_exports, {
-  genVercelEntry: () => genVercelEntry
-});
-module.exports = __toCommonJS(vercel_exports);
-var import_utils = require("@modern-js/utils");
-var import_utils2 = require("../utils");
-function genVercelEntry({ config, plugins, appContext } = {}) {
-  const defaultConfig = {
-    server: {
-      port: 8080
-    },
-    output: {
-      path: "."
-    }
-  };
-  return `
-
-  const fs = require('node:fs/promises');
-  const path = require('node:path');
-  const { createProdServer } = require('@modern-js/prod-server');
-  ${(0, import_utils2.genPluginImportsCode)(plugins || [])}
-
-  if(!process.env.NODE_ENV){
-    process.env.NODE_ENV = 'production';
-  }
-
-  let requestHandler = null;
-  async function createHandler() {
-    try {
-      let routes = [];
-      const routeFilepath = path.join(__dirname, "${import_utils.ROUTE_SPEC_FILE}");
-      try {
-        await fs.access(routeFilepath);
-        const content = await fs.readFile(routeFilepath, "utf-8");
-        const routeSpec = JSON.parse(content);
-        routes = routeSpec.routes;
-      } catch (error) {
-        console.warn('route.json not found, continuing with empty routes.');
-      }
-
-      const prodServerOptions = {
-        pwd: __dirname,
-        routes,
-        config: ${JSON.stringify(config || defaultConfig)},
-        serverConfigFile: '${import_utils.DEFAULT_SERVER_CONFIG}',
-        plugins: ${(0, import_utils2.getPluginsCode)(plugins || [])},
-        appContext: ${appContext ? (0, import_utils2.severAppContextTemplate)(appContext) : "undefined"},
-        disableCustomHook: true
-      }
-
-      const app = await createProdServer(prodServerOptions)
-
-      requestHandler = app.getRequestListener();
-
-      return requestHandler;
-    } catch(error) {
-      console.error(error);
-      process.exit(1);
-    }
-  }
-
-  createHandler();
-
-  module.exports = async(req, res) => {
-    if(typeof requestHandler !== 'function'){
-      await createHandler();
-    }
-    return requestHandler(req, res);
-  }
-  `;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  genVercelEntry
-});

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

@@ -1,40 +0,0 @@
-import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
-import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
-function genVercelEntry() {
-  var _ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, config = _ref.config, plugins = _ref.plugins, appContext = _ref.appContext;
-  var defaultConfig = {
-    server: {
-      port: 8080
-    },
-    output: {
-      path: "."
-    }
-  };
-  return "\n\n  const fs = require('node:fs/promises');\n  const path = require('node:path');\n  const { createProdServer } = require('@modern-js/prod-server');\n  ".concat(genPluginImportsCode(plugins || []), `
-
-  if(!process.env.NODE_ENV){
-    process.env.NODE_ENV = 'production';
-  }
-
-  let requestHandler = null;
-  async function createHandler() {
-    try {
-      let routes = [];
-      const routeFilepath = path.join(__dirname, "`).concat(ROUTE_SPEC_FILE, `");
-      try {
-        await fs.access(routeFilepath);
-        const content = await fs.readFile(routeFilepath, "utf-8");
-        const routeSpec = JSON.parse(content);
-        routes = routeSpec.routes;
-      } catch (error) {
-        console.warn('route.json not found, continuing with empty routes.');
-      }
-
-      const prodServerOptions = {
-        pwd: __dirname,
-        routes,
-        config: `).concat(JSON.stringify(config || defaultConfig), ",\n        serverConfigFile: '").concat(DEFAULT_SERVER_CONFIG, "',\n        plugins: ").concat(getPluginsCode(plugins || []), ",\n        appContext: ").concat(appContext ? severAppContextTemplate(appContext) : "undefined", ",\n        disableCustomHook: true\n      }\n\n      const app = await createProdServer(prodServerOptions)\n\n      requestHandler = app.getRequestListener();\n\n      return requestHandler;\n    } catch(error) {\n      console.error(error);\n      process.exit(1);\n    }\n  }\n\n  createHandler();\n\n  module.exports = async(req, res) => {\n    if(typeof requestHandler !== 'function'){\n      await createHandler();\n    }\n    return requestHandler(req, res);\n  }\n  ");
-}
-export {
-  genVercelEntry
-};

package/dist/esm-node/plugins/deploy/entrys/vercel.js

@@ -1,70 +0,0 @@
-import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
-import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
-function genVercelEntry({ config, plugins, appContext } = {}) {
-  const defaultConfig = {
-    server: {
-      port: 8080
-    },
-    output: {
-      path: "."
-    }
-  };
-  return `
-
-  const fs = require('node:fs/promises');
-  const path = require('node:path');
-  const { createProdServer } = require('@modern-js/prod-server');
-  ${genPluginImportsCode(plugins || [])}
-
-  if(!process.env.NODE_ENV){
-    process.env.NODE_ENV = 'production';
-  }
-
-  let requestHandler = null;
-  async function createHandler() {
-    try {
-      let routes = [];
-      const routeFilepath = path.join(__dirname, "${ROUTE_SPEC_FILE}");
-      try {
-        await fs.access(routeFilepath);
-        const content = await fs.readFile(routeFilepath, "utf-8");
-        const routeSpec = JSON.parse(content);
-        routes = routeSpec.routes;
-      } catch (error) {
-        console.warn('route.json not found, continuing with empty routes.');
-      }
-
-      const prodServerOptions = {
-        pwd: __dirname,
-        routes,
-        config: ${JSON.stringify(config || defaultConfig)},
-        serverConfigFile: '${DEFAULT_SERVER_CONFIG}',
-        plugins: ${getPluginsCode(plugins || [])},
-        appContext: ${appContext ? severAppContextTemplate(appContext) : "undefined"},
-        disableCustomHook: true
-      }
-
-      const app = await createProdServer(prodServerOptions)
-
-      requestHandler = app.getRequestListener();
-
-      return requestHandler;
-    } catch(error) {
-      console.error(error);
-      process.exit(1);
-    }
-  }
-
-  createHandler();
-
-  module.exports = async(req, res) => {
-    if(typeof requestHandler !== 'function'){
-      await createHandler();
-    }
-    return requestHandler(req, res);
-  }
-  `;
-}
-export {
-  genVercelEntry
-};