@modern-js/app-tools 2.49.3-alpha.14 → 2.49.3-alpha.16

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

@@ -0,0 +1,60 @@
+"use strict";
+const fs = require("node:fs/promises");
+const path = require("node:path");
+const { createNetlifyFunction } = require("@modern-js/prod-server/netlify");
+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,
+    appContext: {
+      sharedDirectory: p_sharedDirectory,
+      apiDirectory: p_apiDirectory,
+      lambdaDirectory: p_lambdaDirectory
+    },
+    ...dynamicProdOptions
+  };
+  const app = await createNetlifyFunction(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 (request, context) => {
+  if (!requestHandler) {
+    await createHandler();
+  }
+  return requestHandler(request, context);
+};

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

@@ -28,36 +28,58 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  genNodeEntry: () => genNodeEntry
+  createNodePreset: () => createNodePreset
 });
 module.exports = __toCommonJS(node_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
 var import_utils2 = require("../utils");
-async function genNodeEntry({ config, plugins, appContext }) {
-  var _config_bff;
-  const serverConfig = {
-    server: {
-      port: 8080
+var import_dependencies = require("../dependencies");
+const createNodePreset = (appContext, config, needModernServer) => {
+  const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
+  const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
+  const outputDirectory = import_node_path.default.join(appDirectory, ".output");
+  const entryFilePath = import_node_path.default.join(outputDirectory, "index.js");
+  return {
+    async prepare() {
+      await import_utils.fs.remove(outputDirectory);
     },
-    bff: {
-      prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
+    async writeOutput() {
+      await import_utils.fs.copy(distDirectory, outputDirectory);
     },
-    output: {
-      path: "."
+    async genEntry() {
+      var _config_bff;
+      if (!needModernServer) {
+        return;
+      }
+      const 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: "."
+        }
+      };
+      const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
+      const dynamicProdOptions = {
+        config: serverConfig,
+        serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
+        plugins
+      };
+      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./nodeEntry.js"))).toString();
+      const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
+      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      await import_utils.fs.writeFile(entryFilePath, entryCode);
+      await (0, import_dependencies.handleDependencies)(appDirectory, outputDirectory, [
+        "@modern-js/prod-server"
+      ]);
     }
   };
-  const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
-  const dynamicProdOptions = {
-    config: serverConfig,
-    serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
-    plugins
-  };
-  let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./nodeEntry.js"))).toString();
-  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.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 entryCode;
-}
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  genNodeEntry
+  createNodePreset
 });

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

@@ -28,33 +28,116 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var vercel_exports = {};
 __export(vercel_exports, {
-  genVercelEntry: () => genVercelEntry
+  createVercelPreset: () => createVercelPreset
 });
 module.exports = __toCommonJS(vercel_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
+var import_routes = require("../../../utils/routes");
 var import_utils2 = require("../utils");
-async function genVercelEntry({ config, plugins, appContext }) {
-  var _config_bff;
-  const serverConfig = {
-    bff: {
-      prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
+var import_dependencies = require("../dependencies");
+const createVercelPreset = (appContext, config, needModernServer) => {
+  const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
+  const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
+  const vercelOutput = import_node_path.default.join(appDirectory, ".vercel");
+  const outputDirectory = import_node_path.default.join(vercelOutput, "output");
+  const funcsDirectory = import_node_path.default.join(outputDirectory, "functions", "index.func");
+  const entryFilePath = import_node_path.default.join(funcsDirectory, "index.js");
+  return {
+    async prepare() {
+      await import_utils.fs.remove(vercelOutput);
     },
-    output: {
-      path: "."
+    async writeOutput() {
+      const config2 = {
+        version: 3,
+        routes: [
+          {
+            src: "/static/(.*)",
+            headers: {
+              "cache-control": "s-maxage=31536000, immutable"
+            },
+            continue: true
+          },
+          {
+            handle: "filesystem"
+          }
+        ]
+      };
+      if (!needModernServer) {
+        const { source: { mainEntryName } } = config2;
+        entrypoints.forEach((entry) => {
+          const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
+          config2.routes.push({
+            src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
+            headers: {
+              "cache-control": "s-maxage=0"
+            },
+            dest: `/html/${entry.entryName}/index.html`
+          });
+        });
+      } else {
+        config2.routes.push({
+          src: "/(.*)",
+          dest: `/index`
+        });
+      }
+      await import_utils.fs.ensureDir(outputDirectory);
+      await import_utils.fs.writeJSON(import_node_path.default.join(outputDirectory, "config.json"), config2, {
+        spaces: 2
+      });
+      const staticDirectory = import_node_path.default.join(outputDirectory, "static/static");
+      await import_utils.fs.copy(import_node_path.default.join(distDirectory, "static"), staticDirectory);
+      if (!needModernServer) {
+        const destHtmlDirectory = import_node_path.default.join(distDirectory, "html");
+        const outputHtmlDirectory = import_node_path.default.join(import_node_path.default.join(outputDirectory, "static"), "html");
+        await import_utils.fs.copy(destHtmlDirectory, outputHtmlDirectory);
+      } else {
+        await import_utils.fs.ensureDir(funcsDirectory);
+        await import_utils.fs.copy(distDirectory, funcsDirectory, {
+          filter: (src) => {
+            const distStaticDirectory = import_node_path.default.join(distDirectory, "static");
+            return !src.includes(distStaticDirectory);
+          }
+        });
+        await import_utils.fs.writeJSON(import_node_path.default.join(funcsDirectory, ".vc-config.json"), {
+          runtime: "nodejs16.x",
+          handler: "index.js",
+          launcherType: "Nodejs",
+          shouldAddHelpers: false,
+          supportsResponseStreaming: true
+        });
+      }
+    },
+    async genEntry() {
+      var _config_bff;
+      if (!needModernServer) {
+        return;
+      }
+      const 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: "."
+        }
+      };
+      const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
+      const dynamicProdOptions = {
+        config: serverConfig,
+        serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
+        plugins
+      };
+      const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
+      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)).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      await import_utils.fs.writeFile(entryFilePath, entryCode);
+      await (0, import_dependencies.handleDependencies)(appDirectory, funcsDirectory, [
+        "@modern-js/prod-server"
+      ]);
     }
   };
-  const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
-  const dynamicProdOptions = {
-    config: serverConfig,
-    serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
-    plugins
-  };
-  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)).replace("p_sharedDirectory", appContext.sharedDirectory).replace("p_apiDirectory", appContext.apiDirectory).replace("p_lambdaDirectory", appContext.lambdaDirectory);
-  return entryCode;
-}
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  genVercelEntry
+  createVercelPreset
 });

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

@@ -34,7 +34,8 @@ __export(utils_exports, {
   getPluginsCode: () => getPluginsCode,
   getProjectUsage: () => getProjectUsage,
   linkPackage: () => linkPackage,
-  severAppContextTemplate: () => severAppContextTemplate,
+  readDirRecursive: () => readDirRecursive,
+  serverAppContenxtTemplate: () => serverAppContenxtTemplate,
   writePackage: () => writePackage
 });
 module.exports = __toCommonJS(utils_exports);
@@ -42,12 +43,14 @@ var import_path = __toESM(require("path"));
 var import_node_os = __toESM(require("node:os"));
 var import_utils = require("@modern-js/utils");
 var import_mlly = require("mlly");
-const severAppContextTemplate = (serverAppContext) => {
-  return `{
-    sharedDirectory: ${serverAppContext.sharedDirectory},
-    apiDirectory: ${serverAppContext.apiDirectory},
-    lambdaDirectory: ${serverAppContext.lambdaDirectory},
-  }`;
+const serverAppContenxtTemplate = (appContext) => {
+  const { appDirectory, sharedDirectory, apiDirectory, lambdaDirectory, metaName } = appContext;
+  return {
+    sharedDirectory: `path.join(__dirname, "${import_path.default.relative(appDirectory, sharedDirectory)}")`,
+    apiDirectory: `path.join(__dirname, "${import_path.default.relative(appDirectory, apiDirectory)}")`,
+    lambdaDirectory: `path.join(__dirname, "${import_path.default.relative(appDirectory, lambdaDirectory)}")`,
+    metaName
+  };
 };
 const getPluginsCode = (plugins) => `[${plugins.map((_, index) => `plugin_${index}()`).join(",")}]`;
 const genPluginImportsCode = (plugins) => {
@@ -137,6 +140,16 @@ const linkPackage = async (from, to, projectRootDir) => {
     console.error("Cannot link", from, "to", to, error);
   });
 };
+const readDirRecursive = async (dir) => {
+  const files = await import_utils.fs.readdir(dir, {
+    withFileTypes: true
+  });
+  const filesAndDirs = await Promise.all(files.map(async (file) => {
+    const resPath = import_path.default.resolve(dir, file.name);
+    return file.isDirectory() ? readDirRecursive(resPath) : resPath;
+  }));
+  return filesAndDirs.flat();
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   applyProductionCondition,
@@ -145,6 +158,7 @@ const linkPackage = async (from, to, projectRootDir) => {
   getPluginsCode,
   getProjectUsage,
   linkPackage,
-  severAppContextTemplate,
+  readDirRecursive,
+  serverAppContenxtTemplate,
   writePackage
 });

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

@@ -8,52 +8,7 @@ import { nodeFileTrace, resolve } from "@vercel/nft";
 import { fs as fse, pkgUp, semver } from "@modern-js/utils";
 import { readPackageJSON } from "pkg-types";
 import { parseNodeModulePath } from "mlly";
-import { linkPackage, writePackage } from "./utils";
-var readDirRecursive = function() {
-  var _ref = _async_to_generator(function(dir) {
-    var files, filesAndDirs;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          return [
-            4,
-            fse.readdir(dir, {
-              withFileTypes: true
-            })
-          ];
-        case 1:
-          files = _state.sent();
-          return [
-            4,
-            Promise.all(files.map(function() {
-              var _ref2 = _async_to_generator(function(file) {
-                var resPath;
-                return _ts_generator(this, function(_state2) {
-                  resPath = path.resolve(dir, file.name);
-                  return [
-                    2,
-                    file.isDirectory() ? readDirRecursive(resPath) : resPath
-                  ];
-                });
-              });
-              return function(file) {
-                return _ref2.apply(this, arguments);
-              };
-            }()))
-          ];
-        case 2:
-          filesAndDirs = _state.sent();
-          return [
-            2,
-            filesAndDirs.flat()
-          ];
-      }
-    });
-  });
-  return function readDirRecursive2(dir) {
-    return _ref.apply(this, arguments);
-  };
-}();
+import { linkPackage, readDirRecursive, writePackage } from "./utils";
 function isFile(file) {
   return _isFile.apply(this, arguments);
 }