@abtnode/util 1.6.22 → 1.6.23

package/lib/can-pkg-rw.js

@@ -3,7 +3,7 @@ const locateNpmGlobalByBinary = require('./locate-npm-global-by-binary');
 const { canReadAndWriteDir } = require('./fs');
 
 module.exports = (cmdName, packageName) => {
-  const installDir = locateNpmGlobalByBinary(cmdName);
+  const installDir = locateNpmGlobalByBinary(cmdName, packageName);
   if (!installDir) {
     throw new Error(`${packageName} is not installed as a global package`);
   }

package/lib/locate-npm-global-by-binary.js

@@ -1,22 +1,32 @@
-/* eslint-disable no-unused-vars, no-console */
-
 const fs = require('fs');
 const path = require('path');
-const shelljs = require('shelljs');
+const shell = require('shelljs');
 
-module.exports = (binaryName) => {
+module.exports = (binaryName, packageName) => {
   if (!binaryName) {
     throw new Error('binaryName is required');
   }
 
-  const result = shelljs.which(binaryName);
+  let result = shell.which(binaryName);
   if (!result || !result.stdout) {
     return '';
   }
 
-  const binPath = result.stdout;
+  const binPath = result.stdout.trim();
 
+  // Check if the package is installed via pnpm: only if we have packageName set
   let binDir = path.dirname(fs.realpathSync(binPath));
+  if (packageName) {
+    const { stdout: pnpmPath } = shell.which('pnpm');
+    if (pnpmPath) {
+      result = shell.exec('pnpm bin -g', { silent: true });
+      const pnpmBinDir = result.stdout.trim();
+      if (binDir === pnpmBinDir) {
+        result = shell.exec(`pnpm root -g ${packageName}`, { silent: true });
+        return path.join(result.stdout.trim(), packageName);
+      }
+    }
+  }
 
   while (binDir && binDir !== path.sep && path.basename(binDir) !== 'node_modules') {
     const packageJsonPath = path.join(binDir, 'package.json');

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.22",
+  "version": "1.6.23",
   "description": "ArcBlock's JavaScript utility",
   "main": "lib/index.js",
   "files": [
@@ -18,9 +18,9 @@
   "author": "polunzh <polunzh@gmail.com> (http://github.com/polunzh)",
   "license": "MIT",
   "dependencies": {
-    "@ocap/mcrypto": "^1.14.16",
-    "@ocap/util": "^1.14.16",
-    "@ocap/wallet": "^1.14.16",
+    "@ocap/mcrypto": "^1.14.19",
+    "@ocap/util": "^1.14.19",
+    "@ocap/wallet": "^1.14.19",
     "axios": "^0.25.0",
     "axios-mock-adapter": "^1.20.0",
     "axon": "^2.0.3",
@@ -54,5 +54,5 @@
     "fs-extra": "^10.0.0",
     "jest": "^27.4.5"
   },
-  "gitHead": "18ac52a439dbd04e4ace98d796b6de517503fb14"
+  "gitHead": "6c478fb7e2a30b302981b5339f349c69134e022e"
 }