From 78fd942faa752980caba6e37edd2932b1235cfd7 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 5 Jan 2018 13:32:01 +0100 Subject: [PATCH] Return to old way of including web3 types --- packages/0x.js/tsconfig.json | 1 + packages/abi-gen/tsconfig.json | 2 +- packages/contracts/tsconfig.json | 1 + packages/kovan-faucets/tsconfig.json | 2 +- packages/subproviders/tsconfig.json | 1 + packages/types/tsconfig.json | 2 +- packages/utils/tsconfig.json | 2 +- packages/web3-typescript-typings/{web3 => }/index.d.ts | 0 packages/web3-typescript-typings/package.json | 8 ++++---- packages/web3-wrapper/tsconfig.json | 2 +- packages/website/tsconfig.json | 2 +- 11 files changed, 13 insertions(+), 10 deletions(-) rename packages/web3-typescript-typings/{web3 => }/index.d.ts (100%) diff --git a/packages/0x.js/tsconfig.json b/packages/0x.js/tsconfig.json index 3d3b7a4f52..1defcc4a4f 100644 --- a/packages/0x.js/tsconfig.json +++ b/packages/0x.js/tsconfig.json @@ -9,6 +9,7 @@ "./test/**/*", "../../node_modules/types-bn/index.d.ts", "../../node_modules/types-ethereumjs-util/index.d.ts", + "../../node_modules/web3-typescript-typings/index.d.ts", "../../node_modules/chai-typescript-typings/index.d.ts", "../../node_modules/chai-as-promised-typescript-typings/index.d.ts" ] diff --git a/packages/abi-gen/tsconfig.json b/packages/abi-gen/tsconfig.json index e358165538..5e0c7c6d39 100644 --- a/packages/abi-gen/tsconfig.json +++ b/packages/abi-gen/tsconfig.json @@ -3,5 +3,5 @@ "compilerOptions": { "outDir": "lib" }, - "include": ["./src/**/*", "./test/**/*"] + "include": ["./src/**/*", "./test/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] } diff --git a/packages/contracts/tsconfig.json b/packages/contracts/tsconfig.json index b3ab06b0d9..38008a5420 100644 --- a/packages/contracts/tsconfig.json +++ b/packages/contracts/tsconfig.json @@ -11,6 +11,7 @@ "include": [ "../../node_modules/types-ethereumjs-util/index.d.ts", "../../node_modules/chai-typescript-typings/index.d.ts", + "../../node_modules/web3-typescript-typings/index.d.ts", "../../node_modules/chai-as-promised-typescript-typings/index.d.ts", "../../node_modules/types-ethereumjs-util/index.d.ts", "../../node_modules/types-bn/index.d.ts", diff --git a/packages/kovan-faucets/tsconfig.json b/packages/kovan-faucets/tsconfig.json index 6f3948fc5e..7f0c084ff5 100644 --- a/packages/kovan-faucets/tsconfig.json +++ b/packages/kovan-faucets/tsconfig.json @@ -3,5 +3,5 @@ "compilerOptions": { "outDir": "lib" }, - "include": ["./src/ts/**/*"] + "include": ["./src/ts/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] } diff --git a/packages/subproviders/tsconfig.json b/packages/subproviders/tsconfig.json index d889e2a511..9a65a0a971 100644 --- a/packages/subproviders/tsconfig.json +++ b/packages/subproviders/tsconfig.json @@ -7,6 +7,7 @@ "./src/**/*", "./test/**/*", "../../node_modules/chai-typescript-typings/index.d.ts", + "../../node_modules/web3-typescript-typings/index.d.ts", "../../node_modules/types-bn/index.d.ts", "../../node_modules/types-ethereumjs-util/index.d.ts", "../../node_modules/chai-as-promised-typescript-typings/index.d.ts" diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json index c56d255d54..3d967d05f0 100644 --- a/packages/types/tsconfig.json +++ b/packages/types/tsconfig.json @@ -3,5 +3,5 @@ "compilerOptions": { "outDir": "lib" }, - "include": ["./src/**/*"] + "include": ["./src/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] } diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index c56d255d54..3d967d05f0 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -3,5 +3,5 @@ "compilerOptions": { "outDir": "lib" }, - "include": ["./src/**/*"] + "include": ["./src/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] } diff --git a/packages/web3-typescript-typings/web3/index.d.ts b/packages/web3-typescript-typings/index.d.ts similarity index 100% rename from packages/web3-typescript-typings/web3/index.d.ts rename to packages/web3-typescript-typings/index.d.ts diff --git a/packages/web3-typescript-typings/package.json b/packages/web3-typescript-typings/package.json index f93382fc7c..c69cd40fb2 100644 --- a/packages/web3-typescript-typings/package.json +++ b/packages/web3-typescript-typings/package.json @@ -2,10 +2,10 @@ "name": "web3-typescript-typings", "version": "0.9.0", "description": "Typescript type definitions for web3", - "main": "web3/index.d.ts", - "types": "web3/index.d.ts", + "main": "index.d.ts", + "types": "index.d.ts", "scripts": { - "lint": "tslint web3/index.d.ts" + "lint": "tslint index.d.ts" }, "repository": { "type": "git", @@ -22,7 +22,7 @@ "@types/bignumber.js": "^4.0.2", "tslint": "^5.5.0", "tslint-config-0xproject": "^0.0.2", - "typescript": "^2.4.2" + "typescript": "~2.6.1" }, "dependencies": { "bignumber.js": "~4.1.0" diff --git a/packages/web3-wrapper/tsconfig.json b/packages/web3-wrapper/tsconfig.json index c56d255d54..3d967d05f0 100644 --- a/packages/web3-wrapper/tsconfig.json +++ b/packages/web3-wrapper/tsconfig.json @@ -3,5 +3,5 @@ "compilerOptions": { "outDir": "lib" }, - "include": ["./src/**/*"] + "include": ["./src/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] } diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index 43c417be06..0e14e54500 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -6,7 +6,7 @@ "jsx": "react", "baseUrl": "./", "allowJs": true, - "strictNullChecks": true, + "strictNullChecks": false, "declaration": false, "paths": { "*": ["node_modules/@types/*", "*"]