@modern-js/app-tools 2.49.3-alpha.10 → 2.49.3-alpha.2

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

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

package/dist/esm/utils/routes.js

@@ -1,7 +1,7 @@
 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, MAIN_ENTRY_NAME, ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { fs, ROUTE_SPEC_FILE } from "@modern-js/utils";
 var generateRoutes = function() {
   var _ref = _async_to_generator(function(appContext) {
     var serverRoutes, distDirectory, output;
@@ -32,11 +32,7 @@ var getPathWithoutExt = function(filename) {
   var extname = path.extname(filename);
   return filename.slice(0, -extname.length);
 };
-var isMainEntry = function(entryName, mainEntryName) {
-  return entryName === (mainEntryName || MAIN_ENTRY_NAME);
-};
 export {
   generateRoutes,
-  getPathWithoutExt,
-  isMainEntry
+  getPathWithoutExt
 };

package/dist/esm-node/analyze/getServerRoutes.js

@@ -1,7 +1,6 @@
 import path from "path";
 import fs from "fs";
-import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, removeTailSlash, SERVER_WORKER_BUNDLE_DIRECTORY } from "@modern-js/utils";
-import { isMainEntry } from "../utils/routes";
+import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash, SERVER_WORKER_BUNDLE_DIRECTORY } from "@modern-js/utils";
 import { walkDirectory } from "./utils";
 const applyBaseUrl = (baseUrl, routes) => {
   if (baseUrl) {
@@ -74,14 +73,14 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
   const { packageName } = appContext;
   const workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   let htmlRoutes = entrypoints.reduce((previous, { entryName }) => {
-    const isMain = isMainEntry(entryName, mainEntryName);
-    const entryOptions = getEntryOptions(entryName, isMain, ssr, ssrByEntries, packageName);
+    const isMainEntry = entryName === (mainEntryName || MAIN_ENTRY_NAME);
+    const entryOptions = getEntryOptions(entryName, isMainEntry, ssr, ssrByEntries, packageName);
     const isSSR = Boolean(entryOptions);
     const isWorker = Boolean(workerSSR);
     const isStream = typeof entryOptions === "object" && (entryOptions.mode === "stream" || Boolean(entryOptions.preload));
     const { resHeaders } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
     let route = {
-      urlPath: `/${isMain ? "" : entryName}`,
+      urlPath: `/${isMainEntry ? "" : entryName}`,
       entryName,
       entryPath: removeLeadingSlash(path.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`)),
       isSPA: true,

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

@@ -0,0 +1,73 @@
+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: "."
+    }
+  };
+  if (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) {
+    appContext.apiDirectory = appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory.replace(/\/api$/, "/_api");
+  }
+  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
+};

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

@@ -1,7 +1,6 @@
 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";
 var deploy_default = () => ({
@@ -15,11 +14,10 @@ var deploy_default = () => ({
     return {
       async beforeDeploy() {
         const appContext = api.useAppContext();
-        const modernConfig = api.useResolvedConfigContext();
-        const { source: { mainEntryName } } = modernConfig;
         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");
@@ -27,48 +25,11 @@ var deploy_default = () => ({
           await fse.remove(outputDirectory);
           await fse.copy(distDirectory, outputDirectory);
         }
-        if (deployTarget === "netlify") {
-          const netlifyOutput = path.join(appDirectory, ".netlify");
-          funcsDirectory = path.join(netlifyOutput, "functions");
-          const routes = [];
-          if (!needModernServer) {
-            entrypoints.forEach((entry) => {
-              const isMain = isMainEntry(entry.entryName, mainEntryName);
-              routes.push({
-                src: `/${isMain ? "" : `${entry.entryName}/`}*`,
-                dest: `/html/${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);
-          const redirectContent = routes.map((route) => {
-            return `${route.src} ${route.dest} ${route.status}`;
-          }).join("\n");
-          console.log("redirectContent", redirectContent);
-          await fse.remove(outputDirectory);
-          await fse.ensureDir(funcsDirectory);
-          await fse.copy(distDirectory, funcsDirectory, {
-            filter: (src) => {
-              const distStaticDirectory = path.join(distDirectory, "static");
-              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 config = {
+          const config2 = {
             version: 3,
             routes: [
               {
@@ -85,9 +46,8 @@ var deploy_default = () => ({
           };
           if (!needModernServer) {
             entrypoints.forEach((entry) => {
-              const isMain = isMainEntry(entry.entryName, mainEntryName);
-              config.routes.push({
-                src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
+              config2.routes.push({
+                src: `/${entry.entryName}(?:/.*)?`,
                 headers: {
                   "cache-control": "s-maxage=0"
                 },
@@ -95,13 +55,13 @@ var deploy_default = () => ({
               });
             });
           } else {
-            config.routes.push({
+            config2.routes.push({
               src: "/(.*)",
               dest: `/index`
             });
           }
           await fse.ensureDir(outputDirectory);
-          await fse.writeJSON(path.join(outputDirectory, "config.json"), config, {
+          await fse.writeJSON(path.join(outputDirectory, "config.json"), config2, {
             spaces: 2
           });
           staticDirectory = path.join(outputDirectory, "static/static");
@@ -119,6 +79,10 @@ var deploy_default = () => ({
                 return !src.includes(distStaticDirectory);
               }
             });
+            const apiDirectory2 = path.join(funcsDirectory, "api");
+            if (await fse.pathExists(apiDirectory2)) {
+              await fse.rename(apiDirectory2, path.join(funcsDirectory, "_api"));
+            }
             await fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
               runtime: "nodejs16.x",
               handler: "index.js",
@@ -128,6 +92,13 @@ 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)}")`,
@@ -139,28 +110,28 @@ var deploy_default = () => ({
         console.log("deployTarget111111111", deployTarget);
         switch (deployTarget) {
           case "node": {
-            const { genNodeEntry } = await import("./platforms/node");
+            const { genNodeEntry } = await import("./entrys/node");
             code = genNodeEntry({
               plugins,
-              config: modernConfig,
+              config,
               appContext: serverAppContext
             });
             break;
           }
           case "vercel": {
-            const { genVercelEntry } = await import("./platforms/vercel");
-            code = await genVercelEntry({
+            const { genVercelEntry } = await import("./entrys/vercel");
+            code = genVercelEntry({
               plugins,
-              config: modernConfig,
+              config,
               appContext: serverAppContext
             });
             break;
           }
           case "netlify": {
-            const { genNetlifyEntry } = await import("./platforms/netlify");
+            const { genNetlifyEntry } = await import("./entrys/netlify");
             code = genNetlifyEntry({
               plugins,
-              config: modernConfig,
+              config,
               appContext: serverAppContext
             });
             break;

package/dist/esm-node/utils/routes.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { fs, MAIN_ENTRY_NAME, ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { fs, ROUTE_SPEC_FILE } from "@modern-js/utils";
 const generateRoutes = async (appContext) => {
   const { serverRoutes, distDirectory } = appContext;
   const output = JSON.stringify({
@@ -11,11 +11,7 @@ const getPathWithoutExt = (filename) => {
   const extname = path.extname(filename);
   return filename.slice(0, -extname.length);
 };
-const isMainEntry = (entryName, mainEntryName) => {
-  return entryName === (mainEntryName || MAIN_ENTRY_NAME);
-};
 export {
   generateRoutes,
-  getPathWithoutExt,
-  isMainEntry
+  getPathWithoutExt
 };

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

@@ -1,5 +1,6 @@
+import { ServerAppContext } from '../utils';
 export declare function genVercelEntry({ config, plugins, appContext, }?: {
     config?: Record<string, any>;
     plugins?: string[];
-    appContext?: Record<string, any>;
-}): Promise<string>;
+    appContext?: ServerAppContext;
+}): string;