@modern-js/app-tools 2.49.3-alpha.4 → 2.49.3-alpha.6

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,6 +48,8 @@ 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;
@@ -54,10 +57,46 @@ var deploy_default = () => ({
         let outputDirectory = import_path.default.join(appDirectory, ".output");
         let funcsDirectory = outputDirectory;
         let staticDirectory = import_path.default.join(outputDirectory, "static");
-        if (deployTarget === "node" || deployTarget === "netlify") {
+        if (deployTarget === "node") {
           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
+            });
+          }
+          console.log("routes", routes, needModernServer);
+          const redirectContent = routes.map((route) => {
+            return `${route.src} ${route.dest} ${route.status}`;
+          }).join("\n");
+          console.log("redirectContent", redirectContent);
+          const redirectFilePath = import_path.default.join(distDirectory, "_redirects");
+          await import_utils.fs.writeFile(redirectFilePath, 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);
+            }
+          });
+        }
         if (deployTarget === "vercel") {
           const vercelOutput = import_path.default.join(appDirectory, ".vercel");
           await import_utils.fs.remove(vercelOutput);
@@ -79,8 +118,9 @@ var deploy_default = () => ({
           };
           if (!needModernServer) {
             entrypoints.forEach((entry) => {
+              const isMain = (0, import_routes.isMainEntry)(entry.entryName, mainEntryName);
               config2.routes.push({
-                src: `/${entry.entryName}(?:/.*)?`,
+                src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
                 headers: {
                   "cache-control": "s-maxage=0"
                 },
@@ -142,7 +182,7 @@ var deploy_default = () => ({
             const { genNodeEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/node")));
             code = genNodeEntry({
               plugins,
-              config,
+              config: modernConfig,
               appContext: serverAppContext
             });
             break;
@@ -151,7 +191,7 @@ var deploy_default = () => ({
             const { genVercelEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/vercel")));
             code = genVercelEntry({
               plugins,
-              config,
+              config: modernConfig,
               appContext: serverAppContext
             });
             break;
@@ -160,7 +200,7 @@ var deploy_default = () => ({
             const { genNetlifyEntry } = await Promise.resolve().then(() => __toESM(require("./entrys/netlify")));
             code = genNetlifyEntry({
               plugins,
-              config,
+              config: modernConfig,
               appContext: serverAppContext
             });
             break;

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,

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,11 +18,13 @@ 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, 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, configContext, outputDirectory, funcsDirectory, staticDirectory, netlifyOutput, routes, redirectContent, redirectFilePath, vercelOutput, config, destHtmlDirectory, outputHtmlDirectory, 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;
@@ -29,7 +32,7 @@ function deploy_default() {
                   outputDirectory = path.join(appDirectory, ".output");
                   funcsDirectory = outputDirectory;
                   staticDirectory = path.join(outputDirectory, "static");
-                  if (!(deployTarget === "node" || deployTarget === "netlify"))
+                  if (!(deployTarget === "node"))
                     return [
                       3,
                       3
@@ -48,17 +51,78 @@ 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 ? "" : entry.entryName, "(?:/.*)?"),
+                        dest: "/html/".concat(entry.entryName, "/index.html"),
+                        status: 200
+                      });
+                    });
+                  } else {
+                    routes.push({
+                      src: "/*",
+                      dest: "/.netlify/functions/index",
+                      status: 200
+                    });
+                  }
+                  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);
+                  redirectFilePath = path.join(distDirectory, "_redirects");
+                  return [
+                    4,
+                    fse.writeFile(redirectFilePath, redirectContent)
+                  ];
+                case 4:
+                  _state.sent();
+                  return [
+                    4,
+                    fse.remove(outputDirectory)
+                  ];
+                case 5:
+                  _state.sent();
+                  return [
+                    4,
+                    fse.ensureDir(funcsDirectory)
+                  ];
+                case 6:
+                  _state.sent();
+                  return [
+                    4,
+                    fse.copy(distDirectory, funcsDirectory, {
+                      filter: function(src) {
+                        var distStaticDirectory = path.join(distDirectory, "static");
+                        return !src.includes(distStaticDirectory);
+                      }
+                    })
+                  ];
+                case 7:
+                  _state.sent();
+                  _state.label = 8;
+                case 8:
                   if (!(deployTarget === "vercel"))
                     return [
                       3,
-                      13
+                      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,
-                    13
+                    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,7 +212,7 @@ function deploy_default() {
                       }
                     })
                   ];
-                case 11:
+                case 16:
                   _state.sent();
                   return [
                     4,
@@ -159,10 +224,10 @@ function deploy_default() {
                       supportsResponseStreaming: true
                     })
                   ];
-                case 12:
+                case 17:
                   _state.sent();
-                  _state.label = 13;
-                case 13:
+                  _state.label = 18;
+                case 18:
                   bff = configContext.bff;
                   config1 = {
                     output: {
@@ -183,88 +248,88 @@ function deploy_default() {
                     case "node":
                       return [
                         3,
-                        14
+                        19
                       ];
                     case "vercel":
                       return [
                         3,
-                        16
+                        21
                       ];
                     case "netlify":
                       return [
                         3,
-                        18
+                        23
                       ];
                   }
                   return [
                     3,
-                    20
+                    25
                   ];
-                case 14:
+                case 19:
                   return [
                     4,
                     import("./entrys/node")
                   ];
-                case 15:
+                case 20:
                   genNodeEntry = _state.sent().genNodeEntry;
                   code = genNodeEntry({
                     plugins,
-                    config: config1,
+                    config: modernConfig,
                     appContext: serverAppContext
                   });
                   return [
                     3,
-                    21
+                    26
                   ];
-                case 16:
+                case 21:
                   return [
                     4,
                     import("./entrys/vercel")
                   ];
-                case 17:
+                case 22:
                   genVercelEntry = _state.sent().genVercelEntry;
                   code = genVercelEntry({
                     plugins,
-                    config: config1,
+                    config: modernConfig,
                     appContext: serverAppContext
                   });
                   return [
                     3,
-                    21
+                    26
                   ];
-                case 18:
+                case 23:
                   return [
                     4,
                     import("./entrys/netlify")
                   ];
-                case 19:
+                case 24:
                   genNetlifyEntry = _state.sent().genNetlifyEntry;
                   code = genNetlifyEntry({
                     plugins,
-                    config: config1,
+                    config: modernConfig,
                     appContext: serverAppContext
                   });
                   return [
                     3,
-                    21
+                    26
                   ];
-                case 20:
+                case 25:
                   {
                     code = 'throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");';
                   }
-                  _state.label = 21;
-                case 21:
+                  _state.label = 26;
+                case 26:
                   entryFilePath = path.join(funcsDirectory, "index.js");
                   if (!needModernServer)
                     return [
                       3,
-                      24
+                      29
                     ];
                   return [
                     4,
                     fse.writeFile(entryFilePath, code)
                   ];
-                case 22:
+                case 27:
                   _state.sent();
                   return [
                     4,
@@ -272,10 +337,10 @@ function deploy_default() {
                       "@modern-js/prod-server"
                     ])
                   ];
-                case 23:
+                case 28:
                   _state.sent();
-                  _state.label = 24;
-                case 24:
+                  _state.label = 29;
+                case 29:
                   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, ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { fs, MAIN_ENTRY_NAME, ROUTE_SPEC_FILE } from "@modern-js/utils";
 var generateRoutes = function() {
   var _ref = _async_to_generator(function(appContext) {
     var serverRoutes, distDirectory, output;
@@ -32,7 +32,11 @@ 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
+  getPathWithoutExt,
+  isMainEntry
 };

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

@@ -1,6 +1,7 @@
 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";
 const applyBaseUrl = (baseUrl, routes) => {
   if (baseUrl) {
@@ -73,14 +74,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 || MAIN_ENTRY_NAME);
-    const entryOptions = getEntryOptions(entryName, isMainEntry, ssr, ssrByEntries, packageName);
+    const isMain = isMainEntry(entryName, mainEntryName);
+    const entryOptions = 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: removeLeadingSlash(path.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`)),
       isSPA: true,

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

@@ -1,6 +1,7 @@
 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 = () => ({
@@ -14,6 +15,8 @@ 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;
@@ -21,10 +24,46 @@ var deploy_default = () => ({
         let outputDirectory = path.join(appDirectory, ".output");
         let funcsDirectory = outputDirectory;
         let staticDirectory = path.join(outputDirectory, "static");
-        if (deployTarget === "node" || deployTarget === "netlify") {
+        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
+            });
+          }
+          console.log("routes", routes, needModernServer);
+          const redirectContent = routes.map((route) => {
+            return `${route.src} ${route.dest} ${route.status}`;
+          }).join("\n");
+          console.log("redirectContent", redirectContent);
+          const redirectFilePath = path.join(distDirectory, "_redirects");
+          await fse.writeFile(redirectFilePath, 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);
+            }
+          });
+        }
         if (deployTarget === "vercel") {
           const vercelOutput = path.join(appDirectory, ".vercel");
           await fse.remove(vercelOutput);
@@ -46,8 +85,9 @@ var deploy_default = () => ({
           };
           if (!needModernServer) {
             entrypoints.forEach((entry) => {
+              const isMain = isMainEntry(entry.entryName, mainEntryName);
               config2.routes.push({
-                src: `/${entry.entryName}(?:/.*)?`,
+                src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
                 headers: {
                   "cache-control": "s-maxage=0"
                 },
@@ -109,7 +149,7 @@ var deploy_default = () => ({
             const { genNodeEntry } = await import("./entrys/node");
             code = genNodeEntry({
               plugins,
-              config,
+              config: modernConfig,
               appContext: serverAppContext
             });
             break;
@@ -118,7 +158,7 @@ var deploy_default = () => ({
             const { genVercelEntry } = await import("./entrys/vercel");
             code = genVercelEntry({
               plugins,
-              config,
+              config: modernConfig,
               appContext: serverAppContext
             });
             break;
@@ -127,7 +167,7 @@ var deploy_default = () => ({
             const { genNetlifyEntry } = await import("./entrys/netlify");
             code = genNetlifyEntry({
               plugins,
-              config,
+              config: modernConfig,
               appContext: serverAppContext
             });
             break;

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

@@ -1,5 +1,5 @@
 import path from "path";
-import { fs, ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { fs, MAIN_ENTRY_NAME, ROUTE_SPEC_FILE } from "@modern-js/utils";
 const generateRoutes = async (appContext) => {
   const { serverRoutes, distDirectory } = appContext;
   const output = JSON.stringify({
@@ -11,7 +11,11 @@ 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
+  getPathWithoutExt,
+  isMainEntry
 };

package/dist/types/utils/routes.d.ts

@@ -1,4 +1,4 @@
 import type { IAppContext } from '@modern-js/core';
-declare const generateRoutes: (appContext: IAppContext) => Promise<void>;
-declare const getPathWithoutExt: (filename: string) => string;
-export { generateRoutes, getPathWithoutExt };
+export declare const generateRoutes: (appContext: IAppContext) => Promise<void>;
+export declare const getPathWithoutExt: (filename: string) => string;
+export declare const isMainEntry: (entryName: string, mainEntryName?: string) => boolean;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.3-alpha.4",
+  "version": "2.49.3-alpha.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -81,19 +81,19 @@
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
     "@modern-js/core": "2.49.2",
-    "@modern-js/plugin": "2.49.2",
+    "@modern-js/node-bundle-require": "2.49.2",
     "@modern-js/plugin-data-loader": "2.49.2",
+    "@modern-js/plugin-i18n": "2.49.2",
     "@modern-js/prod-server": "2.49.2",
-    "@modern-js/server-core": "2.49.2",
+    "@modern-js/plugin-lint": "2.49.2",
+    "@modern-js/plugin": "2.49.2",
     "@modern-js/rsbuild-plugin-esbuild": "2.49.2",
-    "@modern-js/node-bundle-require": "2.49.2",
+    "@modern-js/server": "2.49.2",
+    "@modern-js/server-utils": "2.49.2",
     "@modern-js/types": "2.49.2",
-    "@modern-js/plugin-i18n": "2.49.2",
     "@modern-js/utils": "2.49.2",
     "@modern-js/uni-builder": "2.49.2",
-    "@modern-js/plugin-lint": "2.49.2",
-    "@modern-js/server-utils": "2.49.2",
-    "@modern-js/server": "2.49.2"
+    "@modern-js/server-core": "2.49.2"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.6.10",