Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit 902e887

Browse files
authored
fix: remove abort-controller deps (#4015)
`AbortController` and `AbortSignal` are global in all supported runtimes so we don't need the polyfill any more. BREAKING CHANGE: node 15+ is required
1 parent 67a8c47 commit 902e887

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+26
-79
lines changed

.github/workflows/test.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,9 @@ jobs:
355355
- name: ipfs browser video streaming
356356
repo: https://github.com/ipfs-examples/js-ipfs-browser-video-streaming.git
357357
deps: ipfs-core@$PWD/packages/ipfs-core/dist
358-
- name: ipfs browser vue
359-
repo: https://github.com/ipfs-examples/js-ipfs-browser-vue.git
360-
deps: ipfs-core@$PWD/packages/ipfs-core/dist
358+
#- name: ipfs browser vue
359+
# repo: https://github.com/ipfs-examples/js-ipfs-browser-vue.git
360+
# deps: ipfs-core@$PWD/packages/ipfs-core/dist
361361
- name: ipfs browser webpack
362362
repo: https://github.com/ipfs-examples/js-ipfs-browser-webpack.git
363363
deps: ipfs-core@$PWD/packages/ipfs-core/dist
@@ -391,21 +391,21 @@ jobs:
391391
- name: ipfs-client add files
392392
repo: https://github.com/ipfs-examples/js-ipfs-ipfs-client-add-files.git
393393
deps: ipfs@$PWD/packages/ipfs/dist,ipfs-client@$PWD/packages/ipfs-client/dist
394-
- name: ipfs electron js
395-
repo: https://github.com/ipfs-examples/js-ipfs-run-in-electron.git
396-
deps: ipfs-core@$PWD/packages/ipfs-core/dist
394+
#- name: ipfs electron js
395+
# repo: https://github.com/ipfs-examples/js-ipfs-run-in-electron.git
396+
# deps: ipfs-core@$PWD/packages/ipfs-core/dist
397397
- name: ipfs running multiple nodes
398398
repo: https://github.com/ipfs-examples/js-ipfs-running-multiple-nodes.git
399399
deps: ipfs@$PWD/packages/ipfs/dist
400400
#- name: ipfs traverse ipld graphs
401401
# repo: https://github.com/ipfs-examples/js-ipfs-traverse-ipld-graphs.git
402402
# deps: ipfs-core@$PWD/packages/ipfs-core/dist
403-
- name: types with typescript
404-
repo: https://github.com/ipfs-examples/js-ipfs-types-use-ipfs-from-ts.git
405-
deps: ipfs-core@$PWD/packages/ipfs-core/dist
406-
- name: types with typed js
407-
repo: https://github.com/ipfs-examples/js-ipfs-types-use-ipfs-from-typed-js.git
408-
deps: ipfs-core@$PWD/packages/ipfs-core/dist,ipfs-core-types@$PWD/packages/ipfs-core-types/dist
403+
#- name: types with typescript
404+
# repo: https://github.com/ipfs-examples/js-ipfs-types-use-ipfs-from-ts.git
405+
# deps: ipfs-core@$PWD/packages/ipfs-core/dist
406+
#- name: types with typed js
407+
# repo: https://github.com/ipfs-examples/js-ipfs-types-use-ipfs-from-typed-js.git
408+
# deps: ipfs-core@$PWD/packages/ipfs-core/dist,ipfs-core-types@$PWD/packages/ipfs-core-types/dist
409409
steps:
410410
- uses: actions/checkout@v2
411411
- uses: actions/setup-node@v2

packages/interface-ipfs-core/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"clean": "rimraf ./dist",
5151
"build": "aegir build && copyfiles ./test/fixtures/**/*, ./dist/cjs && copyfiles ./test/fixtures/**/*, ./dist/esm",
5252
"lint": "aegir ts -p check && aegir lint",
53-
"dep-check": "aegir dep-check -i abort-controller -i ipfs-core-types -i rimraf -i copyfiles"
53+
"dep-check": "aegir dep-check -i ipfs-core-types -i rimraf -i copyfiles"
5454
},
5555
"repository": {
5656
"type": "git",
@@ -66,7 +66,6 @@
6666
"@ipld/dag-pb": "^2.1.3",
6767
"@types/pako": "^1.0.2",
6868
"@types/readable-stream": "^2.3.11",
69-
"abort-controller": "^3.0.0",
7069
"aegir": "^36.0.1",
7170
"blockstore-core": "^1.0.2",
7271
"copyfiles": "^2.4.1",
@@ -95,7 +94,6 @@
9594
"multiaddr": "^10.0.0",
9695
"multiformats": "^9.4.13",
9796
"nanoid": "^3.1.23",
98-
"native-abort-controller": "^1.0.3",
9997
"p-map": "^4.0.0",
10098
"p-retry": "^4.5.0",
10199
"pako": "^1.0.2",

packages/interface-ipfs-core/src/bitswap/wantlist.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { getDescribe, getIt } from '../utils/mocha.js'
55
import { waitForWantlistKey, waitForWantlistKeyToBeRemoved } from './utils.js'
66
import { isWebWorker } from 'ipfs-utils/src/env.js'
77
import testTimeout from '../utils/test-timeout.js'
8-
import { AbortController } from 'native-abort-controller'
98
import { CID } from 'multiformats/cid'
109
import delay from 'delay'
1110
import { ipfsOptionsWebsocketsFilterAll } from '../utils/ipfs-options-websockets-filter-all.js'

packages/interface-ipfs-core/src/pubsub/subscribe.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { waitForPeers, getTopic } from './utils.js'
99
import { expect } from 'aegir/utils/chai.js'
1010
import { getDescribe, getIt } from '../utils/mocha.js'
1111
import delay from 'delay'
12-
import { AbortController } from 'native-abort-controller'
1312
import { isWebWorker, isNode } from 'ipfs-utils/src/env.js'
1413
import { ipfsOptionsWebsocketsFilterAll } from '../utils/ipfs-options-websockets-filter-all.js'
1514
import first from 'it-first'

packages/ipfs-core-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
},
8080
"license": "MIT",
8181
"dependencies": {
82-
"@chainsafe/libp2p-noise": "^5.0.0",
82+
"@chainsafe/libp2p-noise": "^5.0.1",
8383
"blockstore-datastore-adapter": "^2.0.2",
8484
"datastore-core": "^6.0.7",
8585
"datastore-fs": "^6.0.1",

packages/ipfs-core-utils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
},
113113
"license": "MIT",
114114
"dependencies": {
115-
"any-signal": "^2.1.2",
115+
"any-signal": "^3.0.0",
116116
"blob-to-it": "^1.0.1",
117117
"browser-readablestream-to-it": "^1.0.1",
118118
"debug": "^4.1.1",
@@ -130,7 +130,7 @@
130130
"multiformats": "^9.4.13",
131131
"nanoid": "^3.1.23",
132132
"parse-duration": "^1.0.0",
133-
"timeout-abort-controller": "^2.0.0",
133+
"timeout-abort-controller": "^3.0.0",
134134
"uint8arrays": "^3.0.0"
135135
},
136136
"devDependencies": {

packages/ipfs-core/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"test:electron-renderer": "aegir build --esm-tests && aegir test -t electron-renderer -f ./dist/cjs/browser-test/*.spec.js",
6363
"test:bootstrapers": "IPFS_TEST=bootstrapers aegir test -t browser -f test/bootstrapers.js",
6464
"clean": "rimraf ./dist",
65-
"dep-check": "aegir dep-check -i interface-ipfs-core -i ipfs-core-types -i abort-controller -i npm-run-all --i interface-blockstore"
65+
"dep-check": "aegir dep-check -i interface-ipfs-core -i ipfs-core-types -i npm-run-all --i interface-blockstore"
6666
},
6767
"dependencies": {
6868
"@chainsafe/libp2p-noise": "^5.0.0",
@@ -71,7 +71,7 @@
7171
"@ipld/dag-json": "^8.0.1",
7272
"@ipld/dag-pb": "^2.1.3",
7373
"@multiformats/murmur3": "^1.0.1",
74-
"any-signal": "^2.1.2",
74+
"any-signal": "^3.0.0",
7575
"array-shuffle": "^2.0.0",
7676
"blockstore-core": "^1.0.2",
7777
"blockstore-datastore-adapter": "^2.0.2",
@@ -123,11 +123,10 @@
123123
"multiaddr": "^10.0.0",
124124
"multiaddr-to-uri": "^8.0.0",
125125
"multiformats": "^9.4.13",
126-
"native-abort-controller": "^1.0.3",
127126
"pako": "^1.0.2",
128127
"parse-duration": "^1.0.0",
129128
"peer-id": "^0.16.0",
130-
"timeout-abort-controller": "^2.0.0",
129+
"timeout-abort-controller": "^3.0.0",
131130
"uint8arrays": "^3.0.0"
132131
},
133132
"devDependencies": {

packages/ipfs-core/src/preload.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import toUri from 'multiaddr-to-uri'
44
import debug from 'debug'
55
import shuffle from 'array-shuffle'
6-
import { AbortController } from 'native-abort-controller'
76
import { preload } from 'ipfs-core-config/preload'
87
/** @type {typeof import('hashlru').default} */
98
// @ts-ignore - hashlru has incorrect typedefs

packages/ipfs-core/src/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
export const ipfsCore = '0.13.0'
3-
export const commit = '7375caa8805298fc671ed4080e1023aafe756151'
3+
export const commit = ''
44
export const interfaceIpfsCore = '^0.153.0'

packages/ipfs-http-client/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,13 @@
5151
"test:electron-renderer": "aegir build --esm-tests && aegir test -t electron-renderer -f ./dist/cjs/browser-test/*.spec.js",
5252
"lint": "aegir ts -p check && aegir lint",
5353
"clean": "rimraf ./dist",
54-
"dep-check": "aegir dep-check -i ipfs-core -i rimraf -i ipfs-core-types -i abort-controller"
54+
"dep-check": "aegir dep-check -i ipfs-core -i rimraf -i ipfs-core-types"
5555
},
5656
"dependencies": {
5757
"@ipld/dag-cbor": "^7.0.0",
5858
"@ipld/dag-json": "^8.0.1",
5959
"@ipld/dag-pb": "^2.1.3",
60-
"abort-controller": "^3.0.0",
61-
"any-signal": "^2.1.2",
60+
"any-signal": "^3.0.0",
6261
"debug": "^4.1.1",
6362
"err-code": "^3.0.1",
6463
"ipfs-core-types": "^0.9.0",
@@ -69,7 +68,6 @@
6968
"merge-options": "^3.0.4",
7069
"multiaddr": "^10.0.0",
7170
"multiformats": "^9.4.13",
72-
"native-abort-controller": "^1.0.3",
7371
"parse-duration": "^1.0.0",
7472
"stream-to-it": "^0.2.2",
7573
"uint8arrays": "^3.0.0"

packages/ipfs-http-client/src/add-all.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { configure } from './lib/configure.js'
44
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
55
import { toUrlSearchParams } from './lib/to-url-search-params.js'
66
import { abortSignal } from './lib/abort-signal.js'
7-
import { AbortController } from 'native-abort-controller'
87

98
/**
109
* @typedef {import('ipfs-utils/src/types').ProgressFn} IPFSUtilsHttpUploadProgressFn

packages/ipfs-http-client/src/block/put.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
33
import { configure } from '../lib/configure.js'
44
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
55
import { abortSignal } from '../lib/abort-signal.js'
6-
import { AbortController } from 'native-abort-controller'
76

87
/**
98
* @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/config/replace.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
33
import { configure } from '../lib/configure.js'
44
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
55
import { abortSignal } from '../lib/abort-signal.js'
6-
import { AbortController } from 'native-abort-controller'
76

87
/**
98
* @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/dag/import.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { configure } from '../lib/configure.js'
22
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
33
import { abortSignal } from '../lib/abort-signal.js'
44
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
5-
import { AbortController } from 'native-abort-controller'
65
import { CID } from 'multiformats/cid'
76

87
/**

packages/ipfs-http-client/src/dag/put.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { configure } from '../lib/configure.js'
33
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
44
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
55
import { abortSignal } from '../lib/abort-signal.js'
6-
import { AbortController } from 'native-abort-controller'
76

87
/**
98
* @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/dht/put.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { configure } from '../lib/configure.js'
22
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
33
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
44
import { abortSignal } from '../lib/abort-signal.js'
5-
import { AbortController } from 'native-abort-controller'
65
import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
76
import { mapEvent } from './map-event.js'
87

packages/ipfs-http-client/src/files/write.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { configure } from '../lib/configure.js'
44
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
55
import { toUrlSearchParams } from '../lib/to-url-search-params.js'
66
import { abortSignal } from '../lib/abort-signal.js'
7-
import { AbortController } from 'native-abort-controller'
87

98
/**
109
* @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/object/patch/append-data.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
33
import { configure } from '../../lib/configure.js'
44
import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
55
import { abortSignal } from '../../lib/abort-signal.js'
6-
import { AbortController } from 'native-abort-controller'
76

87
/**
98
* @typedef {import('../../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/object/patch/set-data.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { multipartRequest } from 'ipfs-core-utils/multipart-request'
33
import { configure } from '../../lib/configure.js'
44
import { toUrlSearchParams } from '../../lib/to-url-search-params.js'
55
import { abortSignal } from '../../lib/abort-signal.js'
6-
import { AbortController } from 'native-abort-controller'
76

87
/**
98
* @typedef {import('../../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/pubsub/publish.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { toUrlSearchParams } from '../lib/to-url-search-params.js'
33
import { multipartRequest } from 'ipfs-core-utils/multipart-request'
44
import { abortSignal } from '../lib/abort-signal.js'
55
import { textToUrlSafeRpc } from '../lib/http-rpc-wire-format.js'
6-
import { AbortController } from 'native-abort-controller'
76

87
/**
98
* @typedef {import('../types').HTTPClientExtraOptions} HTTPClientExtraOptions

packages/ipfs-http-client/src/pubsub/subscription-tracker.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { AbortController } from 'native-abort-controller'
21

32
/**
43
* @typedef {import('ipfs-core-types/src/pubsub').MessageHandlerFn} MessageHandlerFn

packages/ipfs-http-client/test/pubsub.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* eslint-env mocha */
22

33
import { expect } from 'aegir/utils/chai.js'
4-
import { AbortController } from 'native-abort-controller'
54
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
65
import defer from 'p-defer'
76
import { factory } from './utils/factory.js'

packages/ipfs-http-server/package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"test": "aegir test -t node",
4040
"test:node": "aegir test -t node",
4141
"clean": "rimraf ./dist",
42-
"dep-check": "aegir dep-check -i ipfs-http-client -i rimraf -i abort-controller -i ipfs-core-types -i npm-run-all",
42+
"dep-check": "aegir dep-check -i ipfs-http-client -i rimraf -i ipfs-core-types -i npm-run-all",
4343
"build": "run-s build:*",
4444
"build:update-version": "node scripts/update-version.js",
4545
"build:aegir": "aegir build --no-bundle"
@@ -49,8 +49,7 @@
4949
"@hapi/content": "^5.0.2",
5050
"@hapi/hapi": "^20.0.0",
5151
"@ipld/dag-pb": "^2.1.3",
52-
"abort-controller": "^3.0.0",
53-
"any-signal": "^2.1.2",
52+
"any-signal": "^3.0.0",
5453
"debug": "^4.1.1",
5554
"dlv": "^1.1.3",
5655
"err-code": "^3.0.1",
@@ -74,10 +73,9 @@
7473
"just-safe-set": "^2.2.1",
7574
"multiaddr": "^10.0.0",
7675
"multiformats": "^9.4.13",
77-
"native-abort-controller": "^1.0.3",
7876
"parse-duration": "^1.0.0",
7977
"stream-to-it": "^0.2.2",
80-
"timeout-abort-controller": "^2.0.0",
78+
"timeout-abort-controller": "^3.0.0",
8179
"uint8arrays": "^3.0.0",
8280
"uri-to-multiaddr": "^6.0.0"
8381
},

packages/ipfs-http-server/src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { Multiaddr } from 'multiaddr'
55
// @ts-expect-error no types
66
import toMultiaddr from 'uri-to-multiaddr'
77
import Boom from '@hapi/boom'
8-
import { AbortController } from 'native-abort-controller'
98
import { routes } from './api/routes/index.js'
109
import { errorHandler } from './error-handler.js'
10+
1111
const LOG = 'ipfs:http-api'
1212
const LOG_ERROR = 'ipfs:http-api:error'
1313

packages/ipfs-http-server/test/inject/bitswap.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { CID } from 'multiformats/cid'
55
import sinon from 'sinon'
66
import { testHttpMethod } from '../utils/test-http-method.js'
77
import { http } from '../utils/http.js'
8-
import { AbortSignal } from 'native-abort-controller'
98
import { base58btc } from 'multiformats/bases/base58'
109
import { base64 } from 'multiformats/bases/base64'
1110

packages/ipfs-http-server/test/inject/block.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { testHttpMethod } from '../utils/test-http-method.js'
88
import { http } from '../utils/http.js'
99
import sinon from 'sinon'
1010
import { CID } from 'multiformats/cid'
11-
import { AbortSignal } from 'native-abort-controller'
1211
import { base58btc } from 'multiformats/bases/base58'
1312
import { base64 } from 'multiformats/bases/base64'
1413
import { base32 } from 'multiformats/bases/base32'

packages/ipfs-http-server/test/inject/bootstrap.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import qs from 'qs'
55
import { testHttpMethod } from '../utils/test-http-method.js'
66
import { http } from '../utils/http.js'
77
import sinon from 'sinon'
8-
import { AbortSignal } from 'native-abort-controller'
98

109
const defaultList = [
1110
'server0',

packages/ipfs-http-server/test/inject/config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import streamToPromise from 'stream-to-promise'
77
import { testHttpMethod } from '../utils/test-http-method.js'
88
import { http } from '../utils/http.js'
99
import sinon from 'sinon'
10-
import { AbortSignal } from 'native-abort-controller'
1110

1211
const profiles = {
1312
profile1: {

packages/ipfs-http-server/test/inject/dag.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { testHttpMethod } from '../utils/test-http-method.js'
1010
import { http } from '../utils/http.js'
1111
import { matchIterable } from '../utils/match-iterable.js'
1212
import sinon from 'sinon'
13-
import { AbortSignal } from 'native-abort-controller'
1413
import { base58btc } from 'multiformats/bases/base58'
1514
import { base32 } from 'multiformats/bases/base32'
1615
import drain from 'it-drain'

packages/ipfs-http-server/test/inject/dht.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { http } from '../utils/http.js'
77
import sinon from 'sinon'
88
import errCode from 'err-code'
99
import { CID } from 'multiformats/cid'
10-
import { AbortSignal } from 'native-abort-controller'
1110
import { allNdjson } from '../utils/all-ndjson.js'
1211
import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
1312
import FormData from 'form-data'

packages/ipfs-http-server/test/inject/dns.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { expect } from 'aegir/utils/chai.js'
44
import { testHttpMethod } from '../utils/test-http-method.js'
55
import { http } from '../utils/http.js'
66
import sinon from 'sinon'
7-
import { AbortSignal } from 'native-abort-controller'
87

98
const defaultOptions = {
109
recursive: false,

packages/ipfs-http-server/test/inject/files.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import sinon from 'sinon'
1111
import { CID } from 'multiformats/cid'
1212
import first from 'it-first'
1313
import toBuffer from 'it-to-buffer'
14-
import { AbortSignal } from 'native-abort-controller'
1514
import { base58btc } from 'multiformats/bases/base58'
1615
import { base64 } from 'multiformats/bases/base64'
1716
import { matchIterable } from '../utils/match-iterable.js'

packages/ipfs-http-server/test/inject/id.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { expect } from 'aegir/utils/chai.js'
44
import { testHttpMethod } from '../utils/test-http-method.js'
55
import { http } from '../utils/http.js'
66
import sinon from 'sinon'
7-
import { AbortSignal } from 'native-abort-controller'
87

98
const defaultOptions = {
109
signal: sinon.match.instanceOf(AbortSignal),

packages/ipfs-http-server/test/inject/key.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { expect } from 'aegir/utils/chai.js'
55
import { testHttpMethod } from '../utils/test-http-method.js'
66
import { http } from '../utils/http.js'
77
import sinon from 'sinon'
8-
import { AbortSignal } from 'native-abort-controller'
98

109
describe('/key', function () {
1110
let ipfs

0 commit comments

Comments
 (0)