aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Millman <brandon@0xproject.com>2018-07-21 04:51:12 +0800
committerGitHub <noreply@github.com>2018-07-21 04:51:12 +0800
commite54501522dcf93521c8ff7dfe5b216cffeaa1b29 (patch)
tree70b54c3ccd83d964f78e7569361e775556a456b5
parentdc151f7290072c9776c9b351ae30bf577fcd1015 (diff)
parentf2baeddc301206889f8ee2bdb80b0018e03e411f (diff)
downloaddexon-0x-contracts-e54501522dcf93521c8ff7dfe5b216cffeaa1b29.tar.gz
dexon-0x-contracts-e54501522dcf93521c8ff7dfe5b216cffeaa1b29.tar.zst
dexon-0x-contracts-e54501522dcf93521c8ff7dfe5b216cffeaa1b29.zip
Merge pull request #903 from 0xProject/bug/website/fix-website
Add AbortController polyfill to fetchAsync in utils
-rw-r--r--packages/utils/CHANGELOG.json9
-rw-r--r--packages/utils/package.json1
-rw-r--r--packages/utils/src/fetchAsync.ts3
-rw-r--r--packages/website/package.json10
-rw-r--r--yarn.lock77
5 files changed, 29 insertions, 71 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",
diff --git a/yarn.lock b/yarn.lock
index 8c6dda8a6..62b5750b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -220,28 +220,6 @@
ethers "3.0.22"
lodash "4.17.10"
-"@0xproject/react-docs@^0.0.16":
- version "0.0.16"
- resolved "https://registry.yarnpkg.com/@0xproject/react-docs/-/react-docs-0.0.16.tgz#67670f0f77e34aca0647fb4a56bbe9102c0c6e3a"
- dependencies:
- "@0xproject/react-shared" "^0.2.3"
- "@0xproject/utils" "^0.7.3"
- "@types/lodash" "4.14.104"
- "@types/material-ui" "0.18.0"
- "@types/node" "9.6.0"
- "@types/react" "16.3.13"
- "@types/react-dom" "16.0.4"
- "@types/react-scroll" "0.0.31"
- basscss "8.0.4"
- compare-versions "3.1.0"
- lodash "4.17.10"
- material-ui "0.17.4"
- react "15.6.1"
- react-dom "15.6.1"
- react-markdown "3.2.2"
- react-scroll "1.7.7"
- react-tooltip "3.4.0"
-
"@0xproject/react-shared@^0.2.3":
version "0.2.3"
resolved "https://registry.yarnpkg.com/@0xproject/react-shared/-/react-shared-0.2.3.tgz#f0403b9b7f1cfbe2853b53cc983ebb13ee8753a5"
@@ -294,29 +272,6 @@
"@0xproject/typescript-typings" "^0.0.3"
lodash "4.17.10"
-"@0xproject/subproviders@^0.10.6":
- version "0.10.6"
- resolved "https://registry.yarnpkg.com/@0xproject/subproviders/-/subproviders-0.10.6.tgz#383a9bb96c661148b6f4541fb553c79c787983e1"
- dependencies:
- "@0xproject/assert" "^0.2.14"
- "@0xproject/types" "^0.8.2"
- "@0xproject/typescript-typings" "^0.4.3"
- "@0xproject/utils" "^0.7.3"
- "@ledgerhq/hw-app-eth" "4.7.3"
- "@ledgerhq/hw-transport-u2f" "4.7.3"
- bip39 "2.5.0"
- bn.js "4.11.7"
- ethereumjs-tx "1.3.4"
- ethereumjs-util "5.1.5"
- ganache-core "0xProject/ganache-core"
- hdkey "0.7.1"
- lodash "4.17.10"
- semaphore-async-await "1.5.1"
- web3 "0.20.6"
- web3-provider-engine "14.0.6"
- optionalDependencies:
- "@ledgerhq/hw-transport-node-hid" "4.7.3"
-
"@0xproject/types@^0.5.0":
version "0.5.0"
resolved "https://registry.yarnpkg.com/@0xproject/types/-/types-0.5.0.tgz#ba3cfbc11a8c6344b57c9680aa7df2ea84b9bf05"
@@ -370,19 +325,12 @@
lodash "4.17.10"
web3 "0.20.6"
-"@ledgerhq/hw-app-eth@4.7.3", "@ledgerhq/hw-app-eth@^4.3.0":
+"@ledgerhq/hw-app-eth@^4.3.0":
version "4.7.3"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-4.7.3.tgz#d352e19658ae296532e522c53c8ec2a1a77b64e5"
dependencies:
"@ledgerhq/hw-transport" "^4.7.3"
-"@ledgerhq/hw-transport-node-hid@4.7.3":
- version "4.7.3"
- resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.7.3.tgz#e7634d53161cdffed4f602cddca6a7bc34e7b79b"
- dependencies:
- "@ledgerhq/hw-transport" "^4.7.3"
- node-hid "^0.7.2"
-
"@ledgerhq/hw-transport-node-hid@^4.3.0":
version "4.7.6"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-4.7.6.tgz#f2bd7c714e359af84377d07dd6431f2aa582e71e"
@@ -390,7 +338,7 @@
"@ledgerhq/hw-transport" "^4.7.3"
node-hid "^0.7.2"
-"@ledgerhq/hw-transport-u2f@4.7.3", "@ledgerhq/hw-transport-u2f@^4.3.0":
+"@ledgerhq/hw-transport-u2f@^4.3.0":
version "4.7.3"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-4.7.3.tgz#32be84bd2829f0ad0745604355f73a169dceb5e5"
dependencies:
@@ -1283,6 +1231,10 @@ abbrev@1.0.x:
version "1.0.9"
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+abortcontroller-polyfill@^1.1.9:
+ version "1.1.9"
+ resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.1.9.tgz#9fefe359fda2e9e0932dc85e6106453ac393b2da"
+
abstract-leveldown@0.12.3:
version "0.12.3"
resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-0.12.3.tgz#116b1ec5c7710ef7a2d5706768bbdb4440be1070"
@@ -2531,7 +2483,7 @@ bintrees@1.0.2, bintrees@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.2.tgz#49f896d6e858a4a499df85c38fb399b9aff840f8"
-bip39@2.5.0, bip39@^2.5.0:
+bip39@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/bip39/-/bip39-2.5.0.tgz#51cbd5179460504a63ea3c000db3f787ca051235"
dependencies:
@@ -3465,7 +3417,7 @@ compare-func@^1.3.1:
array-ify "^1.0.0"
dot-prop "^3.0.0"
-compare-versions@3.1.0, compare-versions@^3.0.1:
+compare-versions@^3.0.1:
version "3.1.0"
resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.1.0.tgz#43310256a5c555aaed4193c04d8f154cf9c6efd5"
@@ -5049,7 +5001,7 @@ ethereumjs-blockstream@5.0.0:
source-map-support "0.5.6"
uuid "3.2.1"
-ethereumjs-tx@0xProject/ethereumjs-tx#fake-tx-include-signature-by-default, ethereumjs-tx@1.3.4:
+ethereumjs-tx@0xProject/ethereumjs-tx#fake-tx-include-signature-by-default:
version "1.3.4"
resolved "https://codeload.github.com/0xProject/ethereumjs-tx/tar.gz/29d1153889c389591f74b2401da8a0c6ad40f9a7"
dependencies:
@@ -6514,7 +6466,7 @@ hawk@~6.0.2:
hoek "4.x.x"
sntp "2.x.x"
-hdkey@0.7.1, hdkey@^0.7.0, hdkey@^0.7.1:
+hdkey@^0.7.0, hdkey@^0.7.1:
version "0.7.1"
resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-0.7.1.tgz#caee4be81aa77921e909b8d228dd0f29acaee632"
dependencies:
@@ -10709,13 +10661,6 @@ react-tap-event-plugin@2.0.1, react-tap-event-plugin@^2.0.1:
dependencies:
fbjs "^0.8.6"
-react-tooltip@3.4.0:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-3.4.0.tgz#037f38f797c3e6b1b58d2534ccc8c2c76af4f52d"
- dependencies:
- classnames "^2.2.5"
- prop-types "^15.6.0"
-
react-tooltip@^3.2.7:
version "3.5.0"
resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-3.5.0.tgz#f4bff54b3c70415b6bd25b8bcf7801c230d1b517"
@@ -11533,7 +11478,7 @@ selfsigned@^1.9.1:
dependencies:
node-forge "0.7.1"
-semaphore-async-await@1.5.1, semaphore-async-await@^1.5.1:
+semaphore-async-await@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz#857bef5e3644601ca4b9570b87e9df5ca12974fa"