@modern-js/app-tools 2.54.3-alpha.4 → 2.54.3

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

@@ -5,7 +5,7 @@ import path from "path";
 import os from "node:os";
 import { fs as fse } from "@modern-js/utils";
 import { parseNodeModulePath } from "mlly";
-import { nodeFileTrace } from "@vercel/nft";
+import { nodeFileTrace, resolve } from "@vercel/nft";
 function applyPublicCondition(pkg) {
   var _pkg_publishConfig;
   if (pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig = pkg.publishConfig) === null || _pkg_publishConfig === void 0 ? void 0 : _pkg_publishConfig.exports) {
@@ -14,12 +14,11 @@ function applyPublicCondition(pkg) {
   }
 }
 var writePackage = function() {
-  var _ref = _async_to_generator(function(options) {
-    var pkg, version, projectDir, _pkgPath, pkgPath, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, src, subpath, dest, dirname, subpath1, dest1, dirname1, err, pkgJSON, packageJsonPath;
+  var _ref = _async_to_generator(function(pkg, version, projectDir, _pkgPath) {
+    var pkgPath, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, src, subpath, dest, dirname, subpath1, dest1, dirname1, err, pkgJSON, packageJsonPath;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          pkg = options.pkg, version = options.version, projectDir = options.projectDir, _pkgPath = options._pkgPath;
           pkgPath = _pkgPath || pkg.name;
           _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
           _state.label = 1;
@@ -134,7 +133,7 @@ var writePackage = function() {
       }
     });
   });
-  return function writePackage2(options) {
+  return function writePackage2(pkg, version, projectDir, _pkgPath) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -319,20 +318,15 @@ var findPackageParents = function(pkg, version, tracedFiles) {
     return tracedFiles[path2];
   });
   var parentPkgs = _to_consumable_array(new Set(versionFiles.flatMap(function(file) {
-    return (
-      // Because it supports copyWholePackage configuration, not all files exist.
-      file === null || file === void 0 ? void 0 : file.parents.map(function(parentPath) {
-        var parentFile = tracedFiles[parentPath];
-        if (!parentFile || parentFile.pkgName === pkg.name) {
-          return null;
-        }
-        return "".concat(parentFile.pkgName, "@").concat(parentFile.pkgVersion);
-      }).filter(Boolean)
-    );
+    return file.parents.map(function(parentPath) {
+      var parentFile = tracedFiles[parentPath];
+      if (!parentFile || parentFile.pkgName === pkg.name) {
+        return null;
+      }
+      return "".concat(parentFile.pkgName, "@").concat(parentFile.pkgVersion);
+    }).filter(Boolean);
   })));
-  return parentPkgs.filter(function(parentPkg) {
-    return parentPkg;
-  });
+  return parentPkgs;
 };
 var traceFiles = function() {
   var _ref = _async_to_generator(function(entryFiles, serverRootDir) {
@@ -346,7 +340,34 @@ var traceFiles = function() {
             4,
             nodeFileTrace(entryFiles, {
               base,
-              processCwd: serverRootDir
+              processCwd: serverRootDir,
+              resolve: function() {
+                var _ref2 = _async_to_generator(function(id, parent, job, isCjs) {
+                  return _ts_generator(this, function(_state2) {
+                    if (id.startsWith("@modern-js/prod-server")) {
+                      return [
+                        2,
+                        require.resolve(id, {
+                          paths: [
+                            require.resolve("@modern-js/app-tools")
+                          ]
+                        })
+                      ];
+                    } else {
+                      return [
+                        2,
+                        resolve(id, parent, job, isCjs)
+                      ];
+                    }
+                    return [
+                      2
+                    ];
+                  });
+                });
+                return function(id, parent, job, isCjs) {
+                  return _ref2.apply(this, arguments);
+                };
+              }()
             })
           ];
         case 1:

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

@@ -204,7 +204,7 @@ var createNetlifyPreset = function(appContext, modernConfig, needModernServer) {
     },
     genEntry: function genEntry() {
       return _async_to_generator(function() {
-        var _modernConfig_bff, serverConfig, pluginImportCode, dynamicProdOptions, entryCode, serverAppContext;
+        var _modernConfig_bff, serverConfig, pluginImportCode, dynamicProdOptions, pluginsCode, entryCode, serverAppContext;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -224,9 +224,11 @@ var createNetlifyPreset = function(appContext, modernConfig, needModernServer) {
               pluginImportCode = genPluginImportsCode(plugins || []);
               dynamicProdOptions = {
                 config: serverConfig,
-                serverConfigFile: DEFAULT_SERVER_CONFIG,
-                plugins
+                serverConfigFile: DEFAULT_SERVER_CONFIG
               };
+              pluginsCode = "[".concat(plugins.map(function(plugin, index) {
+                return "plugin_".concat(index, "()");
+              }).join(","), "]");
               return [
                 4,
                 fse.readFile(path.join(__dirname, "./netlifyEntry.js"))
@@ -234,7 +236,7 @@ var createNetlifyPreset = function(appContext, modernConfig, needModernServer) {
             case 1:
               entryCode = _state.sent().toString();
               serverAppContext = serverAppContenxtTemplate(appContext);
-              entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+              entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(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);
               return [
                 4,
                 fse.writeFile(entryFilePath, entryCode)
@@ -273,13 +275,9 @@ var createNetlifyPreset = function(appContext, modernConfig, needModernServer) {
               }
               return [
                 4,
-                handleDependencies({
-                  appDir: appDirectory,
-                  serverRootDir: funcsDirectory,
-                  includeEntries: [
-                    require.resolve("@modern-js/prod-server")
-                  ]
-                })
+                handleDependencies(appDirectory, funcsDirectory, [
+                  "@modern-js/prod-server"
+                ])
               ];
             case 3:
               _state.sent();

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

@@ -89,7 +89,8 @@ var require_netlifyEntry = __commonJS({
                   sharedDirectory: p_sharedDirectory,
                   apiDirectory: p_apiDirectory,
                   lambdaDirectory: p_lambdaDirectory
-                }
+                },
+                plugins: p_plugins
               }, dynamicProdOptions);
               return [
                 4,

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

@@ -51,7 +51,7 @@ var createNodePreset = function(appContext, config) {
     },
     genEntry: function genEntry() {
       return _async_to_generator(function() {
-        var _config_bff, serverConfig, pluginImportCode, dynamicProdOptions, entryCode, serverAppContext;
+        var _config_bff, serverConfig, pluginImportCode, dynamicProdOptions, pluginsCode, entryCode, serverAppContext;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -69,9 +69,11 @@ var createNodePreset = function(appContext, config) {
               pluginImportCode = genPluginImportsCode(plugins || []);
               dynamicProdOptions = {
                 config: serverConfig,
-                serverConfigFile: DEFAULT_SERVER_CONFIG,
-                plugins
+                serverConfigFile: DEFAULT_SERVER_CONFIG
               };
+              pluginsCode = "[".concat(plugins.map(function(plugin, index) {
+                return "plugin_".concat(index, "()");
+              }).join(","), "]");
               return [
                 4,
                 fse.readFile(path.join(__dirname, "./nodeEntry.js"))
@@ -79,7 +81,7 @@ var createNodePreset = function(appContext, config) {
             case 1:
               entryCode = _state.sent().toString();
               serverAppContext = serverAppContenxtTemplate(appContext);
-              entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+              entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(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);
               return [
                 4,
                 fse.writeFile(entryFilePath, entryCode)
@@ -106,14 +108,9 @@ var createNodePreset = function(appContext, config) {
               };
               return [
                 4,
-                handleDependencies({
-                  appDir: appDirectory,
-                  serverRootDir: outputDirectory,
-                  includeEntries: [
-                    require.resolve("@modern-js/prod-server")
-                  ],
-                  entryFilter: filter
-                })
+                handleDependencies(appDirectory, outputDirectory, [
+                  "@modern-js/prod-server"
+                ], filter)
               ];
             case 1:
               _state.sent();

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

@@ -81,7 +81,8 @@ function _main() {
               sharedDirectory: p_sharedDirectory,
               apiDirectory: p_apiDirectory,
               lambdaDirectory: p_lambdaDirectory
-            }
+            },
+            plugins: p_plugins
           }, dynamicProdOptions);
           return [
             4,

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

@@ -151,7 +151,7 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
     },
     genEntry: function genEntry() {
       return _async_to_generator(function() {
-        var _modernConfig_bff, serverConfig, pluginImportCode, dynamicProdOptions, serverAppContext, entryCode;
+        var _modernConfig_bff, serverConfig, pluginImportCode, dynamicProdOptions, pluginsCode, serverAppContext, entryCode;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -171,9 +171,11 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
               pluginImportCode = genPluginImportsCode(plugins || []);
               dynamicProdOptions = {
                 config: serverConfig,
-                serverConfigFile: DEFAULT_SERVER_CONFIG,
-                plugins
+                serverConfigFile: DEFAULT_SERVER_CONFIG
               };
+              pluginsCode = "[".concat(plugins.map(function(plugin, index) {
+                return "plugin_".concat(index, "()");
+              }).join(","), "]");
               serverAppContext = serverAppContenxtTemplate(appContext);
               return [
                 4,
@@ -181,7 +183,7 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
               ];
             case 1:
               entryCode = _state.sent().toString();
-              entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+              entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(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);
               return [
                 4,
                 fse.writeFile(entryFilePath, entryCode)
@@ -207,13 +209,9 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
               }
               return [
                 4,
-                handleDependencies({
-                  appDir: appDirectory,
-                  serverRootDir: funcsDirectory,
-                  includeEntries: [
-                    require.resolve("@modern-js/prod-server")
-                  ]
-                })
+                handleDependencies(appDirectory, funcsDirectory, [
+                  "@modern-js/prod-server"
+                ])
               ];
             case 1:
               _state.sent();

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

@@ -89,7 +89,8 @@ var require_vercelEntry = __commonJS({
                   sharedDirectory: p_sharedDirectory,
                   apiDirectory: p_apiDirectory,
                   lambdaDirectory: p_lambdaDirectory
-                }
+                },
+                plugins: p_plugins
               }, dynamicProdOptions);
               return [
                 4,

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

@@ -1,11 +1,21 @@
-import path from "node:path";
+import path, { isAbsolute } from "node:path";
 import { fs as fse, pkgUp, semver } from "@modern-js/utils";
 import { readPackageJSON } from "pkg-types";
 import { parseNodeModulePath } from "mlly";
-import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles as defaultTraceFiles, findPackageParents, resolveTracedPath, readDirRecursive } from "./utils";
-const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = defaultTraceFiles, entryFilter, modifyPackageJson, copyWholePackage }) => {
+import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles, findPackageParents, resolveTracedPath } from "./utils";
+const handleDependencies = async (appDir, serverRootDir, include, entryFilter) => {
   const base = "/";
   const entryFiles = await findEntryFiles(serverRootDir, entryFilter);
+  const includeEntries = include.map((item) => {
+    if (isAbsolute(item)) {
+      return item;
+    }
+    try {
+      return require.resolve(item);
+    } catch (error) {
+    }
+    return item;
+  });
   const fileTrace = await traceFiles(entryFiles.concat(includeEntries), serverRootDir, base);
   const currentProjectModules = path.join(appDir, "node_modules");
   const tracedFiles = Object.fromEntries(await Promise.all([
@@ -100,17 +110,9 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
       }
       tracedPackage.versions[pkgJSON.version] = tracedPackageVersion;
     }
+    tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.path === tracedFile.pkgPath && tracedPackageVersion.files.push(tracedFile.path);
     tracedFile.pkgName = pkgName;
     tracedFile.pkgVersion = pkgJSON.version;
-    const shouldCopyWholePackage = copyWholePackage === null || copyWholePackage === void 0 ? void 0 : copyWholePackage(pkgName);
-    if (tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.pkgJSON.version === tracedFile.pkgVersion) {
-      if (shouldCopyWholePackage) {
-        const allFiles = await readDirRecursive(tracedFile.pkgPath);
-        tracedPackageVersion.files.push(...allFiles);
-      } else {
-        tracedPackageVersion.files.push(tracedFile.path);
-      }
-    }
   }
   const multiVersionPkgs = {};
   const singleVersionPackages = [];
@@ -128,11 +130,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
   await Promise.all(singleVersionPackages.map((pkgName) => {
     const pkg = tracedPackages[pkgName];
     const version = Object.keys(pkg.versions)[0];
-    return writePackage({
-      pkg,
-      version,
-      projectDir: serverRootDir
-    });
+    return writePackage(pkg, version, serverRootDir);
   }));
   const projectPkgJson = await readPackageJSON(serverRootDir).catch(() => ({}));
   for (const [pkgName, pkgVersions] of Object.entries(multiVersionPkgs)) {
@@ -159,12 +157,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
     for (const [version, parentPkgs] of versionEntires) {
       const pkg = tracedPackages[pkgName];
       const pkgDestPath = `.modernjs/${pkgName}@${version}/node_modules/${pkgName}`;
-      await writePackage({
-        pkg,
-        version,
-        projectDir: serverRootDir,
-        _pkgPath: pkgDestPath
-      });
+      await writePackage(pkg, version, serverRootDir, pkgDestPath);
       await linkPackage(pkgDestPath, `${pkgName}`, serverRootDir);
       for (const parentPkg of parentPkgs) {
         const parentPkgName = parentPkg.replace(/@[^@]+$/, "");
@@ -173,7 +166,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
     }
   }
   const outputPkgPath = path.join(serverRootDir, "package.json");
-  const newPkgJson = {
+  await fse.writeJSON(outputPkgPath, {
     name: `${projectPkgJson.name || "modernjs-project"}-prod`,
     version: projectPkgJson.version || "0.0.0",
     private: true,
@@ -183,9 +176,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
         Object.keys(pkg.versions)[0]
       ])
     ].sort(([a], [b]) => a.localeCompare(b)))
-  };
-  const finalPkgJson = (modifyPackageJson === null || modifyPackageJson === void 0 ? void 0 : modifyPackageJson(newPkgJson)) || newPkgJson;
-  await fse.writeJSON(outputPkgPath, finalPkgJson);
+  });
 };
 export {
   handleDependencies

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

@@ -2,7 +2,7 @@ import path from "path";
 import os from "node:os";
 import { fs as fse } from "@modern-js/utils";
 import { parseNodeModulePath } from "mlly";
-import { nodeFileTrace } from "@vercel/nft";
+import { nodeFileTrace, resolve } from "@vercel/nft";
 function applyPublicCondition(pkg) {
   var _pkg_publishConfig;
   if (pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig = pkg.publishConfig) === null || _pkg_publishConfig === void 0 ? void 0 : _pkg_publishConfig.exports) {
@@ -10,8 +10,7 @@ function applyPublicCondition(pkg) {
     pkg.exports = pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig1 = pkg.publishConfig) === null || _pkg_publishConfig1 === void 0 ? void 0 : _pkg_publishConfig1.exports;
   }
 }
-const writePackage = async (options) => {
-  const { pkg, version, projectDir, _pkgPath } = options;
+const writePackage = async (pkg, version, projectDir, _pkgPath) => {
   const pkgPath = _pkgPath || pkg.name;
   for (const src of pkg.versions[version].files) {
     if (src.includes("node_modules")) {
@@ -85,23 +84,31 @@ const findEntryFiles = async (rootDir, entryFilter) => {
 const findPackageParents = (pkg, version, tracedFiles) => {
   const versionFiles = pkg.versions[version].files.map((path2) => tracedFiles[path2]);
   const parentPkgs = [
-    ...new Set(versionFiles.flatMap((file) => (
-      // Because it supports copyWholePackage configuration, not all files exist.
-      file === null || file === void 0 ? void 0 : file.parents.map((parentPath) => {
-        const parentFile = tracedFiles[parentPath];
-        if (!parentFile || parentFile.pkgName === pkg.name) {
-          return null;
-        }
-        return `${parentFile.pkgName}@${parentFile.pkgVersion}`;
-      }).filter(Boolean)
-    )))
+    ...new Set(versionFiles.flatMap((file) => file.parents.map((parentPath) => {
+      const parentFile = tracedFiles[parentPath];
+      if (!parentFile || parentFile.pkgName === pkg.name) {
+        return null;
+      }
+      return `${parentFile.pkgName}@${parentFile.pkgVersion}`;
+    }).filter(Boolean)))
   ];
-  return parentPkgs.filter((parentPkg) => parentPkg);
+  return parentPkgs;
 };
 const traceFiles = async (entryFiles, serverRootDir, base = "/") => {
   return await nodeFileTrace(entryFiles, {
     base,
-    processCwd: serverRootDir
+    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 resolve(id, parent, job, isCjs);
+      }
+    }
   });
 };
 const resolveTracedPath = async (base, p) => fse.realpath(path.resolve(base, p));

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

@@ -76,12 +76,14 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       const pluginImportCode = genPluginImportsCode(plugins || []);
       const dynamicProdOptions = {
         config: serverConfig,
-        serverConfigFile: DEFAULT_SERVER_CONFIG,
-        plugins
+        serverConfigFile: DEFAULT_SERVER_CONFIG
       };
+      const pluginsCode = `[${plugins.map((plugin, index) => {
+        return `plugin_${index}()`;
+      }).join(",")}]`;
       let entryCode = (await fse.readFile(path.join(__dirname, "./netlifyEntry.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);
+      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${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 fse.writeFile(entryFilePath, entryCode);
     },
     async end() {
@@ -91,13 +93,9 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       if (!needModernServer) {
         return;
       }
-      await handleDependencies({
-        appDir: appDirectory,
-        serverRootDir: funcsDirectory,
-        includeEntries: [
-          require.resolve("@modern-js/prod-server")
-        ]
-      });
+      await handleDependencies(appDirectory, funcsDirectory, [
+        "@modern-js/prod-server"
+      ]);
     }
   };
 };

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

@@ -37,6 +37,7 @@ var require_netlifyEntry = __commonJS({
           apiDirectory: p_apiDirectory,
           lambdaDirectory: p_lambdaDirectory
         },
+        plugins: p_plugins,
         ...dynamicProdOptions
       };
       const requestHandler2 = await createNetlifyFunction(prodServerOptions);

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

@@ -31,12 +31,14 @@ const createNodePreset = (appContext, config) => {
       const pluginImportCode = genPluginImportsCode(plugins || []);
       const dynamicProdOptions = {
         config: serverConfig,
-        serverConfigFile: DEFAULT_SERVER_CONFIG,
-        plugins
+        serverConfigFile: DEFAULT_SERVER_CONFIG
       };
+      const pluginsCode = `[${plugins.map((plugin, index) => {
+        return `plugin_${index}()`;
+      }).join(",")}]`;
       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);
+      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${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 fse.writeFile(entryFilePath, entryCode);
     },
     async end() {
@@ -45,14 +47,9 @@ const createNodePreset = (appContext, config) => {
       const filter = (filePath) => {
         return !filePath.startsWith(staticDirectory);
       };
-      await handleDependencies({
-        appDir: appDirectory,
-        serverRootDir: outputDirectory,
-        includeEntries: [
-          require.resolve("@modern-js/prod-server")
-        ],
-        entryFilter: filter
-      });
+      await handleDependencies(appDirectory, outputDirectory, [
+        "@modern-js/prod-server"
+      ], filter);
     }
   };
 };

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

@@ -29,6 +29,7 @@ async function main() {
       apiDirectory: p_apiDirectory,
       lambdaDirectory: p_lambdaDirectory
     },
+    plugins: p_plugins,
     ...dynamicProdOptions
   };
   const app = await createProdServer(prodServerOptions);

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

@@ -91,25 +91,23 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
       const pluginImportCode = genPluginImportsCode(plugins || []);
       const dynamicProdOptions = {
         config: serverConfig,
-        serverConfigFile: DEFAULT_SERVER_CONFIG,
-        plugins
+        serverConfigFile: DEFAULT_SERVER_CONFIG
       };
+      const pluginsCode = `[${plugins.map((plugin, index) => {
+        return `plugin_${index}()`;
+      }).join(",")}]`;
       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);
+      entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${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 fse.writeFile(entryFilePath, entryCode);
     },
     async end() {
       if (!needModernServer) {
         return;
       }
-      await handleDependencies({
-        appDir: appDirectory,
-        serverRootDir: funcsDirectory,
-        includeEntries: [
-          require.resolve("@modern-js/prod-server")
-        ]
-      });
+      await handleDependencies(appDirectory, funcsDirectory, [
+        "@modern-js/prod-server"
+      ]);
     }
   };
 };

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

@@ -37,6 +37,7 @@ var require_vercelEntry = __commonJS({
           apiDirectory: p_apiDirectory,
           lambdaDirectory: p_lambdaDirectory
         },
+        plugins: p_plugins,
         ...dynamicProdOptions
       };
       const app = await createProdServer(prodServerOptions);

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

@@ -1,11 +1 @@
-import type { PackageJson } from 'pkg-types';
-import { traceFiles as defaultTraceFiles } from './utils';
-export declare const handleDependencies: ({ appDir, serverRootDir, includeEntries, traceFiles, entryFilter, modifyPackageJson, copyWholePackage, }: {
-    appDir: string;
-    serverRootDir: string;
-    includeEntries: string[];
-    traceFiles?: ((entryFiles: string[], serverRootDir: string, base?: string) => Promise<import("@vercel/nft").NodeFileTraceResult>) | undefined;
-    entryFilter?: ((filePath: string) => boolean) | undefined;
-    modifyPackageJson?: ((pkgJson: PackageJson) => PackageJson) | undefined;
-    copyWholePackage?: ((pkgName: string) => boolean) | undefined;
-}) => Promise<void>;
+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

@@ -17,13 +17,7 @@ export type TracedFile = {
     pkgName: string;
     pkgVersion?: string;
 };
-interface WritePackageOptions {
-    pkg: TracedPackage;
-    version: string;
-    projectDir: string;
-    _pkgPath?: string;
-}
-export declare const writePackage: (options: WritePackageOptions) => Promise<void>;
+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;