@modern-js/app-tools 2.57.0 → 2.57.1-alpha.0

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

@@ -49,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)) {
@@ -72,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);
@@ -89,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,

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,
@@ -145,11 +146,19 @@ const traceFiles = async (entryFiles, serverRootDir, base = "/") => {
   });
 };
 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,7 +7,7 @@ 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 { 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, 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;
@@ -51,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
                         ];
@@ -106,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
@@ -139,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,

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

@@ -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,7 +2,7 @@ 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 { 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);
@@ -16,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)) {
@@ -39,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);
@@ -56,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,

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

@@ -105,10 +105,18 @@ const traceFiles = async (entryFiles, serverRootDir, base = "/") => {
   });
 };
 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/utils.d.ts

@@ -34,4 +34,5 @@ export declare const findEntryFiles: (rootDir: string, entryFilter?: ((filePath:
 export declare const findPackageParents: (pkg: TracedPackage, version: string, tracedFiles: Record<string, TracedFile>) => string[];
 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.0",
+  "version": "2.57.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -88,18 +88,18 @@
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
     "@modern-js/core": "2.57.0",
-    "@modern-js/node-bundle-require": "2.57.0",
     "@modern-js/plugin": "2.57.0",
-    "@modern-js/plugin-data-loader": "2.57.0",
     "@modern-js/plugin-i18n": "2.57.0",
-    "@modern-js/plugin-lint": "2.57.0",
     "@modern-js/prod-server": "2.57.0",
-    "@modern-js/rsbuild-plugin-esbuild": "2.57.0",
-    "@modern-js/server-utils": "2.57.0",
     "@modern-js/server": "2.57.0",
     "@modern-js/server-core": "2.57.0",
-    "@modern-js/types": "2.57.0",
+    "@modern-js/node-bundle-require": "2.57.0",
+    "@modern-js/server-utils": "2.57.0",
+    "@modern-js/plugin-lint": "2.57.0",
+    "@modern-js/rsbuild-plugin-esbuild": "2.57.0",
     "@modern-js/uni-builder": "2.57.0",
+    "@modern-js/types": "2.57.0",
+    "@modern-js/plugin-data-loader": "2.57.0",
     "@modern-js/utils": "2.57.0"
   },
   "devDependencies": {
@@ -112,8 +112,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@scripts/jest-config": "2.57.0",
-    "@scripts/build": "2.57.0"
+    "@scripts/build": "2.57.0",
+    "@scripts/jest-config": "2.57.0"
   },
   "sideEffects": false,
   "publishConfig": {