@modern-js/app-tools 2.49.3-alpha.1 → 2.49.3-alpha.11

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

@@ -3,6 +3,7 @@ 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";
 function deploy_default() {
@@ -17,15 +18,16 @@ function deploy_default() {
       return {
         beforeDeploy: function beforeDeploy() {
           return _async_to_generator(function() {
-            var appContext, appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints, _getProjectUsage, useSSR, useAPI, useWebServer, needModernServer, configContext, outputDirectory, funcsDirectory, staticDirectory, vercelOutput, config, destHtmlDirectory, outputHtmlDirectory, apiDirectory1, 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, serverAppContext1, genNetlifyEntry, entryFilePath;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
                   appContext = api.useAppContext();
+                  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;
-                  configContext = api.useResolvedConfigContext();
                   outputDirectory = path.join(appDirectory, ".output");
                   funcsDirectory = outputDirectory;
                   staticDirectory = path.join(outputDirectory, "static");
@@ -48,17 +50,79 @@ function deploy_default() {
                   _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,
-                      16
+                      18
                     ];
                   vercelOutput = path.join(appDirectory, ".vercel");
                   return [
                     4,
                     fse.remove(vercelOutput)
                   ];
-                case 4:
+                case 9:
                   _state.sent();
                   outputDirectory = path.join(vercelOutput, "output");
                   config = {
@@ -78,8 +142,9 @@ function deploy_default() {
                   };
                   if (!needModernServer) {
                     entrypoints.forEach(function(entry) {
+                      var isMain = isMainEntry(entry.entryName, mainEntryName);
                       config.routes.push({
-                        src: "/".concat(entry.entryName, "(?:/.*)?"),
+                        src: "/".concat(isMain ? "" : entry.entryName, "(?:/.*)?"),
                         headers: {
                           "cache-control": "s-maxage=0"
                         },
@@ -96,7 +161,7 @@ function deploy_default() {
                     4,
                     fse.ensureDir(outputDirectory)
                   ];
-                case 5:
+                case 10:
                   _state.sent();
                   return [
                     4,
@@ -104,19 +169,19 @@ function deploy_default() {
                       spaces: 2
                     })
                   ];
-                case 6:
+                case 11:
                   _state.sent();
                   staticDirectory = path.join(outputDirectory, "static/static");
                   return [
                     4,
                     fse.copy(path.join(distDirectory, "static"), staticDirectory)
                   ];
-                case 7:
+                case 12:
                   _state.sent();
                   if (!!needModernServer)
                     return [
                       3,
-                      9
+                      14
                     ];
                   destHtmlDirectory = path.join(distDirectory, "html");
                   outputHtmlDirectory = path.join(path.join(outputDirectory, "static"), "html");
@@ -124,19 +189,19 @@ function deploy_default() {
                     4,
                     fse.copy(destHtmlDirectory, outputHtmlDirectory)
                   ];
-                case 8:
+                case 13:
                   _state.sent();
                   return [
                     3,
-                    16
+                    18
                   ];
-                case 9:
+                case 14:
                   funcsDirectory = path.join(outputDirectory, "functions", "index.func");
                   return [
                     4,
                     fse.ensureDir(funcsDirectory)
                   ];
-                case 10:
+                case 15:
                   _state.sent();
                   return [
                     4,
@@ -147,27 +212,8 @@ function deploy_default() {
                       }
                     })
                   ];
-                case 11:
-                  _state.sent();
-                  apiDirectory1 = path.join(funcsDirectory, "api");
-                  return [
-                    4,
-                    fse.pathExists(apiDirectory1)
-                  ];
-                case 12:
-                  if (!_state.sent())
-                    return [
-                      3,
-                      14
-                    ];
-                  return [
-                    4,
-                    fse.rename(apiDirectory1, path.join(funcsDirectory, "_api"))
-                  ];
-                case 13:
+                case 16:
                   _state.sent();
-                  _state.label = 14;
-                case 14:
                   return [
                     4,
                     fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
@@ -178,17 +224,10 @@ function deploy_default() {
                       supportsResponseStreaming: true
                     })
                   ];
-                case 15:
+                case 17:
                   _state.sent();
-                  _state.label = 16;
-                case 16:
-                  bff = configContext.bff;
-                  config1 = {
-                    output: {
-                      path: "."
-                    },
-                    bff
-                  };
+                  _state.label = 18;
+                case 18:
                   plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
                   serverAppContext = {
                     sharedDirectory: 'path.join(__dirname, "'.concat(path.relative(appDirectory, sharedDirectory), '")'),
@@ -202,88 +241,99 @@ function deploy_default() {
                     case "node":
                       return [
                         3,
-                        17
+                        19
                       ];
                     case "vercel":
                       return [
                         3,
-                        19
+                        21
                       ];
                     case "netlify":
                       return [
                         3,
-                        21
+                        24
                       ];
                   }
                   return [
                     3,
-                    23
+                    26
                   ];
-                case 17:
+                case 19:
                   return [
                     4,
-                    import("./entrys/node")
+                    import("./platforms/node")
                   ];
-                case 18:
+                case 20:
                   genNodeEntry = _state.sent().genNodeEntry;
                   code = genNodeEntry({
                     plugins,
-                    config: config1,
+                    config: modernConfig,
                     appContext: serverAppContext
                   });
                   return [
                     3,
-                    24
+                    27
                   ];
-                case 19:
+                case 21:
                   return [
                     4,
-                    import("./entrys/vercel")
+                    import("./platforms/vercel")
                   ];
-                case 20:
+                case 22:
                   genVercelEntry = _state.sent().genVercelEntry;
-                  code = genVercelEntry({
-                    plugins,
-                    config: config1,
-                    appContext: serverAppContext
-                  });
+                  serverAppContext1 = {
+                    sharedDirectory: path.join(__dirname, path.relative(appDirectory, sharedDirectory)),
+                    apiDirectory: path.join(__dirname, path.relative(appDirectory, apiDirectory)),
+                    lambdaDirectory: path.join(__dirname, path.relative(appDirectory, lambdaDirectory)),
+                    metaName
+                  };
+                  return [
+                    4,
+                    genVercelEntry({
+                      plugins,
+                      config: modernConfig,
+                      appContext: serverAppContext1
+                    })
+                  ];
+                case 23:
+                  code = _state.sent();
                   return [
                     3,
-                    24
+                    27
                   ];
-                case 21:
+                case 24:
                   return [
                     4,
-                    import("./entrys/netlify")
+                    import("./platforms/netlify")
                   ];
-                case 22:
+                case 25:
                   genNetlifyEntry = _state.sent().genNetlifyEntry;
                   code = genNetlifyEntry({
                     plugins,
-                    config: config1,
+                    config: modernConfig,
                     appContext: serverAppContext
                   });
                   return [
                     3,
-                    24
+                    27
                   ];
-                case 23:
+                case 26:
                   {
                     code = 'throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");';
                   }
-                  _state.label = 24;
-                case 24:
+                  _state.label = 27;
+                case 27:
                   entryFilePath = path.join(funcsDirectory, "index.js");
                   if (!needModernServer)
                     return [
                       3,
-                      27
+                      30
                     ];
                   return [
                     4,
                     fse.writeFile(entryFilePath, code)
                   ];
-                case 25:
+                case 28:
                   _state.sent();
                   return [
                     4,
@@ -291,10 +341,10 @@ function deploy_default() {
                       "@modern-js/prod-server"
                     ])
                   ];
-                case 26:
+                case 29:
                   _state.sent();
-                  _state.label = 27;
-                case 27:
+                  _state.label = 30;
+                case 30:
                   return [
                     2
                   ];

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

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

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

@@ -0,0 +1,56 @@
+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() {
+    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: "."
+            }
+          };
+          console.log("appContext.sharedDirectory", appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory);
+          pluginImportCode = genPluginImportsCode(plugins || []);
+          dynamicProdOptions = {
+            config: config || defaultConfig,
+            serverConfigFile: DEFAULT_SERVER_CONFIG,
+            plugins,
+            appContext: appContext ? {
+              sharedDirectory: appContext.sharedDirectory,
+              apiDirectory: appContext.apiDirectory,
+              lambdaDirectory: appContext.lambdaDirectory
+            } : "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", '"'.concat(ROUTE_SPEC_FILE, '"')).replace(
+            "p_dynamicProdOptions",
+            // JSON.stringify(dynamicProdOptions),
+            JSON.stringify(dynamicProdOptions)
+          );
+          return [
+            2,
+            entryCode
+          ];
+      }
+    });
+  });
+  return _genVercelEntry.apply(this, arguments);
+}
+export {
+  genVercelEntry
+};