@modern-js/app-tools 2.50.0 → 2.51.0

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

@@ -0,0 +1,114 @@
+import path from "node:path";
+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, modernConfig, needModernServer) => {
+  const { appDirectory, distDirectory, serverInternalPlugins, 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);
+    },
+    async writeOutput() {
+      const config = {
+        version: 3,
+        routes: [
+          {
+            src: "/static/(.*)",
+            headers: {
+              "cache-control": "s-maxage=31536000, immutable"
+            },
+            continue: true
+          },
+          {
+            handle: "filesystem"
+          }
+        ]
+      };
+      if (!needModernServer) {
+        const { source: { mainEntryName } } = modernConfig;
+        entrypoints.forEach((entry) => {
+          const isMain = isMainEntry(entry.entryName, mainEntryName);
+          config.routes.push({
+            src: `/${isMain ? "" : entry.entryName}(?:/.*)?`,
+            headers: {
+              "cache-control": "s-maxage=0"
+            },
+            dest: `/html/${entry.entryName}/index.html`
+          });
+        });
+      } else {
+        config.routes.push({
+          src: "/(.*)",
+          dest: `/index`
+        });
+      }
+      await fse.ensureDir(outputDirectory);
+      await fse.writeJSON(path.join(outputDirectory, "config.json"), config, {
+        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 _modernConfig_bff;
+      if (!needModernServer) {
+        return;
+      }
+      const serverConfig = {
+        bff: {
+          prefix: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_bff = modernConfig.bff) === null || _modernConfig_bff === void 0 ? void 0 : _modernConfig_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);
+    },
+    async end() {
+      if (!needModernServer) {
+        return;
+      }
+      await handleDependencies(appDirectory, funcsDirectory, [
+        "@modern-js/prod-server"
+      ]);
+    }
+  };
+};
+export {
+  createVercelPreset
+};

package/dist/esm-node/plugins/deploy/platforms/vercelEntry.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_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,
+        appContext: {
+          sharedDirectory: p_sharedDirectory,
+          apiDirectory: p_apiDirectory,
+          lambdaDirectory: p_lambdaDirectory
+        },
+        ...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/plugins/deploy/utils.js

@@ -0,0 +1,44 @@
+import path from "path";
+import { ROUTE_SPEC_FILE, fs as fse, isDepExists } from "@modern-js/utils";
+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) => {
+  return plugins.map((plugin, index) => `
+      let plugin_${index} = require('${plugin}')
+      plugin_${index} = plugin_${index}.default || plugin_${index}
+      `).join(";\n");
+};
+const getProjectUsage = (appDirectory, distDirectory) => {
+  const routeJSON = path.join(distDirectory, ROUTE_SPEC_FILE);
+  const { routes } = fse.readJSONSync(routeJSON);
+  let useSSR = false;
+  let useAPI = false;
+  routes.forEach((route) => {
+    if (route.isSSR) {
+      useSSR = true;
+    }
+    if (route.isApi) {
+      useAPI = true;
+    }
+  });
+  const useWebServer = isDepExists(appDirectory, "@modern-js/plugin-server");
+  return {
+    useSSR,
+    useAPI,
+    useWebServer
+  };
+};
+export {
+  genPluginImportsCode,
+  getPluginsCode,
+  getProjectUsage,
+  serverAppContenxtTemplate
+};

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/defineConfig.d.ts

@@ -4,7 +4,7 @@ import type { AppLegacyUserConfig, AppUserConfig } from './types';
  * This function helps you to autocomplete configuration types.
  * It accepts a direct config object, or a function that returns a config.
  */
-export declare const defineConfig: <B extends "rspack" | "webpack" = "webpack">(config: UserConfigExport<AppUserConfig<B>>) => UserConfigExport<AppUserConfig<B>>;
+export declare const defineConfig: <B extends "webpack" | "rspack" = "webpack">(config: UserConfigExport<AppUserConfig<B>>) => UserConfigExport<AppUserConfig<B>>;
 /**
  * @deprecated Please use `defineConfig` instead.
  * `defineLegacyConfig` will be removed in the future major version.

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

@@ -0,0 +1 @@
+export declare const handleDependencies: (appDir: string, serverRootDir: string, include: string[], entryFilter?: ((filePath: string) => boolean) | undefined) => Promise<void>;

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

@@ -0,0 +1,31 @@
+import type { PackageJson } from 'pkg-types';
+export type TracedPackage = {
+    name: string;
+    versions: Record<string, {
+        pkgJSON: PackageJson;
+        path: string;
+        isDirectDep: boolean;
+        files: string[];
+    }>;
+};
+export type TracedFile = {
+    path: string;
+    subpath: string;
+    parents: string[];
+    isDirectDep: boolean;
+    pkgPath: string;
+    pkgName: string;
+    pkgVersion?: string;
+};
+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>;
+interface ReadDirOptions {
+    filter?: (filePath: string) => boolean;
+}
+export declare const readDirRecursive: (dir: string, options?: ReadDirOptions) => Promise<string[]>;
+export declare const isFile: (file: string) => Promise<boolean>;
+export declare const findEntryFiles: (rootDir: string, entryFilter?: ((filePath: string) => boolean) | undefined) => Promise<string[]>;
+export declare const findPackageParents: (pkg: TracedPackage, version: string, tracedFiles: Record<string, TracedFile>) => string[];
+export declare const traceFiles: (entryFiles: string[], serverRootDir: string, base?: string) => Promise<import("@vercel/nft").NodeFileTraceResult>;
+export declare const resolveTracedPath: (base: string, p: string) => Promise<string>;
+export {};

package/dist/types/plugins/deploy/index.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

@@ -0,0 +1,2 @@
+import { CreatePreset } from './platform';
+export declare const createNetlifyPreset: CreatePreset;

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

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

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

@@ -0,0 +1,2 @@
+import { CreatePreset } from './platform';
+export declare const createNodePreset: CreatePreset;

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,10 @@
+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>;
+    end?: () => Promise<void>;
+};
+export {};

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

@@ -0,0 +1,2 @@
+import { CreatePreset } from './platform';
+export declare const createVercelPreset: CreatePreset;

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

@@ -0,0 +1,20 @@
+import { IAppContext } from '@modern-js/core';
+export type ServerAppContext = {
+    sharedDirectory: string;
+    apiDirectory: string;
+    lambdaDirectory: string;
+    metaName: 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) => {
+    useSSR: boolean;
+    useAPI: boolean;
+    useWebServer: boolean;
+};

package/dist/types/types/hooks.d.ts

@@ -79,6 +79,7 @@ export type AppToolsHooks<B extends Bundler = 'webpack'> = {
         stats?: Stats | MultiStats;
     }, unknown>;
     beforeDeploy: AsyncWorkflow<Record<string, any>, unknown>;
+    deploy: AsyncWorkflow<Record<string, any>, unknown>;
     afterDeploy: AsyncWorkflow<Record<string, any>, unknown>;
     beforeRestart: AsyncWorkflow<void, void>;
     registerDev: ParallelWorkflow<void, DevToolData>;

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.50.0",
+  "version": "2.51.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -69,30 +69,34 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@rsbuild/plugin-node-polyfill": "0.6.15",
-    "@rsbuild/shared": "0.6.15",
-    "@rsbuild/core": "0.6.15",
+    "@rsbuild/plugin-node-polyfill": "0.7.1",
+    "@rsbuild/shared": "0.7.1",
+    "@rsbuild/core": "0.7.1",
+    "@swc/helpers": "0.5.3",
+    "@vercel/nft": "^0.26.4",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
-    "@swc/helpers": "0.5.3",
     "esbuild-register": "^3.5.0",
-    "@modern-js/core": "2.50.0",
-    "@modern-js/node-bundle-require": "2.50.0",
-    "@modern-js/plugin": "2.50.0",
-    "@modern-js/plugin-i18n": "2.50.0",
-    "@modern-js/plugin-data-loader": "2.50.0",
-    "@modern-js/plugin-lint": "2.50.0",
-    "@modern-js/prod-server": "2.50.0",
-    "@modern-js/server": "2.50.0",
-    "@modern-js/server-utils": "2.50.0",
-    "@modern-js/server-core": "2.50.0",
-    "@modern-js/types": "2.50.0",
-    "@modern-js/uni-builder": "2.50.0",
-    "@modern-js/utils": "2.50.0",
-    "@modern-js/rsbuild-plugin-esbuild": "2.50.0"
+    "mlly": "^1.6.1",
+    "pkg-types": "^1.1.0",
+    "std-env": "^3.7.0",
+    "@modern-js/node-bundle-require": "2.51.0",
+    "@modern-js/plugin-i18n": "2.51.0",
+    "@modern-js/plugin-data-loader": "2.51.0",
+    "@modern-js/plugin": "2.51.0",
+    "@modern-js/plugin-lint": "2.51.0",
+    "@modern-js/core": "2.51.0",
+    "@modern-js/prod-server": "2.51.0",
+    "@modern-js/rsbuild-plugin-esbuild": "2.51.0",
+    "@modern-js/server": "2.51.0",
+    "@modern-js/server-core": "2.51.0",
+    "@modern-js/server-utils": "2.51.0",
+    "@modern-js/types": "2.51.0",
+    "@modern-js/uni-builder": "2.51.0",
+    "@modern-js/utils": "2.51.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.6.15",
+    "@rsbuild/plugin-swc": "0.7.1",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
     "@types/node": "^14",
@@ -101,8 +105,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.91.0",
-    "@scripts/build": "2.50.0",
-    "@scripts/jest-config": "2.50.0"
+    "@scripts/build": "2.51.0",
+    "@scripts/jest-config": "2.51.0"
   },
   "sideEffects": false,
   "publishConfig": {