diff options
| author | Brandon Millman <brandon@0xproject.com> | 2018-07-21 04:51:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 04:51:12 +0800 |
| commit | e54501522dcf93521c8ff7dfe5b216cffeaa1b29 (patch) | |
| tree | 70b54c3ccd83d964f78e7569361e775556a456b5 /packages | |
| parent | dc151f7290072c9776c9b351ae30bf577fcd1015 (diff) | |
| parent | f2baeddc301206889f8ee2bdb80b0018e03e411f (diff) | |
| download | dexon-sol-tools-e54501522dcf93521c8ff7dfe5b216cffeaa1b29.tar dexon-sol-tools-e54501522dcf93521c8ff7dfe5b216cffeaa1b29.tar.gz dexon-sol-tools-e54501522dcf93521c8ff7dfe5b216cffeaa1b29.tar.bz2 dexon-sol-tools-e54501522dcf93521c8ff7dfe5b216cffeaa1b29.tar.lz dexon-sol-tools-e54501522dcf93521c8ff7dfe5b216cffeaa1b29.tar.xz dexon-sol-tools-e54501522dcf93521c8ff7dfe5b216cffeaa1b29.tar.zst dexon-sol-tools-e54501522dcf93521c8ff7dfe5b216cffeaa1b29.zip | |
Merge pull request #903 from 0xProject/bug/website/fix-website
Add AbortController polyfill to fetchAsync in utils
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/utils/CHANGELOG.json | 9 | ||||
| -rw-r--r-- | packages/utils/package.json | 1 | ||||
| -rw-r--r-- | packages/utils/src/fetchAsync.ts | 3 | ||||
| -rw-r--r-- | packages/website/package.json | 10 |
4 files changed, 18 insertions, 5 deletions
diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index 4ff5236ec..92149a7d4 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -1,5 +1,14 @@ [ { + "version": "1.0.1", + "changes": [ + { + "note": "Add `AbortController` polyfill to `fetchAsync`", + "pr": 903 + } + ] + }, + { "timestamp": 1532043000, "version": "1.0.0", "changes": [ diff --git a/packages/utils/package.json b/packages/utils/package.json index 7e3d46ce7..382604fdd 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -38,6 +38,7 @@ "@0xproject/types": "^1.0.0-rc.1", "@0xproject/typescript-typings": "^1.0.0", "@types/node": "^8.0.53", + "abortcontroller-polyfill": "^1.1.9", "bignumber.js": "~4.1.0", "detect-node": "2.0.3", "ethereum-types": "^1.0.0", diff --git a/packages/utils/src/fetchAsync.ts b/packages/utils/src/fetchAsync.ts index c02e5baba..b4c85718d 100644 --- a/packages/utils/src/fetchAsync.ts +++ b/packages/utils/src/fetchAsync.ts @@ -1,5 +1,8 @@ import isNode = require('detect-node'); import 'isomorphic-fetch'; +// WARNING: This needs to be imported after isomorphic-fetch: https://github.com/mo/abortcontroller-polyfill#using-it-on-browsers-without-fetch +// tslint:disable-next-line:ordered-imports +import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only'; export const fetchAsync = async ( endpoint: string, diff --git a/packages/website/package.json b/packages/website/package.json index 4cefa19a9..99fd7cff3 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -7,7 +7,7 @@ "private": true, "description": "Website and 0x portal dapp", "scripts": { - "build": "NODE_ENV=production webpack; exit 0;", + "build": "NODE_ENV=production node --max_old_space_size=8192 ../../node_modules/.bin/webpack; exit 0;", "clean": "shx rm -f public/bundle*", "lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'", "watch_without_deps": "webpack-dev-server --content-base public --https", @@ -23,13 +23,13 @@ "dependencies": { "@0xproject/contract-wrappers": "^0.0.5", "@0xproject/order-utils": "^0.0.9", - "@0xproject/react-docs": "^0.0.16", + "@0xproject/react-docs": "^1.0.0", "@0xproject/react-shared": "^0.2.3", - "@0xproject/subproviders": "^0.10.6", + "@0xproject/subproviders": "^1.0.0", "@0xproject/types": "^0.8.1", "@0xproject/typescript-typings": "^0.4.3", - "@0xproject/utils": "^0.7.3", - "@0xproject/web3-wrapper": "^0.7.3", + "@0xproject/utils": "^1.0.0", + "@0xproject/web3-wrapper": "^1.0.0", "accounting": "^0.4.1", "basscss": "^8.0.3", "blockies": "^0.0.2", |