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

package/dist/cjs/analyze/getServerRoutes.js

@@ -34,7 +34,6 @@ module.exports = __toCommonJS(getServerRoutes_exports);
 var import_path = __toESM(require("path"));
 var import_fs = __toESM(require("fs"));
 var import_utils = require("@modern-js/utils");
-var import_routes = require("../utils/routes");
 var import_utils2 = require("./utils");
 const applyBaseUrl = (baseUrl, routes) => {
   if (baseUrl) {
@@ -107,14 +106,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 = (0, import_routes.isMainEntry)(entryName, mainEntryName);
-    const entryOptions = (0, import_utils.getEntryOptions)(entryName, isMain, ssr, ssrByEntries, packageName);
+    const isMainEntry = entryName === (mainEntryName || import_utils.MAIN_ENTRY_NAME);
+    const entryOptions = (0, import_utils.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: (0, import_utils.removeLeadingSlash)(import_path.default.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`)),
       isSPA: true,

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

@@ -0,0 +1,97 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var vercel_exports = {};
+__export(vercel_exports, {
+  genVercelEntry: () => genVercelEntry
+});
+module.exports = __toCommonJS(vercel_exports);
+var import_utils = require("@modern-js/utils");
+var import_utils2 = require("../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');
+  ${(0, import_utils2.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, "${import_utils.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: '${import_utils.DEFAULT_SERVER_CONFIG}',
+        plugins: ${(0, import_utils2.getPluginsCode)(plugins || [])},
+        appContext: ${appContext ? (0, import_utils2.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);
+  }
+  `;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  genVercelEntry
+});

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

@@ -34,7 +34,6 @@ module.exports = __toCommonJS(deploy_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_std_env = require("std-env");
-var import_routes = require("../../utils/routes");
 var import_utils2 = require("./utils");
 var import_dependencies = require("./dependencies");
 var deploy_default = () => ({
@@ -48,11 +47,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 } = (0, import_utils2.getProjectUsage)(appDirectory, distDirectory);
         const needModernServer = useSSR || useAPI || useWebServer;
+        const configContext = api.useResolvedConfigContext();
         let outputDirectory = import_path.default.join(appDirectory, ".output");
         let funcsDirectory = outputDirectory;
         let staticDirectory = import_path.default.join(outputDirectory, "static");
@@ -60,48 +58,11 @@ var deploy_default = () => ({
           await import_utils.fs.remove(outputDirectory);
           await import_utils.fs.copy(distDirectory, outputDirectory);
         }
-        if (deployTarget === "netlify") {
-          const netlifyOutput = import_path.default.join(appDirectory, ".netlify");
-          funcsDirectory = import_path.default.join(netlifyOutput, "functions");
-          const routes = [];
-          if (!needModernServer) {
-            entrypoints.forEach((entry) => {
-              const isMain = (0, import_routes.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 import_utils.fs.remove(outputDirectory);
-          await import_utils.fs.ensureDir(funcsDirectory);
-          await import_utils.fs.copy(distDirectory, funcsDirectory, {
-            filter: (src) => {
-              const distStaticDirectory = import_path.default.join(distDirectory, "static");
-              return !src.includes(distStaticDirectory);
-            }
-          });
-          const redirectFilePath = import_path.default.join(distDirectory, "_redirects");
-          await import_utils.fs.writeFile(redirectFilePath, redirectContent);
-        }
         if (deployTarget === "vercel") {
           const vercelOutput = import_path.default.join(appDirectory, ".vercel");
           await import_utils.fs.remove(vercelOutput);
           outputDirectory = import_path.default.join(vercelOutput, "output");
-          const config = {
+          const config2 = {
             version: 3,
             routes: [
               {
@@ -118,9 +79,8 @@ var deploy_default = () => ({
           };
           if (!needModernServer) {
             entrypoints.forEach((entry) => {
-              const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
-              config.routes.push({
-                src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
+              config2.routes.push({
+                src: `/${entry.entryName}(?:/.*)?`,
                 headers: {
                   "cache-control": "s-maxage=0"
                 },
@@ -128,13 +88,13 @@ var deploy_default = () => ({
               });
             });
           } else {
-            config.routes.push({
+            config2.routes.push({
               src: "/(.*)",
               dest: `/index`
             });
           }
           await import_utils.fs.ensureDir(outputDirectory);
-          await import_utils.fs.writeJSON(import_path.default.join(outputDirectory, "config.json"), config, {
+          await import_utils.fs.writeJSON(import_path.default.join(outputDirectory, "config.json"), config2, {
             spaces: 2
           });
           staticDirectory = import_path.default.join(outputDirectory, "static/static");
@@ -152,6 +112,10 @@ var deploy_default = () => ({
                 return !src.includes(distStaticDirectory);
               }
             });
+            const apiDirectory2 = import_path.default.join(funcsDirectory, "api");
+            if (await import_utils.fs.pathExists(apiDirectory2)) {
+              await import_utils.fs.rename(apiDirectory2, import_path.default.join(funcsDirectory, "_api"));
+            }
             await import_utils.fs.writeJSON(import_path.default.join(funcsDirectory, ".vc-config.json"), {
               runtime: "nodejs16.x",
               handler: "index.js",
@@ -161,6 +125,13 @@ var deploy_default = () => ({
             });
           }
         }
+        const { bff } = configContext;
+        const config = {
+          output: {
+            path: "."
+          },
+          bff
+        };
         const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
         const serverAppContext = {
           sharedDirectory: `path.join(__dirname, "${import_path.default.relative(appDirectory, sharedDirectory)}")`,
@@ -172,28 +143,28 @@ var deploy_default = () => ({
         console.log("deployTarget111111111", deployTarget);
         switch (deployTarget) {
           case "node": {
-            const { genNodeEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/node")));
+            const { genNodeEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/node")));
             code = genNodeEntry({
               plugins,
-              config: modernConfig,
+              config,
               appContext: serverAppContext
             });
             break;
           }
           case "vercel": {
-            const { genVercelEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/vercel")));
-            code = await genVercelEntry({
+            const { genVercelEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/vercel")));
+            code = genVercelEntry({
               plugins,
-              config: modernConfig,
+              config,
               appContext: serverAppContext
             });
             break;
           }
           case "netlify": {
-            const { genNetlifyEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/netlify")));
+            const { genNetlifyEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/netlify")));
             code = genNetlifyEntry({
               plugins,
-              config: modernConfig,
+              config,
               appContext: serverAppContext
             });
             break;

package/dist/cjs/utils/routes.js

@@ -29,8 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var routes_exports = {};
 __export(routes_exports, {
   generateRoutes: () => generateRoutes,
-  getPathWithoutExt: () => getPathWithoutExt,
-  isMainEntry: () => isMainEntry
+  getPathWithoutExt: () => getPathWithoutExt
 });
 module.exports = __toCommonJS(routes_exports);
 var import_path = __toESM(require("path"));
@@ -46,12 +45,8 @@ const getPathWithoutExt = (filename) => {
   const extname = import_path.default.extname(filename);
   return filename.slice(0, -extname.length);
 };
-const isMainEntry = (entryName, mainEntryName) => {
-  return entryName === (mainEntryName || import_utils.MAIN_ENTRY_NAME);
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   generateRoutes,
-  getPathWithoutExt,
-  isMainEntry
+  getPathWithoutExt
 });

package/dist/esm/analyze/getServerRoutes.js

@@ -4,8 +4,7 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 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";
 var applyBaseUrl = function(baseUrl, routes) {
   if (baseUrl) {
@@ -76,14 +75,14 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
   var workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   var htmlRoutes = entrypoints.reduce(function(previous, param) {
     var entryName = param.entryName;
-    var isMain = isMainEntry(entryName, mainEntryName);
-    var entryOptions = getEntryOptions(entryName, isMain, ssr, ssrByEntries, packageName);
+    var isMainEntry = entryName === (mainEntryName || MAIN_ENTRY_NAME);
+    var entryOptions = getEntryOptions(entryName, isMainEntry, ssr, ssrByEntries, packageName);
     var isSSR = Boolean(entryOptions);
     var isWorker = Boolean(workerSSR);
     var isStream = typeof entryOptions === "object" && (entryOptions.mode === "stream" || Boolean(entryOptions.preload));
     var resHeaders = ((routes === null || routes === void 0 ? void 0 : routes[entryName]) || {}).resHeaders;
     var route = {
-      urlPath: "/".concat(isMain ? "" : entryName),
+      urlPath: "/".concat(isMainEntry ? "" : entryName),
       entryName,
       entryPath: removeLeadingSlash(path.posix.normalize("".concat(htmlPath, "/").concat(entryName).concat(disableHtmlFolder ? ".html" : "/index.html"))),
       isSPA: true,

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

@@ -0,0 +1,43 @@
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
+import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
+function genVercelEntry() {
+  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
+    },
+    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 "\n\n  const fs = require('node:fs/promises');\n  const path = require('node:path');\n  const { createProdServer } = require('@modern-js/prod-server');\n  ".concat(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, "`).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      const app = await createProdServer(prodServerOptions)\n\n      requestHandler = app.getRequestListener();\n\n      return requestHandler;\n    } catch(error) {\n      console.error(error);\n      process.exit(1);\n    }\n  }\n\n  createHandler();\n\n  module.exports = async(req, res) => {\n    if(typeof requestHandler !== 'function'){\n      await createHandler();\n    }\n    return requestHandler(req, res);\n  }\n  ");
+}
+export {
+  genVercelEntry
+};