diff options
| author | Fabio Berger <me@fabioberger.com> | 2019-01-15 22:13:24 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2019-01-15 22:13:24 +0800 |
| commit | 7c37d10d1f93791db75b1622efa775a361965c49 (patch) | |
| tree | 7017104bea27120661f71701552214dc5efba909 /packages/react-shared/package.json | |
| parent | affd6170540034c31593a4f36ce1dbacb91b6b3e (diff) | |
| parent | 18084588ea9fa724d6e32c9a49c79d49f189ba7c (diff) | |
| download | dexon-0x-contracts-7c37d10d1f93791db75b1622efa775a361965c49.tar.gz dexon-0x-contracts-7c37d10d1f93791db75b1622efa775a361965c49.tar.zst dexon-0x-contracts-7c37d10d1f93791db75b1622efa775a361965c49.zip | |
Merge branch 'development' into feature/monorepo-scripts/publishToDockerHub
* development: (87 commits)
Update packages/sol-tracing-utils/src/trace_collection_subprovider.ts
Make mapping namings direct
Remove unused tslint disable
Revert "Remove logAsyncErrors hack"
Remove logAsyncErrors hack
Refactor logAsyncErrors to follow our conventions
Export Sources and SourceCodes out of tracing utils
Replace console.log with logUtils.log (#1515)
strict decoding of return values using generics
makerAssetFillAmount -> takerAssetFillAmount
Ran prettier
Linter
Fix build after rebase
Style cleanup for Compressed Calldata in Contract Wrappers PR
Use simpler `_.find` to locate fillOrderBai
Updated dutch auction wrapper
Added back abi-gen-wrappers
Renamed signatureParser.ts to signature_parser.ts
Renamed decode rule `structsAsObjects` to `shouldConvertStructsToObjects`
circle build failed. New commit to resubmit job.
...
Diffstat (limited to 'packages/react-shared/package.json')
| -rw-r--r-- | packages/react-shared/package.json | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 5754e238b..1b253e1e4 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -1,6 +1,6 @@ { "name": "@0x/react-shared", - "version": "1.1.0", + "version": "1.1.1", "engines": { "node": ">=6.12" }, @@ -25,15 +25,15 @@ "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0x/dev-utils": "^1.0.22", - "@0x/tslint-config": "^2.0.0", + "@0x/dev-utils": "^1.0.23", + "@0x/tslint-config": "^2.0.1", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", "tslint": "^5.9.1", "typescript": "3.0.1" }, "dependencies": { - "@0x/types": "^1.5.0", + "@0x/types": "^1.5.1", "@material-ui/core": "^3.0.1", "@types/is-mobile": "0.3.0", "@types/lodash": "4.14.104", @@ -50,13 +50,13 @@ "is-mobile": "^0.2.2", "lodash": "^4.17.5", "material-ui": "^0.20.0", - "react": "^16.4.2", - "react-dom": "^16.4.2", - "react-highlight": "0xproject/react-highlight#2f40a42e0a3f0ad126f9f42d505b97b603fc7162", + "react": "^16.5.2", + "react-dom": "^16.5.2", + "react-highlight": "0xproject/react-highlight#699ac4d9529e33520bff4b9bd9c624d21efbba75", "react-markdown": "^3.2.2", "react-router-dom": "^4.1.1", "react-scroll": "0xproject/react-scroll#pr-330-and-replace-state", - "styled-components": "^3.3.0", + "styled-components": "^4.0.1", "valid-url": "^1.0.9" }, "publishConfig": { |