Update dependencies

* Bump dev dependencies

* Bump dependencies

* Upgrade XO and reformat

Author: novemberborn

lib/assert.js

@@ -55,11 +55,7 @@ class AssertionError extends Error {
 		// Reserved for power-assert statements
 		this.statements = [];
 
-		if (options.savedError) {
-			this.savedError = options.savedError;
-		} else {
-			this.savedError = getErrorWithLongStackTrace();
-		}
+		this.savedError = options.savedError ? options.savedError : getErrorWithLongStackTrace();
 	}
 }
 exports.AssertionError = AssertionError;
@@ -502,7 +498,7 @@ class Assertions {
 				retval = fn();
 				if (isPromise(retval)) {
 					// Here isPromise() checks if something is "promise like". Cast to an actual promise.
-					Promise.resolve(retval).catch(noop);
+					Promise.resolve(retval).catch(noop); // eslint-disable-line promise/prefer-await-to-then
 					fail(new AssertionError({
 						assertion: 'throws',
 						message,
@@ -562,7 +558,7 @@ class Assertions {
 				return Promise.resolve();
 			}
 
-			const handlePromise = (promise, wasReturned) => {
+			const handlePromise = async (promise, wasReturned) => {
 				// Create an error object to record the stack before it gets lost in the promise chain.
 				const savedError = getErrorWithLongStackTrace();
 				// Handle "promise like" objects by casting to a real Promise.
@@ -586,8 +582,11 @@ class Assertions {
 				});
 
 				pending(intermediate);
-				// Don't reject the returned promise, even if the assertion fails.
-				return intermediate.catch(noop);
+				try {
+					return await intermediate;
+				} catch {
+					// Don't reject the returned promise, even if the assertion fails.
+				}
 			};
 
 			if (isPromise(thrower)) {
@@ -669,7 +668,7 @@ class Assertions {
 				return Promise.resolve();
 			}
 
-			const handlePromise = (promise, wasReturned) => {
+			const handlePromise = async (promise, wasReturned) => {
 				// Create an error object to record the stack before it gets lost in the promise chain.
 				const savedError = getErrorWithLongStackTrace();
 				// Handle "promise like" objects by casting to a real Promise.
@@ -682,8 +681,12 @@ class Assertions {
 					});
 				});
 				pending(intermediate);
-				// Don't reject the returned promise, even if the assertion fails.
-				return intermediate.catch(noop);
+
+				try {
+					return await intermediate;
+				} catch {
+					// Don't reject the returned promise, even if the assertion fails.
+				}
 			};
 
 			if (isPromise(nonThrower)) {

lib/plugin-support/shared-workers.js

@@ -57,7 +57,7 @@ async function observeWorkerProcess(fork, runStatus) {
 		signalDeregistered = resolve;
 	});
 
-	fork.promise.finally(() => {
+	fork.promise.finally(() => { // eslint-disable-line promise/prefer-await-to-then
 		if (registrationCount === 0) {
 			signalDeregistered();
 		}
@@ -98,7 +98,7 @@ async function observeWorkerProcess(fork, runStatus) {
 				port
 			}, [port]);
 
-			fork.promise.finally(() => {
+			fork.promise.finally(() => { // eslint-disable-line promise/prefer-await-to-then
 				launched.worker.postMessage({
 					type: 'deregister-test-worker',
 					id: fork.forkId

lib/test.js

@@ -333,7 +333,7 @@ class Test {
 		this.refreshTimeout();
 
 		promise
-			.catch(error => this.saveFirstError(error))
+			.catch(error => this.saveFirstError(error)) // eslint-disable-line promise/prefer-await-to-then
 			.then(() => { // eslint-disable-line promise/prefer-await-to-then
 				this.pendingAssertionCount--;
 				this.refreshTimeout();
@@ -636,7 +636,7 @@ class Test {
 				};
 
 				promise
-					.catch(error => {
+					.catch(error => { // eslint-disable-line promise/prefer-await-to-then
 						if (!this.detectImproperThrows(error)) {
 							this.saveFirstError(new assert.AssertionError({
 								message: 'Rejected promise returned by test',

lib/watcher.js

@@ -144,7 +144,7 @@ class Watcher {
 						this.clearLogOnNextRun = false;
 					}
 				})
-				.catch(rethrowAsync);
+				.catch(rethrowAsync); // eslint-disable-line promise/prefer-await-to-then
 		};
 
 		this.testDependencies = [];

lib/worker/base.js

@@ -252,7 +252,7 @@ if (isRunningInThread) {
 	const {workerData} = require('worker_threads');
 	const {options} = workerData;
 	delete workerData.options; // Don't allow user code access.
-	run(options).catch(onError);
+	run(options).catch(onError); // eslint-disable-line promise/prefer-await-to-then
 } else if (isRunningInChildProcess) {
 	channel.send({type: 'ready-for-options'});
 	channel.options.then(run).catch(onError); // eslint-disable-line promise/prefer-await-to-then

lib/worker/channel.js

@@ -172,7 +172,7 @@ function registerSharedWorker(filename, initialData) {
 	sharedWorkerHandle.ref();
 	const ready = pEvent(ourPort, 'message', ({type}) => type === 'ready').then(() => { // eslint-disable-line promise/prefer-await-to-then
 		currentlyAvailable = error === null;
-	}).finally(() => {
+	}).finally(() => { // eslint-disable-line promise/prefer-await-to-then
 		// Once ready, it's up to user code to subscribe to messages, which (see
 		// below) causes us to reference the port.
 		sharedWorkerHandle.unref();