Skip to content

Commit

Permalink
fix: remove abort-controller deps (#4015)
Browse files Browse the repository at this point in the history
`AbortController` and `AbortSignal` are global in all supported runtimes so we don't need the polyfill any more.

BREAKING CHANGE: node 15+ is required
  • Loading branch information
achingbrain committed Jan 20, 2022
1 parent dc78383 commit 91269af
Show file tree
Hide file tree
Showing 13 changed files with 2 additions and 16 deletions.
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,13 @@
"test:electron-renderer": "aegir build --esm-tests && aegir test -t electron-renderer -f ./dist/cjs/browser-test/*.spec.js",
"lint": "aegir ts -p check && aegir lint",
"clean": "rimraf ./dist",
"dep-check": "aegir dep-check -i ipfs-core -i rimraf -i ipfs-core-types -i abort-controller"
"dep-check": "aegir dep-check -i ipfs-core -i rimraf -i ipfs-core-types"
},
"dependencies": {
"@ipld/dag-cbor": "^7.0.0",
"@ipld/dag-json": "^8.0.1",
"@ipld/dag-pb": "^2.1.3",
"abort-controller": "^3.0.0",
"any-signal": "^2.1.2",
"any-signal": "^3.0.0",
"debug": "^4.1.1",
"err-code": "^3.0.1",
"ipfs-core-types": "^0.9.0",
Expand All @@ -69,7 +68,6 @@
"merge-options": "^3.0.4",
"multiaddr": "^10.0.0",
"multiformats": "^9.4.13",
"native-abort-controller": "^1.0.3",
"parse-duration": "^1.0.0",
"stream-to-it": "^0.2.2",
"uint8arrays": "^3.0.0"
Expand Down
1 change: 0 additions & 1 deletion src/add-all.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { configure } from './lib/configure.js'
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
import { toUrlSearchParams } from './lib/to-url-search-params.js'
import { abortSignal } from './lib/abort-signal.js'
import { AbortController } from 'native-abort-controller'

/**
* @typedef {import('ipfs-utils/src/types').ProgressFn} IPFSUtilsHttpUploadProgressFn
Expand Down
1 change: 0 additions & 1 deletion src/block/put.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
import { configure } from '../lib/configure.js'
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
import { abortSignal } from '../lib/abort-signal.js'
import { AbortController } from 'native-abort-controller'

/**
* @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions
Expand Down
1 change: 0 additions & 1 deletion src/config/replace.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
import { configure } from '../lib/configure.js'
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
import { abortSignal } from '../lib/abort-signal.js'
import { AbortController } from 'native-abort-controller'

/**
* @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions
Expand Down
1 change: 0 additions & 1 deletion src/dag/import.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { configure } from '../lib/configure.js'
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
import { abortSignal } from '../lib/abort-signal.js'
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
import { AbortController } from 'native-abort-controller'
import { CID } from 'multiformats/cid'

/**
Expand Down
1 change: 0 additions & 1 deletion src/dag/put.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { configure } from '../lib/configure.js'
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
import { abortSignal } from '../lib/abort-signal.js'
import { AbortController } from 'native-abort-controller'

/**
* @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions
Expand Down
1 change: 0 additions & 1 deletion src/dht/put.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { configure } from '../lib/configure.js'
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
import { abortSignal } from '../lib/abort-signal.js'
import { AbortController } from 'native-abort-controller'
import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
import { mapEvent } from './map-event.js'

Expand Down
1 change: 0 additions & 1 deletion src/files/write.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { configure } from '../lib/configure.js'
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
import { abortSignal } from '../lib/abort-signal.js'
import { AbortController } from 'native-abort-controller'

/**
* @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions
Expand Down
1 change: 0 additions & 1 deletion src/object/patch/append-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
import { configure } from '../../lib/configure.js'
import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
import { abortSignal } from '../../lib/abort-signal.js'
import { AbortController } from 'native-abort-controller'

/**
* @typedef {import('../../types').HTTPClientExtraOptions} HTTPClientExtraOptions
Expand Down
1 change: 0 additions & 1 deletion src/object/patch/set-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
import { configure } from '../../lib/configure.js'
import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
import { abortSignal } from '../../lib/abort-signal.js'
import { AbortController } from 'native-abort-controller'

/**
* @typedef {import('../../types').HTTPClientExtraOptions} HTTPClientExtraOptions
Expand Down
1 change: 0 additions & 1 deletion src/pubsub/publish.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { toUrlSearchParams } from '../lib/to-url-search-params.js'
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
import { abortSignal } from '../lib/abort-signal.js'
import { textToUrlSafeRpc } from '../lib/http-rpc-wire-format.js'
import { AbortController } from 'native-abort-controller'

/**
* @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions
Expand Down
1 change: 0 additions & 1 deletion src/pubsub/subscription-tracker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { AbortController } from 'native-abort-controller'

/**
* @typedef {import('ipfs-core-types/src/pubsub').MessageHandlerFn} MessageHandlerFn
Expand Down
1 change: 0 additions & 1 deletion test/pubsub.spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint-env mocha */

import { expect } from 'aegir/utils/chai.js'
import { AbortController } from 'native-abort-controller'
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
import defer from 'p-defer'
import { factory } from './utils/factory.js'
Expand Down

0 comments on commit 91269af

Please sign in to comment.