Skip to content

Commit a068e53

Browse files
committed
fix: use native AbortController in electron
1 parent e9d0092 commit a068e53

File tree

5 files changed

+17
-3
lines changed

5 files changed

+17
-3
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
],
1414
"browser": {
1515
"./src/http/fetch.js": "./src/http/fetch.browser.js",
16+
"./src/abort-controller.js": "./src/abort-controller.browser.js",
1617
"./src/text-encoder.js": "./src/text-encoder.browser.js",
1718
"./src/text-decoder.js": "./src/text-decoder.browser.js",
1819
"./src/temp-dir.js": "./src/temp-dir.browser.js",
@@ -65,4 +66,4 @@
6566
"Marcin Rataj <lidel@lidel.org>",
6667
"bluelovers <codelovers@users.sourceforge.net>"
6768
]
68-
}
69+
}

src/abort-controller.browser.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
'use strict'
2+
/* eslint-env browser */
3+
4+
module.exports = AbortController

src/abort-controller.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
'use strict'
2+
3+
// Electron has `AbortController` and should use that instead of custom.
4+
if (typeof AbortController === 'function') {
5+
/* eslint-env browser */
6+
module.exports = require('./abort-controller.browser')
7+
} else {
8+
module.exports = require('abort-controller')
9+
}

src/http.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const { TimeoutError, HTTPError } = require('./http/error')
66
const merge = require('merge-options').bind({ ignoreUndefined: true })
77
const { URL, URLSearchParams } = require('iso-url')
88
const TextDecoder = require('./text-decoder')
9-
const AbortController = require('abort-controller')
9+
const AbortController = require('./abort-controller')
1010
const anySignal = require('any-signal')
1111

1212
const timeout = (promise, ms, abortController) => {

test/http.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai')
55
const HTTP = require('../src/http')
66
const toStream = require('it-to-stream')
77
const delay = require('delay')
8-
const AbortController = require('abort-controller')
8+
const AbortController = require('../src/abort-controller')
99
const drain = require('it-drain')
1010
const all = require('it-all')
1111
const { isBrowser, isWebWorker } = require('../src/env')

0 commit comments

Comments
 (0)