mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-27 04:46:10 +01:00
5ee1291662
Previously all browser globals were allowed to be used anywhere by ESLint because we had set the `env` property to `browser` in the ESLint config. This has made it easy to accidentally use browser globals (e.g. #8338), so it has been removed. Instead we now have a short list of allowed globals. All browser globals are now accessed as properties on `window`. Unfortunately this change resulted in a few different confusing unit test errors, as some of our unit tests setup assumed that a particular global would be used via `window` or `global`. In particular, `window.fetch` didn't work correctly because it wasn't patched by the AbortController polyfill (only `global.fetch` was being patched). The `jsdom-global` package we were using complicated matters by setting all of the JSDOM `window` properties directly on `global`, overwriting the `AbortController` for example. The `helpers.js` test setup module has been simplified somewhat by removing `jsdom-global` and constructing the JSDOM instance manually. The JSDOM window is set on `window`, and a few properties are set on `global` as well as needed by various dependencies. `node-fetch` and the AbortController polyfill/patch now work as expected as well, though `fetch` is only available on `window` now.
24 lines
543 B
JavaScript
24 lines
543 B
JavaScript
const fetchWithTimeout = ({ timeout = 120000 } = {}) => {
|
|
return async function _fetch (url, opts) {
|
|
const abortController = new window.AbortController()
|
|
const abortSignal = abortController.signal
|
|
const f = window.fetch(url, {
|
|
...opts,
|
|
signal: abortSignal,
|
|
})
|
|
|
|
const timer = setTimeout(() => abortController.abort(), timeout)
|
|
|
|
try {
|
|
const res = await f
|
|
clearTimeout(timer)
|
|
return res
|
|
} catch (e) {
|
|
clearTimeout(timer)
|
|
throw e
|
|
}
|
|
}
|
|
}
|
|
|
|
export default fetchWithTimeout
|