Require Node.js 8

.gitattributes

@@ -1,2 +1 @@
-* text=auto
-*.js text eol=lf
+* text=auto eol=lf

.travis.yml

@@ -1,5 +1,5 @@
 language: node_js
 node_js:
+  - '12'
+  - '10'
   - '8'
-  - '6'
-  - '4'

index.js

@@ -1,11 +1,15 @@
 'use strict';
-module.exports = (promise, onFinally) => {
-	onFinally = onFinally || (() => {});
 
-	return promise.then(
-		val => Promise.resolve(onFinally()).then(() => val),
-		err => Promise.resolve(onFinally()).then(() => {
-			throw err;
-		})
-	);
+module.exports = async (
+	promise,
+	onFinally = (() => {})
+) => {
+	try {
+		const value = await promise;
+		await onFinally();
+		return value;
+	} catch (error) {
+		await onFinally();
+		throw error;
+	}
 };

package.json

@@ -10,7 +10,7 @@
 		"url": "sindresorhus.com"
 	},
 	"engines": {
-		"node": ">=4"
+		"node": ">=8"
 	},
 	"scripts": {
 		"test": "xo && ava"
@@ -33,7 +33,7 @@
 		"bluebird"
 	],
 	"devDependencies": {
-		"ava": "*",
-		"xo": "*"
+		"ava": "^1.4.1",
+		"xo": "^0.24.0"
 	}
 }

readme.md

@@ -17,9 +17,13 @@ $ npm install p-finally
 ```js
 const pFinally = require('p-finally');
 
-const dir = createTempDir();
+const directory = createTempDir();
 
-pFinally(write(dir), () => cleanup(dir));
+(async () => {
+	await pFinally(write(directory), () => {
+		cleanup(directory);
+	});
+});
 ```
 
 
@@ -40,8 +44,3 @@ Note: Throwing or returning a rejected promise will reject `promise` with the re
 
 - [p-try](https://github.com/sindresorhus/p-try) - `Promise.try()` ponyfill - Starts a promise chain
 - [More…](https://github.com/sindresorhus/promise-fun)
-
-
-## License
-
-MIT © [Sindre Sorhus](https://sindresorhus.com)

test.js

@@ -1,46 +1,46 @@
 import test from 'ava';
-import m from '.';
+import pFinally from '.';
 
 const fixture = Symbol('fixture');
-const fixtureErr = new Error('err');
+const fixtureError = new Error('error');
 
 test('does nothing when nothing is passed', async t => {
-	t.is(await m(Promise.resolve(fixture)), fixture);
+	t.is(await pFinally(Promise.resolve(fixture)), fixture);
 });
 
 test('callback is called when promise is fulfilled', async t => {
-	let called = false;
+	let isCalled = false;
 
-	const val = await m(Promise.resolve(fixture), () => {
-		called = true;
+	const value = await pFinally(Promise.resolve(fixture), () => {
+		isCalled = true;
 	});
 
-	t.is(val, fixture);
-	t.true(called);
+	t.is(value, fixture);
+	t.true(isCalled);
 });
 
 test('callback is called when promise is rejected', async t => {
-	let called = false;
+	let isCalled = false;
 
-	await m(Promise.reject(fixtureErr), () => {
-		called = true;
-	}).catch(err => {
-		t.is(err, fixtureErr);
+	await pFinally(Promise.reject(fixtureError), () => {
+		isCalled = true;
+	}).catch(error => {
+		t.is(error, fixtureError);
 	});
 
-	t.true(called);
+	t.true(isCalled);
 });
 
 test('returning a rejected promise in the callback rejects the promise', async t => {
-	await m(Promise.resolve(fixture), () => Promise.reject(fixtureErr)).then(() => {
+	await pFinally(Promise.resolve(fixture), () => Promise.reject(fixtureError)).then(() => {
 		t.fail();
-	}, err => {
-		t.is(err, fixtureErr);
+	}, error => {
+		t.is(error, fixtureError);
 	});
 });
 
 test('returning a rejected promise in the callback for an already rejected promise changes the rejection reason', async t => {
-	await m(Promise.reject(new Error('orig err')), () => Promise.reject(fixtureErr)).catch(err => {
-		t.is(err, fixtureErr);
+	await pFinally(Promise.reject(new Error('original error')), () => Promise.reject(fixtureError)).catch(error => {
+		t.is(error, fixtureError);
 	});
 });