From 3c257e2c4eee335ab90ca39bdd87df2bd2323bea Mon Sep 17 00:00:00 2001 From: achingbrain Date: Wed, 3 Feb 2021 12:15:21 +0000 Subject: [PATCH 1/2] chore: update native-abort-controller To avoid extending built-in classes you now need to use named exports when importing `native-abort-controller`. --- package.json | 2 +- src/http.js | 2 +- test/http.spec.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 29dcd72..1abd02a 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "it-to-stream": "^0.1.2", "merge-options": "^3.0.4", "nanoid": "^3.1.20", - "native-abort-controller": "0.0.3", + "native-abort-controller": "^1.0.0", "native-fetch": "2.0.1", "node-fetch": "^2.6.1", "stream-to-it": "^0.2.2", diff --git a/src/http.js b/src/http.js index e3182e8..880d4ba 100644 --- a/src/http.js +++ b/src/http.js @@ -6,7 +6,7 @@ const { TimeoutError, HTTPError } = require('./http/error') const merge = require('merge-options').bind({ ignoreUndefined: true }) const { URL, URLSearchParams } = require('iso-url') const TextDecoder = require('./text-decoder') -const AbortController = require('native-abort-controller') +const { AbortController } = require('native-abort-controller') const anySignal = require('any-signal') /** diff --git a/test/http.spec.js b/test/http.spec.js index f4819b9..0d6f3bd 100644 --- a/test/http.spec.js +++ b/test/http.spec.js @@ -6,7 +6,7 @@ const HTTP = require('../src/http') // @ts-ignore const toStream = require('it-to-stream') const delay = require('delay') -const AbortController = require('native-abort-controller') +const { AbortController } = require('native-abort-controller') const drain = require('it-drain') const all = require('it-all') const { isBrowser, isWebWorker } = require('../src/env') From f4fde67ed6b346e7c737de24f6297493c69bb18f Mon Sep 17 00:00:00 2001 From: achingbrain Date: Wed, 3 Feb 2021 12:57:01 +0000 Subject: [PATCH 2/2] chore: remove vendored typedef --- package.json | 2 +- types/native-abort-controller/index.d.ts | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 types/native-abort-controller/index.d.ts diff --git a/package.json b/package.json index 1abd02a..ba0f86c 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "it-to-stream": "^0.1.2", "merge-options": "^3.0.4", "nanoid": "^3.1.20", - "native-abort-controller": "^1.0.0", + "native-abort-controller": "^1.0.3", "native-fetch": "2.0.1", "node-fetch": "^2.6.1", "stream-to-it": "^0.2.2", diff --git a/types/native-abort-controller/index.d.ts b/types/native-abort-controller/index.d.ts deleted file mode 100644 index a448ef7..0000000 --- a/types/native-abort-controller/index.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export type { AbortController, AbortSignal } - -export default AbortController -export = AbortController