.travis.yml

@@ -7,6 +7,5 @@ node_js:
   - '13'
   - '12'
   - '10'
-  - '8'
 after_success:
   - './node_modules/.bin/nyc report --reporter=text-lcov | ./node_modules/.bin/coveralls'

index.d.ts

@@ -44,7 +44,7 @@ declare namespace execa {
 		This can be either an absolute path or a path relative to the `cwd` option.
 
 		Requires `preferLocal` to be `true`.
-		
+
 		For example, this can be used together with [`get-node`](https://github.com/ehmicky/get-node) to run a specific Node.js version in a child process.
 
 		@default process.execPath
@@ -336,14 +336,21 @@ declare namespace execa {
 		extends Error,
 			ExecaReturnBase<StdoutErrorType> {
 		/**
-		The error message.
+		Error message when the child process failed to run. In addition to the underlying error message, it also contains some information related to why the child process errored.
+
+		The child process stderr then stdout are appended to the end, separated with newlines and not interleaved.
 		*/
 		message: string;
 
 		/**
-		Original error message. This is `undefined` unless the child process exited due to an `error` event or a timeout.
+		This is the same as the `message` property except it does not include the child process stdout/stderr.
+		*/
+		shortMessage: string;
+
+		/**
+		Original error message. This is the same as the `message` property except it includes neither the child process stdout/stderr nor some additional information added by Execa.
 
-		The `message` property contains both the `originalMessage` and some additional information added by Execa.
+		This is `undefined` unless the child process exited due to an `error` event or a timeout.
 		*/
 		originalMessage?: string;
 	}

index.test-d.ts

@@ -40,6 +40,7 @@ try {
 	expectType<boolean>(execaError.killed);
 	expectType<string | undefined>(execaError.signal);
 	expectType<string | undefined>(execaError.signalDescription);
+	expectType<string>(execaError.shortMessage);
 	expectType<string | undefined>(execaError.originalMessage);
 }
 
@@ -70,6 +71,7 @@ try {
 	expectType<boolean>(execaError.killed);
 	expectType<string | undefined>(execaError.signal);
 	expectType<string | undefined>(execaError.signalDescription);
+	expectType<string>(execaError.shortMessage);
 	expectType<string | undefined>(execaError.originalMessage);
 }
 

lib/error.js

@@ -47,15 +47,18 @@ const makeError = ({
 	const errorCode = error && error.code;
 
 	const prefix = getErrorPrefix({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled});
-	const message = `Command ${prefix}: ${command}`;
+	const execaMessage = `Command ${prefix}: ${command}`;
+	const shortMessage = error instanceof Error ? `${execaMessage}\n${error.message}` : execaMessage;
+	const message = [shortMessage, stderr, stdout].filter(Boolean).join('\n');
 
 	if (error instanceof Error) {
 		error.originalMessage = error.message;
-		error.message = `${message}\n${error.message}`;
+		error.message = message;
 	} else {
 		error = new Error(message);
 	}
 
+	error.shortMessage = shortMessage;
 	error.command = command;
 	error.exitCode = exitCode;
 	error.signal = signal;

lib/kill.js

@@ -1,7 +1,6 @@
 'use strict';
 const os = require('os');
 const onExit = require('signal-exit');
-const pFinally = require('p-finally');
 
 const DEFAULT_FORCE_KILL_TIMEOUT = 1000 * 5;
 
@@ -18,9 +17,17 @@ const setKillTimeout = (kill, signal, options, killResult) => {
 	}
 
 	const timeout = getForceKillAfterTimeout(options);
-	setTimeout(() => {
+	const t = setTimeout(() => {
 		kill('SIGKILL');
-	}, timeout).unref();
+	}, timeout);
+
+	// Guarded because there's no `.unref()` when `execa` is used in the renderer
+	// process in Electron. This cannot be tested since we don't run tests in
+	// Electron.
+	// istanbul ignore else
+	if (t.unref) {
+		t.unref();
+	}
 };
 
 const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => {
@@ -75,15 +82,15 @@ const setupTimeout = (spawned, {timeout, killSignal = 'SIGTERM'}, spawnedPromise
 		}, timeout);
 	});
 
-	const safeSpawnedPromise = pFinally(spawnedPromise, () => {
+	const safeSpawnedPromise = spawnedPromise.finally(() => {
 		clearTimeout(timeoutId);
 	});
 
 	return Promise.race([timeoutPromise, safeSpawnedPromise]);
 };
 
 // `cleanup` option handling
-const setExitHandler = (spawned, {cleanup, detached}, timedPromise) => {
+const setExitHandler = async (spawned, {cleanup, detached}, timedPromise) => {
 	if (!cleanup || detached) {
 		return timedPromise;
 	}
@@ -92,8 +99,9 @@ const setExitHandler = (spawned, {cleanup, detached}, timedPromise) => {
 		spawned.kill();
 	});
 
-	// TODO: Use native "finally" syntax when targeting Node.js 10
-	return pFinally(timedPromise, removeExitHandler);
+	return timedPromise.finally(() => {
+		removeExitHandler();
+	});
 };
 
 module.exports = {

lib/promise.js

@@ -17,12 +17,7 @@ const mergePromiseProperty = (spawned, promise, property) => {
 const mergePromise = (spawned, promise) => {
 	mergePromiseProperty(spawned, promise, 'then');
 	mergePromiseProperty(spawned, promise, 'catch');
-
-	// TODO: Remove the `if`-guard when targeting Node.js 10
-	if (Promise.prototype.finally) {
-		mergePromiseProperty(spawned, promise, 'finally');
-	}
-
+	mergePromiseProperty(spawned, promise, 'finally');
 	return spawned;
 };
 

package.json

@@ -1,16 +1,17 @@
 {
 	"name": "execa",
-	"version": "3.4.0",
+	"version": "4.0.0",
 	"description": "Process execution for humans",
 	"license": "MIT",
 	"repository": "sindresorhus/execa",
+	"funding": "https://github.com/sindresorhus/execa?sponsor=1",
 	"author": {
 		"name": "Sindre Sorhus",
 		"email": "sindresorhus@gmail.com",
 		"url": "sindresorhus.com"
 	},
 	"engines": {
-		"node": "^8.12.0 || >=9.7.0"
+		"node": ">=10"
 	},
 	"scripts": {
 		"test": "xo && nyc ava && tsd"
@@ -45,21 +46,20 @@
 		"merge-stream": "^2.0.0",
 		"npm-run-path": "^4.0.0",
 		"onetime": "^5.1.0",
-		"p-finally": "^2.0.0",
 		"signal-exit": "^3.0.2",
 		"strip-final-newline": "^2.0.0"
 	},
 	"devDependencies": {
-		"@types/node": "^12.0.7",
+		"@types/node": "^12.12.18",
 		"ava": "^2.1.0",
-		"coveralls": "^3.0.4",
-		"get-node": "^5.0.0",
+		"coveralls": "^3.0.9",
+		"get-node": "^6.6.0",
 		"is-running": "^2.1.0",
 		"nyc": "^14.1.1",
 		"p-event": "^4.1.0",
 		"tempfile": "^3.0.0",
-		"tsd": "^0.7.3",
-		"xo": "^0.24.0"
+		"tsd": "^0.11.0",
+		"xo": "^0.25.3"
 	},
 	"nyc": {
 		"exclude": [