@modern-js/app-tools 2.53.1-alpha.3 → 2.53.1-alpha.4

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

@@ -36,10 +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, includeEntries, entryFilter, modifyPackageJson, copyWholePackage }) => {
+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 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()

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

@@ -125,31 +125,24 @@ 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) => (
+      // 因为支持 copyWholePackage 配置，并不是所有的文件都会被复制的
+      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);
-      }
-    }
+    cache: /* @__PURE__ */ Object.create(null)
   });
 };
 const resolveTracedPath = async (base, p) => import_utils.fs.realpath(import_path.default.resolve(base, p));

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

@@ -84,10 +84,7 @@ const createNodePreset = (appContext, config) => {
         includeEntries: [
           require.resolve("@modern-js/prod-server")
         ],
-        entryFilter: filter,
-        copyWholePackage: (pkgName) => {
-          return pkgName === "koa";
-        }
+        entryFilter: filter
       });
     }
   };

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

@@ -7,14 +7,14 @@ 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, readDirRecursive } from "./utils";
+import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles as defaultTraceFiles, findPackageParents, resolveTracedPath, readDirRecursive } from "./utils";
 var handleDependencies = function() {
   var _ref = _async_to_generator(function(param) {
-    var appDir, serverRootDir, includeEntries, 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 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, entryFilter = param.entryFilter, modifyPackageJson = param.modifyPackageJson, copyWholePackage = param.copyWholePackage;
+          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,

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) {
@@ -319,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 (
+      // 因为支持 copyWholePackage 配置，并不是所有的文件都会被复制的
+      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) {
@@ -342,33 +347,7 @@ var traceFiles = function() {
             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);
-                };
-              }()
+              cache: /* @__PURE__ */ Object.create(null)
             })
           ];
         case 1:

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

@@ -110,10 +110,7 @@ var createNodePreset = function(appContext, config) {
                   includeEntries: [
                     require.resolve("@modern-js/prod-server")
                   ],
-                  entryFilter: filter,
-                  copyWholePackage: function(pkgName) {
-                    return pkgName === "koa";
-                  }
+                  entryFilter: filter
                 })
               ];
             case 1:

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

@@ -2,8 +2,8 @@ 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, readDirRecursive } from "./utils";
-const handleDependencies = async ({ appDir, serverRootDir, includeEntries, entryFilter, modifyPackageJson, copyWholePackage }) => {
+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 fileTrace = await traceFiles(entryFiles.concat(includeEntries), serverRootDir, base);

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) {
@@ -85,31 +85,24 @@ 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) => (
+      // 因为支持 copyWholePackage 配置，并不是所有的文件都会被复制的
+      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);
-      }
-    }
+    cache: /* @__PURE__ */ Object.create(null)
   });
 };
 const resolveTracedPath = async (base, p) => fse.realpath(path.resolve(base, p));

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

@@ -51,10 +51,7 @@ const createNodePreset = (appContext, config) => {
         includeEntries: [
           require.resolve("@modern-js/prod-server")
         ],
-        entryFilter: filter,
-        copyWholePackage: (pkgName) => {
-          return pkgName === "koa";
-        }
+        entryFilter: filter
       });
     }
   };

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

@@ -1,8 +1,10 @@
 import type { PackageJson } from 'pkg-types';
-export declare const handleDependencies: ({ appDir, serverRootDir, includeEntries, entryFilter, modifyPackageJson, copyWholePackage, }: {
+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;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.53.1-alpha.3",
+  "version": "2.53.1-alpha.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -90,18 +90,18 @@
     "std-env": "^3.7.0",
     "@modern-js/plugin-data-loader": "2.53.0",
     "@modern-js/core": "2.53.0",
-    "@modern-js/plugin": "2.53.0",
     "@modern-js/node-bundle-require": "2.53.0",
     "@modern-js/prod-server": "2.53.0",
     "@modern-js/plugin-i18n": "2.53.0",
-    "@modern-js/types": "2.53.0",
-    "@modern-js/plugin-lint": "2.53.0",
+    "@modern-js/plugin": "2.53.0",
     "@modern-js/server-core": "2.53.0",
+    "@modern-js/types": "2.53.0",
+    "@modern-js/rsbuild-plugin-esbuild": "2.53.0",
+    "@modern-js/utils": "2.53.0",
     "@modern-js/server": "2.53.0",
+    "@modern-js/server-utils": "2.53.0",
     "@modern-js/uni-builder": "2.53.0",
-    "@modern-js/utils": "2.53.0",
-    "@modern-js/rsbuild-plugin-esbuild": "2.53.0",
-    "@modern-js/server-utils": "2.53.0"
+    "@modern-js/plugin-lint": "2.53.0"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.7.3",