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

package/dist/cjs/analyze/getServerRoutes.js

@@ -34,6 +34,7 @@ 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) {
@@ -106,14 +107,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 isMainEntry = entryName === (mainEntryName || import_utils.MAIN_ENTRY_NAME);
-    const entryOptions = (0, import_utils.getEntryOptions)(entryName, isMainEntry, ssr, ssrByEntries, packageName);
+    const isMain = (0, import_routes.isMainEntry)(entryName, mainEntryName);
+    const entryOptions = (0, import_utils.getEntryOptions)(entryName, isMain, 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: `/${isMainEntry ? "" : entryName}`,
+      urlPath: `/${isMain ? "" : 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/index.js

@@ -34,6 +34,7 @@ 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 = () => ({
@@ -47,10 +48,11 @@ 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");
@@ -58,11 +60,48 @@ 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 config2 = {
+          const config = {
             version: 3,
             routes: [
               {
@@ -79,8 +118,9 @@ var deploy_default = () => ({
           };
           if (!needModernServer) {
             entrypoints.forEach((entry) => {
-              config2.routes.push({
-                src: `/${entry.entryName}(?:/.*)?`,
+              const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
+              config.routes.push({
+                src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
                 headers: {
                   "cache-control": "s-maxage=0"
                 },
@@ -88,13 +128,13 @@ var deploy_default = () => ({
               });
             });
           } else {
-            config2.routes.push({
+            config.routes.push({
               src: "/(.*)",
               dest: `/index`
             });
           }
           await import_utils.fs.ensureDir(outputDirectory);
-          await import_utils.fs.writeJSON(import_path.default.join(outputDirectory, "config.json"), config2, {
+          await import_utils.fs.writeJSON(import_path.default.join(outputDirectory, "config.json"), config, {
             spaces: 2
           });
           staticDirectory = import_path.default.join(outputDirectory, "static/static");
@@ -112,10 +152,6 @@ 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",
@@ -125,13 +161,6 @@ 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)}")`,
@@ -143,28 +172,34 @@ var deploy_default = () => ({
         console.log("deployTarget111111111", deployTarget);
         switch (deployTarget) {
           case "node": {
-            const { genNodeEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/node")));
+            const { genNodeEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/node")));
             code = genNodeEntry({
               plugins,
-              config,
+              config: modernConfig,
               appContext: serverAppContext
             });
             break;
           }
           case "vercel": {
-            const { genVercelEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/vercel")));
-            code = genVercelEntry({
+            const { genVercelEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/vercel")));
+            const serverAppContext2 = {
+              sharedDirectory: import_path.default.join(__dirname, import_path.default.relative(appDirectory, sharedDirectory)),
+              apiDirectory: import_path.default.join(__dirname, import_path.default.relative(appDirectory, apiDirectory)),
+              lambdaDirectory: import_path.default.join(__dirname, import_path.default.relative(appDirectory, lambdaDirectory)),
+              metaName
+            };
+            code = await genVercelEntry({
               plugins,
-              config,
-              appContext: serverAppContext
+              config: modernConfig,
+              appContext: serverAppContext2
             });
             break;
           }
           case "netlify": {
-            const { genNetlifyEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/netlify")));
+            const { genNetlifyEntry } = await Promise.resolve().then(() => __toESM(require("./platforms/netlify")));
             code = genNetlifyEntry({
               plugins,
-              config,
+              config: modernConfig,
               appContext: serverAppContext
             });
             break;

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

@@ -0,0 +1,36 @@
+"use strict";
+const fs = require("node:fs/promises");
+const path = require("node:path");
+const { createProdServer } = require("@modern-js/prod-server");
+p_genPluginImportsCode;
+if (!process.env.NODE_ENV) {
+  process.env.NODE_ENV = "production";
+}
+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 main() {
+  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,
+    ...dynamicProdOptions
+  };
+  const app = await createProdServer(prodServerOptions);
+  const port = process.env.PORT || 8080;
+  app.listen(port, () => {
+    console.log("\\x1b[32mServer is listening on port", port, "\\x1b[0m");
+  });
+}
+main();

package/dist/cjs/plugins/deploy/platforms/platform.js

@@ -0,0 +1,16 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 platform_exports = {};
+module.exports = __toCommonJS(platform_exports);

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

@@ -0,0 +1,66 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var vercel_exports = {};
+__export(vercel_exports, {
+  genVercelEntry: () => genVercelEntry
+});
+module.exports = __toCommonJS(vercel_exports);
+var import_node_path = __toESM(require("node:path"));
+var import_utils = require("@modern-js/utils");
+var import_utils2 = require("../utils");
+async function genVercelEntry({ config, plugins, appContext } = {}) {
+  const defaultConfig = {
+    output: {
+      path: "."
+    }
+  };
+  console.log("appContext.sharedDirectory", appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory);
+  const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
+  const dynamicProdOptions = {
+    config: config || defaultConfig,
+    serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
+    plugins,
+    appContext: appContext ? {
+      sharedDirectory: appContext.sharedDirectory,
+      apiDirectory: appContext.apiDirectory,
+      lambdaDirectory: appContext.lambdaDirectory
+    } : "undefined"
+  };
+  let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./vercelEntry.js"))).toString();
+  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace(
+    "p_dynamicProdOptions",
+    // JSON.stringify(dynamicProdOptions),
+    JSON.stringify(dynamicProdOptions)
+  );
+  return entryCode;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  genVercelEntry
+});

package/dist/cjs/plugins/deploy/platforms/vercelEntry.js

@@ -0,0 +1,55 @@
+"use strict";
+const fs = require("node:fs/promises");
+const path = require("node:path");
+const { createProdServer } = require("@modern-js/prod-server");
+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,
+    ...dynamicProdOptions
+  };
+  const app = await createProdServer(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 (req, res) => {
+  if (!requestHandler) {
+    await createHandler();
+  }
+  return requestHandler(req, res);
+};

package/dist/cjs/utils/routes.js

@@ -29,7 +29,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var routes_exports = {};
 __export(routes_exports, {
   generateRoutes: () => generateRoutes,
-  getPathWithoutExt: () => getPathWithoutExt
+  getPathWithoutExt: () => getPathWithoutExt,
+  isMainEntry: () => isMainEntry
 });
 module.exports = __toCommonJS(routes_exports);
 var import_path = __toESM(require("path"));
@@ -45,8 +46,12 @@ 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
+  getPathWithoutExt,
+  isMainEntry
 });

package/dist/esm/analyze/getServerRoutes.js

@@ -4,7 +4,8 @@ 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, MAIN_ENTRY_NAME, removeTailSlash, SERVER_WORKER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, removeTailSlash, SERVER_WORKER_BUNDLE_DIRECTORY } from "@modern-js/utils";
+import { isMainEntry } from "../utils/routes";
 import { walkDirectory } from "./utils";
 var applyBaseUrl = function(baseUrl, routes) {
   if (baseUrl) {
@@ -75,14 +76,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 isMainEntry = entryName === (mainEntryName || MAIN_ENTRY_NAME);
-    var entryOptions = getEntryOptions(entryName, isMainEntry, ssr, ssrByEntries, packageName);
+    var isMain = isMainEntry(entryName, mainEntryName);
+    var entryOptions = getEntryOptions(entryName, isMain, 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(isMainEntry ? "" : entryName),
+      urlPath: "/".concat(isMain ? "" : entryName),
       entryName,
       entryPath: removeLeadingSlash(path.posix.normalize("".concat(htmlPath, "/").concat(entryName).concat(disableHtmlFolder ? ".html" : "/index.html"))),
       isSPA: true,