merge developmentx

packages/sra-report/package.json

@@ -33,6 +33,7 @@
         "@0xproject/connect": "^0.6.6",
         "@0xproject/json-schemas": "^0.7.17",
         "@0xproject/utils": "^0.4.3",
+        "@0xproject/typescript-typings": "^0.0.1",
         "chalk": "^2.3.0",
         "lodash": "^4.17.4",
         "newman": "^3.9.3",
@@ -48,8 +49,6 @@
         "@types/yargs": "^10.0.0",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
-        "chai-as-promised-typescript-typings": "^0.0.10",
-        "chai-typescript-typings": "^0.0.4",
         "copyfiles": "^1.2.0",
         "dirty-chai": "^2.0.1",
         "mocha": "^4.0.1",

packages/sra-report/tsconfig.json

@@ -3,12 +3,5 @@
     "compilerOptions": {
         "outDir": "lib"
     },
-    "include": [
-        "./src/**/*",
-        "./test/**/*",
-        "../../node_modules/chai-as-promised-typescript-typings/index.d.ts",
-        "../../node_modules/chai-typescript-typings/index.d.ts",
-        "../../node_modules/web3-typescript-typings/index.d.ts",
-        "../../node_modules/ethers-typescript-typings/index.d.ts"
-    ]
+    "include": ["./src/**/*", "./test/**/*"]
 }