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

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

@@ -36,10 +36,20 @@ var import_utils = require("@modern-js/utils");
 var import_pkg_types = require("pkg-types");
 var import_mlly = require("mlly");
 var import_utils2 = require("./utils");
-const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = import_utils2.traceFiles, entryFilter, modifyPackageJson, copyWholePackage }) => {
+const handleDependencies = async (appDir, serverRootDir, include, entryFilter) => {
   const base = "/";
   const entryFiles = await (0, import_utils2.findEntryFiles)(serverRootDir, entryFilter);
-  const fileTrace = await traceFiles(entryFiles.concat(includeEntries), serverRootDir, base);
+  const includeEntries = include.map((item) => {
+    if ((0, import_node_path.isAbsolute)(item)) {
+      return item;
+    }
+    try {
+      return require.resolve(item);
+    } catch (error) {
+    }
+    return item;
+  });
+  const fileTrace = await (0, import_utils2.traceFiles)(entryFiles.concat(includeEntries), serverRootDir, base);
   const currentProjectModules = import_node_path.default.join(appDir, "node_modules");
   const tracedFiles = Object.fromEntries(await Promise.all([
     ...fileTrace.reasons.entries()
@@ -133,17 +143,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 (0, import_utils2.readDirRecursive)(tracedFile.pkgPath);
-        tracedPackageVersion.files.push(...allFiles);
-      } else {
-        tracedPackageVersion.files.push(tracedFile.path);
-      }
-    }
   }
   const multiVersionPkgs = {};
   const singleVersionPackages = [];
@@ -161,11 +163,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 (0, import_utils2.writePackage)({
-      pkg,
-      version,
-      projectDir: serverRootDir
-    });
+    return (0, import_utils2.writePackage)(pkg, version, serverRootDir);
   }));
   const projectPkgJson = await (0, import_pkg_types.readPackageJSON)(serverRootDir).catch(() => ({}));
   for (const [pkgName, pkgVersions] of Object.entries(multiVersionPkgs)) {
@@ -192,12 +190,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 (0, import_utils2.writePackage)({
-        pkg,
-        version,
-        projectDir: serverRootDir,
-        _pkgPath: pkgDestPath
-      });
+      await (0, import_utils2.writePackage)(pkg, version, serverRootDir, pkgDestPath);
       await (0, import_utils2.linkPackage)(pkgDestPath, `${pkgName}`, serverRootDir);
       for (const parentPkg of parentPkgs) {
         const parentPkgName = parentPkg.replace(/@[^@]+$/, "");
@@ -206,7 +199,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
     }
   }
   const outputPkgPath = import_node_path.default.join(serverRootDir, "package.json");
-  const newPkgJson = {
+  await import_utils.fs.writeJSON(outputPkgPath, {
     name: `${projectPkgJson.name || "modernjs-project"}-prod`,
     version: projectPkgJson.version || "0.0.0",
     private: true,
@@ -216,9 +209,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 import_utils.fs.writeJSON(outputPkgPath, finalPkgJson);
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -50,8 +50,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")) {
@@ -125,23 +124,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 (0, import_nft.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 (0, import_nft.resolve)(id, parent, job, isCjs);
+      }
+    }
   });
 };
 const resolveTracedPath = async (base, p) => import_utils.fs.realpath(import_path.default.resolve(base, p));

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

@@ -109,12 +109,14 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
       const dynamicProdOptions = {
         config: serverConfig,
-        serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
-        plugins
+        serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG
       };
+      const pluginsCode = `[${plugins.map((plugin, index) => {
+        return `plugin_${index}()`;
+      }).join(",")}]`;
       let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./netlifyEntry.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_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      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() {
@@ -124,13 +126,9 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       if (!needModernServer) {
         return;
       }
-      await (0, import_dependencies.handleDependencies)({
-        appDir: appDirectory,
-        serverRootDir: funcsDirectory,
-        includeEntries: [
-          require.resolve("@modern-js/prod-server")
-        ]
-      });
+      await (0, import_dependencies.handleDependencies)(appDirectory, funcsDirectory, [
+        "@modern-js/prod-server"
+      ]);
     }
   };
 };

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

@@ -32,6 +32,7 @@ async function initServer() {
       apiDirectory: p_apiDirectory,
       lambdaDirectory: p_lambdaDirectory
     },
+    plugins: p_plugins,
     ...dynamicProdOptions
   };
   const requestHandler2 = await createNetlifyFunction(prodServerOptions);

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

@@ -64,12 +64,14 @@ const createNodePreset = (appContext, config) => {
       const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
       const dynamicProdOptions = {
         config: serverConfig,
-        serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
-        plugins
+        serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG
       };
+      const pluginsCode = `[${plugins.map((plugin, index) => {
+        return `plugin_${index}()`;
+      }).join(",")}]`;
       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_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      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() {
@@ -78,14 +80,9 @@ const createNodePreset = (appContext, config) => {
       const filter = (filePath) => {
         return !filePath.startsWith(staticDirectory);
       };
-      await (0, import_dependencies.handleDependencies)({
-        appDir: appDirectory,
-        serverRootDir: outputDirectory,
-        includeEntries: [
-          require.resolve("@modern-js/prod-server")
-        ],
-        entryFilter: filter
-      });
+      await (0, import_dependencies.handleDependencies)(appDirectory, outputDirectory, [
+        "@modern-js/prod-server"
+      ], filter);
     }
   };
 };

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

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

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

@@ -124,25 +124,23 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
       const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
       const dynamicProdOptions = {
         config: serverConfig,
-        serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
-        plugins
+        serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG
       };
+      const pluginsCode = `[${plugins.map((plugin, index) => {
+        return `plugin_${index}()`;
+      }).join(",")}]`;
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
       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_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      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) {
         return;
       }
-      await (0, import_dependencies.handleDependencies)({
-        appDir: appDirectory,
-        serverRootDir: funcsDirectory,
-        includeEntries: [
-          require.resolve("@modern-js/prod-server")
-        ]
-      });
+      await (0, import_dependencies.handleDependencies)(appDirectory, funcsDirectory, [
+        "@modern-js/prod-server"
+      ]);
     }
   };
 };

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

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

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

@@ -3,18 +3,17 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { _ as _ts_values } from "@swc/helpers/_/_ts_values";
-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";
+import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles, findPackageParents, resolveTracedPath } from "./utils";
 var handleDependencies = function() {
-  var _ref = _async_to_generator(function(param) {
-    var appDir, serverRootDir, includeEntries, _param_traceFiles, traceFiles, entryFilter, modifyPackageJson, copyWholePackage, base, entryFiles, fileTrace, currentProjectModules, tracedFiles, _, tracedPackages, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, tracedFile, pkgName, tracedPackage, pkgJSON, tracedPackageVersion, shouldCopyWholePackage, _tracedPackageVersion_files, allFiles, err, multiVersionPkgs, singleVersionPackages, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, tracedPackage1, versions, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, version, projectPkgJson, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3, _loop, _iterator3, _step3, err, outputPkgPath, newPkgJson, finalPkgJson;
+  var _ref = _async_to_generator(function(appDir, serverRootDir, include, entryFilter) {
+    var base, entryFiles, includeEntries, fileTrace, currentProjectModules, tracedFiles, _, tracedPackages, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, tracedFile, pkgName, tracedPackage, pkgJSON, tracedPackageVersion, err, multiVersionPkgs, singleVersionPackages, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, tracedPackage1, versions, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, version, projectPkgJson, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3, _loop, _iterator3, _step3, err, outputPkgPath;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          appDir = param.appDir, serverRootDir = param.serverRootDir, includeEntries = param.includeEntries, _param_traceFiles = param.traceFiles, traceFiles = _param_traceFiles === void 0 ? defaultTraceFiles : _param_traceFiles, entryFilter = param.entryFilter, modifyPackageJson = param.modifyPackageJson, copyWholePackage = param.copyWholePackage;
           base = "/";
           return [
             4,
@@ -22,6 +21,16 @@ var handleDependencies = function() {
           ];
         case 1:
           entryFiles = _state.sent();
+          includeEntries = include.map(function(item) {
+            if (isAbsolute(item)) {
+              return item;
+            }
+            try {
+              return require.resolve(item);
+            } catch (error) {
+            }
+            return item;
+          });
           return [
             4,
             traceFiles(entryFiles.concat(includeEntries), serverRootDir, base)
@@ -33,12 +42,12 @@ var handleDependencies = function() {
           return [
             4,
             Promise.all(_to_consumable_array(fileTrace.reasons.entries()).map(function() {
-              var _ref2 = _async_to_generator(function(param2) {
+              var _ref2 = _async_to_generator(function(param) {
                 var _param, _path, reasons, filePath, baseDir, pkgName2, subpath, pkgPath, parsed, MODERN_UTILS_PATH, MODERN_UTILS_PATH_REGEX, match, packageJsonPath, _tmp, packageJson, parents, tracedFile2;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
-                      _param = _sliced_to_array(param2, 2), _path = _param[0], reasons = _param[1];
+                      _param = _sliced_to_array(param, 2), _path = _param[0], reasons = _param[1];
                       if (reasons.ignored) {
                         return [
                           2
@@ -171,9 +180,9 @@ var handleDependencies = function() {
         case 4:
           _state.trys.push([
             4,
-            11,
-            12,
-            13
+            9,
+            10,
+            11
           ]);
           _iterator = Object.values(tracedFiles)[Symbol.iterator]();
           _state.label = 5;
@@ -181,7 +190,7 @@ var handleDependencies = function() {
           if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
             return [
               3,
-              10
+              8
             ];
           tracedFile = _step.value;
           pkgName = tracedFile.pkgName;
@@ -221,53 +230,30 @@ var handleDependencies = function() {
             }
             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;
-          shouldCopyWholePackage = copyWholePackage === null || copyWholePackage === void 0 ? void 0 : copyWholePackage(pkgName);
-          if (!(tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.pkgJSON.version === tracedFile.pkgVersion))
-            return [
-              3,
-              9
-            ];
-          if (!shouldCopyWholePackage)
-            return [
-              3,
-              8
-            ];
-          return [
-            4,
-            readDirRecursive(tracedFile.pkgPath)
-          ];
+          _state.label = 7;
         case 7:
-          allFiles = _state.sent();
-          (_tracedPackageVersion_files = tracedPackageVersion.files).push.apply(_tracedPackageVersion_files, _to_consumable_array(allFiles));
-          return [
-            3,
-            9
-          ];
-        case 8:
-          tracedPackageVersion.files.push(tracedFile.path);
-          _state.label = 9;
-        case 9:
           _iteratorNormalCompletion = true;
           return [
             3,
             5
           ];
-        case 10:
+        case 8:
           return [
             3,
-            13
+            11
           ];
-        case 11:
+        case 9:
           err = _state.sent();
           _didIteratorError = true;
           _iteratorError = err;
           return [
             3,
-            13
+            11
           ];
-        case 12:
+        case 10:
           try {
             if (!_iteratorNormalCompletion && _iterator.return != null) {
               _iterator.return();
@@ -280,7 +266,7 @@ var handleDependencies = function() {
           return [
             7
           ];
-        case 13:
+        case 11:
           multiVersionPkgs = {};
           singleVersionPackages = [];
           _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
@@ -333,14 +319,10 @@ var handleDependencies = function() {
             Promise.all(singleVersionPackages.map(function(pkgName2) {
               var pkg = tracedPackages[pkgName2];
               var version2 = Object.keys(pkg.versions)[0];
-              return writePackage({
-                pkg,
-                version: version2,
-                projectDir: serverRootDir
-              });
+              return writePackage(pkg, version2, serverRootDir);
             }))
           ];
-        case 14:
+        case 12:
           _state.sent();
           return [
             4,
@@ -348,16 +330,16 @@ var handleDependencies = function() {
               return {};
             })
           ];
-        case 15:
+        case 13:
           projectPkgJson = _state.sent();
           _iteratorNormalCompletion3 = true, _didIteratorError3 = false, _iteratorError3 = void 0;
-          _state.label = 16;
-        case 16:
+          _state.label = 14;
+        case 14:
           _state.trys.push([
-            16,
-            21,
-            22,
-            23
+            14,
+            19,
+            20,
+            21
           ]);
           _loop = function() {
             var _step_value, pkgName2, pkgVersions, versionEntires, _iteratorNormalCompletion4, _didIteratorError4, _iteratorError4, _iterator4, _step4, _step_value1, version2, parentPkgs, pkg, pkgDestPath, _iteratorNormalCompletion12, _didIteratorError12, _iteratorError12, _iterator12, _step12, parentPkg, parentPkgName, err2, err2;
@@ -365,8 +347,8 @@ var handleDependencies = function() {
               switch (_state2.label) {
                 case 0:
                   _step_value = _sliced_to_array(_step3.value, 2), pkgName2 = _step_value[0], pkgVersions = _step_value[1];
-                  versionEntires = Object.entries(pkgVersions).sort(function(param2, param1) {
-                    var _param = _sliced_to_array(param2, 2), v1 = _param[0], p1 = _param[1], _param1 = _sliced_to_array(param1, 2), v2 = _param1[0], p2 = _param1[1];
+                  versionEntires = Object.entries(pkgVersions).sort(function(param, param1) {
+                    var _param = _sliced_to_array(param, 2), v1 = _param[0], p1 = _param[1], _param1 = _sliced_to_array(param1, 2), v2 = _param1[0], p2 = _param1[1];
                     var _tracedPackages_pkgName_versions_v1, _tracedPackages_pkgName_versions, _tracedPackages_pkgName, _tracedPackages_pkgName_versions_v2, _tracedPackages_pkgName_versions1, _tracedPackages_pkgName1;
                     var shouldHoist1 = (_tracedPackages_pkgName = tracedPackages[pkgName2]) === null || _tracedPackages_pkgName === void 0 ? void 0 : (_tracedPackages_pkgName_versions = _tracedPackages_pkgName.versions) === null || _tracedPackages_pkgName_versions === void 0 ? void 0 : (_tracedPackages_pkgName_versions_v1 = _tracedPackages_pkgName_versions[v1]) === null || _tracedPackages_pkgName_versions_v1 === void 0 ? void 0 : _tracedPackages_pkgName_versions_v1.isDirectDep;
                     var shouldHoist2 = (_tracedPackages_pkgName1 = tracedPackages[pkgName2]) === null || _tracedPackages_pkgName1 === void 0 ? void 0 : (_tracedPackages_pkgName_versions1 = _tracedPackages_pkgName1.versions) === null || _tracedPackages_pkgName_versions1 === void 0 ? void 0 : (_tracedPackages_pkgName_versions_v2 = _tracedPackages_pkgName_versions1[v2]) === null || _tracedPackages_pkgName_versions_v2 === void 0 ? void 0 : _tracedPackages_pkgName_versions_v2.isDirectDep;
@@ -408,12 +390,7 @@ var handleDependencies = function() {
                   pkgDestPath = ".modernjs/".concat(pkgName2, "@").concat(version2, "/node_modules/").concat(pkgName2);
                   return [
                     4,
-                    writePackage({
-                      pkg,
-                      version: version2,
-                      projectDir: serverRootDir,
-                      _pkgPath: pkgDestPath
-                    })
+                    writePackage(pkg, version2, serverRootDir, pkgDestPath)
                   ];
                 case 3:
                   _state2.sent();
@@ -521,40 +498,40 @@ var handleDependencies = function() {
             });
           };
           _iterator3 = Object.entries(multiVersionPkgs)[Symbol.iterator]();
-          _state.label = 17;
-        case 17:
+          _state.label = 15;
+        case 15:
           if (!!(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done))
             return [
               3,
-              20
+              18
             ];
           return [
             5,
             _ts_values(_loop())
           ];
-        case 18:
+        case 16:
           _state.sent();
-          _state.label = 19;
-        case 19:
+          _state.label = 17;
+        case 17:
           _iteratorNormalCompletion3 = true;
           return [
             3,
-            17
+            15
           ];
-        case 20:
+        case 18:
           return [
             3,
-            23
+            21
           ];
-        case 21:
+        case 19:
           err = _state.sent();
           _didIteratorError3 = true;
           _iteratorError3 = err;
           return [
             3,
-            23
+            21
           ];
-        case 22:
+        case 20:
           try {
             if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
               _iterator3.return();
@@ -567,28 +544,26 @@ var handleDependencies = function() {
           return [
             7
           ];
-        case 23:
+        case 21:
           outputPkgPath = path.join(serverRootDir, "package.json");
-          newPkgJson = {
-            name: "".concat(projectPkgJson.name || "modernjs-project", "-prod"),
-            version: projectPkgJson.version || "0.0.0",
-            private: true,
-            dependencies: Object.fromEntries(_to_consumable_array(Object.values(tracedPackages).map(function(pkg) {
-              return [
-                pkg.name,
-                Object.keys(pkg.versions)[0]
-              ];
-            })).sort(function(param2, param1) {
-              var _param = _sliced_to_array(param2, 1), a = _param[0], _param1 = _sliced_to_array(param1, 1), b = _param1[0];
-              return a.localeCompare(b);
-            }))
-          };
-          finalPkgJson = (modifyPackageJson === null || modifyPackageJson === void 0 ? void 0 : modifyPackageJson(newPkgJson)) || newPkgJson;
           return [
             4,
-            fse.writeJSON(outputPkgPath, finalPkgJson)
+            fse.writeJSON(outputPkgPath, {
+              name: "".concat(projectPkgJson.name || "modernjs-project", "-prod"),
+              version: projectPkgJson.version || "0.0.0",
+              private: true,
+              dependencies: Object.fromEntries(_to_consumable_array(Object.values(tracedPackages).map(function(pkg) {
+                return [
+                  pkg.name,
+                  Object.keys(pkg.versions)[0]
+                ];
+              })).sort(function(param, param1) {
+                var _param = _sliced_to_array(param, 1), a = _param[0], _param1 = _sliced_to_array(param1, 1), b = _param1[0];
+                return a.localeCompare(b);
+              }))
+            })
           ];
-        case 24:
+        case 22:
           _state.sent();
           return [
             2
@@ -596,7 +571,7 @@ var handleDependencies = function() {
       }
     });
   });
-  return function handleDependencies2(_) {
+  return function handleDependencies2(appDir, serverRootDir, include, entryFilter) {
     return _ref.apply(this, arguments);
   };
 }();