aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid <logvinov.leon@gmail.com>2018-02-05 18:24:36 +0800
committerGitHub <noreply@github.com>2018-02-05 18:24:36 +0800
commit03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778 (patch)
treef5f41d05c24c289ff63b18de1dfd1f59daac7c5f
parent45ac9603083c38dbab6fb6eff26c744eea2b4429 (diff)
parentf6d963d45ac1e07e3cd56cdd47f7f1576dd7ac96 (diff)
downloaddexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar.gz
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar.bz2
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar.lz
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar.xz
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.tar.zst
dexon-sol-tools-03b1b12ef1e4cdf9b834ff5cc1312b2eda3d2778.zip
Merge pull request #359 from 0xProject/feature/ts-2.7
TS 2.7
Diffstat
-rw-r--r--packages/0x.js/package.json2
-rw-r--r--packages/0x.js/src/contract_wrappers/contract_wrapper.ts8
-rw-r--r--packages/abi-gen/package.json2
-rw-r--r--packages/assert/package.json2
-rw-r--r--packages/connect/package.json2
-rw-r--r--packages/contracts/package.json2
-rw-r--r--packages/deployer/package.json2
-rw-r--r--packages/dev-utils/package.json2
-rw-r--r--packages/json-schemas/package.json2
-rw-r--r--packages/monorepo-scripts/package.json2
-rw-r--r--packages/subproviders/package.json2
-rw-r--r--packages/testnet-faucets/package.json2
-rw-r--r--packages/tslint-config/package.json2
-rw-r--r--packages/types/package.json2
-rw-r--r--packages/utils/package.json2
-rw-r--r--packages/web3-typescript-typings/package.json2
-rw-r--r--packages/web3-wrapper/package.json2
-rw-r--r--packages/website/package.json2
-rw-r--r--yarn.lock6
19 files changed, 24 insertions, 24 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 93ffef376..150d823ff 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -71,7 +71,7 @@
"truffle-hdwallet-provider": "^0.0.3",
"tslint": "5.8.0",
"typedoc": "~0.8.0",
- "typescript": "~2.6.1",
+ "typescript": "2.7.1",
"web3-provider-engine": "^13.0.1",
"web3-typescript-typings": "^0.9.7",
"webpack": "^3.1.0"
diff --git a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
index 873489dc9..2d5818618 100644
--- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
@@ -34,8 +34,8 @@ export class ContractWrapper {
protected _web3Wrapper: Web3Wrapper;
private _networkId: number;
private _abiDecoder?: AbiDecoder;
- private _blockAndLogStreamerIfExists: BlockAndLogStreamer | undefined;
- private _blockAndLogStreamInterval: NodeJS.Timer;
+ private _blockAndLogStreamerIfExists?: BlockAndLogStreamer;
+ private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer;
private _filters: { [filterToken: string]: Web3.FilterObject };
private _filterCallbacks: {
[filterToken: string]: EventCallback<ContractEventArgs>;
@@ -162,7 +162,7 @@ export class ContractWrapper {
);
const catchAllLogFilter = {};
this._blockAndLogStreamerIfExists.addLogFilter(catchAllLogFilter);
- this._blockAndLogStreamInterval = intervalUtils.setAsyncExcludingInterval(
+ this._blockAndLogStreamIntervalIfExists = intervalUtils.setAsyncExcludingInterval(
this._reconcileBlockAsync.bind(this),
constants.DEFAULT_BLOCK_POLLING_INTERVAL,
this._onReconcileBlockError.bind(this),
@@ -191,7 +191,7 @@ export class ContractWrapper {
}
this._blockAndLogStreamerIfExists.unsubscribeFromOnLogAdded(this._onLogAddedSubscriptionToken as string);
this._blockAndLogStreamerIfExists.unsubscribeFromOnLogRemoved(this._onLogRemovedSubscriptionToken as string);
- intervalUtils.clearAsyncExcludingInterval(this._blockAndLogStreamInterval);
+ intervalUtils.clearAsyncExcludingInterval(this._blockAndLogStreamIntervalIfExists as NodeJS.Timer);
delete this._blockAndLogStreamerIfExists;
}
private async _reconcileBlockAsync(): Promise<void> {
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index b4173be8c..cf0f5dbc8 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -43,7 +43,7 @@
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"tslint": "5.8.0",
- "typescript": "~2.6.1",
+ "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7"
}
}
diff --git a/packages/assert/package.json b/packages/assert/package.json
index 66ef2e010..3d95be11a 100644
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -35,7 +35,7 @@
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"tslint": "5.8.0",
- "typescript": "~2.6.1"
+ "typescript": "2.7.1"
},
"dependencies": {
"@0xproject/json-schemas": "^0.7.6",
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 2a7c29e9c..e5cc7acd2 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -59,7 +59,7 @@
"shx": "^0.2.2",
"tslint": "5.8.0",
"typedoc": "~0.8.0",
- "typescript": "~2.6.1",
+ "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7"
}
}
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 90317e82d..7cb42ac24 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -54,7 +54,7 @@
"tslint": "5.8.0",
"types-bn": "^0.0.1",
"types-ethereumjs-util": "0xproject/types-ethereumjs-util",
- "typescript": "~2.6.1",
+ "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7",
"yargs": "^10.0.3"
},
diff --git a/packages/deployer/package.json b/packages/deployer/package.json
index 580c9c1e2..8767f0edc 100644
--- a/packages/deployer/package.json
+++ b/packages/deployer/package.json
@@ -31,7 +31,7 @@
"copyfiles": "^1.2.0",
"web3-typescript-typings": "^0.9.4",
"types-bn": "^0.0.1",
- "typescript": "~2.6.1",
+ "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7"
},
"dependencies": {
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 9bf48c23c..a79cc3c1e 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -28,7 +28,7 @@
"tslint": "5.8.0",
"types-bn": "^0.0.1",
"types-ethereumjs-util": "0xproject/types-ethereumjs-util",
- "typescript": "~2.6.1"
+ "typescript": "2.7.1"
},
"dependencies": {
"@0xproject/utils": "^0.2.3",
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index 1e45183a4..39ba53bb4 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -41,6 +41,6 @@
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"tslint": "5.8.0",
- "typescript": "~2.6.1"
+ "typescript": "2.7.1"
}
}
diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index 850e71259..7783c67ba 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -25,7 +25,7 @@
"@types/node": "^8.0.53",
"shx": "^0.2.2",
"tslint": "5.8.0",
- "typescript": "~2.6.1"
+ "typescript": "2.7.1"
},
"dependencies": {
"chalk": "^2.3.0",
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 95df4d6cb..e00052309 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -49,7 +49,7 @@
"tslint": "5.8.0",
"types-bn": "^0.0.1",
"types-ethereumjs-util": "0xproject/types-ethereumjs-util",
- "typescript": "~2.6.1",
+ "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.5",
"webpack": "^3.1.0"
}
diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json
index c92901d85..05a3ef58d 100644
--- a/packages/testnet-faucets/package.json
+++ b/packages/testnet-faucets/package.json
@@ -36,7 +36,7 @@
"shx": "^0.2.2",
"source-map-loader": "^0.1.6",
"tslint": "5.8.0",
- "typescript": "~2.6.1",
+ "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7",
"webpack": "^3.1.0",
"webpack-node-externals": "^1.6.0"
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index 08597a0ee..269e99fc0 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -29,7 +29,7 @@
"shx": "^0.2.2",
"tslint": "5.8.0",
"tslint-eslint-rules": "^4.1.1",
- "typescript": "~2.6.1"
+ "typescript": "2.7.1"
},
"dependencies": {
"lodash": "^4.17.4",
diff --git a/packages/types/package.json b/packages/types/package.json
index 0d6149ba1..ebfa72797 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -24,7 +24,7 @@
"shx": "^0.2.2",
"tslint": "5.8.0",
"web3-typescript-typings": "^0.9.5",
- "typescript": "~2.6.1"
+ "typescript": "2.7.1"
},
"dependencies": {
"bignumber.js": "~4.1.0",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 65ee69805..99d9fbd2b 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -27,7 +27,7 @@
"shx": "^0.2.2",
"tslint": "5.8.0",
"web3-typescript-typings": "^0.9.5",
- "typescript": "~2.6.1"
+ "typescript": "2.7.1"
},
"dependencies": {
"bignumber.js": "~4.1.0",
diff --git a/packages/web3-typescript-typings/package.json b/packages/web3-typescript-typings/package.json
index 4737088b0..8650a651f 100644
--- a/packages/web3-typescript-typings/package.json
+++ b/packages/web3-typescript-typings/package.json
@@ -22,7 +22,7 @@
"@types/bignumber.js": "^4.0.2",
"tslint": "5.8.0",
"tslint-config-0xproject": "^0.0.2",
- "typescript": "~2.6.1"
+ "typescript": "2.7.1"
},
"dependencies": {
"bignumber.js": "~4.1.0"
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 29a46f1f3..bce4949c0 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -26,7 +26,7 @@
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"tslint": "5.8.0",
- "typescript": "~2.6.1",
+ "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7"
},
"dependencies": {
diff --git a/packages/website/package.json b/packages/website/package.json
index 3d6cc24f7..a3573b40f 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -99,7 +99,7 @@
"source-map-loader": "^0.1.6",
"style-loader": "0.13.x",
"tslint": "5.8.0",
- "typescript": "~2.6.1",
+ "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7",
"webpack": "^3.1.0",
"webpack-dev-middleware": "^1.10.0",
diff --git a/yarn.lock b/yarn.lock
index 4c66bf2cb..7b9ea57c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9109,9 +9109,9 @@ typescript@2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"
-typescript@~2.6.1:
- version "2.6.2"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
+typescript@2.7.1:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.1.tgz#bb3682c2c791ac90e7c6210b26478a8da085c359"
ua-parser-js@^0.7.9:
version "0.7.17"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 22:35:55 +0800