diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-12-09 01:21:51 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-12-09 01:21:51 +0800 |
| commit | af8d24d0eb5af781f4731b5559979f2b02579785 (patch) | |
| tree | 6f429e6f2b3050de6dd7ce16e42c7f387bd5018a /packages/json-schemas | |
| parent | ca85a97106ea6d09fbceafac8f9516945ccff399 (diff) | |
| parent | 5eea829be9f5e8669c40dac965231051b668ed37 (diff) | |
| download | dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar.gz dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar.bz2 dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar.lz dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar.xz dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar.zst dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.zip | |
Merge branch 'development' into feature/addSubproviders
* development:
Update README.md
Inline network module
Stop supporting different file extensions in abi-gen
Refactor networkId out of web3Wrapper
Update connect types in preperation for publishing
Fix CI command
Address feedback
Refactor web3Wrapper to a separate package
# Conflicts:
# package.json
# packages/website/ts/blockchain.ts
Diffstat (limited to 'packages/json-schemas')
| -rw-r--r-- | packages/json-schemas/package.json | 4 | ||||
| -rw-r--r-- | packages/json-schemas/src/globals.d.ts | 6 | ||||
| -rw-r--r-- | packages/json-schemas/test/schema_test.ts | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 0181e4dd4..52deb2254 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -5,7 +5,7 @@ "main": "lib/src/index.js", "types": "lib/src/index.d.ts", "scripts": { - "lint": "tslint --project . src/*.ts test/*.ts", + "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", "test": "run-s clean build run_mocha", "test:circleci": "yarn test", "run_mocha": "mocha lib/test/**/*_test.js", @@ -23,12 +23,12 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/json-schemas/README.md", "dependencies": { - "es6-promisify": "^5.0.0", "jsonschema": "^1.2.0", "lodash.values": "^4.3.0" }, "devDependencies": { "@0xproject/tslint-config": "^0.2.0", + "@0xproject/utils": "^0.0.1", "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", "@types/mocha": "^2.2.42", diff --git a/packages/json-schemas/src/globals.d.ts b/packages/json-schemas/src/globals.d.ts index 157705f57..91ed2021e 100644 --- a/packages/json-schemas/src/globals.d.ts +++ b/packages/json-schemas/src/globals.d.ts @@ -1,7 +1 @@ declare module 'dirty-chai'; - -// es6-promisify declarations -declare function promisify(original: any, settings?: any): ((...arg: any[]) => Promise<any>); -declare module 'es6-promisify' { - export = promisify; -} diff --git a/packages/json-schemas/test/schema_test.ts b/packages/json-schemas/test/schema_test.ts index 758ccac61..8a2f9407d 100644 --- a/packages/json-schemas/test/schema_test.ts +++ b/packages/json-schemas/test/schema_test.ts @@ -1,7 +1,7 @@ +import {promisify} from '@0xproject/utils'; import BigNumber from 'bignumber.js'; import * as chai from 'chai'; import * as dirtyChai from 'dirty-chai'; -import promisify = require('es6-promisify'); import forEach = require('lodash.foreach'); import 'mocha'; |