@modern-js/app-tools 2.57.2-alpha.0 → 2.58.1-alpha.0

package/dist/cjs/builder/builder-webpack/index.js

@@ -38,7 +38,7 @@ async function createWebpackBuilderForModern(options) {
   const { normalizedConfig } = options;
   if (normalizedConfig.tools.esbuild) {
     const { esbuild: esbuildOptions } = normalizedConfig.tools;
-    const { pluginEsbuild } = await import("@modern-js/rsbuild-plugin-esbuild");
+    const { pluginEsbuild } = await Promise.resolve().then(() => __toESM(require("@modern-js/rsbuild-plugin-esbuild")));
     builder.addPlugins([
       pluginEsbuild(esbuildOptions)
     ]);

package/dist/cjs/builder/generator/index.js

@@ -50,7 +50,7 @@ async function generateBuilder(options, bundlerType) {
   return builder;
 }
 async function applyBuilderPlugins(builder, options) {
-  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterWorker } = await import("../shared/builderPlugins/index.js");
+  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderPluginAdapterWorker } = await Promise.resolve().then(() => __toESM(require("../shared/builderPlugins")));
   builder.addPlugins([
     builderPluginAdapterBasic(),
     builderPluginAdapterSSR(options),
@@ -59,7 +59,7 @@ async function applyBuilderPlugins(builder, options) {
   ]);
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {
-    const { pluginNodePolyfill } = await import("@rsbuild/plugin-node-polyfill");
+    const { pluginNodePolyfill } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-node-polyfill")));
     builder.addPlugins([
       pluginNodePolyfill()
     ]);

package/dist/cjs/builder/index.js

@@ -33,10 +33,10 @@ __export(builder_exports, {
 module.exports = __toCommonJS(builder_exports);
 async function createBuilderGenerator(bundler) {
   if (bundler === "rspack") {
-    const { createRspackBuilderForModern } = await import("./builder-rspack/index.js");
+    const { createRspackBuilderForModern } = await Promise.resolve().then(() => __toESM(require("./builder-rspack")));
     return createRspackBuilderForModern;
   }
-  const { createWebpackBuilderForModern } = await import("./builder-webpack/index.js");
+  const { createWebpackBuilderForModern } = await Promise.resolve().then(() => __toESM(require("./builder-webpack")));
   return createWebpackBuilderForModern;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/commands/build.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var build_exports = {};
 __export(build_exports, {
@@ -46,15 +36,6 @@ const build = async (api, options) => {
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
   await (0, import_loadPlugins.loadServerPlugins)(api, appContext.appDirectory, appContext.metaName);
-  if (appContext.moduleType && appContext.moduleType === "module") {
-    var _resolvedConfig_source1;
-    const { registerEsm } = await import("../esm/register-esm.mjs");
-    await registerEsm({
-      appDir: appContext.appDirectory,
-      distDir: appContext.distDirectory,
-      alias: (_resolvedConfig_source1 = resolvedConfig.source) === null || _resolvedConfig_source1 === void 0 ? void 0 : _resolvedConfig_source1.alias
-    });
-  }
   await (0, import_register.registerCompiler)(appContext.appDirectory, appContext.distDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias);
   const { apiOnly } = appContext;
   if (apiOnly) {

package/dist/cjs/commands/dev.js

@@ -50,15 +50,6 @@ const dev = async (api, options, devServerOptions) => {
   let normalizedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  if (appContext.moduleType && appContext.moduleType === "module") {
-    var _normalizedConfig_source1;
-    const { registerEsm } = await import("../esm/register-esm.mjs");
-    await registerEsm({
-      appDir: appContext.appDirectory,
-      distDir: appContext.distDirectory,
-      alias: (_normalizedConfig_source1 = normalizedConfig.source) === null || _normalizedConfig_source1 === void 0 ? void 0 : _normalizedConfig_source1.alias
-    });
-  }
   await (0, import_register.registerCompiler)(appContext.appDirectory, appContext.distDirectory, normalizedConfig === null || normalizedConfig === void 0 ? void 0 : (_normalizedConfig_source = normalizedConfig.source) === null || _normalizedConfig_source === void 0 ? void 0 : _normalizedConfig_source.alias);
   normalizedConfig = {
     ...normalizedConfig,

package/dist/cjs/commands/index.js

@@ -44,7 +44,7 @@ const devCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const devToolMetas = await runner.registerDev();
   const devProgram = program.command("dev").alias("start").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.dev.describe)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("-e --entry [entry...]", import_locale.i18n.t(import_locale.localeKeys.command.dev.entry)).option("--analyze", import_locale.i18n.t(import_locale.localeKeys.command.shared.analyze)).option("--api-only", import_locale.i18n.t(import_locale.localeKeys.command.dev.apiOnly)).option("--web-only", import_locale.i18n.t(import_locale.localeKeys.command.dev.webOnly)).action(async (options) => {
-    const { dev } = await import("./dev.js");
+    const { dev } = await Promise.resolve().then(() => __toESM(require("./dev")));
     await dev(api, options);
   });
   for (const meta of devToolMetas) {
@@ -54,7 +54,7 @@ const devCommand = async (program, api) => {
     for (const subCmd of meta.subCommands) {
       devProgram.command(subCmd).action(async (options = {}) => {
         const { appDirectory } = api.useAppContext();
-        const { isTypescript } = await import("@modern-js/utils");
+        const { isTypescript } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
         await runner.beforeDevTask(meta);
         await meta.action(options, {
           isTsProject: isTypescript(appDirectory)
@@ -67,7 +67,7 @@ const buildCommand = async (program, api) => {
   const runner = api.useHookRunners();
   const platformBuilders = await runner.registerBuildPlatform();
   const buildProgram = program.command("build").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.build.describe)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--analyze", import_locale.i18n.t(import_locale.localeKeys.command.shared.analyze)).action(async (options) => {
-    const { build } = await import("./build.js");
+    const { build } = await Promise.resolve().then(() => __toESM(require("./build")));
     await build(api, options);
   });
   for (const platformBuilder of platformBuilders) {
@@ -75,7 +75,7 @@ const buildCommand = async (program, api) => {
     for (const platform of platforms) {
       buildProgram.command(platform).action(async () => {
         const { appDirectory } = api.useAppContext();
-        const { isTypescript } = await import("@modern-js/utils");
+        const { isTypescript } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
         await runner.beforeBuildPlatform(platformBuilders);
         await platformBuilder.build(platform, {
           isTsProject: isTypescript(appDirectory)
@@ -86,17 +86,17 @@ const buildCommand = async (program, api) => {
 };
 const serverCommand = (program, api) => {
   program.command("serve").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.serve.describe)).option("--api-only", import_locale.i18n.t(import_locale.localeKeys.command.dev.apiOnly)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).action(async () => {
-    const { start } = await import("./serve.js");
+    const { start } = await Promise.resolve().then(() => __toESM(require("./serve")));
     await start(api);
   });
 };
 const deployCommand = (program, api) => {
   program.command("deploy").usage("[options]").option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("-s --skip-build", import_locale.i18n.t(import_locale.localeKeys.command.shared.skipBuild)).description(import_locale.i18n.t(import_locale.localeKeys.command.deploy.describe)).action(async (options) => {
     if (!options.skipBuild) {
-      const { build } = await import("./build.js");
+      const { build } = await Promise.resolve().then(() => __toESM(require("./build")));
       await build(api);
     }
-    const { deploy } = await import("./deploy.js");
+    const { deploy } = await Promise.resolve().then(() => __toESM(require("./deploy")));
     await deploy(api, options);
     process.exit(0);
   });
@@ -111,7 +111,7 @@ const newCommand = (program, locale) => {
 };
 const inspectCommand = (program, api) => {
   program.command("inspect").description("inspect the internal configs").option(`--env <env>`, import_locale.i18n.t(import_locale.localeKeys.command.inspect.env), "development").option("--output <output>", import_locale.i18n.t(import_locale.localeKeys.command.inspect.output), "./").option("--verbose", import_locale.i18n.t(import_locale.localeKeys.command.inspect.verbose)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).action(async (options) => {
-    const { inspect } = await import("./inspect.js");
+    const { inspect } = await Promise.resolve().then(() => __toESM(require("./inspect")));
     inspect(api, options);
   });
 };

package/dist/cjs/index.js

@@ -139,7 +139,7 @@ const appTools = (options = {
       async fileChange(e) {
         const { filename, eventType, isPrivate } = e;
         if (!isPrivate && (eventType === "change" || eventType === "unlink")) {
-          const { closeServer } = await import("./utils/createServer");
+          const { closeServer } = await Promise.resolve().then(() => __toESM(require("./utils/createServer")));
           await closeServer();
           await (0, import_restart.restart)(api.useHookRunners(), filename);
         }

package/dist/cjs/plugins/analyze/index.js

@@ -77,9 +77,9 @@ var analyze_default = ({ bundler }) => ({
           return;
         }
         const [{ getBundleEntry }, { getServerRoutes }, { getHtmlTemplate }] = await Promise.all([
-          import("./getBundleEntry.js"),
-          import("./getServerRoutes.js"),
-          import("./getHtmlTemplate.js")
+          Promise.resolve().then(() => __toESM(require("./getBundleEntry"))),
+          Promise.resolve().then(() => __toESM(require("./getServerRoutes"))),
+          Promise.resolve().then(() => __toESM(require("./getHtmlTemplate")))
         ]);
         const { entrypoints } = await hookRunners.modifyEntrypoints({
           entrypoints: await getBundleEntry(hookRunners, appContext, resolvedConfig)

package/dist/cjs/plugins/deploy/dependencies/index.js

@@ -38,12 +38,21 @@ var import_pkg_types = require("pkg-types");
 var import_mlly = require("mlly");
 var import_utils2 = require("./utils");
 var import_nft = require("@vercel/nft");
-const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = import_utils2.traceFiles, entryFilter, modifyPackageJson, copyWholePackage, traceOptions }) => {
+const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = import_utils2.traceFiles, entryFilter, modifyPackageJson, copyWholePackage, cacheOptions = {
+  cacheDir: ".modern-js/deploy",
+  fileCache: true,
+  analysisCache: true
+}, traceOptions }) => {
   const base = "/";
+  const startTime = Date.now();
   const entryFiles = await (0, import_utils2.findEntryFiles)(serverRootDir, entryFilter);
   const fileTrace = await traceFiles({
     entryFiles: entryFiles.concat(includeEntries),
     serverRootDir,
+    cacheOptions: {
+      ...cacheOptions,
+      cacheDir: import_node_path.default.resolve(appDir, cacheOptions.cacheDir)
+    },
     base,
     traceOptions
   });
@@ -219,7 +228,6 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
     name: `${projectPkgJson.name || "modernjs-project"}-prod`,
     version: projectPkgJson.version || "0.0.0",
     private: true,
-    type: projectPkgJson.type || "commonjs",
     dependencies: Object.fromEntries([
       ...Object.values(tracedPackages).map((pkg) => [
         pkg.name,
@@ -229,6 +237,8 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
   };
   const finalPkgJson = (modifyPackageJson === null || modifyPackageJson === void 0 ? void 0 : modifyPackageJson(newPkgJson)) || newPkgJson;
   await import_utils.fs.writeJSON(outputPkgPath, finalPkgJson);
+  const endTime = Date.now();
+  console.log("handleDependencies cost:", endTime - startTime);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/plugins/deploy/dependencies/utils.js

@@ -139,23 +139,83 @@ const findPackageParents = (pkg, version, tracedFiles) => {
   ];
   return parentPkgs.filter((parentPkg) => parentPkg);
 };
-const traceFiles = async ({ entryFiles, serverRootDir, base = "/", traceOptions }) => {
-  return await (0, import_nft.nodeFileTrace)(entryFiles, {
+async function serializeMap(map) {
+  const resolvedMap = /* @__PURE__ */ new Map();
+  await Promise.all(Array.from(map.entries()).map(async ([key, value]) => {
+    resolvedMap.set(key, value instanceof Promise ? await Promise.resolve(value) : value);
+  }));
+  return JSON.stringify(resolvedMap, (key, value) => {
+    if (value instanceof Map) {
+      return {
+        dataType: "Map",
+        value: Array.from(value.entries())
+      };
+    }
+    if (value instanceof Set) {
+      return {
+        dataType: "Set",
+        value: Array.from(value)
+      };
+    }
+    return value;
+  });
+}
+function deserializeMap(serializedData) {
+  return JSON.parse(serializedData, (key, value) => {
+    if (value && value.dataType === "Map") {
+      return new Map(value.value);
+    }
+    if (value && value.dataType === "Set") {
+      return new Set(value.value);
+    }
+    return value;
+  });
+}
+const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions, traceOptions }) => {
+  const { cacheDir, fileCache: enableFileCache, analysisCache: enableAnalysisCache } = cacheOptions;
+  const analysisCacheFile = import_path.default.join(cacheDir, "analysis-cache.json");
+  const fileCacheFile = import_path.default.join(cacheDir, "file-cache.json");
+  const cache = /* @__PURE__ */ Object.create(null);
+  if (enableAnalysisCache && await import_utils.fs.pathExists(analysisCacheFile)) {
+    const analysisCache2 = (await import_utils.fs.readFile(analysisCacheFile)).toString();
+    cache.analysisCache = deserializeMap(analysisCache2);
+  }
+  if (enableFileCache && await import_utils.fs.pathExists(fileCacheFile)) {
+    const fileCache2 = (await import_utils.fs.readFile(fileCacheFile)).toString();
+    cache.fileCache = deserializeMap(fileCache2);
+  }
+  const res = await (0, import_nft.nodeFileTrace)(entryFiles, {
     base,
     processCwd: serverRootDir,
-    resolve: async (id, parent, job, isCjs) => {
-      if (id.startsWith("@modern-js/prod-server")) {
-        return require.resolve(id, {
-          paths: [
-            require.resolve("@modern-js/app-tools")
-          ]
-        });
-      } else {
-        return (0, import_nft.resolve)(id, parent, job, isCjs);
-      }
-    },
+    cache,
     ...traceOptions
   });
+  const { analysisCache, fileCache } = cache;
+  if (analysisCache || fileCache) {
+    await import_utils.fs.ensureDir(cacheDir);
+    if (analysisCache) {
+      const newAnalysisCache = new Map(analysisCache);
+      for (const key of newAnalysisCache.keys()) {
+        if (!key.includes("node_modules/")) {
+          newAnalysisCache.delete(key);
+        }
+      }
+      import_utils.fs.writeFile(analysisCacheFile, await serializeMap(newAnalysisCache));
+    }
+    if (fileCache) {
+      const newFileCache = new Map(fileCache);
+      for (const key of newFileCache.keys()) {
+        if (!key.includes("node_modules/")) {
+          newFileCache.delete(key);
+        }
+      }
+      console.time("111");
+      import_utils.fs.writeFile(fileCacheFile, await serializeMap(newFileCache));
+      console.timeEnd("111");
+    }
+  }
+  console.log("ffffffff", __filename);
+  return res;
 };
 const resolveTracedPath = async (base, p) => import_utils.fs.realpath(import_path.default.resolve(base, p));
 const isSubPath = (parentPath, childPath) => {

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

@@ -50,13 +50,11 @@ async function cleanDistDirectory(dir) {
   }
 }
 const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
-  const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
-  const isEsmProject = moduleType === "module";
+  const { appDirectory, distDirectory, entrypoints, serverPlugins } = appContext;
   const plugins = serverPlugins.map((plugin) => plugin.name);
   const netlifyOutput = import_node_path.default.join(appDirectory, ".netlify");
   const funcsDirectory = import_node_path.default.join(netlifyOutput, "functions");
   const entryFilePath = import_node_path.default.join(funcsDirectory, "index.js");
-  const handlerFilePath = import_node_path.default.join(funcsDirectory, "netlify-handler.cjs");
   return {
     async prepare() {
       await import_utils.fs.remove(netlifyOutput);
@@ -105,9 +103,7 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
           prefix: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_bff = modernConfig.bff) === null || _modernConfig_bff === void 0 ? void 0 : _modernConfig_bff.prefix
         },
         output: {
-          distPath: {
-            root: "."
-          }
+          path: "."
         }
       };
       const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
@@ -118,15 +114,10 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       const pluginsCode = `[${plugins.map((plugin, index) => {
         return `plugin_${index}()`;
       }).join(",")}]`;
-      let handlerCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./netlify-handler.js"))).toString();
+      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./netlifyEntry.js"))).toString();
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
-      handlerCode = handlerCode.replace("handlerCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
-      await import_utils.fs.writeFile(handlerFilePath, handlerCode);
-      if (isEsmProject) {
-        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./netlify-entry.mjs"), entryFilePath);
-      } else {
-        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./netlify-entry.js"), entryFilePath);
-      }
+      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      await import_utils.fs.writeFile(entryFilePath, entryCode);
     },
     async end() {
       if (process.env.NODE_ENV !== "development") {

package/dist/cjs/plugins/deploy/platforms/{netlify-handler.js → netlifyEntry.js}

@@ -53,11 +53,9 @@ async function createHandler() {
   return requestHandler;
 }
 createHandler();
-module.exports = {
-  handler: async (request, context) => {
-    if (!requestHandler) {
-      await createHandler();
-    }
-    return requestHandler(request, context);
+module.exports.default = async (request, context) => {
+  if (!requestHandler) {
+    await createHandler();
   }
+  return requestHandler(request, context);
 };

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

@@ -36,8 +36,7 @@ var import_utils = require("@modern-js/utils");
 var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
 const createNodePreset = (appContext, config) => {
-  const { appDirectory, distDirectory, serverPlugins, moduleType } = appContext;
-  const isEsmProject = moduleType === "module";
+  const { appDirectory, distDirectory, serverPlugins } = appContext;
   const plugins = serverPlugins.map((plugin) => plugin.name);
   const outputDirectory = import_node_path.default.join(appDirectory, ".output");
   const staticDirectory = import_node_path.default.join(outputDirectory, "static");
@@ -59,9 +58,7 @@ const createNodePreset = (appContext, config) => {
           prefix: config === null || config === void 0 ? void 0 : (_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix
         },
         output: {
-          distPath: {
-            root: "."
-          }
+          path: "."
         }
       };
       const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
@@ -72,16 +69,10 @@ const createNodePreset = (appContext, config) => {
       const pluginsCode = `[${plugins.map((plugin, index) => {
         return `plugin_${index}()`;
       }).join(",")}]`;
-      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./node-entry.js"))).toString();
+      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./nodeEntry.js"))).toString();
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
       entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
-      if (isEsmProject) {
-        const cjsEntryFilePath = import_node_path.default.join(outputDirectory, "index.cjs");
-        await import_utils.fs.writeFile(cjsEntryFilePath, entryCode);
-        await import_utils.fs.writeFile(entryFilePath, `import('./index.cjs');`);
-      } else {
-        await import_utils.fs.writeFile(entryFilePath, entryCode);
-      }
+      await import_utils.fs.writeFile(entryFilePath, entryCode);
     },
     async end() {
       console.log("Static directory:", import_utils.chalk.blue(import_node_path.default.relative(appDirectory, staticDirectory)));

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

@@ -37,14 +37,12 @@ var import_routes = require("../../../utils/routes");
 var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
 const createVercelPreset = (appContext, modernConfig, needModernServer) => {
-  const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
-  const isEsmProject = moduleType === "module";
+  const { appDirectory, distDirectory, entrypoints, serverPlugins } = appContext;
   const plugins = serverPlugins.map((plugin) => plugin.name);
   const vercelOutput = import_node_path.default.join(appDirectory, ".vercel");
   const outputDirectory = import_node_path.default.join(vercelOutput, "output");
   const funcsDirectory = import_node_path.default.join(outputDirectory, "functions", "index.func");
   const entryFilePath = import_node_path.default.join(funcsDirectory, "index.js");
-  const handlerFilePath = import_node_path.default.join(funcsDirectory, "vercel-handler.cjs");
   return {
     async prepare() {
       await import_utils.fs.remove(vercelOutput);
@@ -120,9 +118,7 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
           prefix: modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_bff = modernConfig.bff) === null || _modernConfig_bff === void 0 ? void 0 : _modernConfig_bff.prefix
         },
         output: {
-          distPath: {
-            root: "."
-          }
+          path: "."
         }
       };
       const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
@@ -134,14 +130,9 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
         return `plugin_${index}()`;
       }).join(",")}]`;
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
-      let handlerCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./vercel-handler.js"))).toString();
-      handlerCode = handlerCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
-      await import_utils.fs.writeFile(handlerFilePath, handlerCode);
-      if (isEsmProject) {
-        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./vercel-entry.mjs"), entryFilePath);
-      } else {
-        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./vercel-entry.js"), entryFilePath);
-      }
+      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./vercelEntry.js"))).toString();
+      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      await import_utils.fs.writeFile(entryFilePath, entryCode);
     },
     async end() {
       if (!needModernServer) {

package/dist/cjs/plugins/deploy/platforms/{vercel-handler.js → vercelEntry.js}

@@ -1,26 +1,4 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var vercel_handler_exports = {};
-__export(vercel_handler_exports, {
-  handler: () => handler
-});
-module.exports = __toCommonJS(vercel_handler_exports);
 const fs = require("node:fs/promises");
 const path = require("node:path");
 const { createProdServer } = require("@modern-js/prod-server");
@@ -75,13 +53,9 @@ async function createHandler() {
   return requestHandler;
 }
 createHandler();
-const handler = async (req, res) => {
+module.exports = async (req, res) => {
   if (!requestHandler) {
     await createHandler();
   }
   return requestHandler(req, res);
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  handler
-});

package/dist/cjs/utils/config.js

@@ -30,17 +30,17 @@ var config_exports = {};
 __export(config_exports, {
   buildServerConfig: () => buildServerConfig,
   defineServerConfig: () => defineServerConfig,
-  emitResolvedConfig: () => emitResolvedConfig,
-  safeReplacer: () => safeReplacer
+  emitResolvedConfig: () => emitResolvedConfig
 });
 module.exports = __toCommonJS(config_exports);
 var path = __toESM(require("path"));
 var import_node_bundle_require = require("@modern-js/node-bundle-require");
 var import_utils = require("@modern-js/utils");
+var import_flatted = require("flatted");
 const defineServerConfig = (config) => config;
 const buildServerConfig = async ({ appDirectory, distDirectory, configFile, options, watch }) => {
   const configFilePath = await (0, import_utils.getServerConfig)(appDirectory, configFile);
-  const getOutputFile = async (filepath) => path.resolve(distDirectory, `${filepath.replace(new RegExp(import_utils.CONFIG_FILE_EXTENSIONS.join("|")), "")}.cjs`);
+  const getOutputFile = async (filepath) => path.resolve(distDirectory, `${filepath.replace(new RegExp(import_utils.CONFIG_FILE_EXTENSIONS.join("|")), "")}.js`);
   if (configFilePath) {
     const configHelperFilePath = path.normalize(path.join(distDirectory, "./config-helper.js"));
     const helperCode = `
@@ -69,33 +69,17 @@ const buildServerConfig = async ({ appDirectory, distDirectory, configFile, opti
     });
   }
 };
-const safeReplacer = () => {
-  const cache = [];
-  const keyCache = [];
-  return function(key, value) {
-    if (typeof value === "object" && value !== null) {
-      const index = cache.indexOf(value);
-      if (index !== -1) {
-        return `[Circular ${keyCache[index]}]`;
-      }
-      cache.push(value);
-      keyCache.push(key || "root");
-    }
-    return value;
-  };
-};
 const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
   var _resolvedConfig_output_distPath;
   const outputPath = (0, import_utils.ensureAbsolutePath)(appDirectory, path.join(((_resolvedConfig_output_distPath = resolvedConfig.output.distPath) === null || _resolvedConfig_output_distPath === void 0 ? void 0 : _resolvedConfig_output_distPath.root) || "./dist", import_utils.OUTPUT_CONFIG_FILE));
-  await import_utils.fs.writeJSON(outputPath, resolvedConfig, {
-    spaces: 2,
-    replacer: safeReplacer()
+  const output = (0, import_flatted.stringify)(resolvedConfig);
+  await import_utils.fs.writeFile(outputPath, output, {
+    encoding: "utf-8"
   });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildServerConfig,
   defineServerConfig,
-  emitResolvedConfig,
-  safeReplacer
+  emitResolvedConfig
 });

package/dist/cjs/utils/loadPlugins.js

@@ -37,7 +37,7 @@ async function getServerPlugins(api, metaName = "modern-js") {
 }
 async function loadServerPlugins(api, appDirectory, metaName) {
   const plugins = await getServerPlugins(api, metaName);
-  const instances = await (0, import_prod_server.loadServerPlugins)(plugins, appDirectory);
+  const instances = (0, import_prod_server.loadServerPlugins)(plugins, appDirectory);
   return instances;
 }
 // Annotate the CommonJS export names for ESM import in node: