Use which-command instead of which (#1253)

Author: sindresorhus

lib/arguments/command-file.js

@@ -2,7 +2,7 @@ import {openSync, readSync, closeSync} from 'node:fs';
 import {Buffer} from 'node:buffer';
 import path from 'node:path';
 import process from 'node:process';
-import which from 'which';
+import {whichCommandSync} from 'which-command';
 import pathKey from 'path-key';
 
 /*
@@ -72,39 +72,13 @@ const resolveWithShebang = parsed => {
 	return resolvePath(parsed);
 };
 
-// Search `PATH` for the command, first honoring `PATHEXT`, then ignoring it as a fallback
-const resolvePath = parsed => resolveInCwd(parsed, false) || resolveInCwd(parsed, true);
-
-const resolveInCwd = (parsed, ignorePathExtension) => {
+// Search `PATH` for the command, resolving its Windows executable extension via `PATHEXT`
+const resolvePath = parsed => {
 	const environment = parsed.options.env || process.env;
-
-	/*
-	`which` runs `stat` relative to the current directory but has no `cwd` option, so we temporarily switch into the target directory and restore it afterwards.
-
-	`process.chdir()` is disabled in worker threads and might be absent in non-Node runtimes.
-	*/
-	const canChangeDirectory = process.chdir !== undefined && !process.chdir.disabled;
-	const originalDirectory = process.cwd();
-	if (canChangeDirectory) {
-		try {
-			process.chdir(parsed.options.cwd);
-		} catch {}
-	}
-
-	try {
-		const resolved = which.sync(parsed.file, {
-			path: environment[pathKey({env: environment})],
-			pathExt: ignorePathExtension ? path.delimiter : undefined,
-		});
-		// `cwd` is already an absolute path, so this returns an absolute path too
-		return path.resolve(parsed.options.cwd, resolved);
-	} catch {
-		return undefined;
-	} finally {
-		if (canChangeDirectory) {
-			process.chdir(originalDirectory);
-		}
-	}
+	return whichCommandSync(parsed.file, {
+		cwd: parsed.options.cwd,
+		path: environment[pathKey({env: environment})],
+	});
 };
 
 const SHEBANG_BYTE_LENGTH = 150;

package.json

@@ -62,7 +62,7 @@
 		"pretty-ms": "^9.3.0",
 		"signal-exit": "^4.1.0",
 		"strip-final-newline": "^4.0.0",
-		"which": "^7.0.0",
+		"which-command": "^0.1.0",
 		"yoctocolors": "^2.1.2"
 	},
 	"devDependencies": {

test/arguments/shell.js

@@ -1,7 +1,7 @@
 import process from 'node:process';
 import {pathToFileURL} from 'node:url';
 import test from 'ava';
-import which from 'which';
+import {whichCommand} from 'which-command';
 import {execa} from '../../index.js';
 import {setFixtureDirectory} from '../helpers/fixtures-directory.js';
 import {identity} from '../helpers/stdio.js';
@@ -18,7 +18,7 @@ test('can use `options.shell: true`', async t => {
 
 const testShellPath = async (t, mapPath) => {
 	const shellPath = isWindows ? 'cmd.exe' : 'bash';
-	const shell = mapPath(await which(shellPath));
+	const shell = mapPath(await whichCommand(shellPath));
 	const {stdout} = await execa('node test/fixtures/noop.js foo', {shell});
 	t.is(stdout, 'foo');
 };