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

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

@@ -0,0 +1,186 @@
+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 index_copy_default = () => ({
+  name: "@modern-js/plugin-deploy",
+  pre: [
+    "@modern-js/plugin-bff",
+    "@modern-js/plugin-server"
+  ],
+  setup: (api) => {
+    const deployTarget = process.env.MODERNJS_DEPLOY || provider || "node";
+    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;
+        let outputDirectory = path.join(appDirectory, ".output");
+        let funcsDirectory = outputDirectory;
+        let staticDirectory = path.join(outputDirectory, "static");
+        if (deployTarget === "node") {
+          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 supported, 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 = {
+            version: 3,
+            routes: [
+              {
+                src: "/static/(.*)",
+                headers: {
+                  "cache-control": "s-maxage=31536000, immutable"
+                },
+                continue: true
+              },
+              {
+                handle: "filesystem"
+              }
+            ]
+          };
+          if (!needModernServer) {
+            entrypoints.forEach((entry) => {
+              const isMain = isMainEntry(entry.entryName, mainEntryName);
+              config.routes.push({
+                src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
+                headers: {
+                  "cache-control": "s-maxage=0"
+                },
+                dest: `/html/${entry.entryName}/index.html`
+              });
+            });
+          } else {
+            config.routes.push({
+              src: "/(.*)",
+              dest: `/index`
+            });
+          }
+          await fse.ensureDir(outputDirectory);
+          await fse.writeJSON(path.join(outputDirectory, "config.json"), config, {
+            spaces: 2
+          });
+          staticDirectory = path.join(outputDirectory, "static/static");
+          await fse.copy(path.join(distDirectory, "static"), staticDirectory);
+          if (!needModernServer) {
+            const destHtmlDirectory = path.join(distDirectory, "html");
+            const outputHtmlDirectory = path.join(path.join(outputDirectory, "static"), "html");
+            await fse.copy(destHtmlDirectory, outputHtmlDirectory);
+          } else {
+            funcsDirectory = path.join(outputDirectory, "functions", "index.func");
+            await fse.ensureDir(funcsDirectory);
+            await fse.copy(distDirectory, funcsDirectory, {
+              filter: (src) => {
+                const distStaticDirectory = path.join(distDirectory, "static");
+                return !src.includes(distStaticDirectory);
+              }
+            });
+            await fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
+              runtime: "nodejs16.x",
+              handler: "index.js",
+              launcherType: "Nodejs",
+              shouldAddHelpers: false,
+              supportsResponseStreaming: true
+            });
+          }
+        }
+        const plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
+        const serverAppContext = {
+          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
+        };
+        console.log("serverAppContext", serverAppContext);
+        let code = ``;
+        console.log("deployTarget111111111", deployTarget);
+        switch (deployTarget) {
+          case "node": {
+            const { genNodeEntry } = await import("./platforms/node");
+            code = await genNodeEntry({
+              plugins,
+              config: modernConfig,
+              appContext: serverAppContext
+            });
+            break;
+          }
+          case "vercel": {
+            const { genVercelEntry } = await import("./platforms/vercel");
+            code = await genVercelEntry({
+              plugins,
+              config: modernConfig,
+              appContext: serverAppContext
+            });
+            break;
+          }
+          case "netlify": {
+            const { genNetlifyEntry } = await import("./platforms/netlify");
+            code = await genNetlifyEntry({
+              plugins,
+              config: modernConfig,
+              appContext: serverAppContext
+            });
+            break;
+          }
+          default: {
+            code = `throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");`;
+          }
+        }
+        const entryFilePath = path.join(funcsDirectory, "index.js");
+        if (needModernServer) {
+          await fse.writeFile(entryFilePath, code);
+          await handleDependencies(appDirectory, funcsDirectory, [
+            "@modern-js/prod-server"
+          ]);
+        }
+      }
+    };
+  }
+});
+export {
+  index_copy_default as default
+};

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

@@ -1,9 +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";
+import { createNodePreset } from "./platforms/node";
 var deploy_default = () => ({
   name: "@modern-js/plugin-deploy",
   pre: [
@@ -15,168 +12,25 @@ var deploy_default = () => ({
     return {
       async beforeDeploy() {
         const appContext = api.useAppContext();
+        const { appDirectory, distDirectory } = appContext;
         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;
-        let outputDirectory = path.join(appDirectory, ".output");
-        let funcsDirectory = outputDirectory;
-        let staticDirectory = path.join(outputDirectory, "static");
-        if (deployTarget === "node") {
-          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 = {
-            version: 3,
-            routes: [
-              {
-                src: "/static/(.*)",
-                headers: {
-                  "cache-control": "s-maxage=31536000, immutable"
-                },
-                continue: true
-              },
-              {
-                handle: "filesystem"
-              }
-            ]
-          };
-          if (!needModernServer) {
-            entrypoints.forEach((entry) => {
-              const isMain = isMainEntry(entry.entryName, mainEntryName);
-              config.routes.push({
-                src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
-                headers: {
-                  "cache-control": "s-maxage=0"
-                },
-                dest: `/html/${entry.entryName}/index.html`
-              });
-            });
-          } else {
-            config.routes.push({
-              src: "/(.*)",
-              dest: `/index`
-            });
-          }
-          await fse.ensureDir(outputDirectory);
-          await fse.writeJSON(path.join(outputDirectory, "config.json"), config, {
-            spaces: 2
-          });
-          staticDirectory = path.join(outputDirectory, "static/static");
-          await fse.copy(path.join(distDirectory, "static"), staticDirectory);
-          if (!needModernServer) {
-            const destHtmlDirectory = path.join(distDirectory, "html");
-            const outputHtmlDirectory = path.join(path.join(outputDirectory, "static"), "html");
-            await fse.copy(destHtmlDirectory, outputHtmlDirectory);
-          } else {
-            funcsDirectory = path.join(outputDirectory, "functions", "index.func");
-            await fse.ensureDir(funcsDirectory);
-            await fse.copy(distDirectory, funcsDirectory, {
-              filter: (src) => {
-                const distStaticDirectory = path.join(distDirectory, "static");
-                return !src.includes(distStaticDirectory);
-              }
-            });
-            await fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
-              runtime: "nodejs16.x",
-              handler: "index.js",
-              launcherType: "Nodejs",
-              shouldAddHelpers: false,
-              supportsResponseStreaming: true
-            });
-          }
-        }
-        const plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
-        const serverAppContext = {
-          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
-        };
-        console.log("serverAppContext", serverAppContext);
-        let code = ``;
-        console.log("deployTarget111111111", deployTarget);
+        let deployPreset;
         switch (deployTarget) {
-          case "node": {
-            const { genNodeEntry } = await import("./platforms/node");
-            code = await genNodeEntry({
-              plugins,
-              config: modernConfig,
-              appContext: serverAppContext
-            });
+          case "node":
+            deployPreset = createNodePreset(appContext, modernConfig, needModernServer);
             break;
-          }
-          case "vercel": {
-            const { genVercelEntry } = await import("./platforms/vercel");
-            code = await genVercelEntry({
-              plugins,
-              config: modernConfig,
-              appContext: serverAppContext
-            });
-            break;
-          }
-          case "netlify": {
-            const { genNetlifyEntry } = await import("./platforms/netlify");
-            code = await genNetlifyEntry({
-              plugins,
-              config: modernConfig,
-              appContext: serverAppContext
-            });
+          case "vercel":
+            deployPreset = createNodePreset(appContext, modernConfig, needModernServer);
             break;
-          }
           default: {
-            code = `throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");`;
+            throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");
           }
         }
-        const entryFilePath = path.join(funcsDirectory, "index.js");
-        if (needModernServer) {
-          await fse.writeFile(entryFilePath, code);
-          await handleDependencies(appDirectory, funcsDirectory, [
-            "@modern-js/prod-server"
-          ]);
-        }
+        await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.prepare());
+        await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.writeOutput());
+        await (deployPreset === null || deployPreset === void 0 ? void 0 : deployPreset.genEntry());
       }
     };
   }

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

@@ -1,71 +1,109 @@
-import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
-import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
-function genNetlifyEntry({ config, plugins, appContext } = {}) {
-  const defaultConfig = {
-    server: {
-      port: 8080
+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";
+const createNetlifyPreset = (appContext, config, needModernServer) => {
+  const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
+  const plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
+  const netlifyOutput = path.join(appDirectory, ".netlify");
+  const outputDirectory = path.join(netlifyOutput, "output");
+  const funcsDirectory = path.join(outputDirectory, "functions", "index.func");
+  const entryFilePath = path.join(funcsDirectory, "index.js");
+  return {
+    async prepare() {
+      await fse.remove(netlifyOutput);
     },
-    output: {
-      path: "."
-    }
-  };
-  return `
-
-  const fs = require('node:fs/promises');
-  const path = require('node:path');
-  const { createNetlifyFunction } = require('@modern-js/prod-server/netlify');
-  ${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, "${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.');
+    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 = 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`
+        });
       }
-
-      const prodServerOptions = {
-        pwd: __dirname,
-        routes,
-        config: ${JSON.stringify(config || defaultConfig)},
-        serverConfigFile: '${DEFAULT_SERVER_CONFIG}',
-        plugins: ${getPluginsCode(plugins || [])},
-        appContext: ${appContext ? severAppContextTemplate(appContext) : "undefined"},
-        disableCustomHook: true
+      await fse.ensureDir(outputDirectory);
+      await fse.writeJSON(path.join(outputDirectory, "config.json"), config2, {
+        spaces: 2
+      });
+      const staticDirectory = path.join(outputDirectory, "static/static");
+      await fse.copy(path.join(distDirectory, "static"), staticDirectory);
+      if (!needModernServer) {
+        const destHtmlDirectory = path.join(distDirectory, "html");
+        const outputHtmlDirectory = path.join(path.join(outputDirectory, "static"), "html");
+        await fse.copy(destHtmlDirectory, outputHtmlDirectory);
+      } else {
+        await fse.ensureDir(funcsDirectory);
+        await fse.copy(distDirectory, funcsDirectory, {
+          filter: (src) => {
+            const distStaticDirectory = path.join(distDirectory, "static");
+            return !src.includes(distStaticDirectory);
+          }
+        });
+        await fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
+          runtime: "nodejs16.x",
+          handler: "index.js",
+          launcherType: "Nodejs",
+          shouldAddHelpers: false,
+          supportsResponseStreaming: true
+        });
       }
-
-      requestHandler = await createNetlifyFunction(prodServerOptions)
-
-      return requestHandler
-    } catch(error) {
-      console.error(error);
-      process.exit(1);
-    }
-  }
-
-  createHandler();
-
-  const handleRequest = async(request, context) => {
-    if(typeof requestHandler !== 'function'){
-      await createHandler();
+    },
+    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 = genPluginImportsCode(plugins || []);
+      const dynamicProdOptions = {
+        config: serverConfig,
+        serverConfigFile: DEFAULT_SERVER_CONFIG,
+        plugins
+      };
+      let entryCode = (await fse.readFile(path.join(__dirname, "./netlifyEntry.js"))).toString();
+      const serverAppContext = serverAppContenxtTemplate(appContext);
+      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${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 fse.writeFile(entryFilePath, entryCode);
+      await handleDependencies(appDirectory, funcsDirectory, [
+        "@modern-js/prod-server"
+      ]);
     }
-    return requestHandler(request, context);
-  }
-
-  export default handleRequest;
-  `;
-}
+  };
+};
 export {
-  genNetlifyEntry
+  createNetlifyPreset
 };

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

@@ -0,0 +1,68 @@
+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) {
+    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);
+    };
+  }
+});
+export default require_netlifyEntry();