aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-01-05 20:32:01 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-01-10 18:24:37 +0800
commit78fd942faa752980caba6e37edd2932b1235cfd7 (patch)
treebf2c8b18ac7ae166002695098d135be94f6044ed
parenta3274ac9b1f972f58f9e3b7ca5fc45829c4a1cd2 (diff)
downloaddexon-sol-tools-78fd942faa752980caba6e37edd2932b1235cfd7.tar
dexon-sol-tools-78fd942faa752980caba6e37edd2932b1235cfd7.tar.gz
dexon-sol-tools-78fd942faa752980caba6e37edd2932b1235cfd7.tar.bz2
dexon-sol-tools-78fd942faa752980caba6e37edd2932b1235cfd7.tar.lz
dexon-sol-tools-78fd942faa752980caba6e37edd2932b1235cfd7.tar.xz
dexon-sol-tools-78fd942faa752980caba6e37edd2932b1235cfd7.tar.zst
dexon-sol-tools-78fd942faa752980caba6e37edd2932b1235cfd7.zip
Return to old way of including web3 types
-rw-r--r--packages/0x.js/tsconfig.json1
-rw-r--r--packages/abi-gen/tsconfig.json2
-rw-r--r--packages/contracts/tsconfig.json1
-rw-r--r--packages/kovan-faucets/tsconfig.json2
-rw-r--r--packages/subproviders/tsconfig.json1
-rw-r--r--packages/types/tsconfig.json2
-rw-r--r--packages/utils/tsconfig.json2
-rw-r--r--packages/web3-typescript-typings/index.d.ts (renamed from packages/web3-typescript-typings/web3/index.d.ts)0
-rw-r--r--packages/web3-typescript-typings/package.json8
-rw-r--r--packages/web3-wrapper/tsconfig.json2
-rw-r--r--packages/website/tsconfig.json2
11 files changed, 13 insertions, 10 deletions
diff --git a/packages/0x.js/tsconfig.json b/packages/0x.js/tsconfig.json
index 3d3b7a4f5..1defcc4a4 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 e35816553..5e0c7c6d3 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 b3ab06b0d..38008a542 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 6f3948fc5..7f0c084ff 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 d889e2a51..9a65a0a97 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 c56d255d5..3d967d05f 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 c56d255d5..3d967d05f 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
index 6fd126d2a..6fd126d2a 100644
--- a/packages/web3-typescript-typings/web3/index.d.ts
+++ b/packages/web3-typescript-typings/index.d.ts
diff --git a/packages/web3-typescript-typings/package.json b/packages/web3-typescript-typings/package.json
index f93382fc7..c69cd40fb 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 c56d255d5..3d967d05f 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 43c417be0..0e14e5450 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/*", "*"]