@modern-js/app-tools 2.49.3-alpha.14 → 2.49.3-alpha.16

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

@@ -0,0 +1,68 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var require_netlifyEntry = __commonJS({
+  "src/plugins/deploy/platforms/netlifyEntry.js"(exports, module) {
+    const fs = require("node:fs/promises");
+    const path = require("node:path");
+    const { createNetlifyFunction } = require("@modern-js/prod-server/netlify");
+    p_genPluginImportsCode;
+    if (!process.env.NODE_ENV) {
+      process.env.NODE_ENV = "production";
+    }
+    let requestHandler = null;
+    let handlerCreationPromise = null;
+    async function loadRoutes(routeFilepath) {
+      try {
+        await fs.access(routeFilepath);
+        const content = await fs.readFile(routeFilepath, "utf-8");
+        const routeSpec = JSON.parse(content);
+        return routeSpec.routes || [];
+      } catch (error) {
+        console.warn("route.json not found or invalid, continuing with empty routes.");
+        return [];
+      }
+    }
+    async function initServer() {
+      const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
+      const routes = await loadRoutes(routeFilepath);
+      const dynamicProdOptions = p_dynamicProdOptions;
+      const prodServerOptions = {
+        pwd: __dirname,
+        routes,
+        disableCustomHook: true,
+        appContext: {
+          sharedDirectory: p_sharedDirectory,
+          apiDirectory: p_apiDirectory,
+          lambdaDirectory: p_lambdaDirectory
+        },
+        ...dynamicProdOptions
+      };
+      const app = await createNetlifyFunction(prodServerOptions);
+      return app.getRequestListener();
+    }
+    async function createHandler() {
+      if (!handlerCreationPromise) {
+        handlerCreationPromise = (async () => {
+          try {
+            requestHandler = await initServer();
+          } catch (error) {
+            console.error("Error creating server:", error);
+            process.exit(1);
+          }
+        })();
+      }
+      await handlerCreationPromise;
+      return requestHandler;
+    }
+    createHandler();
+    module.exports = async (request, context) => {
+      if (!requestHandler) {
+        await createHandler();
+      }
+      return requestHandler(request, context);
+    };
+  }
+});
+export default require_netlifyEntry();

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

@@ -1,29 +1,51 @@
 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 genNodeEntry({ config, plugins, appContext }) {
-  var _config_bff;
-  const serverConfig = {
-    server: {
-      port: 8080
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse, getInternalPlugins } from "@modern-js/utils";
+import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
+import { handleDependencies } from "../dependencies";
+const createNodePreset = (appContext, config, needModernServer) => {
+  const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
+  const plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
+  const outputDirectory = path.join(appDirectory, ".output");
+  const entryFilePath = path.join(outputDirectory, "index.js");
+  return {
+    async prepare() {
+      await fse.remove(outputDirectory);
     },
-    bff: {
-      prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
+    async writeOutput() {
+      await fse.copy(distDirectory, outputDirectory);
     },
-    output: {
-      path: "."
+    async genEntry() {
+      var _config_bff;
+      if (!needModernServer) {
+        return;
+      }
+      const serverConfig = {
+        server: {
+          port: 8080
+        },
+        bff: {
+          prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
+        },
+        output: {
+          path: "."
+        }
+      };
+      const pluginImportCode = genPluginImportsCode(plugins || []);
+      const dynamicProdOptions = {
+        config: serverConfig,
+        serverConfigFile: DEFAULT_SERVER_CONFIG,
+        plugins
+      };
+      let entryCode = (await fse.readFile(path.join(__dirname, "./nodeEntry.js"))).toString();
+      const serverAppContext = serverAppContenxtTemplate(appContext);
+      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      await fse.writeFile(entryFilePath, entryCode);
+      await handleDependencies(appDirectory, outputDirectory, [
+        "@modern-js/prod-server"
+      ]);
     }
   };
-  const pluginImportCode = genPluginImportsCode(plugins || []);
-  const dynamicProdOptions = {
-    config: serverConfig,
-    serverConfigFile: DEFAULT_SERVER_CONFIG,
-    plugins
-  };
-  let entryCode = (await fse.readFile(path.join(__dirname, "./nodeEntry.js"))).toString();
-  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", appContext.sharedDirectory).replace("p_apiDirectory", appContext.apiDirectory).replace("p_lambdaDirectory", appContext.lambdaDirectory);
-  return entryCode;
-}
+};
 export {
-  genNodeEntry
+  createNodePreset
 };

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

@@ -1,26 +1,109 @@
 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 }) {
-  var _config_bff;
-  const serverConfig = {
-    bff: {
-      prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
+import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse, getInternalPlugins } from "@modern-js/utils";
+import { isMainEntry } from "../../../utils/routes";
+import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
+import { handleDependencies } from "../dependencies";
+const createVercelPreset = (appContext, config, needModernServer) => {
+  const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
+  const plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
+  const vercelOutput = path.join(appDirectory, ".vercel");
+  const outputDirectory = path.join(vercelOutput, "output");
+  const funcsDirectory = path.join(outputDirectory, "functions", "index.func");
+  const entryFilePath = path.join(funcsDirectory, "index.js");
+  return {
+    async prepare() {
+      await fse.remove(vercelOutput);
     },
-    output: {
-      path: "."
+    async writeOutput() {
+      const config2 = {
+        version: 3,
+        routes: [
+          {
+            src: "/static/(.*)",
+            headers: {
+              "cache-control": "s-maxage=31536000, immutable"
+            },
+            continue: true
+          },
+          {
+            handle: "filesystem"
+          }
+        ]
+      };
+      if (!needModernServer) {
+        const { source: { mainEntryName } } = config2;
+        entrypoints.forEach((entry) => {
+          const isMain = isMainEntry(entry.entryName, mainEntryName);
+          config2.routes.push({
+            src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
+            headers: {
+              "cache-control": "s-maxage=0"
+            },
+            dest: `/html/${entry.entryName}/index.html`
+          });
+        });
+      } else {
+        config2.routes.push({
+          src: "/(.*)",
+          dest: `/index`
+        });
+      }
+      await fse.ensureDir(outputDirectory);
+      await fse.writeJSON(path.join(outputDirectory, "config.json"), config2, {
+        spaces: 2
+      });
+      const staticDirectory = path.join(outputDirectory, "static/static");
+      await fse.copy(path.join(distDirectory, "static"), staticDirectory);
+      if (!needModernServer) {
+        const destHtmlDirectory = path.join(distDirectory, "html");
+        const outputHtmlDirectory = path.join(path.join(outputDirectory, "static"), "html");
+        await fse.copy(destHtmlDirectory, outputHtmlDirectory);
+      } else {
+        await fse.ensureDir(funcsDirectory);
+        await fse.copy(distDirectory, funcsDirectory, {
+          filter: (src) => {
+            const distStaticDirectory = path.join(distDirectory, "static");
+            return !src.includes(distStaticDirectory);
+          }
+        });
+        await fse.writeJSON(path.join(funcsDirectory, ".vc-config.json"), {
+          runtime: "nodejs16.x",
+          handler: "index.js",
+          launcherType: "Nodejs",
+          shouldAddHelpers: false,
+          supportsResponseStreaming: true
+        });
+      }
+    },
+    async genEntry() {
+      var _config_bff;
+      if (!needModernServer) {
+        return;
+      }
+      const serverConfig = {
+        bff: {
+          prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
+        },
+        output: {
+          path: "."
+        }
+      };
+      const pluginImportCode = genPluginImportsCode(plugins || []);
+      const dynamicProdOptions = {
+        config: serverConfig,
+        serverConfigFile: DEFAULT_SERVER_CONFIG,
+        plugins
+      };
+      const serverAppContext = serverAppContenxtTemplate(appContext);
+      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)).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      await fse.writeFile(entryFilePath, entryCode);
+      await handleDependencies(appDirectory, funcsDirectory, [
+        "@modern-js/prod-server"
+      ]);
     }
   };
-  const pluginImportCode = genPluginImportsCode(plugins || []);
-  const dynamicProdOptions = {
-    config: serverConfig,
-    serverConfigFile: DEFAULT_SERVER_CONFIG,
-    plugins
-  };
-  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)).replace("p_sharedDirectory", appContext.sharedDirectory).replace("p_apiDirectory", appContext.apiDirectory).replace("p_lambdaDirectory", appContext.lambdaDirectory);
-  return entryCode;
-}
+};
 export {
-  genVercelEntry
+  createVercelPreset
 };

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

@@ -2,12 +2,14 @@ import path from "path";
 import os from "node:os";
 import { ROUTE_SPEC_FILE, fs as fse, isDepExists } from "@modern-js/utils";
 import { parseNodeModulePath } from "mlly";
-const severAppContextTemplate = (serverAppContext) => {
-  return `{
-    sharedDirectory: ${serverAppContext.sharedDirectory},
-    apiDirectory: ${serverAppContext.apiDirectory},
-    lambdaDirectory: ${serverAppContext.lambdaDirectory},
-  }`;
+const serverAppContenxtTemplate = (appContext) => {
+  const { appDirectory, sharedDirectory, apiDirectory, lambdaDirectory, metaName } = appContext;
+  return {
+    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
+  };
 };
 const getPluginsCode = (plugins) => `[${plugins.map((_, index) => `plugin_${index}()`).join(",")}]`;
 const genPluginImportsCode = (plugins) => {
@@ -97,6 +99,16 @@ const linkPackage = async (from, to, projectRootDir) => {
     console.error("Cannot link", from, "to", to, error);
   });
 };
+const readDirRecursive = async (dir) => {
+  const files = await fse.readdir(dir, {
+    withFileTypes: true
+  });
+  const filesAndDirs = await Promise.all(files.map(async (file) => {
+    const resPath = path.resolve(dir, file.name);
+    return file.isDirectory() ? readDirRecursive(resPath) : resPath;
+  }));
+  return filesAndDirs.flat();
+};
 export {
   applyProductionCondition,
   applyPublicCondition,
@@ -104,6 +116,7 @@ export {
   getPluginsCode,
   getProjectUsage,
   linkPackage,
-  severAppContextTemplate,
+  readDirRecursive,
+  serverAppContenxtTemplate,
   writePackage
 };

package/dist/types/plugins/deploy/index copy.d.ts

@@ -0,0 +1,4 @@
+import { CliPlugin } from '@modern-js/core';
+import { AppTools } from '../../types';
+declare const _default: () => CliPlugin<AppTools>;
+export default _default;

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

@@ -1,5 +1,2 @@
-export declare function genNetlifyEntry({ config, plugins, appContext, }?: {
-    config?: Record<string, any>;
-    plugins?: string[];
-    appContext?: Record<string, any>;
-}): string;
+import { CreatePreset } from './platform';
+export declare const createNetlifyPreset: CreatePreset;

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

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

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

@@ -1,8 +1,2 @@
-import { NormalizedConfig } from '@modern-js/core';
-import { AppTools } from '../../../types';
-import { AppContext } from './platform';
-export declare function genNodeEntry({ config, plugins, appContext, }: {
-    config?: NormalizedConfig<AppTools>;
-    plugins?: string[];
-    appContext: AppContext;
-}): Promise<string>;
+import { CreatePreset } from './platform';
+export declare const createNodePreset: CreatePreset;

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

@@ -1,5 +1,9 @@
-export type AppContext = {
-    sharedDirectory: string;
-    apiDirectory: string;
-    lambdaDirectory: string;
+import { IAppContext, NormalizedConfig } from '@modern-js/core';
+import { AppTools } from '../../../types';
+export type CreatePreset = (appContext: IAppContext, config: NormalizedConfig<AppTools>, needModernServer?: boolean) => DeployPreset;
+type DeployPreset = {
+    prepare: () => Promise<void>;
+    writeOutput: () => Promise<void>;
+    genEntry: () => Promise<void>;
 };
+export {};

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

@@ -1,8 +1,2 @@
-import { NormalizedConfig } from '@modern-js/core';
-import { AppTools } from '../../../types';
-import { AppContext } from './platform';
-export declare function genVercelEntry({ config, plugins, appContext, }: {
-    config?: NormalizedConfig<AppTools>;
-    plugins?: string[];
-    appContext: AppContext;
-}): Promise<string>;
+import { CreatePreset } from './platform';
+export declare const createVercelPreset: CreatePreset;

package/dist/types/plugins/deploy/utils.d.ts

@@ -1,11 +1,17 @@
 import type { PackageJson } from 'pkg-types';
+import { IAppContext } from '@modern-js/core';
 export type ServerAppContext = {
     sharedDirectory: string;
     apiDirectory: string;
     lambdaDirectory: string;
     metaName: string;
 };
-export declare const severAppContextTemplate: (serverAppContext: ServerAppContext) => string;
+export declare const serverAppContenxtTemplate: (appContext: IAppContext) => {
+    sharedDirectory: string;
+    apiDirectory: string;
+    lambdaDirectory: string;
+    metaName: string;
+};
 export declare const getPluginsCode: (plugins: string[]) => string;
 export declare const genPluginImportsCode: (plugins: string[]) => string;
 export declare const getProjectUsage: (appDirectory: string, distDirectory: string) => {
@@ -25,3 +31,4 @@ export type TracedPackage = {
 };
 export declare const writePackage: (pkg: TracedPackage, version: string, projectDir: string, _pkgPath?: string) => Promise<void>;
 export declare const linkPackage: (from: string, to: string, projectRootDir: string) => Promise<void>;
+export declare const readDirRecursive: (dir: string) => Promise<string[]>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.3-alpha.14",
+  "version": "2.49.3-alpha.16",
   "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/plugin-data-loader": "2.49.2",
     "@modern-js/core": "2.49.2",
-    "@modern-js/node-bundle-require": "2.49.2",
     "@modern-js/plugin": "2.49.2",
-    "@modern-js/plugin-data-loader": "2.49.2",
     "@modern-js/plugin-lint": "2.49.2",
-    "@modern-js/plugin-i18n": "2.49.2",
-    "@modern-js/prod-server": "2.49.2",
     "@modern-js/rsbuild-plugin-esbuild": "2.49.2",
+    "@modern-js/prod-server": "2.49.2",
+    "@modern-js/plugin-i18n": "2.49.2",
     "@modern-js/server-core": "2.49.2",
+    "@modern-js/node-bundle-require": "2.49.2",
     "@modern-js/server-utils": "2.49.2",
-    "@modern-js/uni-builder": "2.49.2",
     "@modern-js/types": "2.49.2",
-    "@modern-js/server": "2.49.2",
-    "@modern-js/utils": "2.49.2"
+    "@modern-js/utils": "2.49.2",
+    "@modern-js/uni-builder": "2.49.2",
+    "@modern-js/server": "2.49.2"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.6.10",