@nocobase/cli 2.1.11-test.10 → 2.1.11-test.11

package/dist/lib/self-manager.js

@@ -148,6 +148,33 @@ function normalizePnpmGlobalNodeModulesRoot(pnpmGlobalRoot) {
         ? normalizedGlobalRoot
         : path.join(normalizedGlobalRoot, 'node_modules');
 }
+function readSiblingPnpmGlobalNodeModulesRoots(pnpmGlobalRoot) {
+    const globalNodeModulesDir = normalizePnpmGlobalNodeModulesRoot(pnpmGlobalRoot);
+    const globalProjectDir = path.dirname(globalNodeModulesDir);
+    let entries;
+    try {
+        entries = fs.readdirSync(globalProjectDir);
+    }
+    catch {
+        return [];
+    }
+    return entries
+        .filter((entry) => {
+        if (entry === path.basename(globalNodeModulesDir)) {
+            return false;
+        }
+        try {
+            return fs.statSync(path.join(globalProjectDir, entry)).isDirectory();
+        }
+        catch {
+            return false;
+        }
+    })
+        .map((entry) => path.join(globalProjectDir, entry, 'node_modules'));
+}
+function readPnpmGlobalNodeModulesRoots(pnpmGlobalRoot) {
+    return [normalizePnpmGlobalNodeModulesRoot(pnpmGlobalRoot), ...readSiblingPnpmGlobalNodeModulesRoots(pnpmGlobalRoot)];
+}
 function packageNameToPath(packageName) {
     return packageName.split('/').filter(Boolean);
 }
@@ -176,7 +203,7 @@ function isPnpmGlobalRootPath(pnpmGlobalRoot, packageRoot) {
     return segments.slice(pnpmStoreIndex + 1).includes('node_modules');
 }
 function isPnpmGlobalPackagePath(pnpmGlobalRoot, packageRoot, packageName) {
-    return isSameRealPath(path.join(normalizePnpmGlobalNodeModulesRoot(pnpmGlobalRoot), ...packageNameToPath(packageName)), packageRoot);
+    return readPnpmGlobalNodeModulesRoots(pnpmGlobalRoot).some((pnpmGlobalNodeModulesRoot) => isSameRealPath(path.join(pnpmGlobalNodeModulesRoot, ...packageNameToPath(packageName)), packageRoot));
 }
 function isPnpmGlobalBinProjectPath(pnpmGlobalBin, packageRoot, packageName) {
     const pnpmHome = path.dirname(normalizePath(pnpmGlobalBin));
@@ -192,7 +219,7 @@ function isPnpmGlobalBinProjectPath(pnpmGlobalBin, packageRoot, packageName) {
         return false;
     }
     return entries.some((entry) => {
-        const pnpmGlobalRoot = path.join(globalDir, entry, 'node_modules');
+        const pnpmGlobalRoot = path.join(globalDir, entry);
         return (isPnpmGlobalRootPath(pnpmGlobalRoot, packageRoot)
             || isPnpmGlobalPackagePath(pnpmGlobalRoot, packageRoot, packageName));
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.11-test.10",
+  "version": "2.1.11-test.11",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",