aboutsummaryrefslogtreecommitdiffstats
path: root/packages/subproviders
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-03-04 23:33:58 +0800
committerFabio Berger <me@fabioberger.com>2018-03-04 23:33:58 +0800
commit9ac1cce26fcf17d161b7d67b3240728d623a1085 (patch)
treeb00482542d91e1374f1a470314afc26957d2f35b /packages/subproviders
parent02f82be094dbaf92a1ae6752b9f05dbf6188cf86 (diff)
parent0a597c94d6359c34dc0ab2d3cc4e1dfecaecf18a (diff)
downloaddexon-0x-contracts-9ac1cce26fcf17d161b7d67b3240728d623a1085.tar.gz
dexon-0x-contracts-9ac1cce26fcf17d161b7d67b3240728d623a1085.tar.zst
dexon-0x-contracts-9ac1cce26fcf17d161b7d67b3240728d623a1085.zip
Merge branch 'development' into improveLedgerSubprovider
* development: (28 commits) Remove unnecessary type assertion Fix comments Add comments Don't need any external packages for 0x connect docs yet Instead of adding `@0xproject/types` to tsconfig.json, let's only add it when calling TypeDoc Fix styling Make prettier ignore postpublish_utils Add hack comment Add comment about typeDoc versions Add support for merging multiple topLevel packages under a single section. For now, we simply merge the two package's children (works well for merging 0x.js types and @0xproject/types) Because we now include non-0x.js source, the keys changed. Needed to add both for backward compatibility with old doc JSON's Add support for backward compatibility for TypeDoc versions <0.9.0 Consolidate all same exports together Add @0xproject/types to 0x.js tsconfig `include` so that TypeDoc also includes these types in the generated doc JSON Fix small bug where onHover type declarations with comments was taking up the entire window width Update to custom typeDoc fork with latest version (TS 2.7.0 support) + a bug fix allowing us to defer to the `include` in tsconfig.json on which files to run through TypeDoc Move web3 typings from devDeps to deps remove extrenuous comma Add PR number Add changelog entries from types and utils ... # Conflicts: # packages/subproviders/CHANGELOG.md
Diffstat (limited to 'packages/subproviders')
-rw-r--r--packages/subproviders/CHANGELOG.md3
-rw-r--r--packages/subproviders/package.json2
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md
index e9899363e..0ae534746 100644
--- a/packages/subproviders/CHANGELOG.md
+++ b/packages/subproviders/CHANGELOG.md
@@ -1,7 +1,8 @@
# CHANGELOG
-## v0.5.1 - _TBD, 2018_
+## v0.6.0 - _TBD_
+ * Move web3 types from being a devDep to a dep since one cannot use this package without it (#429)
* Add `numberOfAccounts` param to `LedgerSubprovider` method `getAccountsAsync`
## v0.5.0 - _February 16, 2018_
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 5e9c2ed89..6b702fcb3 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -30,6 +30,7 @@
"lodash": "^4.17.4",
"semaphore-async-await": "^1.5.1",
"web3": "^0.20.0",
+ "web3-typescript-typings": "^0.9.11",
"web3-provider-engine": "^13.0.1"
},
"devDependencies": {
@@ -51,7 +52,6 @@
"types-bn": "^0.0.1",
"types-ethereumjs-util": "0xProject/types-ethereumjs-util",
"typescript": "2.7.1",
- "web3-typescript-typings": "^0.9.11",
"webpack": "^3.1.0"
}
}