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

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

@@ -0,0 +1,197 @@
+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_vercelEntry = __commonJS({
+  "src/plugins/deploy/platforms/vercelEntry.js"(exports, module) {
+    var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
+    var _object_spread = require("@swc/helpers/_/_object_spread");
+    var _ts_generator = require("@swc/helpers/_/_ts_generator");
+    var fs = require("node:fs/promises");
+    var path = require("node:path");
+    var createProdServer = require("@modern-js/prod-server").createProdServer;
+    p_genPluginImportsCode;
+    if (!process.env.NODE_ENV) {
+      process.env.NODE_ENV = "production";
+    }
+    var requestHandler = null;
+    var handlerCreationPromise = null;
+    function loadRoutes(routeFilepath) {
+      return _loadRoutes.apply(this, arguments);
+    }
+    function _loadRoutes() {
+      _loadRoutes = _async_to_generator._(function(routeFilepath) {
+        var content, routeSpec, error;
+        return _ts_generator._(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              _state.trys.push([
+                0,
+                3,
+                ,
+                4
+              ]);
+              return [
+                4,
+                fs.access(routeFilepath)
+              ];
+            case 1:
+              _state.sent();
+              return [
+                4,
+                fs.readFile(routeFilepath, "utf-8")
+              ];
+            case 2:
+              content = _state.sent();
+              routeSpec = JSON.parse(content);
+              return [
+                2,
+                routeSpec.routes || []
+              ];
+            case 3:
+              error = _state.sent();
+              console.warn("route.json not found or invalid, continuing with empty routes.");
+              return [
+                2,
+                []
+              ];
+            case 4:
+              return [
+                2
+              ];
+          }
+        });
+      });
+      return _loadRoutes.apply(this, arguments);
+    }
+    function initServer() {
+      return _initServer.apply(this, arguments);
+    }
+    function _initServer() {
+      _initServer = _async_to_generator._(function() {
+        var routeFilepath, routes, dynamicProdOptions, prodServerOptions, app;
+        return _ts_generator._(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
+              return [
+                4,
+                loadRoutes(routeFilepath)
+              ];
+            case 1:
+              routes = _state.sent();
+              dynamicProdOptions = p_dynamicProdOptions;
+              prodServerOptions = _object_spread._({
+                pwd: __dirname,
+                routes,
+                disableCustomHook: true
+              }, dynamicProdOptions);
+              return [
+                4,
+                createProdServer(prodServerOptions)
+              ];
+            case 2:
+              app = _state.sent();
+              return [
+                2,
+                app.getRequestListener()
+              ];
+          }
+        });
+      });
+      return _initServer.apply(this, arguments);
+    }
+    function createHandler() {
+      return _createHandler.apply(this, arguments);
+    }
+    function _createHandler() {
+      _createHandler = _async_to_generator._(function() {
+        return _ts_generator._(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              if (!handlerCreationPromise) {
+                handlerCreationPromise = _async_to_generator._(function() {
+                  var error;
+                  return _ts_generator._(this, function(_state2) {
+                    switch (_state2.label) {
+                      case 0:
+                        _state2.trys.push([
+                          0,
+                          2,
+                          ,
+                          3
+                        ]);
+                        return [
+                          4,
+                          initServer()
+                        ];
+                      case 1:
+                        requestHandler = _state2.sent();
+                        return [
+                          3,
+                          3
+                        ];
+                      case 2:
+                        error = _state2.sent();
+                        console.error("Error creating server:", error);
+                        process.exit(1);
+                        return [
+                          3,
+                          3
+                        ];
+                      case 3:
+                        return [
+                          2
+                        ];
+                    }
+                  });
+                })();
+              }
+              return [
+                4,
+                handlerCreationPromise
+              ];
+            case 1:
+              _state.sent();
+              return [
+                2,
+                requestHandler
+              ];
+          }
+        });
+      });
+      return _createHandler.apply(this, arguments);
+    }
+    createHandler();
+    module.exports = function() {
+      var _ref = _async_to_generator._(function(req, res) {
+        return _ts_generator._(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              if (!!requestHandler)
+                return [
+                  3,
+                  2
+                ];
+              return [
+                4,
+                createHandler()
+              ];
+            case 1:
+              _state.sent();
+              _state.label = 2;
+            case 2:
+              return [
+                2,
+                requestHandler(req, res)
+              ];
+          }
+        });
+      });
+      return function(req, res) {
+        return _ref.apply(this, arguments);
+      };
+    }();
+  }
+});
+export default require_vercelEntry();

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,10 +15,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 } = getProjectUsage(appDirectory, distDirectory);
         const needModernServer = useSSR || useAPI || useWebServer;
-        const configContext = api.useResolvedConfigContext();
         let outputDirectory = path.join(appDirectory, ".output");
         let funcsDirectory = outputDirectory;
         let staticDirectory = path.join(outputDirectory, "static");
@@ -25,11 +27,48 @@ var deploy_default = () => ({
           await fse.remove(outputDirectory);
           await fse.copy(distDirectory, outputDirectory);
         }
+        if (deployTarget === "netlify") {
+          const netlifyOutput = path.join(appDirectory, ".netlify");
+          funcsDirectory = path.join(netlifyOutput, "functions");
+          const routes = [];
+          if (!needModernServer) {
+            entrypoints.forEach((entry) => {
+              const isMain = isMainEntry(entry.entryName, mainEntryName);
+              routes.push({
+                src: `/${isMain ? "" : `${entry.entryName}/`}*`,
+                dest: `/html/${entry.entryName}/index.html`,
+                status: 200
+              });
+            });
+          } else {
+            routes.push({
+              src: `/*`,
+              dest: `/.netlify/functions/index`,
+              status: 200
+            });
+            throw new Error("Currently on the Netlify platform, only CSR projects are supporte, Support for SSR and BFF projects will be available later");
+          }
+          console.log("routes", routes, needModernServer);
+          const redirectContent = routes.map((route) => {
+            return `${route.src} ${route.dest} ${route.status}`;
+          }).join("\n");
+          console.log("redirectContent", redirectContent);
+          await fse.remove(outputDirectory);
+          await fse.ensureDir(funcsDirectory);
+          await fse.copy(distDirectory, funcsDirectory, {
+            filter: (src) => {
+              const distStaticDirectory = path.join(distDirectory, "static");
+              return !src.includes(distStaticDirectory);
+            }
+          });
+          const redirectFilePath = path.join(distDirectory, "_redirects");
+          await fse.writeFile(redirectFilePath, redirectContent);
+        }
         if (deployTarget === "vercel") {
           const vercelOutput = path.join(appDirectory, ".vercel");
           await fse.remove(vercelOutput);
           outputDirectory = path.join(vercelOutput, "output");
-          const config2 = {
+          const config = {
             version: 3,
             routes: [
               {
@@ -46,8 +85,9 @@ var deploy_default = () => ({
           };
           if (!needModernServer) {
             entrypoints.forEach((entry) => {
-              config2.routes.push({
-                src: `/${entry.entryName}(?:/.*)?`,
+              const isMain = isMainEntry(entry.entryName, mainEntryName);
+              config.routes.push({
+                src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
                 headers: {
                   "cache-control": "s-maxage=0"
                 },
@@ -55,13 +95,13 @@ var deploy_default = () => ({
               });
             });
           } else {
-            config2.routes.push({
+            config.routes.push({
               src: "/(.*)",
               dest: `/index`
             });
           }
           await fse.ensureDir(outputDirectory);
-          await fse.writeJSON(path.join(outputDirectory, "config.json"), config2, {
+          await fse.writeJSON(path.join(outputDirectory, "config.json"), config, {
             spaces: 2
           });
           staticDirectory = path.join(outputDirectory, "static/static");
@@ -79,10 +119,6 @@ var deploy_default = () => ({
                 return !src.includes(distStaticDirectory);
               }
             });
-            const apiDirectory2 = path.join(funcsDirectory, "api");
-            if (await fse.pathExists(apiDirectory2)) {
-              await fse.rename(apiDirectory2, path.join(funcsDirectory, "_api"));
-            }
             await fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
               runtime: "nodejs16.x",
               handler: "index.js",
@@ -92,13 +128,6 @@ var deploy_default = () => ({
             });
           }
         }
-        const { bff } = configContext;
-        const config = {
-          output: {
-            path: "."
-          },
-          bff
-        };
         const plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
         const serverAppContext = {
           sharedDirectory: `path.join(__dirname, "${path.relative(appDirectory, sharedDirectory)}")`,
@@ -110,28 +139,34 @@ var deploy_default = () => ({
         console.log("deployTarget111111111", deployTarget);
         switch (deployTarget) {
           case "node": {
-            const { genNodeEntry } = await import("./entrys/node");
+            const { genNodeEntry } = await import("./platforms/node");
             code = genNodeEntry({
               plugins,
-              config,
+              config: modernConfig,
               appContext: serverAppContext
             });
             break;
           }
           case "vercel": {
-            const { genVercelEntry } = await import("./entrys/vercel");
-            code = genVercelEntry({
+            const { genVercelEntry } = await import("./platforms/vercel");
+            const serverAppContext2 = {
+              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
+            };
+            code = await genVercelEntry({
               plugins,
-              config,
-              appContext: serverAppContext
+              config: modernConfig,
+              appContext: serverAppContext2
             });
             break;
           }
           case "netlify": {
-            const { genNetlifyEntry } = await import("./entrys/netlify");
+            const { genNetlifyEntry } = await import("./platforms/netlify");
             code = genNetlifyEntry({
               plugins,
-              config,
+              config: modernConfig,
               appContext: serverAppContext
             });
             break;

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

@@ -0,0 +1,35 @@
+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/esm-node/plugins/deploy/platforms/vercel.js

@@ -0,0 +1,32 @@
+import path from "node:path";
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse } from "@modern-js/utils";
+import { genPluginImportsCode } from "../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 = genPluginImportsCode(plugins || []);
+  const dynamicProdOptions = {
+    config: config || defaultConfig,
+    serverConfigFile: DEFAULT_SERVER_CONFIG,
+    plugins,
+    appContext: appContext ? {
+      sharedDirectory: appContext.sharedDirectory,
+      apiDirectory: appContext.apiDirectory,
+      lambdaDirectory: appContext.lambdaDirectory
+    } : "undefined"
+  };
+  let entryCode = (await fse.readFile(path.join(__dirname, "./vercelEntry.js"))).toString();
+  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace(
+    "p_dynamicProdOptions",
+    // JSON.stringify(dynamicProdOptions),
+    JSON.stringify(dynamicProdOptions)
+  );
+  return entryCode;
+}
+export {
+  genVercelEntry
+};

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

@@ -0,0 +1,63 @@
+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_vercelEntry = __commonJS({
+  "src/plugins/deploy/platforms/vercelEntry.js"(exports, module) {
+    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);
+    };
+  }
+});
+export default require_vercelEntry();

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/plugins/deploy/platforms/nodeEntry.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/types/plugins/deploy/platforms/platform.d.ts

@@ -0,0 +1 @@
+export {};

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

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

package/dist/types/plugins/deploy/platforms/vercelEntry.d.ts

@@ -0,0 +1,2 @@
+declare function _exports(req: any, res: any): Promise<any>;
+export = _exports;

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.1",
+  "version": "2.49.3-alpha.11",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -80,20 +80,20 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
+    "@modern-js/core": "2.49.2",
+    "@modern-js/plugin": "2.49.2",
     "@modern-js/plugin-data-loader": "2.49.2",
+    "@modern-js/plugin-i18n": "2.49.2",
+    "@modern-js/rsbuild-plugin-esbuild": "2.49.2",
     "@modern-js/prod-server": "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/server-core": "2.49.2",
-    "@modern-js/plugin-i18n": "2.49.2",
-    "@modern-js/core": "2.49.2",
+    "@modern-js/node-bundle-require": "2.49.2",
+    "@modern-js/server-utils": "2.49.2",
     "@modern-js/types": "2.49.2",
     "@modern-js/uni-builder": "2.49.2",
     "@modern-js/utils": "2.49.2",
-    "@modern-js/server": "2.49.2",
-    "@modern-js/node-bundle-require": "2.49.2",
-    "@modern-js/server-utils": "2.49.2"
+    "@modern-js/server": "2.49.2"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.6.10",