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

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

@@ -1,11 +1,8 @@
 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 as fse, getInternalPlugins } from "@modern-js/utils";
 import { provider } from "std-env";
-import { isMainEntry } from "../../utils/routes";
 import { getProjectUsage } from "./utils";
-import { handleDependencies } from "./dependencies";
+import { createNodePreset } from "./platforms/node";
 function deploy_default() {
   return {
     name: "@modern-js/plugin-deploy",
@@ -18,338 +15,44 @@ 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, outputDirectory, funcsDirectory, staticDirectory, netlifyOutput, routes, redirectContent, redirectFilePath, vercelOutput, config, destHtmlDirectory, outputHtmlDirectory, plugins, serverAppContext, code, genNodeEntry, genVercelEntry, genNetlifyEntry, entryFilePath;
+            var appContext, appDirectory, distDirectory, modernConfig, _getProjectUsage, useSSR, useAPI, useWebServer, needModernServer, deployPreset;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
                   appContext = api.useAppContext();
+                  appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory;
                   modernConfig = api.useResolvedConfigContext();
-                  mainEntryName = modernConfig.source.mainEntryName;
-                  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;
-                  outputDirectory = path.join(appDirectory, ".output");
-                  funcsDirectory = outputDirectory;
-                  staticDirectory = path.join(outputDirectory, "static");
-                  if (!(deployTarget === "node"))
-                    return [
-                      3,
-                      3
-                    ];
-                  return [
-                    4,
-                    fse.remove(outputDirectory)
-                  ];
-                case 1:
-                  _state.sent();
-                  return [
-                    4,
-                    fse.copy(distDirectory, outputDirectory)
-                  ];
-                case 2:
-                  _state.sent();
-                  _state.label = 3;
-                case 3:
-                  if (!(deployTarget === "netlify"))
-                    return [
-                      3,
-                      8
-                    ];
-                  netlifyOutput = path.join(appDirectory, ".netlify");
-                  funcsDirectory = path.join(netlifyOutput, "functions");
-                  routes = [];
-                  if (!needModernServer) {
-                    entrypoints.forEach(function(entry) {
-                      var isMain = isMainEntry(entry.entryName, mainEntryName);
-                      routes.push({
-                        src: "/".concat(isMain ? "" : "".concat(entry.entryName, "/"), "*"),
-                        dest: "/html/".concat(entry.entryName, "/index.html"),
-                        status: 200
-                      });
-                    });
-                  } else {
-                    routes.push({
-                      src: "/*",
-                      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);
-                  return [
-                    4,
-                    fse.remove(outputDirectory)
-                  ];
-                case 4:
-                  _state.sent();
-                  return [
-                    4,
-                    fse.ensureDir(funcsDirectory)
-                  ];
-                case 5:
-                  _state.sent();
-                  return [
-                    4,
-                    fse.copy(distDirectory, funcsDirectory, {
-                      filter: function(src) {
-                        var distStaticDirectory = path.join(distDirectory, "static");
-                        return !src.includes(distStaticDirectory);
-                      }
-                    })
-                  ];
-                case 6:
-                  _state.sent();
-                  redirectFilePath = path.join(distDirectory, "_redirects");
-                  return [
-                    4,
-                    fse.writeFile(redirectFilePath, redirectContent)
-                  ];
-                case 7:
-                  _state.sent();
-                  _state.label = 8;
-                case 8:
-                  if (!(deployTarget === "vercel"))
-                    return [
-                      3,
-                      18
-                    ];
-                  vercelOutput = path.join(appDirectory, ".vercel");
-                  return [
-                    4,
-                    fse.remove(vercelOutput)
-                  ];
-                case 9:
-                  _state.sent();
-                  outputDirectory = path.join(vercelOutput, "output");
-                  config = {
-                    version: 3,
-                    routes: [
-                      {
-                        src: "/static/(.*)",
-                        headers: {
-                          "cache-control": "s-maxage=31536000, immutable"
-                        },
-                        continue: true
-                      },
-                      {
-                        handle: "filesystem"
-                      }
-                    ]
-                  };
-                  if (!needModernServer) {
-                    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 10:
-                  _state.sent();
-                  return [
-                    4,
-                    fse.writeJSON(path.join(outputDirectory, "config.json"), config, {
-                      spaces: 2
-                    })
-                  ];
-                case 11:
-                  _state.sent();
-                  staticDirectory = path.join(outputDirectory, "static/static");
-                  return [
-                    4,
-                    fse.copy(path.join(distDirectory, "static"), staticDirectory)
-                  ];
-                case 12:
-                  _state.sent();
-                  if (!!needModernServer)
-                    return [
-                      3,
-                      14
-                    ];
-                  destHtmlDirectory = path.join(distDirectory, "html");
-                  outputHtmlDirectory = path.join(path.join(outputDirectory, "static"), "html");
-                  return [
-                    4,
-                    fse.copy(destHtmlDirectory, outputHtmlDirectory)
-                  ];
-                case 13:
-                  _state.sent();
-                  return [
-                    3,
-                    18
-                  ];
-                case 14:
-                  funcsDirectory = path.join(outputDirectory, "functions", "index.func");
-                  return [
-                    4,
-                    fse.ensureDir(funcsDirectory)
-                  ];
-                case 15:
-                  _state.sent();
-                  return [
-                    4,
-                    fse.copy(distDirectory, funcsDirectory, {
-                      filter: function(src) {
-                        var distStaticDirectory = path.join(distDirectory, "static");
-                        return !src.includes(distStaticDirectory);
-                      }
-                    })
-                  ];
-                case 16:
-                  _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 17:
-                  _state.sent();
-                  _state.label = 18;
-                case 18:
-                  plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
-                  serverAppContext = {
-                    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
-                  };
-                  console.log("serverAppContext", serverAppContext);
-                  code = "";
-                  console.log("deployTarget111111111", deployTarget);
                   switch (deployTarget) {
                     case "node":
-                      return [
-                        3,
-                        19
-                      ];
+                      deployPreset = createNodePreset(appContext, modernConfig, needModernServer);
+                      break;
                     case "vercel":
-                      return [
-                        3,
-                        22
-                      ];
-                    case "netlify":
-                      return [
-                        3,
-                        25
-                      ];
+                      deployPreset = createNodePreset(appContext, modernConfig, needModernServer);
+                      break;
+                    default: {
+                      throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");
+                    }
                   }
-                  return [
-                    3,
-                    28
-                  ];
-                case 19:
                   return [
                     4,
-                    import("./platforms/node")
+                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare()
                   ];
-                case 20:
-                  genNodeEntry = _state.sent().genNodeEntry;
-                  return [
-                    4,
-                    genNodeEntry({
-                      plugins,
-                      config: modernConfig,
-                      appContext: serverAppContext
-                    })
-                  ];
-                case 21:
-                  code = _state.sent();
-                  return [
-                    3,
-                    29
-                  ];
-                case 22:
-                  return [
-                    4,
-                    import("./platforms/vercel")
-                  ];
-                case 23:
-                  genVercelEntry = _state.sent().genVercelEntry;
-                  return [
-                    4,
-                    genVercelEntry({
-                      plugins,
-                      config: modernConfig,
-                      appContext: serverAppContext
-                    })
-                  ];
-                case 24:
-                  code = _state.sent();
-                  return [
-                    3,
-                    29
-                  ];
-                case 25:
-                  return [
-                    4,
-                    import("./platforms/netlify")
-                  ];
-                case 26:
-                  genNetlifyEntry = _state.sent().genNetlifyEntry;
-                  return [
-                    4,
-                    genNetlifyEntry({
-                      plugins,
-                      config: modernConfig,
-                      appContext: serverAppContext
-                    })
-                  ];
-                case 27:
-                  code = _state.sent();
-                  return [
-                    3,
-                    29
-                  ];
-                case 28:
-                  {
-                    code = 'throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");';
-                  }
-                  _state.label = 29;
-                case 29:
-                  entryFilePath = path.join(funcsDirectory, "index.js");
-                  if (!needModernServer)
-                    return [
-                      3,
-                      32
-                    ];
+                case 1:
+                  _state.sent();
                   return [
                     4,
-                    fse.writeFile(entryFilePath, code)
+                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput()
                   ];
-                case 30:
+                case 2:
                   _state.sent();
                   return [
                     4,
-                    handleDependencies(appDirectory, funcsDirectory, [
-                      "@modern-js/prod-server"
-                    ])
+                    deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry()
                   ];
-                case 31:
+                case 3:
                   _state.sent();
-                  _state.label = 32;
-                case 32:
                   return [
                     2
                   ];

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

@@ -1,41 +1,208 @@
-import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
-import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
-function genNetlifyEntry() {
-  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
+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 createNetlifyPreset = 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 netlifyOutput = path.join(appDirectory, ".netlify");
+  var outputDirectory = path.join(netlifyOutput, "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(netlifyOutput)
+              ];
+            case 1:
+              _state.sent();
+              return [
+                2
+              ];
+          }
+        });
+      })();
     },
-    output: {
-      path: "."
+    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, entryCode, serverAppContext;
+        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
+              };
+              return [
+                4,
+                fse.readFile(path.join(__dirname, "./netlifyEntry.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, funcsDirectory, [
+                  "@modern-js/prod-server"
+                ])
+              ];
+            case 3:
+              _state.sent();
+              return [
+                2
+              ];
+          }
+        });
+      })();
     }
   };
-  return "\n\n  const fs = require('node:fs/promises');\n  const path = require('node:path');\n  const { createNetlifyFunction } = require('@modern-js/prod-server/netlify');\n  ".concat(genPluginImportsCode(plugins || []), `
-
-  let requestHandler = null;
-
-  if(!process.env.NODE_ENV){
-    process.env.NODE_ENV = 'production';
-  }
-
-  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      requestHandler = await createNetlifyFunction(prodServerOptions)\n\n      return requestHandler\n    } catch(error) {\n      console.error(error);\n      process.exit(1);\n    }\n  }\n\n  createHandler();\n\n  const handleRequest = async(request, context) => {\n    if(typeof requestHandler !== 'function'){\n      await createHandler();\n    }\n    return requestHandler(request, context);\n  }\n\n  export default handleRequest;\n  ");
-}
+};
 export {
-  genNetlifyEntry
+  createNetlifyPreset
 };