dep!: bump which@3.0.0 (#109)
diff --git a/index.js b/index.js
index 6baac95..052b417 100644
--- a/index.js
+++ b/index.js
@@ -17,7 +17,7 @@
const execa = require('execa');
const pify = require('pify');
-const which = pify(require('which'));
+const which = require('which');
const path = require('path');
const fs = require('fs-extra');
const { CordovaError, events } = require('cordova-common');
@@ -125,9 +125,11 @@
* @return {Promise<string>} Absolute path to npm.
*/
async function isNpmInstalled () {
- return which('npm').catch(_ => {
+ try {
+ return await which('npm');
+ } catch (e) {
throw new CordovaError('"npm" command line tool is not installed: make sure it is accessible on your PATH.');
- });
+ }
}
module.exports.isNpmInstalled = isNpmInstalled;
diff --git a/package-lock.json b/package-lock.json
index 39f1442..80c7b39 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
"pify": "^5.0.0",
"resolve": "^1.22.1",
"semver": "^7.3.8",
- "which": "^2.0.2"
+ "which": "^3.0.0"
},
"devDependencies": {
"@cordova/eslint-config": "^5.0.0",
@@ -892,20 +892,6 @@
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
}
},
- "node_modules/@npmcli/git/node_modules/which": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz",
- "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==",
- "dependencies": {
- "isexe": "^2.0.0"
- },
- "bin": {
- "node-which": "bin/which.js"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
"node_modules/@npmcli/installed-package-contents": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz",
@@ -1014,20 +1000,6 @@
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
}
},
- "node_modules/@npmcli/promise-spawn/node_modules/which": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz",
- "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==",
- "dependencies": {
- "isexe": "^2.0.0"
- },
- "bin": {
- "node-which": "bin/which.js"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
"node_modules/@npmcli/query": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@npmcli/query/-/query-3.0.0.tgz",
@@ -1054,20 +1026,6 @@
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
}
},
- "node_modules/@npmcli/run-script/node_modules/which": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz",
- "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==",
- "dependencies": {
- "isexe": "^2.0.0"
- },
- "bin": {
- "node-which": "bin/which.js"
- },
- "engines": {
- "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
- }
- },
"node_modules/@sigstore/protobuf-specs": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz",
@@ -1779,6 +1737,20 @@
"node": ">= 8"
}
},
+ "node_modules/cross-spawn/node_modules/which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dependencies": {
+ "isexe": "^2.0.0"
+ },
+ "bin": {
+ "node-which": "bin/node-which"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
"node_modules/cssesc": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@@ -4487,6 +4459,20 @@
"node": ">= 6"
}
},
+ "node_modules/node-gyp/node_modules/which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dependencies": {
+ "isexe": "^2.0.0"
+ },
+ "bin": {
+ "node-which": "bin/node-which"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
"node_modules/node-preload": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
@@ -5808,6 +5794,21 @@
"node": ">=8"
}
},
+ "node_modules/spawn-wrap/node_modules/which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dev": true,
+ "dependencies": {
+ "isexe": "^2.0.0"
+ },
+ "bin": {
+ "node-which": "bin/node-which"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
"node_modules/spdx-correct": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
@@ -6362,17 +6363,17 @@
"integrity": "sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg=="
},
"node_modules/which": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
- "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz",
+ "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==",
"dependencies": {
"isexe": "^2.0.0"
},
"bin": {
- "node-which": "bin/node-which"
+ "node-which": "bin/which.js"
},
"engines": {
- "node": ">= 8"
+ "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
}
},
"node_modules/which-boxed-primitive": {
@@ -7284,16 +7285,6 @@
"promise-retry": "^2.0.1",
"semver": "^7.3.5",
"which": "^3.0.0"
- },
- "dependencies": {
- "which": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz",
- "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==",
- "requires": {
- "isexe": "^2.0.0"
- }
- }
}
},
"@npmcli/installed-package-contents": {
@@ -7370,16 +7361,6 @@
"integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==",
"requires": {
"which": "^3.0.0"
- },
- "dependencies": {
- "which": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz",
- "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==",
- "requires": {
- "isexe": "^2.0.0"
- }
- }
}
},
"@npmcli/query": {
@@ -7400,16 +7381,6 @@
"node-gyp": "^9.0.0",
"read-package-json-fast": "^3.0.0",
"which": "^3.0.0"
- },
- "dependencies": {
- "which": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz",
- "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==",
- "requires": {
- "isexe": "^2.0.0"
- }
- }
}
},
"@sigstore/protobuf-specs": {
@@ -7923,6 +7894,16 @@
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
"which": "^2.0.1"
+ },
+ "dependencies": {
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "requires": {
+ "isexe": "^2.0.0"
+ }
+ }
}
},
"cssesc": {
@@ -9929,6 +9910,14 @@
"string_decoder": "^1.1.1",
"util-deprecate": "^1.0.1"
}
+ },
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "requires": {
+ "isexe": "^2.0.0"
+ }
}
}
},
@@ -10876,6 +10865,17 @@
"rimraf": "^3.0.0",
"signal-exit": "^3.0.2",
"which": "^2.0.1"
+ },
+ "dependencies": {
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dev": true,
+ "requires": {
+ "isexe": "^2.0.0"
+ }
+ }
}
},
"spdx-correct": {
@@ -11307,9 +11307,9 @@
"integrity": "sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg=="
},
"which": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
- "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/which/-/which-3.0.0.tgz",
+ "integrity": "sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==",
"requires": {
"isexe": "^2.0.0"
}
diff --git a/package.json b/package.json
index c324e95..fa46782 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
"pify": "^5.0.0",
"resolve": "^1.22.1",
"semver": "^7.3.8",
- "which": "^2.0.2"
+ "which": "^3.0.0"
},
"devDependencies": {
"@cordova/eslint-config": "^5.0.0",