@modern-js/app-tools 2.57.1-beta.2 → 2.57.1

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

@@ -28,8 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var dependencies_exports = {};
 __export(dependencies_exports, {
-  handleDependencies: () => handleDependencies,
-  nodeFileTrace: () => import_nft.nodeFileTrace
+  handleDependencies: () => handleDependencies
 });
 module.exports = __toCommonJS(dependencies_exports);
 var import_node_path = __toESM(require("node:path"));
@@ -37,16 +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");
-var import_nft = require("@vercel/nft");
-const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = import_utils2.traceFiles, entryFilter, modifyPackageJson, copyWholePackage, traceOptions }) => {
+const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = import_utils2.traceFiles, entryFilter, modifyPackageJson, copyWholePackage }) => {
   const base = "/";
   const entryFiles = await (0, import_utils2.findEntryFiles)(serverRootDir, entryFilter);
-  const fileTrace = await traceFiles({
-    entryFiles: entryFiles.concat(includeEntries),
-    serverRootDir,
-    base,
-    traceOptions
-  });
+  const fileTrace = await traceFiles(entryFiles.concat(includeEntries), serverRootDir, base);
   const currentProjectModules = import_node_path.default.join(appDir, "node_modules");
   const dependencySearchRoot = import_node_path.default.resolve(appDir, "../../../../../../");
   const tracedFiles = Object.fromEntries(await Promise.all([
@@ -56,7 +49,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
       return;
     }
     const filePath = await (0, import_utils2.resolveTracedPath)(base, _path);
-    if (filePath.startsWith(serverRootDir) || filePath.startsWith(appDir) && !filePath.startsWith(currentProjectModules)) {
+    if ((0, import_utils2.isSubPath)(serverRootDir, filePath) || (0, import_utils2.isSubPath)(appDir, filePath) && !(0, import_utils2.isSubPath)(currentProjectModules, filePath)) {
       return;
     }
     if (!await (0, import_utils2.isFile)(filePath)) {
@@ -79,7 +72,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
       const packageJsonPath = match ? import_node_path.default.join(match[0], "package.json") : await (0, import_utils.pkgUp)({
         cwd: import_node_path.default.dirname(filePath)
       });
-      if (packageJsonPath === null || packageJsonPath === void 0 ? void 0 : packageJsonPath.startsWith(dependencySearchRoot)) {
+      if (packageJsonPath && (0, import_utils2.isSubPath)(dependencySearchRoot, packageJsonPath)) {
         const packageJson = await import_utils.fs.readJSON(packageJsonPath);
         pkgPath = baseDir = import_node_path.default.dirname(packageJsonPath);
         subpath = import_node_path.default.relative(baseDir, filePath);
@@ -96,7 +89,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
       path: filePath,
       parents,
       isDirectDep: parents.some((parent) => {
-        return parent.startsWith(appDir) && !parent.startsWith(currentProjectModules);
+        return (0, import_utils2.isSubPath)(appDir, parent) && !(0, import_utils2.isSubPath)(currentProjectModules, parent);
       }),
       subpath,
       pkgName,
@@ -231,6 +224,5 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  handleDependencies,
-  nodeFileTrace
+  handleDependencies
 });

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

@@ -31,6 +31,7 @@ __export(utils_exports, {
   findEntryFiles: () => findEntryFiles,
   findPackageParents: () => findPackageParents,
   isFile: () => isFile,
+  isSubPath: () => isSubPath,
   linkPackage: () => linkPackage,
   readDirRecursive: () => readDirRecursive,
   resolveTracedPath: () => resolveTracedPath,
@@ -138,19 +139,26 @@ const findPackageParents = (pkg, version, tracedFiles) => {
   ];
   return parentPkgs.filter((parentPkg) => parentPkg);
 };
-const traceFiles = async ({ entryFiles, serverRootDir, base = "/", traceOptions }) => {
+const traceFiles = async (entryFiles, serverRootDir, base = "/") => {
   return await (0, import_nft.nodeFileTrace)(entryFiles, {
     base,
-    processCwd: serverRootDir,
-    ...traceOptions
+    processCwd: serverRootDir
   });
 };
 const resolveTracedPath = async (base, p) => import_utils.fs.realpath(import_path.default.resolve(base, p));
+const isSubPath = (parentPath, childPath) => {
+  if (!parentPath || !childPath) {
+    return false;
+  }
+  const relative = import_path.default.relative(parentPath, childPath);
+  return relative && !relative.startsWith("..");
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   findEntryFiles,
   findPackageParents,
   isFile,
+  isSubPath,
   linkPackage,
   readDirRecursive,
   resolveTracedPath,

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

@@ -7,15 +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 as defaultTraceFiles, findPackageParents, resolveTracedPath, readDirRecursive } from "./utils";
-import { nodeFileTrace } from "@vercel/nft";
+import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles as defaultTraceFiles, findPackageParents, resolveTracedPath, readDirRecursive, isSubPath } from "./utils";
 var handleDependencies = function() {
   var _ref = _async_to_generator(function(param) {
-    var appDir, serverRootDir, includeEntries, _param_traceFiles, traceFiles, entryFilter, modifyPackageJson, copyWholePackage, traceOptions, base, entryFiles, fileTrace, currentProjectModules, dependencySearchRoot, 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, dependencySearchRoot, 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, traceOptions = param.traceOptions;
+          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,
@@ -25,12 +24,7 @@ var handleDependencies = function() {
           entryFiles = _state.sent();
           return [
             4,
-            traceFiles({
-              entryFiles: entryFiles.concat(includeEntries),
-              serverRootDir,
-              base,
-              traceOptions
-            })
+            traceFiles(entryFiles.concat(includeEntries), serverRootDir, base)
           ];
         case 2:
           fileTrace = _state.sent();
@@ -57,7 +51,7 @@ var handleDependencies = function() {
                       ];
                     case 1:
                       filePath = _state2.sent();
-                      if (filePath.startsWith(serverRootDir) || filePath.startsWith(appDir) && !filePath.startsWith(currentProjectModules)) {
+                      if (isSubPath(serverRootDir, filePath) || isSubPath(appDir, filePath) && !isSubPath(currentProjectModules, filePath)) {
                         return [
                           2
                         ];
@@ -112,7 +106,7 @@ var handleDependencies = function() {
                       _state2.label = 6;
                     case 6:
                       packageJsonPath = _tmp;
-                      if (!(packageJsonPath === null || packageJsonPath === void 0 ? void 0 : packageJsonPath.startsWith(dependencySearchRoot)))
+                      if (!(packageJsonPath && isSubPath(dependencySearchRoot, packageJsonPath)))
                         return [
                           3,
                           8
@@ -145,7 +139,7 @@ var handleDependencies = function() {
                         path: filePath,
                         parents,
                         isDirectDep: parents.some(function(parent) {
-                          return parent.startsWith(appDir) && !parent.startsWith(currentProjectModules);
+                          return isSubPath(appDir, parent) && !isSubPath(currentProjectModules, parent);
                         }),
                         subpath,
                         pkgName: pkgName2,
@@ -609,6 +603,5 @@ var handleDependencies = function() {
   };
 }();
 export {
-  handleDependencies,
-  nodeFileTrace
+  handleDependencies
 };

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

@@ -1,5 +1,4 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
@@ -336,18 +335,19 @@ var findPackageParents = function(pkg, version, tracedFiles) {
   });
 };
 var traceFiles = function() {
-  var _ref = _async_to_generator(function(param) {
-    var entryFiles, serverRootDir, _param_base, base, traceOptions;
+  var _ref = _async_to_generator(function(entryFiles, serverRootDir) {
+    var base;
+    var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          entryFiles = param.entryFiles, serverRootDir = param.serverRootDir, _param_base = param.base, base = _param_base === void 0 ? "/" : _param_base, traceOptions = param.traceOptions;
+          base = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : "/";
           return [
             4,
-            nodeFileTrace(entryFiles, _object_spread({
+            nodeFileTrace(entryFiles, {
               base,
               processCwd: serverRootDir
-            }, traceOptions))
+            })
           ];
         case 1:
           return [
@@ -357,7 +357,7 @@ var traceFiles = function() {
       }
     });
   });
-  return function traceFiles2(_) {
+  return function traceFiles2(entryFiles, serverRootDir) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -374,10 +374,18 @@ var resolveTracedPath = function() {
     return _ref.apply(this, arguments);
   };
 }();
+var isSubPath = function(parentPath, childPath) {
+  if (!parentPath || !childPath) {
+    return false;
+  }
+  var relative = path.relative(parentPath, childPath);
+  return relative && !relative.startsWith("..");
+};
 export {
   findEntryFiles,
   findPackageParents,
   isFile,
+  isSubPath,
   linkPackage,
   readDirRecursive,
   resolveTracedPath,

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

@@ -2,17 +2,11 @@ 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 as defaultTraceFiles, findPackageParents, resolveTracedPath, readDirRecursive } from "./utils";
-import { nodeFileTrace } from "@vercel/nft";
-const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = defaultTraceFiles, entryFilter, modifyPackageJson, copyWholePackage, traceOptions }) => {
+import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles as defaultTraceFiles, findPackageParents, resolveTracedPath, readDirRecursive, isSubPath } 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: entryFiles.concat(includeEntries),
-    serverRootDir,
-    base,
-    traceOptions
-  });
+  const fileTrace = await traceFiles(entryFiles.concat(includeEntries), serverRootDir, base);
   const currentProjectModules = path.join(appDir, "node_modules");
   const dependencySearchRoot = path.resolve(appDir, "../../../../../../");
   const tracedFiles = Object.fromEntries(await Promise.all([
@@ -22,7 +16,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
       return;
     }
     const filePath = await resolveTracedPath(base, _path);
-    if (filePath.startsWith(serverRootDir) || filePath.startsWith(appDir) && !filePath.startsWith(currentProjectModules)) {
+    if (isSubPath(serverRootDir, filePath) || isSubPath(appDir, filePath) && !isSubPath(currentProjectModules, filePath)) {
       return;
     }
     if (!await isFile(filePath)) {
@@ -45,7 +39,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
       const packageJsonPath = match ? path.join(match[0], "package.json") : await pkgUp({
         cwd: path.dirname(filePath)
       });
-      if (packageJsonPath === null || packageJsonPath === void 0 ? void 0 : packageJsonPath.startsWith(dependencySearchRoot)) {
+      if (packageJsonPath && isSubPath(dependencySearchRoot, packageJsonPath)) {
         const packageJson = await fse.readJSON(packageJsonPath);
         pkgPath = baseDir = path.dirname(packageJsonPath);
         subpath = path.relative(baseDir, filePath);
@@ -62,7 +56,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
       path: filePath,
       parents,
       isDirectDep: parents.some((parent) => {
-        return parent.startsWith(appDir) && !parent.startsWith(currentProjectModules);
+        return isSubPath(appDir, parent) && !isSubPath(currentProjectModules, parent);
       }),
       subpath,
       pkgName,
@@ -196,6 +190,5 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
   await fse.writeJSON(outputPkgPath, finalPkgJson);
 };
 export {
-  handleDependencies,
-  nodeFileTrace
+  handleDependencies
 };

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

@@ -98,18 +98,25 @@ const findPackageParents = (pkg, version, tracedFiles) => {
   ];
   return parentPkgs.filter((parentPkg) => parentPkg);
 };
-const traceFiles = async ({ entryFiles, serverRootDir, base = "/", traceOptions }) => {
+const traceFiles = async (entryFiles, serverRootDir, base = "/") => {
   return await nodeFileTrace(entryFiles, {
     base,
-    processCwd: serverRootDir,
-    ...traceOptions
+    processCwd: serverRootDir
   });
 };
 const resolveTracedPath = async (base, p) => fse.realpath(path.resolve(base, p));
+const isSubPath = (parentPath, childPath) => {
+  if (!parentPath || !childPath) {
+    return false;
+  }
+  const relative = path.relative(parentPath, childPath);
+  return relative && !relative.startsWith("..");
+};
 export {
   findEntryFiles,
   findPackageParents,
   isFile,
+  isSubPath,
   linkPackage,
   readDirRecursive,
   resolveTracedPath,

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

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

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

@@ -1,5 +1,4 @@
 import type { PackageJson } from 'pkg-types';
-import { NodeFileTraceOptions } from '@vercel/nft';
 export type TracedPackage = {
     name: string;
     versions: Record<string, {
@@ -33,11 +32,7 @@ export declare const readDirRecursive: (dir: string, options?: ReadDirOptions) =
 export declare const isFile: (file: string) => Promise<boolean>;
 export declare const findEntryFiles: (rootDir: string, entryFilter?: ((filePath: string) => boolean) | undefined) => Promise<string[]>;
 export declare const findPackageParents: (pkg: TracedPackage, version: string, tracedFiles: Record<string, TracedFile>) => string[];
-export declare const traceFiles: ({ entryFiles, serverRootDir, base, traceOptions, }: {
-    entryFiles: string[];
-    serverRootDir: string;
-    base?: string | undefined;
-    traceOptions?: NodeFileTraceOptions | undefined;
-}) => Promise<import("@vercel/nft").NodeFileTraceResult>;
+export declare const traceFiles: (entryFiles: string[], serverRootDir: string, base?: string) => Promise<import("@vercel/nft").NodeFileTraceResult>;
 export declare const resolveTracedPath: (base: string, p: string) => Promise<string>;
+export declare const isSubPath: (parentPath: string, childPath: string) => boolean | "";
 export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.57.1-beta.2",
+  "version": "2.57.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -87,20 +87,20 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.57.0",
-    "@modern-js/plugin": "2.57.0",
-    "@modern-js/node-bundle-require": "2.57.0",
-    "@modern-js/prod-server": "2.57.0",
-    "@modern-js/plugin-data-loader": "2.57.0",
-    "@modern-js/plugin-i18n": "2.57.0",
-    "@modern-js/server-core": "2.57.0",
-    "@modern-js/plugin-lint": "2.57.0",
-    "@modern-js/types": "2.57.0",
-    "@modern-js/server": "2.57.0",
-    "@modern-js/utils": "2.57.0",
-    "@modern-js/rsbuild-plugin-esbuild": "2.57.0",
-    "@modern-js/server-utils": "2.57.0",
-    "@modern-js/uni-builder": "2.57.0"
+    "@modern-js/core": "2.57.1",
+    "@modern-js/plugin": "2.57.1",
+    "@modern-js/node-bundle-require": "2.57.1",
+    "@modern-js/plugin-data-loader": "2.57.1",
+    "@modern-js/plugin-i18n": "2.57.1",
+    "@modern-js/plugin-lint": "2.57.1",
+    "@modern-js/rsbuild-plugin-esbuild": "2.57.1",
+    "@modern-js/server": "2.57.1",
+    "@modern-js/prod-server": "2.57.1",
+    "@modern-js/server-core": "2.57.1",
+    "@modern-js/types": "2.57.1",
+    "@modern-js/utils": "2.57.1",
+    "@modern-js/server-utils": "2.57.1",
+    "@modern-js/uni-builder": "2.57.1"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "1.0.1-beta.3",
@@ -112,8 +112,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@scripts/build": "2.57.0",
-    "@scripts/jest-config": "2.57.0"
+    "@scripts/build": "2.57.1",
+    "@scripts/jest-config": "2.57.1"
   },
   "sideEffects": false,
   "publishConfig": {