@modern-js/app-tools 2.54.3 → 2.54.5

package/dist/cjs/index.js

@@ -147,7 +147,7 @@ const appTools = (options = {
       },
       async beforeRestart() {
         (0, import_utils.cleanRequireCache)([
-          require.resolve("./analyze")
+          require.resolve("./plugins/analyze")
         ]);
       },
       async modifyFileSystemRoutes({ entrypoint, routes }) {

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

@@ -36,20 +36,10 @@ 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, include, entryFilter) => {
+const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = import_utils2.traceFiles, entryFilter, modifyPackageJson, copyWholePackage }) => {
   const base = "/";
   const entryFiles = await (0, import_utils2.findEntryFiles)(serverRootDir, entryFilter);
-  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 fileTrace = await 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()
@@ -143,9 +133,18 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
       }
       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) && // Merged package files are based on the version, not on paths, to handle some boundary cases
+    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 = [];
@@ -163,7 +162,11 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
   await Promise.all(singleVersionPackages.map((pkgName) => {
     const pkg = tracedPackages[pkgName];
     const version = Object.keys(pkg.versions)[0];
-    return (0, import_utils2.writePackage)(pkg, version, serverRootDir);
+    return (0, import_utils2.writePackage)({
+      pkg,
+      version,
+      projectDir: serverRootDir
+    });
   }));
   const projectPkgJson = await (0, import_pkg_types.readPackageJSON)(serverRootDir).catch(() => ({}));
   for (const [pkgName, pkgVersions] of Object.entries(multiVersionPkgs)) {
@@ -190,7 +193,12 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
     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, serverRootDir, pkgDestPath);
+      await (0, import_utils2.writePackage)({
+        pkg,
+        version,
+        projectDir: serverRootDir,
+        _pkgPath: pkgDestPath
+      });
       await (0, import_utils2.linkPackage)(pkgDestPath, `${pkgName}`, serverRootDir);
       for (const parentPkg of parentPkgs) {
         const parentPkgName = parentPkg.replace(/@[^@]+$/, "");
@@ -199,7 +207,7 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
     }
   }
   const outputPkgPath = import_node_path.default.join(serverRootDir, "package.json");
-  await import_utils.fs.writeJSON(outputPkgPath, {
+  const newPkgJson = {
     name: `${projectPkgJson.name || "modernjs-project"}-prod`,
     version: projectPkgJson.version || "0.0.0",
     private: true,
@@ -209,7 +217,9 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
         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,7 +50,8 @@ 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 (pkg, version, projectDir, _pkgPath) => {
+const writePackage = async (options) => {
+  const { pkg, version, projectDir, _pkgPath } = options;
   const pkgPath = _pkgPath || pkg.name;
   for (const src of pkg.versions[version].files) {
     if (src.includes("node_modules")) {
@@ -124,31 +125,23 @@ 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) => 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) => (
+      // 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)
+    )))
   ];
-  return parentPkgs;
+  return parentPkgs.filter((parentPkg) => parentPkg);
 };
 const traceFiles = async (entryFiles, serverRootDir, base = "/") => {
   return 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);
-      }
-    }
+    processCwd: serverRootDir
   });
 };
 const resolveTracedPath = async (base, p) => import_utils.fs.realpath(import_path.default.resolve(base, p));

package/dist/cjs/plugins/deploy/exports.js

@@ -0,0 +1,28 @@
+"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 exports_exports = {};
+__export(exports_exports, {
+  handleDependencies: () => import_dependencies.handleDependencies
+});
+module.exports = __toCommonJS(exports_exports);
+var import_dependencies = require("./dependencies");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handleDependencies
+});

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

@@ -126,9 +126,13 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       if (!needModernServer) {
         return;
       }
-      await (0, import_dependencies.handleDependencies)(appDirectory, funcsDirectory, [
-        "@modern-js/prod-server"
-      ]);
+      await (0, import_dependencies.handleDependencies)({
+        appDir: appDirectory,
+        serverRootDir: funcsDirectory,
+        includeEntries: [
+          require.resolve("@modern-js/prod-server")
+        ]
+      });
     }
   };
 };

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

@@ -80,9 +80,14 @@ const createNodePreset = (appContext, config) => {
       const filter = (filePath) => {
         return !filePath.startsWith(staticDirectory);
       };
-      await (0, import_dependencies.handleDependencies)(appDirectory, outputDirectory, [
-        "@modern-js/prod-server"
-      ], filter);
+      await (0, import_dependencies.handleDependencies)({
+        appDir: appDirectory,
+        serverRootDir: outputDirectory,
+        includeEntries: [
+          require.resolve("@modern-js/prod-server")
+        ],
+        entryFilter: filter
+      });
     }
   };
 };

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

@@ -138,9 +138,13 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
       if (!needModernServer) {
         return;
       }
-      await (0, import_dependencies.handleDependencies)(appDirectory, funcsDirectory, [
-        "@modern-js/prod-server"
-      ]);
+      await (0, import_dependencies.handleDependencies)({
+        appDir: appDirectory,
+        serverRootDir: funcsDirectory,
+        includeEntries: [
+          require.resolve("@modern-js/prod-server")
+        ]
+      });
     }
   };
 };

package/dist/esm/index.js

@@ -219,7 +219,7 @@ var appTools = function() {
           return _async_to_generator(function() {
             return _ts_generator(this, function(_state) {
               cleanRequireCache([
-                require.resolve("./analyze")
+                require.resolve("./plugins/analyze")
               ]);
               return [
                 2

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

@@ -3,17 +3,18 @@ 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, { isAbsolute } from "node:path";
+import path 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, findPackageParents, resolveTracedPath } from "./utils";
+import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles as defaultTraceFiles, findPackageParents, resolveTracedPath, readDirRecursive } from "./utils";
 var handleDependencies = function() {
-  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;
+  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;
     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,
@@ -21,16 +22,6 @@ 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)
@@ -42,12 +33,12 @@ var handleDependencies = function() {
           return [
             4,
             Promise.all(_to_consumable_array(fileTrace.reasons.entries()).map(function() {
-              var _ref2 = _async_to_generator(function(param) {
+              var _ref2 = _async_to_generator(function(param2) {
                 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(param, 2), _path = _param[0], reasons = _param[1];
+                      _param = _sliced_to_array(param2, 2), _path = _param[0], reasons = _param[1];
                       if (reasons.ignored) {
                         return [
                           2
@@ -180,9 +171,9 @@ var handleDependencies = function() {
         case 4:
           _state.trys.push([
             4,
-            9,
-            10,
-            11
+            11,
+            12,
+            13
           ]);
           _iterator = Object.values(tracedFiles)[Symbol.iterator]();
           _state.label = 5;
@@ -190,7 +181,7 @@ var handleDependencies = function() {
           if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
             return [
               3,
-              8
+              10
             ];
           tracedFile = _step.value;
           pkgName = tracedFile.pkgName;
@@ -230,30 +221,54 @@ 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;
-          _state.label = 7;
+          shouldCopyWholePackage = copyWholePackage === null || copyWholePackage === void 0 ? void 0 : copyWholePackage(pkgName);
+          if (!(tracedFile.path.startsWith(tracedFile.pkgPath) && // Merged package files are based on the version, not on paths, to handle some boundary cases
+          tracedPackageVersion.pkgJSON.version === tracedFile.pkgVersion))
+            return [
+              3,
+              9
+            ];
+          if (!shouldCopyWholePackage)
+            return [
+              3,
+              8
+            ];
+          return [
+            4,
+            readDirRecursive(tracedFile.pkgPath)
+          ];
         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 8:
+        case 10:
           return [
             3,
-            11
+            13
           ];
-        case 9:
+        case 11:
           err = _state.sent();
           _didIteratorError = true;
           _iteratorError = err;
           return [
             3,
-            11
+            13
           ];
-        case 10:
+        case 12:
           try {
             if (!_iteratorNormalCompletion && _iterator.return != null) {
               _iterator.return();
@@ -266,7 +281,7 @@ var handleDependencies = function() {
           return [
             7
           ];
-        case 11:
+        case 13:
           multiVersionPkgs = {};
           singleVersionPackages = [];
           _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
@@ -319,10 +334,14 @@ var handleDependencies = function() {
             Promise.all(singleVersionPackages.map(function(pkgName2) {
               var pkg = tracedPackages[pkgName2];
               var version2 = Object.keys(pkg.versions)[0];
-              return writePackage(pkg, version2, serverRootDir);
+              return writePackage({
+                pkg,
+                version: version2,
+                projectDir: serverRootDir
+              });
             }))
           ];
-        case 12:
+        case 14:
           _state.sent();
           return [
             4,
@@ -330,16 +349,16 @@ var handleDependencies = function() {
               return {};
             })
           ];
-        case 13:
+        case 15:
           projectPkgJson = _state.sent();
           _iteratorNormalCompletion3 = true, _didIteratorError3 = false, _iteratorError3 = void 0;
-          _state.label = 14;
-        case 14:
+          _state.label = 16;
+        case 16:
           _state.trys.push([
-            14,
-            19,
-            20,
-            21
+            16,
+            21,
+            22,
+            23
           ]);
           _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;
@@ -347,8 +366,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(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];
+                  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];
                     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;
@@ -390,7 +409,12 @@ var handleDependencies = function() {
                   pkgDestPath = ".modernjs/".concat(pkgName2, "@").concat(version2, "/node_modules/").concat(pkgName2);
                   return [
                     4,
-                    writePackage(pkg, version2, serverRootDir, pkgDestPath)
+                    writePackage({
+                      pkg,
+                      version: version2,
+                      projectDir: serverRootDir,
+                      _pkgPath: pkgDestPath
+                    })
                   ];
                 case 3:
                   _state2.sent();
@@ -498,40 +522,40 @@ var handleDependencies = function() {
             });
           };
           _iterator3 = Object.entries(multiVersionPkgs)[Symbol.iterator]();
-          _state.label = 15;
-        case 15:
+          _state.label = 17;
+        case 17:
           if (!!(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done))
             return [
               3,
-              18
+              20
             ];
           return [
             5,
             _ts_values(_loop())
           ];
-        case 16:
+        case 18:
           _state.sent();
-          _state.label = 17;
-        case 17:
+          _state.label = 19;
+        case 19:
           _iteratorNormalCompletion3 = true;
           return [
             3,
-            15
+            17
           ];
-        case 18:
+        case 20:
           return [
             3,
-            21
+            23
           ];
-        case 19:
+        case 21:
           err = _state.sent();
           _didIteratorError3 = true;
           _iteratorError3 = err;
           return [
             3,
-            21
+            23
           ];
-        case 20:
+        case 22:
           try {
             if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
               _iterator3.return();
@@ -544,26 +568,28 @@ var handleDependencies = function() {
           return [
             7
           ];
-        case 21:
+        case 23:
           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, {
-              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);
-              }))
-            })
+            fse.writeJSON(outputPkgPath, finalPkgJson)
           ];
-        case 22:
+        case 24:
           _state.sent();
           return [
             2
@@ -571,7 +597,7 @@ var handleDependencies = function() {
       }
     });
   });
-  return function handleDependencies2(appDir, serverRootDir, include, entryFilter) {
+  return function handleDependencies2(_) {
     return _ref.apply(this, arguments);
   };
 }();

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, resolve } from "@vercel/nft";
+import { nodeFileTrace } 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,11 +14,12 @@ function applyPublicCondition(pkg) {
   }
 }
 var writePackage = function() {
-  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;
+  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;
     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;
@@ -133,7 +134,7 @@ var writePackage = function() {
       }
     });
   });
-  return function writePackage2(pkg, version, projectDir, _pkgPath) {
+  return function writePackage2(options) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -318,15 +319,20 @@ var findPackageParents = function(pkg, version, tracedFiles) {
     return tracedFiles[path2];
   });
   var parentPkgs = _to_consumable_array(new Set(versionFiles.flatMap(function(file) {
-    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 (
+      // 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 parentPkgs;
+  return parentPkgs.filter(function(parentPkg) {
+    return parentPkg;
+  });
 };
 var traceFiles = function() {
   var _ref = _async_to_generator(function(entryFiles, serverRootDir) {
@@ -340,34 +346,7 @@ var traceFiles = function() {
             4,
             nodeFileTrace(entryFiles, {
               base,
-              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);
-                };
-              }()
+              processCwd: serverRootDir
             })
           ];
         case 1:

package/dist/esm/plugins/deploy/exports.js

@@ -0,0 +1,4 @@
+import { handleDependencies } from "./dependencies";
+export {
+  handleDependencies
+};

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

@@ -275,9 +275,13 @@ var createNetlifyPreset = function(appContext, modernConfig, needModernServer) {
               }
               return [
                 4,
-                handleDependencies(appDirectory, funcsDirectory, [
-                  "@modern-js/prod-server"
-                ])
+                handleDependencies({
+                  appDir: appDirectory,
+                  serverRootDir: funcsDirectory,
+                  includeEntries: [
+                    require.resolve("@modern-js/prod-server")
+                  ]
+                })
               ];
             case 3:
               _state.sent();

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

@@ -108,9 +108,14 @@ var createNodePreset = function(appContext, config) {
               };
               return [
                 4,
-                handleDependencies(appDirectory, outputDirectory, [
-                  "@modern-js/prod-server"
-                ], filter)
+                handleDependencies({
+                  appDir: appDirectory,
+                  serverRootDir: outputDirectory,
+                  includeEntries: [
+                    require.resolve("@modern-js/prod-server")
+                  ],
+                  entryFilter: filter
+                })
               ];
             case 1:
               _state.sent();

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

@@ -209,9 +209,13 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
               }
               return [
                 4,
-                handleDependencies(appDirectory, funcsDirectory, [
-                  "@modern-js/prod-server"
-                ])
+                handleDependencies({
+                  appDir: appDirectory,
+                  serverRootDir: funcsDirectory,
+                  includeEntries: [
+                    require.resolve("@modern-js/prod-server")
+                  ]
+                })
               ];
             case 1:
               _state.sent();

package/dist/esm-node/index.js

@@ -110,7 +110,7 @@ const appTools = (options = {
       },
       async beforeRestart() {
         cleanRequireCache([
-          require.resolve("./analyze")
+          require.resolve("./plugins/analyze")
         ]);
       },
       async modifyFileSystemRoutes({ entrypoint, routes }) {

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

@@ -1,21 +1,11 @@
-import path, { isAbsolute } from "node:path";
+import path 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, findPackageParents, resolveTracedPath } from "./utils";
-const handleDependencies = async (appDir, serverRootDir, include, entryFilter) => {
+import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles as defaultTraceFiles, findPackageParents, resolveTracedPath, readDirRecursive } from "./utils";
+const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = defaultTraceFiles, entryFilter, modifyPackageJson, copyWholePackage }) => {
   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([
@@ -110,9 +100,18 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
       }
       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) && // Merged package files are based on the version, not on paths, to handle some boundary cases
+    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 = [];
@@ -130,7 +129,11 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
   await Promise.all(singleVersionPackages.map((pkgName) => {
     const pkg = tracedPackages[pkgName];
     const version = Object.keys(pkg.versions)[0];
-    return writePackage(pkg, version, serverRootDir);
+    return writePackage({
+      pkg,
+      version,
+      projectDir: serverRootDir
+    });
   }));
   const projectPkgJson = await readPackageJSON(serverRootDir).catch(() => ({}));
   for (const [pkgName, pkgVersions] of Object.entries(multiVersionPkgs)) {
@@ -157,7 +160,12 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
     for (const [version, parentPkgs] of versionEntires) {
       const pkg = tracedPackages[pkgName];
       const pkgDestPath = `.modernjs/${pkgName}@${version}/node_modules/${pkgName}`;
-      await writePackage(pkg, version, serverRootDir, pkgDestPath);
+      await writePackage({
+        pkg,
+        version,
+        projectDir: serverRootDir,
+        _pkgPath: pkgDestPath
+      });
       await linkPackage(pkgDestPath, `${pkgName}`, serverRootDir);
       for (const parentPkg of parentPkgs) {
         const parentPkgName = parentPkg.replace(/@[^@]+$/, "");
@@ -166,7 +174,7 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
     }
   }
   const outputPkgPath = path.join(serverRootDir, "package.json");
-  await fse.writeJSON(outputPkgPath, {
+  const newPkgJson = {
     name: `${projectPkgJson.name || "modernjs-project"}-prod`,
     version: projectPkgJson.version || "0.0.0",
     private: true,
@@ -176,7 +184,9 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
         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, resolve } from "@vercel/nft";
+import { nodeFileTrace } 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,7 +10,8 @@ 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 (pkg, version, projectDir, _pkgPath) => {
+const writePackage = async (options) => {
+  const { pkg, version, projectDir, _pkgPath } = options;
   const pkgPath = _pkgPath || pkg.name;
   for (const src of pkg.versions[version].files) {
     if (src.includes("node_modules")) {
@@ -84,31 +85,23 @@ 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) => 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) => (
+      // 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)
+    )))
   ];
-  return parentPkgs;
+  return parentPkgs.filter((parentPkg) => parentPkg);
 };
 const traceFiles = async (entryFiles, serverRootDir, base = "/") => {
   return await 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 resolve(id, parent, job, isCjs);
-      }
-    }
+    processCwd: serverRootDir
   });
 };
 const resolveTracedPath = async (base, p) => fse.realpath(path.resolve(base, p));

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

@@ -0,0 +1,4 @@
+import { handleDependencies } from "./dependencies";
+export {
+  handleDependencies
+};

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

@@ -93,9 +93,13 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       if (!needModernServer) {
         return;
       }
-      await handleDependencies(appDirectory, funcsDirectory, [
-        "@modern-js/prod-server"
-      ]);
+      await handleDependencies({
+        appDir: appDirectory,
+        serverRootDir: funcsDirectory,
+        includeEntries: [
+          require.resolve("@modern-js/prod-server")
+        ]
+      });
     }
   };
 };

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

@@ -47,9 +47,14 @@ const createNodePreset = (appContext, config) => {
       const filter = (filePath) => {
         return !filePath.startsWith(staticDirectory);
       };
-      await handleDependencies(appDirectory, outputDirectory, [
-        "@modern-js/prod-server"
-      ], filter);
+      await handleDependencies({
+        appDir: appDirectory,
+        serverRootDir: outputDirectory,
+        includeEntries: [
+          require.resolve("@modern-js/prod-server")
+        ],
+        entryFilter: filter
+      });
     }
   };
 };

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

@@ -105,9 +105,13 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
       if (!needModernServer) {
         return;
       }
-      await handleDependencies(appDirectory, funcsDirectory, [
-        "@modern-js/prod-server"
-      ]);
+      await handleDependencies({
+        appDir: appDirectory,
+        serverRootDir: funcsDirectory,
+        includeEntries: [
+          require.resolve("@modern-js/prod-server")
+        ]
+      });
     }
   };
 };

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

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

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

@@ -17,7 +17,13 @@ export type TracedFile = {
     pkgName: string;
     pkgVersion?: string;
 };
-export declare const writePackage: (pkg: TracedPackage, version: string, projectDir: string, _pkgPath?: string) => Promise<void>;
+interface WritePackageOptions {
+    pkg: TracedPackage;
+    version: string;
+    projectDir: string;
+    _pkgPath?: string;
+}
+export declare const writePackage: (options: WritePackageOptions) => Promise<void>;
 export declare const linkPackage: (from: string, to: string, projectRootDir: string) => Promise<void>;
 interface ReadDirOptions {
     filter?: (filePath: string) => boolean;

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

@@ -0,0 +1 @@
+export { handleDependencies } from './dependencies';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.54.3",
+  "version": "2.54.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -43,6 +43,11 @@
       "types": "./dist/types/exports/server.d.ts",
       "jsnext:source": "./src/exports/server.ts",
       "default": "./dist/cjs/exports/server.js"
+    },
+    "./deploy": {
+      "types": "./dist/types/plugins/deploy/exports.d.ts",
+      "jsnext:source": "./src/plugins/deploy/exports.ts",
+      "default": "./dist/cjs/plugins/deploy/exports.js"
     }
   },
   "engines": {
@@ -58,6 +63,9 @@
       ],
       "server": [
         "./dist/types/exports/server.d.ts"
+      ],
+      "deploy": [
+        "./dist/types/plugins/deploy/exports.d.ts"
       ]
     }
   },
@@ -69,9 +77,9 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@rsbuild/plugin-node-polyfill": "0.7.9",
-    "@rsbuild/shared": "0.7.9",
-    "@rsbuild/core": "0.7.9",
+    "@rsbuild/plugin-node-polyfill": "0.7.10",
+    "@rsbuild/shared": "0.7.10",
+    "@rsbuild/core": "0.7.10",
     "@swc/helpers": "0.5.3",
     "@vercel/nft": "^0.26.4",
     "es-module-lexer": "^1.1.0",
@@ -80,23 +88,23 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.54.3",
-    "@modern-js/node-bundle-require": "2.54.3",
-    "@modern-js/plugin-i18n": "2.54.3",
-    "@modern-js/plugin-data-loader": "2.54.3",
-    "@modern-js/plugin": "2.54.3",
-    "@modern-js/plugin-lint": "2.54.3",
-    "@modern-js/prod-server": "2.54.3",
-    "@modern-js/rsbuild-plugin-esbuild": "2.54.3",
-    "@modern-js/server": "2.54.3",
-    "@modern-js/types": "2.54.3",
-    "@modern-js/server-core": "2.54.3",
-    "@modern-js/uni-builder": "2.54.3",
-    "@modern-js/server-utils": "2.54.3",
-    "@modern-js/utils": "2.54.3"
+    "@modern-js/core": "2.54.5",
+    "@modern-js/node-bundle-require": "2.54.5",
+    "@modern-js/plugin-data-loader": "2.54.5",
+    "@modern-js/plugin-i18n": "2.54.5",
+    "@modern-js/plugin": "2.54.5",
+    "@modern-js/prod-server": "2.54.5",
+    "@modern-js/rsbuild-plugin-esbuild": "2.54.5",
+    "@modern-js/plugin-lint": "2.54.5",
+    "@modern-js/server": "2.54.5",
+    "@modern-js/server-core": "2.54.5",
+    "@modern-js/server-utils": "2.54.5",
+    "@modern-js/types": "2.54.5",
+    "@modern-js/uni-builder": "2.54.5",
+    "@modern-js/utils": "2.54.5"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.7.9",
+    "@rsbuild/plugin-swc": "0.7.10",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
     "@types/node": "^14",
@@ -105,8 +113,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.92.0",
-    "@scripts/jest-config": "2.54.3",
-    "@scripts/build": "2.54.3"
+    "@scripts/build": "2.54.5",
+    "@scripts/jest-config": "2.54.5"
   },
   "sideEffects": false,
   "publishConfig": {