merge developmentx

packages/react-docs/README.md

@@ -33,6 +33,14 @@ This package exposes both a single `Documentation` react component that will ren
 
 Currently this package still has some external dependencies outside of the `Documentation` component, so please start your project off by copying the [react-docs-example](https://github.com/0xProject/0x-monorepo/tree/development/packages/react-docs-example) directory and modifying it there. If you need changes in the [react-docs](https://github.com/0xProject/0x-monorepo/tree/development/packages/react-docs) package, fork the 0x monorepo, make the required changes and submit a PR. Until we merge it, you can have your project depend on your own custom fork.
 
+If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
+
+```json
+"compilerOptions": {
+    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+}
+```
+
 ## Future improvements
 
 Feel free to contribute to these improvements!

packages/react-docs/package.json

@@ -35,8 +35,8 @@
         "@types/lodash": "4.14.104",
         "@types/material-ui": "0.18.0",
         "@types/node": "^8.0.53",
-        "@types/react": "^15.0.15",
-        "@types/react-dom": "^0.14.23",
+        "@types/react": "^16.0.34",
+        "@types/react-dom": "^16.0.3",
         "@types/react-scroll": "0.0.31",
         "@types/react-tap-event-plugin": "0.0.30",
         "basscss": "^8.0.3",

packages/react-docs/tsconfig.json

@@ -9,5 +9,5 @@
             "*": ["node_modules/@types/*", "*"]
         }
     },
-    "include": ["./src/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"]
+    "include": ["./src/**/*"]
 }