From af29824397cbe6c2a337c62d9168233c8f054606 Mon Sep 17 00:00:00 2001 From: Drazi Crendraven Date: Tue, 14 Dec 2021 21:58:34 -0500 Subject: [PATCH 1/3] refactor(deps): remove is-error dependency --- lib/assert.js | 3 +-- lib/serialize-error.js | 3 +-- package-lock.json | 4 ++-- package.json | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/assert.js b/lib/assert.js index 70d24d1bf..8f9884faa 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -1,5 +1,4 @@ import concordance from 'concordance'; -import isError from 'is-error'; import isPromise from 'is-promise'; import concordanceOptions from './concordance-options.js'; @@ -154,7 +153,7 @@ function validateExpectations(assertion, expectations, numberArgs) { // eslint-d // Note: this function *must* throw exceptions, since it can be used // as part of a pending assertion for promises. function assertExpectations({assertion, actual, expectations, message, prefix, savedError}) { - if (!isError(actual)) { + if (!(actual instanceof Error)) { throw new AssertionError({ assertion, message, diff --git a/lib/serialize-error.js b/lib/serialize-error.js index 13b5ab178..d58d8851e 100644 --- a/lib/serialize-error.js +++ b/lib/serialize-error.js @@ -4,7 +4,6 @@ import {fileURLToPath, pathToFileURL} from 'node:url'; import cleanYamlObject from 'clean-yaml-object'; import concordance from 'concordance'; -import isError from 'is-error'; import StackUtils from 'stack-utils'; import {AssertionError} from './assert.js'; @@ -146,7 +145,7 @@ function trySerializeError(error, shouldBeautifyStack, testFile) { } export default function serializeError(origin, shouldBeautifyStack, error, testFile) { - if (!isError(error)) { + if (!(error instanceof Error)) { return { avaAssertionError: false, nonErrorObject: true, diff --git a/package-lock.json b/package-lock.json index 4f8f0ec1c..5c9938b8c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,6 @@ "globby": "^12.0.2", "ignore-by-default": "^2.0.0", "indent-string": "^5.0.0", - "is-error": "^2.2.2", "is-plain-object": "^5.0.0", "is-promise": "^4.0.0", "matcher": "^5.0.0", @@ -5682,7 +5681,8 @@ "node_modules/is-error": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/is-error/-/is-error-2.2.2.tgz", - "integrity": "sha512-IOQqts/aHWbiisY5DuPJQ0gcbvaLFCa7fBa9xoLfxBZvQ+ZI/Zh9xoI7Gk+G64N0FdK4AbibytHht2tWgpJWLg==" + "integrity": "sha512-IOQqts/aHWbiisY5DuPJQ0gcbvaLFCa7fBa9xoLfxBZvQ+ZI/Zh9xoI7Gk+G64N0FdK4AbibytHht2tWgpJWLg==", + "dev": true }, "node_modules/is-extglob": { "version": "2.1.1", diff --git a/package.json b/package.json index 52d9abb4f..67d63a92b 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,6 @@ "globby": "^12.0.2", "ignore-by-default": "^2.0.0", "indent-string": "^5.0.0", - "is-error": "^2.2.2", "is-plain-object": "^5.0.0", "is-promise": "^4.0.0", "matcher": "^5.0.0", From acd0dd92c2cee7b1797ce6a4b48fb01e1081de3e Mon Sep 17 00:00:00 2001 From: Mark Wubben Date: Fri, 31 Dec 2021 16:52:09 +0100 Subject: [PATCH 2/3] Use util.types.isNativeError() --- lib/assert.js | 4 +++- lib/serialize-error.js | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/assert.js b/lib/assert.js index 8f9884faa..3c5992431 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -1,3 +1,5 @@ +import util from 'node:util'; + import concordance from 'concordance'; import isPromise from 'is-promise'; @@ -153,7 +155,7 @@ function validateExpectations(assertion, expectations, numberArgs) { // eslint-d // Note: this function *must* throw exceptions, since it can be used // as part of a pending assertion for promises. function assertExpectations({assertion, actual, expectations, message, prefix, savedError}) { - if (!(actual instanceof Error)) { + if (!util.types.isNativeError(actual)) { throw new AssertionError({ assertion, message, diff --git a/lib/serialize-error.js b/lib/serialize-error.js index d58d8851e..cb5341826 100644 --- a/lib/serialize-error.js +++ b/lib/serialize-error.js @@ -1,6 +1,7 @@ import path from 'node:path'; import process from 'node:process'; import {fileURLToPath, pathToFileURL} from 'node:url'; +import util from 'node:util'; import cleanYamlObject from 'clean-yaml-object'; import concordance from 'concordance'; @@ -145,7 +146,7 @@ function trySerializeError(error, shouldBeautifyStack, testFile) { } export default function serializeError(origin, shouldBeautifyStack, error, testFile) { - if (!(error instanceof Error)) { + if (!util.types.isNativeError(error)) { return { avaAssertionError: false, nonErrorObject: true, From 80183def5018216983ed5982fc51e850d87f4643 Mon Sep 17 00:00:00 2001 From: Mark Wubben Date: Fri, 31 Dec 2021 17:01:44 +0100 Subject: [PATCH 3/3] Revert "Use util.types.isNativeError()" This reverts commit acd0dd92c2cee7b1797ce6a4b48fb01e1081de3e. --- lib/assert.js | 4 +--- lib/serialize-error.js | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/assert.js b/lib/assert.js index 3c5992431..8f9884faa 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -1,5 +1,3 @@ -import util from 'node:util'; - import concordance from 'concordance'; import isPromise from 'is-promise'; @@ -155,7 +153,7 @@ function validateExpectations(assertion, expectations, numberArgs) { // eslint-d // Note: this function *must* throw exceptions, since it can be used // as part of a pending assertion for promises. function assertExpectations({assertion, actual, expectations, message, prefix, savedError}) { - if (!util.types.isNativeError(actual)) { + if (!(actual instanceof Error)) { throw new AssertionError({ assertion, message, diff --git a/lib/serialize-error.js b/lib/serialize-error.js index cb5341826..d58d8851e 100644 --- a/lib/serialize-error.js +++ b/lib/serialize-error.js @@ -1,7 +1,6 @@ import path from 'node:path'; import process from 'node:process'; import {fileURLToPath, pathToFileURL} from 'node:url'; -import util from 'node:util'; import cleanYamlObject from 'clean-yaml-object'; import concordance from 'concordance'; @@ -146,7 +145,7 @@ function trySerializeError(error, shouldBeautifyStack, testFile) { } export default function serializeError(origin, shouldBeautifyStack, error, testFile) { - if (!util.types.isNativeError(error)) { + if (!(error instanceof Error)) { return { avaAssertionError: false, nonErrorObject: true,