@modern-js/app-tools 2.56.1 → 2.56.2-alpha.1

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

@@ -36,11 +36,21 @@ 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 createGetMonoRoot = (appDir) => {
+  let monorepoRoot;
+  return () => {
+    if (!monorepoRoot) {
+      monorepoRoot = (0, import_utils.findMonorepoRoot)(appDir, 8);
+    }
+    return monorepoRoot;
+  };
+};
 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.concat(includeEntries), serverRootDir, base);
   const currentProjectModules = import_node_path.default.join(appDir, "node_modules");
+  const getMonorepoRoot = createGetMonoRoot(appDir);
   const tracedFiles = Object.fromEntries(await Promise.all([
     ...fileTrace.reasons.entries()
   ].map(async ([_path, reasons]) => {
@@ -68,10 +78,14 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
       const MODERN_UTILS_PATH = "packages/toolkit/utils";
       const MODERN_UTILS_PATH_REGEX = new RegExp(`(.*${MODERN_UTILS_PATH})`);
       const match = filePath.match(MODERN_UTILS_PATH_REGEX);
+      const monorepoRoot = getMonorepoRoot();
       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) {
+      if (packageJsonPath && monorepoRoot && packageJsonPath.startsWith(monorepoRoot)) {
+        if (!match) {
+          console.log("filePath", filePath, 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);

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

@@ -4,13 +4,22 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { _ as _ts_values } from "@swc/helpers/_/_ts_values";
 import path from "node:path";
-import { fs as fse, pkgUp, semver } from "@modern-js/utils";
+import { findMonorepoRoot, 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";
+var createGetMonoRoot = function(appDir) {
+  var monorepoRoot;
+  return function() {
+    if (!monorepoRoot) {
+      monorepoRoot = findMonorepoRoot(appDir, 8);
+    }
+    return monorepoRoot;
+  };
+};
 var handleDependencies = function() {
   var _ref = _async_to_generator(function(param) {
-    var appDir, serverRootDir, includeEntries, _param_traceFiles, traceFiles, entryFilter, modifyPackageJson, copyWholePackage, base, entryFiles, fileTrace, currentProjectModules, tracedFiles, _, tracedPackages, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, tracedFile, pkgName, tracedPackage, pkgJSON, tracedPackageVersion, shouldCopyWholePackage, _tracedPackageVersion_files, allFiles, err, multiVersionPkgs, singleVersionPackages, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, tracedPackage1, versions, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, version, projectPkgJson, _iteratorNormalCompletion3, _didIteratorError3, _iteratorError3, _loop, _iterator3, _step3, err, outputPkgPath, newPkgJson, finalPkgJson;
+    var appDir, serverRootDir, includeEntries, _param_traceFiles, traceFiles, entryFilter, modifyPackageJson, copyWholePackage, base, entryFiles, fileTrace, currentProjectModules, getMonorepoRoot, 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:
@@ -29,12 +38,13 @@ var handleDependencies = function() {
         case 2:
           fileTrace = _state.sent();
           currentProjectModules = path.join(appDir, "node_modules");
+          getMonorepoRoot = createGetMonoRoot(appDir);
           _ = Object.fromEntries;
           return [
             4,
             Promise.all(_to_consumable_array(fileTrace.reasons.entries()).map(function() {
               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;
+                var _param, _path, reasons, filePath, baseDir, pkgName2, subpath, pkgPath, parsed, MODERN_UTILS_PATH, MODERN_UTILS_PATH_REGEX, match, monorepoRoot, packageJsonPath, _tmp, packageJson, parents, tracedFile2;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
@@ -83,6 +93,7 @@ var handleDependencies = function() {
                       MODERN_UTILS_PATH = "packages/toolkit/utils";
                       MODERN_UTILS_PATH_REGEX = new RegExp("(.*".concat(MODERN_UTILS_PATH, ")"));
                       match = filePath.match(MODERN_UTILS_PATH_REGEX);
+                      monorepoRoot = getMonorepoRoot();
                       if (!match)
                         return [
                           3,
@@ -105,11 +116,14 @@ var handleDependencies = function() {
                       _state2.label = 6;
                     case 6:
                       packageJsonPath = _tmp;
-                      if (!packageJsonPath)
+                      if (!(packageJsonPath && monorepoRoot && packageJsonPath.startsWith(monorepoRoot)))
                         return [
                           3,
                           8
                         ];
+                      if (!match) {
+                        console.log("filePath", filePath, packageJsonPath);
+                      }
                       return [
                         4,
                         fse.readJSON(packageJsonPath)

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

@@ -1,13 +1,23 @@
 import path from "node:path";
-import { fs as fse, pkgUp, semver } from "@modern-js/utils";
+import { findMonorepoRoot, 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";
+const createGetMonoRoot = (appDir) => {
+  let monorepoRoot;
+  return () => {
+    if (!monorepoRoot) {
+      monorepoRoot = findMonorepoRoot(appDir, 8);
+    }
+    return monorepoRoot;
+  };
+};
 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);
   const currentProjectModules = path.join(appDir, "node_modules");
+  const getMonorepoRoot = createGetMonoRoot(appDir);
   const tracedFiles = Object.fromEntries(await Promise.all([
     ...fileTrace.reasons.entries()
   ].map(async ([_path, reasons]) => {
@@ -35,10 +45,14 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
       const MODERN_UTILS_PATH = "packages/toolkit/utils";
       const MODERN_UTILS_PATH_REGEX = new RegExp(`(.*${MODERN_UTILS_PATH})`);
       const match = filePath.match(MODERN_UTILS_PATH_REGEX);
+      const monorepoRoot = getMonorepoRoot();
       const packageJsonPath = match ? path.join(match[0], "package.json") : await pkgUp({
         cwd: path.dirname(filePath)
       });
-      if (packageJsonPath) {
+      if (packageJsonPath && monorepoRoot && packageJsonPath.startsWith(monorepoRoot)) {
+        if (!match) {
+          console.log("filePath", filePath, packageJsonPath);
+        }
         const packageJson = await fse.readJSON(packageJsonPath);
         pkgPath = baseDir = path.dirname(packageJsonPath);
         subpath = path.relative(baseDir, filePath);

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.56.1",
+  "version": "2.56.2-alpha.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.56.1",
     "@modern-js/node-bundle-require": "2.56.1",
+    "@modern-js/core": "2.56.1",
     "@modern-js/plugin": "2.56.1",
-    "@modern-js/plugin-data-loader": "2.56.1",
-    "@modern-js/plugin-lint": "2.56.1",
-    "@modern-js/prod-server": "2.56.1",
-    "@modern-js/rsbuild-plugin-esbuild": "2.56.1",
     "@modern-js/plugin-i18n": "2.56.1",
+    "@modern-js/plugin-lint": "2.56.1",
     "@modern-js/server": "2.56.1",
-    "@modern-js/server-utils": "2.56.1",
-    "@modern-js/types": "2.56.1",
+    "@modern-js/prod-server": "2.56.1",
     "@modern-js/server-core": "2.56.1",
     "@modern-js/utils": "2.56.1",
-    "@modern-js/uni-builder": "2.56.1"
+    "@modern-js/server-utils": "2.56.1",
+    "@modern-js/types": "2.56.1",
+    "@modern-js/uni-builder": "2.56.1",
+    "@modern-js/rsbuild-plugin-esbuild": "2.56.1",
+    "@modern-js/plugin-data-loader": "2.56.1"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "1.0.1-beta.3",