aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md6
-rw-r--r--package.json1
-rw-r--r--packages/0x.js/package.json3
-rw-r--r--packages/0x.js/src/contract_wrappers/contract_wrapper.ts8
-rw-r--r--packages/abi-gen/package.json3
-rw-r--r--packages/assert/package.json3
-rw-r--r--packages/connect/package.json3
-rw-r--r--packages/contracts/README.md6
-rw-r--r--packages/contracts/package.json3
-rw-r--r--packages/deployer/README.md6
-rw-r--r--packages/deployer/package.json3
-rw-r--r--packages/dev-utils/package.json3
-rw-r--r--packages/json-schemas/README.md6
-rw-r--r--packages/json-schemas/package.json3
-rw-r--r--packages/monorepo-scripts/README.md6
-rw-r--r--packages/monorepo-scripts/package.json3
-rw-r--r--packages/subproviders/README.md6
-rw-r--r--packages/subproviders/package.json3
-rw-r--r--packages/testnet-faucets/package.json3
-rw-r--r--packages/tslint-config/README.md6
-rw-r--r--packages/tslint-config/package.json3
-rw-r--r--packages/types/README.md6
-rw-r--r--packages/types/package.json3
-rw-r--r--packages/utils/README.md6
-rw-r--r--packages/utils/package.json3
-rw-r--r--packages/web3-typescript-typings/package.json2
-rw-r--r--packages/web3-wrapper/README.md6
-rw-r--r--packages/web3-wrapper/package.json3
-rw-r--r--packages/website/package.json2
-rw-r--r--yarn.lock6
30 files changed, 100 insertions, 24 deletions
diff --git a/README.md b/README.md
index 16847e87d..775f7cdf3 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,12 @@ Build all packages
yarn lerna:run build
```
+Continuously rebuild on exchange
+
+```bash
+yarn dev
+```
+
### Lint
Lint all packages
diff --git a/package.json b/package.json
index 435920d2c..290b56444 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
"name": "0x.js",
"workspaces": ["packages/*"],
"scripts": {
+ "dev": "lerna run --parallel build:watch",
"testrpc": "testrpc -p 8545 --networkId 50 -m \"${npm_package_config_mnemonic}\"",
"prettier": "prettier --write '**/*.{ts,tsx,json,md}' --config .prettierrc",
"prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}' --config .prettierrc",
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index e56c9963e..a967cea16 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -12,6 +12,7 @@
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
"scripts": {
+ "build:watch": "tsc -w",
"prebuild": "run-s clean generate_contract_wrappers",
"build": "run-p build:umd:prod build:commonjs; exit 0;",
"docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_DIR",
@@ -73,7 +74,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.8",
"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 e04b53282..e6173e182 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -5,6 +5,7 @@
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
+ "build:watch": "tsc -w",
"lint": "tslint --project . 'src/**/*.ts'",
"clean": "shx rm -rf lib",
"build": "tsc"
@@ -42,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.8"
}
}
diff --git a/packages/assert/package.json b/packages/assert/package.json
index 01c3d9509..dbee56d8b 100644
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -5,6 +5,7 @@
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
"scripts": {
+ "build:watch": "tsc -w",
"build": "tsc",
"clean": "shx rm -rf _bundles lib test_temp",
"lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
@@ -34,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.7",
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 71595d798..d1f54f000 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -12,6 +12,7 @@
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
"scripts": {
+ "build:watch": "tsc -w",
"build": "tsc",
"clean": "shx rm -rf _bundles lib test_temp",
"docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_DIR",
@@ -63,7 +64,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.8"
}
}
diff --git a/packages/contracts/README.md b/packages/contracts/README.md
index 0a1c272ab..11b9e5056 100644
--- a/packages/contracts/README.md
+++ b/packages/contracts/README.md
@@ -38,6 +38,12 @@ yarn install
yarn build
```
+or
+
+```bash
+yarn build:watch
+```
+
### Clean
```bash
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 3f54e15c3..d5e352c5d 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -8,6 +8,7 @@
"test": "test"
},
"scripts": {
+ "build:watch": "tsc -w",
"prebuild": "run-s clean copy_artifacts",
"copy_artifacts": "copyfiles './artifacts/**/*' ./lib",
"build": "tsc",
@@ -52,7 +53,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.8",
"yargs": "^10.0.3"
},
diff --git a/packages/deployer/README.md b/packages/deployer/README.md
index 4293f82d4..f4e688fd7 100644
--- a/packages/deployer/README.md
+++ b/packages/deployer/README.md
@@ -60,6 +60,12 @@ yarn install
yarn build
```
+or
+
+```bash
+yarn build:watch
+```
+
### Lint
```bash
diff --git a/packages/deployer/package.json b/packages/deployer/package.json
index be940f164..1a9495d24 100644
--- a/packages/deployer/package.json
+++ b/packages/deployer/package.json
@@ -5,6 +5,7 @@
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
"scripts": {
+ "build:watch": "tsc -w",
"build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' src/solc/solc_bin/* ./lib && tsc",
"test": "npm run build; mocha lib/test/*_test.js",
"compile": "npm run build; node lib/src/cli.js compile",
@@ -29,7 +30,7 @@
"devDependencies": {
"copyfiles": "^1.2.0",
"types-bn": "^0.0.1",
- "typescript": "~2.6.1",
+ "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8"
},
"dependencies": {
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 719426491..0c292c01f 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -5,6 +5,7 @@
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
+ "build:watch": "tsc -w",
"build": "tsc",
"clean": "shx rm -rf lib",
"lint": "tslint --project . 'src/**/*.ts'"
@@ -27,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.4",
diff --git a/packages/json-schemas/README.md b/packages/json-schemas/README.md
index 9166f50c1..754ce4e95 100644
--- a/packages/json-schemas/README.md
+++ b/packages/json-schemas/README.md
@@ -49,6 +49,12 @@ yarn install
yarn build
```
+or
+
+```bash
+yarn build:watch
+```
+
### Lint
```bash
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index 017dddd1d..f7a291ec2 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -5,6 +5,7 @@
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
"scripts": {
+ "build:watch": "tsc -w",
"lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
"test": "run-s clean build run_mocha",
"test:circleci": "yarn test",
@@ -40,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/README.md b/packages/monorepo-scripts/README.md
index bed9bd6a6..ea1d43bd5 100644
--- a/packages/monorepo-scripts/README.md
+++ b/packages/monorepo-scripts/README.md
@@ -40,6 +40,12 @@ yarn install
yarn build
```
+or
+
+```bash
+yarn build:watch
+```
+
### Clean
```bash
diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index af40a995e..2ac81f2d3 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -4,6 +4,7 @@
"private": true,
"description": "Helper scripts for the monorepo",
"scripts": {
+ "build:watch": "tsc -w",
"deps_versions": "node ./lib/deps_versions.js",
"lint": "tslint --project . 'src/**/*.ts'",
"clean": "shx rm -rf lib",
@@ -24,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/README.md b/packages/subproviders/README.md
index d7b80f7ee..78643ad55 100644
--- a/packages/subproviders/README.md
+++ b/packages/subproviders/README.md
@@ -64,6 +64,12 @@ yarn install
yarn build
```
+or
+
+```bash
+yarn build:watch
+```
+
### Clean
```bash
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 6d52393e9..18ba247ea 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -5,6 +5,7 @@
"types": "lib/src/index.d.ts",
"license": "Apache-2.0",
"scripts": {
+ "build:watch": "tsc -w",
"clean": "shx rm -rf lib",
"build": "tsc",
"lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'",
@@ -48,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.8",
"webpack": "^3.1.0"
}
diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json
index f05899896..c6e7faf02 100644
--- a/packages/testnet-faucets/package.json
+++ b/packages/testnet-faucets/package.json
@@ -5,6 +5,7 @@
"description": "A faucet micro-service that dispenses test ERC20 tokens or Ether",
"main": "server.js",
"scripts": {
+ "build:watch": "tsc -w",
"build": "node ../../node_modules/gulp/bin/gulp.js build",
"dev": "node ../../node_modules/gulp/bin/gulp.js run",
"start": "node ./bin/server.js",
@@ -35,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.8",
"webpack": "^3.1.0",
"webpack-node-externals": "^1.6.0"
diff --git a/packages/tslint-config/README.md b/packages/tslint-config/README.md
index 8a6fa8a2f..b517f2d95 100644
--- a/packages/tslint-config/README.md
+++ b/packages/tslint-config/README.md
@@ -44,6 +44,12 @@ yarn install
yarn build
```
+or
+
+```bash
+yarn build:watch
+```
+
### Lint
```bash
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index 47b286e64..c2a8b0692 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -4,6 +4,7 @@
"description": "Lint rules related to 0xProject for TSLint",
"main": "tslint.json",
"scripts": {
+ "build:watch": "tsc -w",
"build": "tsc",
"clean": "shx rm -rf lib",
"lint": "tslint --project . 'rules/**/*.ts'"
@@ -38,7 +39,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/README.md b/packages/types/README.md
index d63970150..d2fa33c8f 100644
--- a/packages/types/README.md
+++ b/packages/types/README.md
@@ -40,6 +40,12 @@ yarn install
yarn build
```
+or
+
+```bash
+yarn build:watch
+```
+
### Lint
```bash
diff --git a/packages/types/package.json b/packages/types/package.json
index 7bbf858f3..1fc8d52b9 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -5,6 +5,7 @@
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
+ "build:watch": "tsc -w",
"build": "tsc",
"clean": "shx rm -rf lib",
"lint": "tslint --project . 'src/**/*.ts'"
@@ -22,7 +23,7 @@
"@0xproject/tslint-config": "^0.4.6",
"shx": "^0.2.2",
"tslint": "5.8.0",
- "typescript": "~2.6.1",
+ "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8"
},
"dependencies": {
diff --git a/packages/utils/README.md b/packages/utils/README.md
index d6cacfa11..ffb0d0190 100644
--- a/packages/utils/README.md
+++ b/packages/utils/README.md
@@ -40,6 +40,12 @@ yarn install
yarn build
```
+or
+
+```bash
+yarn build:watch
+```
+
### Lint
```bash
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 5c03826ba..e276d5e5a 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -5,6 +5,7 @@
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
+ "build:watch": "tsc -w",
"build": "tsc",
"clean": "shx rm -rf lib",
"lint": "tslint --project . 'src/**/*.ts'"
@@ -25,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.8"
},
"dependencies": {
diff --git a/packages/web3-typescript-typings/package.json b/packages/web3-typescript-typings/package.json
index fce928498..651694e08 100644
--- a/packages/web3-typescript-typings/package.json
+++ b/packages/web3-typescript-typings/package.json
@@ -24,7 +24,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/README.md b/packages/web3-wrapper/README.md
index 5b22aefd4..7ed66ca41 100644
--- a/packages/web3-wrapper/README.md
+++ b/packages/web3-wrapper/README.md
@@ -44,6 +44,12 @@ yarn install
yarn build
```
+or
+
+```bash
+yarn build:watch
+```
+
### Lint
```bash
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 6e542124e..baae437a7 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -5,6 +5,7 @@
"main": "lib/index.js",
"types": "lib/index.d.ts",
"scripts": {
+ "build:watch": "tsc -w",
"build": "tsc",
"clean": "shx rm -rf lib",
"lint": "tslint --project . 'src/**/*.ts'"
@@ -25,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.8"
},
"dependencies": {
diff --git a/packages/website/package.json b/packages/website/package.json
index ee853615b..295675fa3 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -96,7 +96,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.8",
"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"