diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-07-17 18:06:35 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-07-17 18:06:35 +0800 |
| commit | 03a6a088c5f1a086c1f3f02a0a70edaea3603860 (patch) | |
| tree | bbe67afd2ad3d902444da65964c7401c9d38d63d /packages/sol-compiler | |
| parent | 1e787a764615bd3df839f2cb117b711be297b9d5 (diff) | |
| parent | a9038f2afc974cecf567a9aef50267d29a995e02 (diff) | |
| download | dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar.gz dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar.bz2 dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar.lz dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar.xz dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.tar.zst dexon-sol-tools-03a6a088c5f1a086c1f3f02a0a70edaea3603860.zip | |
Merge branch 'v2-prototype' into fix-order-watcher
* v2-prototype: (39 commits)
Add chris to website
Fix ocean link
Move update onboarding step tracking to onboarding flow code
Bump npm-run-all from 4.1.2 to 4.1.3
Move format to helper function
Fix linter
Add assertion to make sure caller to fetchAsync isn't trying to set timeout in a context-specific way
Fix linter issues
Remove unused import
Switch conditional
Update yarn.lock and artifact
Fix abi-gen tests to not rely on sleep, since it causes intermittent failures
Add missing assertion
Move type defs to typescript-typingsd
Fix linter
Make createFinalPayload protected
Replace process.browser with detect-node library
Export Web3ProviderEngine and RPCSubprovider from 0x.js
Export Web3ProviderEngine from subproviders package
Update deps
...
Diffstat (limited to 'packages/sol-compiler')
| -rw-r--r-- | packages/sol-compiler/package.json | 1 | ||||
| -rw-r--r-- | packages/sol-compiler/src/compiler.ts | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index e738ab56b..8460420ad 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -87,7 +87,6 @@ "ethereum-types": "^0.0.2", "chalk": "^2.3.0", "ethereumjs-util": "^5.1.1", - "isomorphic-fetch": "^2.2.1", "lodash": "^4.17.4", "mkdirp": "^0.5.1", "require-from-string": "^2.0.1", diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts index bb701a8ce..e61c606be 100644 --- a/packages/sol-compiler/src/compiler.ts +++ b/packages/sol-compiler/src/compiler.ts @@ -8,11 +8,10 @@ import { Resolver, URLResolver, } from '@0xproject/sol-resolver'; -import { logUtils } from '@0xproject/utils'; +import { fetchAsync, logUtils } from '@0xproject/utils'; import chalk from 'chalk'; import * as ethUtil from 'ethereumjs-util'; import * as fs from 'fs'; -import 'isomorphic-fetch'; import * as _ from 'lodash'; import * as path from 'path'; import * as requireFromString from 'require-from-string'; @@ -149,7 +148,7 @@ export class Compiler { } else { logUtils.log(`Downloading ${fullSolcVersion}...`); const url = `${constants.BASE_COMPILER_URL}${fullSolcVersion}`; - const response = await fetch(url); + const response = await fetchAsync(url); const SUCCESS_STATUS = 200; if (response.status !== SUCCESS_STATUS) { throw new Error(`Failed to load ${fullSolcVersion}`); |