From 39f43cb4516904e9b524fb1a4ae6fa1465469294 Mon Sep 17 00:00:00 2001 From: v1rtl Date: Sat, 1 Feb 2025 23:34:01 +0200 Subject: [PATCH] Remove redundant AbortController polyfill --- build.js | 2 -- lib/abort-controller-polyfill.mjs | 3 --- lib/api.mjs | 1 - lib/file.mjs | 1 - package-lock.json | 7 +++++-- package.json | 1 - test/helpers/test-runner.mjs | 1 - types/cjs.d.ts | 1 - 8 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 lib/abort-controller-polyfill.mjs diff --git a/build.js b/build.js index 9b13998..fe48b9a 100644 --- a/build.js +++ b/build.js @@ -72,7 +72,6 @@ async function doBundle (format) { external: format.bundleExternals ? [] : [ - 'abort-controller', 'agentkeepalive', 'multistream', 'node-fetch', @@ -89,7 +88,6 @@ async function doBundle (format) { : [alias({ http: require.resolve('./browser/noop.mjs'), https: require.resolve('./browser/noop.mjs'), - 'abort-controller': require.resolve('./browser/noop.mjs'), 'node-fetch': require.resolve('./browser/fetch.mjs'), './crypto/rsa.mjs': require.resolve('./browser/rsa.mjs'), './aes.mjs': require.resolve('./browser/aes.mjs'), diff --git a/lib/abort-controller-polyfill.mjs b/lib/abort-controller-polyfill.mjs deleted file mode 100644 index 871b099..0000000 --- a/lib/abort-controller-polyfill.mjs +++ /dev/null @@ -1,3 +0,0 @@ -import abortControllerPolyfill from 'abort-controller' -const abortController = globalThis.AbortController || abortControllerPolyfill -export default abortController diff --git a/lib/api.mjs b/lib/api.mjs index c9b7928..b4d6003 100644 --- a/lib/api.mjs +++ b/lib/api.mjs @@ -1,7 +1,6 @@ import { EventEmitter } from 'events' import { Agent as HttpAgent } from 'http' import { Agent as HttpsAgent } from 'https' -import AbortController from './abort-controller-polyfill.mjs' import { createPromise } from './util.mjs' const MAX_RETRIES = 4 diff --git a/lib/file.mjs b/lib/file.mjs index 3680489..bc9e1de 100644 --- a/lib/file.mjs +++ b/lib/file.mjs @@ -4,7 +4,6 @@ import { EventEmitter } from 'events' import { streamToCb, createPromise } from './util.mjs' import { PassThrough } from 'stream' import StreamSkip from 'stream-skip' -import AbortController from './abort-controller-polyfill.mjs' class File extends EventEmitter { constructor (opt) { diff --git a/package-lock.json b/package-lock.json index 6b5565e..2c1db5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "1.3.5", "license": "MIT", "dependencies": { - "abort-controller": "^3.0.0", "pumpify": "^2.0.1", "stream-skip": "^1.0.3" }, @@ -945,6 +944,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dev": true, "dependencies": { "event-target-shim": "^5.0.0" }, @@ -2912,6 +2912,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "dev": true, "engines": { "node": ">=6" } @@ -7151,6 +7152,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dev": true, "requires": { "event-target-shim": "^5.0.0" } @@ -8569,7 +8571,8 @@ "event-target-shim": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "dev": true }, "events": { "version": "3.3.0", diff --git a/package.json b/package.json index 571ed96..9ec08c5 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,6 @@ "provenance": true }, "dependencies": { - "abort-controller": "^3.0.0", "pumpify": "^2.0.1", "stream-skip": "^1.0.3" }, diff --git a/test/helpers/test-runner.mjs b/test/helpers/test-runner.mjs index 9bb6908..a0b1b81 100644 --- a/test/helpers/test-runner.mjs +++ b/test/helpers/test-runner.mjs @@ -91,7 +91,6 @@ if (testedPlatform === 'node') { // The below aliases are copied from build.js http: require.resolve('../../browser/noop.mjs'), https: require.resolve('../../browser/noop.mjs'), - 'abort-controller': require.resolve('../../browser/noop.mjs'), 'node-fetch': require.resolve('../../browser/fetch.mjs'), './crypto/rsa.mjs': require.resolve('../../browser/rsa.mjs'), './aes.mjs': require.resolve('../../browser/aes.mjs'), diff --git a/types/cjs.d.ts b/types/cjs.d.ts index 64bd4e4..76689de 100644 --- a/types/cjs.d.ts +++ b/types/cjs.d.ts @@ -4,7 +4,6 @@ import { EventEmitter } from 'events' import { Agent as HttpAgent } from 'http' import { Agent as HttpsAgent } from 'https' -import AbortController from 'abort-controller' import type * as fetch from 'node-fetch' declare function megajs (options: megajs.StorageOpts, cb?: megajs.errorCb): megajs.Storage