@modern-js/app-tools 2.49.3-alpha.13 → 2.49.3-alpha.15

package/dist/esm/plugins/deploy/platforms/netlifyEntry.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_netlifyEntry = __commonJS({
+  "src/plugins/deploy/platforms/netlifyEntry.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 createNetlifyFunction = require("@modern-js/prod-server/netlify").createNetlifyFunction;
+    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,
+                createNetlifyFunction(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(request, context) {
+        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(request, context)
+              ];
+          }
+        });
+      });
+      return function(request, context) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+  }
+});
+export default require_netlifyEntry();

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

@@ -1,48 +1,105 @@
 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 } from "../utils";
-function genNodeEntry(_) {
-  return _genNodeEntry.apply(this, arguments);
-}
-function _genNodeEntry() {
-  _genNodeEntry = _async_to_generator(function(param) {
-    var config, plugins, appContext, defaultConfig, pluginImportCode, dynamicProdOptions, entryCode;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          config = param.config, plugins = param.plugins, appContext = param.appContext;
-          defaultConfig = {
-            server: {
-              port: 8080
-            },
-            output: {
-              path: "."
-            }
-          };
-          pluginImportCode = genPluginImportsCode(plugins || []);
-          dynamicProdOptions = {
-            config: config || defaultConfig,
-            serverConfigFile: DEFAULT_SERVER_CONFIG,
-            plugins
-          };
-          return [
-            4,
-            fse.readFile(path.join(__dirname, "./nodeEntry.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", appContext.sharedDirectory).replace("p_apiDirectory", appContext.apiDirectory).replace("p_lambdaDirectory", appContext.lambdaDirectory);
-          return [
-            2,
-            entryCode
-          ];
-      }
-    });
-  });
-  return _genNodeEntry.apply(this, arguments);
-}
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse, getInternalPlugins } from "@modern-js/utils";
+import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
+import { handleDependencies } from "../dependencies";
+var createNodePreset = function(appContext, config) {
+  var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverInternalPlugins = appContext.serverInternalPlugins, sharedDirectory = appContext.sharedDirectory, apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory, metaName = appContext.metaName, entrypoints = appContext.entrypoints;
+  var plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
+  var outputDirectory = path.join(appDirectory, ".output");
+  var entryFilePath = path.join(outputDirectory, "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(outputDirectory)
+              ];
+            case 1:
+              _state.sent();
+              return [
+                2
+              ];
+          }
+        });
+      })();
+    },
+    writeOutput: function writeOutput() {
+      return _async_to_generator(function() {
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              return [
+                4,
+                fse.copy(distDirectory, outputDirectory)
+              ];
+            case 1:
+              _state.sent();
+              return [
+                2
+              ];
+          }
+        });
+      })();
+    },
+    genEntry: function genEntry() {
+      return _async_to_generator(function() {
+        var _config_bff, serverConfig, pluginImportCode, dynamicProdOptions, entryCode, serverAppContext;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              serverConfig = {
+                server: {
+                  port: 8080
+                },
+                bff: {
+                  prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
+                },
+                output: {
+                  path: "."
+                }
+              };
+              pluginImportCode = genPluginImportsCode(plugins || []);
+              dynamicProdOptions = {
+                config: serverConfig,
+                serverConfigFile: DEFAULT_SERVER_CONFIG,
+                plugins
+              };
+              return [
+                4,
+                fse.readFile(path.join(__dirname, "./nodeEntry.js"))
+              ];
+            case 1:
+              entryCode = _state.sent().toString();
+              serverAppContext = serverAppContenxtTemplate(appContext);
+              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 [
+                4,
+                handleDependencies(appDirectory, outputDirectory, [
+                  "@modern-js/prod-server"
+                ])
+              ];
+            case 3:
+              _state.sent();
+              return [
+                2
+              ];
+          }
+        });
+      })();
+    }
+  };
+};
 export {
-  genNodeEntry
+  createNodePreset
 };

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

@@ -1,45 +1,208 @@
 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 } from "../utils";
-function genVercelEntry(_) {
-  return _genVercelEntry.apply(this, arguments);
-}
-function _genVercelEntry() {
-  _genVercelEntry = _async_to_generator(function(param) {
-    var config, plugins, appContext, defaultConfig, pluginImportCode, dynamicProdOptions, entryCode;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          config = param.config, plugins = param.plugins, appContext = param.appContext;
-          defaultConfig = {
-            output: {
-              path: "."
-            }
-          };
-          pluginImportCode = genPluginImportsCode(plugins || []);
-          dynamicProdOptions = {
-            config: config || defaultConfig,
-            serverConfigFile: DEFAULT_SERVER_CONFIG,
-            plugins
-          };
-          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", appContext.sharedDirectory).replace("p_apiDirectory", appContext.apiDirectory).replace("p_lambdaDirectory", appContext.lambdaDirectory);
-          return [
-            2,
-            entryCode
-          ];
-      }
-    });
-  });
-  return _genVercelEntry.apply(this, arguments);
-}
+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, config, needModernServer) {
+  var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverInternalPlugins = appContext.serverInternalPlugins, sharedDirectory = appContext.sharedDirectory, apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory, metaName = appContext.metaName, 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 config2, mainEntryName, staticDirectory, destHtmlDirectory, outputHtmlDirectory;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              config2 = {
+                version: 3,
+                routes: [
+                  {
+                    src: "/static/(.*)",
+                    headers: {
+                      "cache-control": "s-maxage=31536000, immutable"
+                    },
+                    continue: true
+                  },
+                  {
+                    handle: "filesystem"
+                  }
+                ]
+              };
+              if (!needModernServer) {
+                mainEntryName = config2.source.mainEntryName;
+                entrypoints.forEach(function(entry) {
+                  var isMain = isMainEntry(entry.entryName, mainEntryName);
+                  config2.routes.push({
+                    src: "/".concat(isMain ? "" : entry.entryName, "(?:/.*)?"),
+                    headers: {
+                      "cache-control": "s-maxage=0"
+                    },
+                    dest: "/html/".concat(entry.entryName, "/index.html")
+                  });
+                });
+              } else {
+                config2.routes.push({
+                  src: "/(.*)",
+                  dest: "/index"
+                });
+              }
+              return [
+                4,
+                fse.ensureDir(outputDirectory)
+              ];
+            case 1:
+              _state.sent();
+              return [
+                4,
+                fse.writeJSON(path.join(outputDirectory, "config.json"), config2, {
+                  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 _config_bff, serverConfig, pluginImportCode, dynamicProdOptions, serverAppContext, entryCode;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              if (!needModernServer) {
+                return [
+                  2
+                ];
+              }
+              serverConfig = {
+                bff: {
+                  prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_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 [
+                4,
+                handleDependencies(appDirectory, funcsDirectory, [
+                  "@modern-js/prod-server"
+                ])
+              ];
+            case 3:
+              _state.sent();
+              return [
+                2
+              ];
+          }
+        });
+      })();
+    }
+  };
+};
 export {
-  genVercelEntry
+  createVercelPreset
 };

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

@@ -4,8 +4,14 @@ import path from "path";
 import os from "node:os";
 import { ROUTE_SPEC_FILE, fs as fse, isDepExists } from "@modern-js/utils";
 import { parseNodeModulePath } from "mlly";
-var severAppContextTemplate = function(serverAppContext) {
-  return "{\n    sharedDirectory: ".concat(serverAppContext.sharedDirectory, ",\n    apiDirectory: ").concat(serverAppContext.apiDirectory, ",\n    lambdaDirectory: ").concat(serverAppContext.lambdaDirectory, ",\n  }");
+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) {
@@ -239,6 +245,6 @@ export {
   getPluginsCode,
   getProjectUsage,
   linkPackage,
-  severAppContextTemplate,
+  serverAppContenxtTemplate,
   writePackage
 };