diff options
author | Leonid <logvinov.leon@gmail.com> | 2018-02-12 22:01:24 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-12 22:01:24 +0800 |
commit | 7f1e789264e2b67c7feffc633bd64caa257657cc (patch) | |
tree | 721cee22fbc45c71ea21fd296dda88c0a03d75a5 | |
parent | ba57c34adb0348af61210aa0bbee3e734b477f58 (diff) | |
parent | 07d00cc515e0f9825b81595386b358593b7a3d6f (diff) | |
download | dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar.gz dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar.bz2 dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar.lz dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar.xz dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.tar.zst dexon-sol-tools-7f1e789264e2b67c7feffc633bd64caa257657cc.zip |
Merge branch 'development' into fix/windows_install
74 files changed, 288 insertions, 518 deletions
diff --git a/.npmignore b/.npmignore deleted file mode 100644 index adf08c8f0..000000000 --- a/.npmignore +++ /dev/null @@ -1,6 +0,0 @@ -.* -tsconfig.json -tslint.json -webpack.config.js -yarn.lock -docs diff --git a/package.json b/package.json index 5720d7a60..1cecd6790 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic" }, "devDependencies": { - "@0xproject/utils": "^0.3.1", + "@0xproject/utils": "^0.3.2", "async-child-process": "^1.1.1", "ethereumjs-testrpc": "^6.0.3", "lerna": "^2.5.1", diff --git a/packages/0x.js/.npmignore b/packages/0x.js/.npmignore new file mode 100644 index 000000000..7fd911797 --- /dev/null +++ b/packages/0x.js/.npmignore @@ -0,0 +1,10 @@ +.* +tsconfig.json +webpack.config.js +yarn-error.log +test/ +/src/ +/_bundles/ +/contract_templates/ +/generated_docs/ +/scripts/ diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md index fa5bd6d4d..0af474c74 100644 --- a/packages/0x.js/CHANGELOG.md +++ b/packages/0x.js/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## v0.32.2 - _February 9, 2018_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) + ## v0.32.1 - _February 7, 2018_ * Reorganized `BlockParamLiteral` export into `@0xproject/types` package (#355) diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index a42d3b9dd..41ebbf4d9 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "0.32.1", + "version": "0.32.3", "description": "A javascript library for interacting with the 0x protocol", "keywords": [ "0x.js", @@ -42,9 +42,9 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0xproject/abi-gen": "^0.2.0", - "@0xproject/dev-utils": "^0.0.11", - "@0xproject/tslint-config": "^0.4.7", + "@0xproject/abi-gen": "^0.2.2", + "@0xproject/dev-utils": "^0.0.13", + "@0xproject/tslint-config": "^0.4.9", "@types/bintrees": "^1.0.2", "@types/jsonschema": "^1.1.1", "@types/lodash": "^4.14.86", @@ -55,9 +55,9 @@ "awesome-typescript-loader": "^3.1.3", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.8", + "chai-as-promised-typescript-typings": "^0.0.9", "chai-bignumber": "^2.0.1", - "chai-typescript-typings": "^0.0.2", + "chai-typescript-typings": "^0.0.3", "copyfiles": "^1.2.0", "coveralls": "^3.0.0", "dirty-chai": "^2.0.1", @@ -77,15 +77,15 @@ "types-bn": "^0.0.1", "typescript": "2.7.1", "web3-provider-engine": "^13.0.1", - "web3-typescript-typings": "^0.9.9", + "web3-typescript-typings": "^0.9.10", "webpack": "^3.1.0" }, "dependencies": { - "@0xproject/assert": "^0.0.17", - "@0xproject/json-schemas": "^0.7.9", - "@0xproject/types": "^0.2.0", - "@0xproject/utils": "^0.3.1", - "@0xproject/web3-wrapper": "^0.1.11", + "@0xproject/assert": "^0.0.19", + "@0xproject/json-schemas": "^0.7.11", + "@0xproject/types": "^0.2.2", + "@0xproject/utils": "^0.3.3", + "@0xproject/web3-wrapper": "^0.1.13", "bintrees": "^1.0.2", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", diff --git a/packages/0x.js/scripts/postpublish.js b/packages/0x.js/scripts/postpublish.js index 1be964478..7cbabd8f6 100644 --- a/packages/0x.js/scripts/postpublish.js +++ b/packages/0x.js/scripts/postpublish.js @@ -15,7 +15,7 @@ postpublish_utils version = result.version; const releaseName = postpublish_utils.getReleaseName(subPackageName, version); const assets = [__dirname + '/../_bundles/index.js', __dirname + '/../_bundles/index.min.js']; - return postpublish_utils.publishReleaseNotes(tag, releaseName, assets); + return postpublish_utils.publishReleaseNotesAsync(tag, releaseName, assets); }) .then(function(release) { console.log('POSTPUBLISH: Release successful, generating docs...'); diff --git a/packages/abi-gen/.npmignore b/packages/abi-gen/.npmignore new file mode 100644 index 000000000..87bc30436 --- /dev/null +++ b/packages/abi-gen/.npmignore @@ -0,0 +1,5 @@ +.* +yarn-error.log +/src/ +/scripts/ +tsconfig.json diff --git a/packages/abi-gen/CHANGELOG.md b/packages/abi-gen/CHANGELOG.md index ac6d58e9c..c86d6fb55 100644 --- a/packages/abi-gen/CHANGELOG.md +++ b/packages/abi-gen/CHANGELOG.md @@ -1,12 +1,16 @@ # CHANGELOG +## v0.2.1 - _February 9, 2018_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) + ## v0.2.0 - _February 7, 2018_ -* Added CLI options for explicit specifying location of partials and main template (#346) -* Added CLI option to specify networkId, adding support for the JSON artifact format found in @0xproject/contracts (#388) + * Added CLI options for explicit specifying location of partials and main template (#346) + * Added CLI option to specify networkId, adding support for the JSON artifact format found in @0xproject/contracts (#388) ## v0.1.0 - _January 11, 2018_ -* Fixed array typings with union types (#295) -* Add event ABIs to context data passed to templates (#302) -* Add constructor ABIs to context data passed to templates (#304) + * Fixed array typings with union types (#295) + * Add event ABIs to context data passed to templates (#302) + * Add constructor ABIs to context data passed to templates (#304) diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index 17810a7f1..4cf40d304 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/abi-gen", - "version": "0.2.0", + "version": "0.2.2", "description": "Generate contract wrappers from ABI and handlebars templates", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -23,7 +23,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/abi-gen/README.md", "dependencies": { - "@0xproject/utils": "^0.3.1", + "@0xproject/utils": "^0.3.3", "chalk": "^2.3.0", "glob": "^7.1.2", "handlebars": "^4.0.11", @@ -34,7 +34,7 @@ "yargs": "^10.0.3" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", + "@0xproject/tslint-config": "^0.4.9", "@types/glob": "^5.0.33", "@types/handlebars": "^4.0.36", "@types/mkdirp": "^0.5.1", @@ -44,6 +44,6 @@ "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9" + "web3-typescript-typings": "^0.9.10" } } diff --git a/packages/abi-gen/scripts/postpublish.js b/packages/abi-gen/scripts/postpublish.js index 16d67e03f..b3e5407c8 100644 --- a/packages/abi-gen/scripts/postpublish.js +++ b/packages/abi-gen/scripts/postpublish.js @@ -2,14 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch(function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/assert/.npmignore b/packages/assert/.npmignore new file mode 100644 index 000000000..05fa23a59 --- /dev/null +++ b/packages/assert/.npmignore @@ -0,0 +1,6 @@ +.* +yarn-error.log +/src/ +/scripts/ +test/ +tsconfig.json diff --git a/packages/assert/CHANGELOG.md b/packages/assert/CHANGELOG.md index cd04130de..23c2c5e56 100644 --- a/packages/assert/CHANGELOG.md +++ b/packages/assert/CHANGELOG.md @@ -1,6 +1,10 @@ # CHANGELOG -## v0.0.4 - _Nov. 14, 2017_ +## v0.0.18 - _February 9, 2017_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) + +## v0.0.4 - _November 14, 2017_ * Re-publish Assert previously published under NPM package @0xproject/0x-assert * Added assertion isValidBaseUnitAmount which checks both that the value is a valid bigNumber and that it does not contain decimals. diff --git a/packages/assert/package.json b/packages/assert/package.json index 7de27121f..50e601702 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/assert", - "version": "0.0.17", + "version": "0.0.19", "description": "Provides a standard way of performing type and schema validation across 0x projects", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", @@ -24,12 +24,12 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/assert/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", + "@0xproject/tslint-config": "^0.4.9", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", "@types/valid-url": "^1.0.2", "chai": "^4.0.1", - "chai-typescript-typings": "^0.0.2", + "chai-typescript-typings": "^0.0.3", "dirty-chai": "^2.0.1", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", @@ -38,8 +38,8 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/json-schemas": "^0.7.9", - "@0xproject/utils": "^0.3.1", + "@0xproject/json-schemas": "^0.7.11", + "@0xproject/utils": "^0.3.3", "lodash": "^4.17.4", "valid-url": "^1.0.9" } diff --git a/packages/assert/scripts/postpublish.js b/packages/assert/scripts/postpublish.js index 16d67e03f..b3e5407c8 100644 --- a/packages/assert/scripts/postpublish.js +++ b/packages/assert/scripts/postpublish.js @@ -2,14 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch(function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/chai-as-promised-typescript-typings/.npmignore b/packages/chai-as-promised-typescript-typings/.npmignore new file mode 100644 index 000000000..104d718ed --- /dev/null +++ b/packages/chai-as-promised-typescript-typings/.npmignore @@ -0,0 +1,3 @@ +.* +yarn-error.log +/scripts/ diff --git a/packages/chai-as-promised-typescript-typings/package.json b/packages/chai-as-promised-typescript-typings/package.json index faaf01e53..e1cbdd44f 100644 --- a/packages/chai-as-promised-typescript-typings/package.json +++ b/packages/chai-as-promised-typescript-typings/package.json @@ -1,6 +1,6 @@ { "name": "chai-as-promised-typescript-typings", - "version": "0.0.8", + "version": "0.0.9", "description": "Typescript type definitions for chai-as-promised", "main": "index.d.ts", "types": "index.d.ts", @@ -18,6 +18,6 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/chai-as-promised-typescript-typings#readme", "dependencies": { - "chai-typescript-typings": "^0.0.2" + "chai-typescript-typings": "^0.0.3" } } diff --git a/packages/chai-as-promised-typescript-typings/scripts/postpublish.js b/packages/chai-as-promised-typescript-typings/scripts/postpublish.js index 16d67e03f..b3e5407c8 100644 --- a/packages/chai-as-promised-typescript-typings/scripts/postpublish.js +++ b/packages/chai-as-promised-typescript-typings/scripts/postpublish.js @@ -2,14 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch(function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/chai-typescript-typings/.npmignore b/packages/chai-typescript-typings/.npmignore new file mode 100644 index 000000000..104d718ed --- /dev/null +++ b/packages/chai-typescript-typings/.npmignore @@ -0,0 +1,3 @@ +.* +yarn-error.log +/scripts/ diff --git a/packages/chai-typescript-typings/package.json b/packages/chai-typescript-typings/package.json index db7cba863..65103f76d 100644 --- a/packages/chai-typescript-typings/package.json +++ b/packages/chai-typescript-typings/package.json @@ -1,6 +1,6 @@ { "name": "chai-typescript-typings", - "version": "0.0.2", + "version": "0.0.3", "description": "Typescript type definitions for chai", "main": "index.d.ts", "types": "index.d.ts", diff --git a/packages/chai-typescript-typings/scripts/postpublish.js b/packages/chai-typescript-typings/scripts/postpublish.js index 16d67e03f..b3e5407c8 100644 --- a/packages/chai-typescript-typings/scripts/postpublish.js +++ b/packages/chai-typescript-typings/scripts/postpublish.js @@ -2,14 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch(function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/connect/.npmignore b/packages/connect/.npmignore new file mode 100644 index 000000000..a9d200050 --- /dev/null +++ b/packages/connect/.npmignore @@ -0,0 +1,7 @@ +.* +yarn-error.log +/src/ +/scripts/ +/generated_docs/ +test/ +tsconfig.json diff --git a/packages/connect/CHANGELOG.md b/packages/connect/CHANGELOG.md index e02020204..91dcc2b2c 100644 --- a/packages/connect/CHANGELOG.md +++ b/packages/connect/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## v0.5.7 - _February 9, 2018_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) + ## v0.5.0 - _January 17, 2018_ * Sanitize api endpoint url and remove trailing slashes (#318) diff --git a/packages/connect/package.json b/packages/connect/package.json index 26ec44ae0..d1e18adf5 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/connect", - "version": "0.5.6", + "version": "0.5.8", "description": "A javascript library for interacting with the standard relayer api", "keywords": [ "connect", @@ -37,16 +37,16 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/connect/README.md", "dependencies": { - "@0xproject/assert": "^0.0.17", - "@0xproject/json-schemas": "^0.7.9", - "@0xproject/utils": "^0.3.1", + "@0xproject/assert": "^0.0.19", + "@0xproject/json-schemas": "^0.7.11", + "@0xproject/utils": "^0.3.3", "isomorphic-fetch": "^2.2.1", "lodash": "^4.17.4", "query-string": "^5.0.1", "websocket": "^1.0.25" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", + "@0xproject/tslint-config": "^0.4.9", "@types/fetch-mock": "^5.12.1", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", @@ -54,8 +54,8 @@ "@types/websocket": "^0.0.34", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.8", - "chai-typescript-typings": "^0.0.2", + "chai-as-promised-typescript-typings": "^0.0.9", + "chai-typescript-typings": "^0.0.3", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "fetch-mock": "^5.13.1", @@ -65,6 +65,6 @@ "tslint": "5.8.0", "typedoc": "~0.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9" + "web3-typescript-typings": "^0.9.10" } } diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 8e52a4bff..fd411f820 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "contracts", - "version": "2.1.10", + "version": "2.1.12", "description": "Smart contract components of 0x protocol", "main": "index.js", "directories": { @@ -33,9 +33,9 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md", "devDependencies": { - "@0xproject/dev-utils": "^0.0.11", - "@0xproject/tslint-config": "^0.4.7", - "@0xproject/types": "^0.2.0", + "@0xproject/dev-utils": "^0.0.13", + "@0xproject/tslint-config": "^0.4.9", + "@0xproject/types": "^0.2.2", "@types/bluebird": "^3.5.3", "@types/lodash": "^4.14.86", "@types/node": "^8.0.53", @@ -43,9 +43,9 @@ "@types/yargs": "^10.0.0", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.8", + "chai-as-promised-typescript-typings": "^0.0.9", "chai-bignumber": "^2.0.1", - "chai-typescript-typings": "^0.0.2", + "chai-typescript-typings": "^0.0.3", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "mocha": "^4.0.1", @@ -56,15 +56,15 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9", + "web3-typescript-typings": "^0.9.10", "yargs": "^10.0.3" }, "dependencies": { - "0x.js": "^0.32.1", - "@0xproject/deployer": "^0.0.7", - "@0xproject/json-schemas": "^0.7.9", - "@0xproject/utils": "^0.3.1", - "@0xproject/web3-wrapper": "^0.1.11", + "0x.js": "^0.32.3", + "@0xproject/deployer": "^0.0.9", + "@0xproject/json-schemas": "^0.7.11", + "@0xproject/utils": "^0.3.3", + "@0xproject/web3-wrapper": "^0.1.13", "bluebird": "^3.5.0", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", diff --git a/packages/deployer/.npmignore b/packages/deployer/.npmignore new file mode 100644 index 000000000..05fa23a59 --- /dev/null +++ b/packages/deployer/.npmignore @@ -0,0 +1,6 @@ +.* +yarn-error.log +/src/ +/scripts/ +test/ +tsconfig.json diff --git a/packages/deployer/CHANGELOG.md b/packages/deployer/CHANGELOG.md new file mode 100644 index 000000000..ad8c64538 --- /dev/null +++ b/packages/deployer/CHANGELOG.md @@ -0,0 +1,5 @@ +# CHANGELOG + +## v0.0.8 - _February 9, 2018_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) diff --git a/packages/deployer/package.json b/packages/deployer/package.json index c0a4f369b..89dfd3ef1 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/deployer", - "version": "0.0.7", + "version": "0.0.9", "description": "Smart contract deployer of 0x protocol", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", @@ -28,15 +28,22 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/deployer/README.md", "devDependencies": { + "@0xproject/tslint-config": "^0.4.9", + "chai": "^4.0.1", "copyfiles": "^1.2.0", "shx": "^0.2.2", + "mocha": "^4.0.1", + "tslint": "5.8.0", "types-bn": "^0.0.1", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9" + "web3-typescript-typings": "^0.9.10" }, "dependencies": { - "@0xproject/utils": "^0.3.1", - "@0xproject/web3-wrapper": "^0.1.11", + "@0xproject/json-schemas": "^0.7.11", + "@0xproject/types": "^0.2.2", + "@0xproject/utils": "^0.3.3", + "@0xproject/web3-wrapper": "^0.1.13", + "ethereumjs-util": "^5.1.1", "lodash": "^4.17.4", "solc": "^0.4.18", "web3": "^0.20.0", diff --git a/packages/deployer/scripts/postpublish.js b/packages/deployer/scripts/postpublish.js index 24384b228..b3e5407c8 100644 --- a/packages/deployer/scripts/postpublish.js +++ b/packages/deployer/scripts/postpublish.js @@ -1,39 +1,5 @@ -const execAsync = require('async-child-process').execAsync; const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); -const cwd = __dirname + '/..'; const subPackageName = packageJSON.name; -const S3BucketPath = 's3://connect-docs-jsons/'; - -let tag; -let version; -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - tag = result.tag; - version = result.version; - const releaseName = postpublish_utils.getReleaseName(subPackageName, version); - return postpublish_utils.publishReleaseNotes(tag, releaseName); - }) - .then(function(release) { - console.log('POSTPUBLISH: Release successful, generating docs...'); - const jsonFilePath = __dirname + '/../' + postpublish_utils.generatedDocsDirectoryName + '/index.json'; - return execAsync('JSON_FILE_PATH=' + jsonFilePath + ' PROJECT_DIR=' + __dirname + '/.. yarn docs:json', { - cwd, - }); - }) - .then(function(result) { - if (result.stderr !== '') { - throw new Error(result.stderr); - } - const fileName = 'v' + version + '.json'; - console.log('POSTPUBLISH: Doc generation successful, uploading docs... as ', fileName); - const s3Url = S3BucketPath + fileName; - return execAsync('S3_URL=' + s3Url + ' yarn upload_docs_json', { - cwd, - }); - }) - .catch(function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/deployer/src/commands.ts b/packages/deployer/src/commands.ts index 2acef8e8f..d1707c5ed 100644 --- a/packages/deployer/src/commands.ts +++ b/packages/deployer/src/commands.ts @@ -1,6 +1,6 @@ -import { migrator } from './migrations/migrate'; import { Compiler } from './compiler'; import { Deployer } from './deployer'; +import { migrator } from './migrations/migrate'; import { CompilerOptions, DeployerOptions } from './utils/types'; export const commands = { diff --git a/packages/deployer/src/globals.d.ts b/packages/deployer/src/globals.d.ts index 0a35002da..2e04d83ea 100644 --- a/packages/deployer/src/globals.d.ts +++ b/packages/deployer/src/globals.d.ts @@ -1,8 +1,11 @@ declare module 'solc' { + // tslint:disable:completed-docs export function compile(sources: any, optimizerEnabled: number, findImports: (importPath: string) => any): any; export function setupMethods(solcBin: any): any; + // tslint:enable:completed-docs } declare module 'web3-eth-abi' { + // tslint:disable-next-line:completed-docs export function encodeParameters(typesArray: string[], parameters: any[]): string; } diff --git a/packages/deployer/src/migrations/config/token_info.ts b/packages/deployer/src/migrations/config/token_info.ts index 7e822fc3b..a815f5801 100644 --- a/packages/deployer/src/migrations/config/token_info.ts +++ b/packages/deployer/src/migrations/config/token_info.ts @@ -1,5 +1,5 @@ -import { constants } from '../../utils/constants'; import { Token } from '../../types'; +import { constants } from '../../utils/constants'; export const tokenInfo: Token[] = [ { diff --git a/packages/deployer/src/migrations/migrate.ts b/packages/deployer/src/migrations/migrate.ts index 393806b45..d3b397f0a 100644 --- a/packages/deployer/src/migrations/migrate.ts +++ b/packages/deployer/src/migrations/migrate.ts @@ -4,6 +4,7 @@ import * as _ from 'lodash'; import { Deployer } from '../deployer'; import { constants } from '../utils/constants'; + import { tokenInfo } from './config/token_info'; export const migrator = { diff --git a/packages/deployer/test/deploy_test.ts b/packages/deployer/test/deploy_test.ts index 5df729a04..5fe2ffbd7 100644 --- a/packages/deployer/test/deploy_test.ts +++ b/packages/deployer/test/deploy_test.ts @@ -5,6 +5,7 @@ import { Compiler } from '../src/compiler'; import { Deployer } from '../src/deployer'; import { fsWrapper } from '../src/utils/fs_wrapper'; import { CompilerOptions, ContractArtifact, ContractData, DoneCallback } from '../src/utils/types'; + import { constructor_args, exchange_binary } from './fixtures/exchange_bin'; import { constants } from './util/constants'; diff --git a/packages/deployer/tslint.json b/packages/deployer/tslint.json new file mode 100644 index 000000000..ffaefe83a --- /dev/null +++ b/packages/deployer/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": ["@0xproject/tslint-config"] +} diff --git a/packages/dev-utils/.npmignore b/packages/dev-utils/.npmignore new file mode 100644 index 000000000..87bc30436 --- /dev/null +++ b/packages/dev-utils/.npmignore @@ -0,0 +1,5 @@ +.* +yarn-error.log +/src/ +/scripts/ +tsconfig.json diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md index 00c022e8b..ad0830f0e 100644 --- a/packages/dev-utils/CHANGELOG.md +++ b/packages/dev-utils/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## v0.0.12 - _February 9, 2018_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) + ## v0.0.11 - _February 7, 2018_ * Updated `types-ethereumjs-util` dev dependency (#352) diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 4ebb9c7c8..d17f4f179 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/dev-utils", - "version": "0.0.11", + "version": "0.0.13", "description": "0x dev TS utils", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -20,8 +20,8 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/dev-utils/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", - "@0xproject/types": "^0.2.0", + "@0xproject/tslint-config": "^0.4.9", + "@0xproject/types": "^0.2.2", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", @@ -31,7 +31,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/utils": "^0.3.1", + "@0xproject/utils": "^0.3.3", "ethereumjs-util": "^5.1.2", "lodash": "^4.17.4", "request-promise-native": "^1.0.5", diff --git a/packages/dev-utils/scripts/postpublish.js b/packages/dev-utils/scripts/postpublish.js index 16d67e03f..b3e5407c8 100644 --- a/packages/dev-utils/scripts/postpublish.js +++ b/packages/dev-utils/scripts/postpublish.js @@ -2,14 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch(function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/json-schemas/.npmignore b/packages/json-schemas/.npmignore new file mode 100644 index 000000000..e14c0cba7 --- /dev/null +++ b/packages/json-schemas/.npmignore @@ -0,0 +1,7 @@ +.* +yarn-error.log +/src/ +/scripts/ +/schemas/ +test/ +tsconfig.json diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md index 28f38acc5..9a9fc12de 100644 --- a/packages/json-schemas/CHANGELOG.md +++ b/packages/json-schemas/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## v0.7.10 - _February 9, 2018_ + +* Fix publishing issue where .npmignore was not properly excluding undesired content (#389) + ## v0.7.0 - _December 20, 2017_ * Rename `subscriptionOptsSchema` to `blockRangeSchema` (#272) diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 270b4d4e0..15f57d2b8 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/json-schemas", - "version": "0.7.9", + "version": "0.7.11", "description": "0x-related json schemas", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", @@ -28,13 +28,13 @@ "lodash.values": "^4.3.0" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", - "@0xproject/utils": "^0.3.1", + "@0xproject/tslint-config": "^0.4.9", + "@0xproject/utils": "^0.3.3", "@types/lodash.foreach": "^4.5.3", "@types/lodash.values": "^4.3.3", "@types/mocha": "^2.2.42", "chai": "^4.0.1", - "chai-typescript-typings": "^0.0.2", + "chai-typescript-typings": "^0.0.3", "dirty-chai": "^2.0.1", "lodash.foreach": "^4.5.0", "mocha": "^4.0.1", diff --git a/packages/json-schemas/scripts/postpublish.js b/packages/json-schemas/scripts/postpublish.js index 16d67e03f..b3e5407c8 100644 --- a/packages/json-schemas/scripts/postpublish.js +++ b/packages/json-schemas/scripts/postpublish.js @@ -2,14 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch(function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index cbc3daad2..8edfef605 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/monorepo-scripts", - "version": "0.1.9", + "version": "0.1.11", "private": true, "description": "Helper scripts for the monorepo", "scripts": { @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/monorepo-scripts/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", + "@0xproject/tslint-config": "^0.4.9", "@types/glob": "^5.0.33", "@types/node": "^8.0.53", "shx": "^0.2.2", diff --git a/packages/monorepo-scripts/scripts/postpublish.js b/packages/monorepo-scripts/scripts/postpublish.js deleted file mode 100644 index 16d67e03f..000000000 --- a/packages/monorepo-scripts/scripts/postpublish.js +++ /dev/null @@ -1,15 +0,0 @@ -const postpublish_utils = require('../../../scripts/postpublish_utils'); -const packageJSON = require('../package.json'); - -const subPackageName = packageJSON.name; - -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch(function(err) { - throw err; - }); diff --git a/packages/subproviders/.npmignore b/packages/subproviders/.npmignore new file mode 100644 index 000000000..05fa23a59 --- /dev/null +++ b/packages/subproviders/.npmignore @@ -0,0 +1,6 @@ +.* +yarn-error.log +/src/ +/scripts/ +test/ +tsconfig.json diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md index 7876b2a4f..f2c028aea 100644 --- a/packages/subproviders/CHANGELOG.md +++ b/packages/subproviders/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## v0.4.1 - _February 9, 2018_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) + ## v0.4.0 - _February 7, 2018_ * Added NonceTrackerSubprovider (#355) diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 7cb721cdd..1a372ac6d 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/subproviders", - "version": "0.4.0", + "version": "0.4.2", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", "license": "Apache-2.0", @@ -18,8 +18,8 @@ "test:integration": "run-s clean build run_mocha_integration" }, "dependencies": { - "@0xproject/assert": "^0.0.17", - "@0xproject/utils": "^0.3.1", + "@0xproject/assert": "^0.0.19", + "@0xproject/utils": "^0.3.3", "bn.js": "^4.11.8", "es6-promisify": "^5.0.0", "ethereumjs-tx": "^1.3.3", @@ -32,17 +32,17 @@ "web3-provider-engine": "^13.0.1" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", - "@0xproject/types": "^0.2.0", - "@0xproject/utils": "^0.3.1", + "@0xproject/tslint-config": "^0.4.9", + "@0xproject/types": "^0.2.2", + "@0xproject/utils": "^0.3.3", "@types/lodash": "^4.14.86", "@types/mocha": "^2.2.42", "@types/node": "^8.0.53", "awesome-typescript-loader": "^3.1.3", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.8", - "chai-typescript-typings": "^0.0.2", + "chai-as-promised-typescript-typings": "^0.0.9", + "chai-typescript-typings": "^0.0.3", "dirty-chai": "^2.0.1", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", @@ -51,7 +51,7 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9", + "web3-typescript-typings": "^0.9.10", "webpack": "^3.1.0" } } diff --git a/packages/subproviders/scripts/postpublish.js b/packages/subproviders/scripts/postpublish.js index 7fa452b08..b3e5407c8 100644 --- a/packages/subproviders/scripts/postpublish.js +++ b/packages/subproviders/scripts/postpublish.js @@ -2,13 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils.getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch (function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 75b780d93..b1190bac7 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0xproject/testnet-faucets", - "version": "1.0.11", + "version": "1.0.13", "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether", "main": "server.js", "scripts": { @@ -15,9 +15,9 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.32.1", - "@0xproject/subproviders": "^0.4.0", - "@0xproject/utils": "^0.3.1", + "0x.js": "^0.32.3", + "@0xproject/subproviders": "^0.4.2", + "@0xproject/utils": "^0.3.3", "body-parser": "^1.17.1", "ethereumjs-tx": "^1.3.3", "ethereumjs-util": "^5.1.1", @@ -28,7 +28,7 @@ "web3-provider-engine": "^13.0.1" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", + "@0xproject/tslint-config": "^0.4.9", "@types/body-parser": "^1.16.1", "@types/express": "^4.0.35", "@types/lodash": "^4.14.86", @@ -41,7 +41,7 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9", + "web3-typescript-typings": "^0.9.10", "webpack": "^3.1.0", "webpack-node-externals": "^1.6.0" } diff --git a/packages/testnet-faucets/scripts/postpublish.js b/packages/testnet-faucets/scripts/postpublish.js deleted file mode 100644 index 16d67e03f..000000000 --- a/packages/testnet-faucets/scripts/postpublish.js +++ /dev/null @@ -1,15 +0,0 @@ -const postpublish_utils = require('../../../scripts/postpublish_utils'); -const packageJSON = require('../package.json'); - -const subPackageName = packageJSON.name; - -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch(function(err) { - throw err; - }); diff --git a/packages/testnet-faucets/src/ts/handler.ts b/packages/testnet-faucets/src/ts/handler.ts index 5ed9ce628..5f6ada186 100644 --- a/packages/testnet-faucets/src/ts/handler.ts +++ b/packages/testnet-faucets/src/ts/handler.ts @@ -129,18 +129,18 @@ export class Handler { } const zeroEx = networkConfig.zeroEx; res.setHeader('Content-Type', 'application/json'); - const makerTokenAddress = await zeroEx.tokenRegistry.getTokenAddressBySymbolIfExistsAsync(requestedAssetType); - if (_.isUndefined(makerTokenAddress)) { + const makerToken = await zeroEx.tokenRegistry.getTokenBySymbolIfExistsAsync(requestedAssetType); + if (_.isUndefined(makerToken)) { throw new Error(`Unsupported asset type: ${requestedAssetType}`); } const takerTokenSymbol = requestedAssetType === RequestedAssetType.WETH ? RequestedAssetType.ZRX : RequestedAssetType.WETH; - const takerTokenAddress = await zeroEx.tokenRegistry.getTokenAddressBySymbolIfExistsAsync(takerTokenSymbol); - if (_.isUndefined(takerTokenAddress)) { + const takerToken = await zeroEx.tokenRegistry.getTokenBySymbolIfExistsAsync(takerTokenSymbol); + if (_.isUndefined(takerToken)) { throw new Error(`Unsupported asset type: ${requestedAssetType}`); } - const makerTokenAmount = new BigNumber(0.1); - const takerTokenAmount = new BigNumber(0.1); + const makerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(0.1), makerToken.decimals); + const takerTokenAmount = ZeroEx.toBaseUnitAmount(new BigNumber(0.1), takerToken.decimals); const order: Order = { maker: configs.DISPENSER_ADDRESS, taker: req.params.recipient, @@ -148,8 +148,8 @@ export class Handler { takerFee: new BigNumber(0), makerTokenAmount, takerTokenAmount, - makerTokenAddress, - takerTokenAddress, + makerTokenAddress: makerToken.address, + takerTokenAddress: takerToken.address, salt: ZeroEx.generatePseudoRandomSalt(), exchangeContractAddress: zeroEx.exchange.getContractAddress(), feeRecipient: ZeroEx.NULL_ADDRESS, @@ -159,7 +159,7 @@ export class Handler { const signature = await zeroEx.signOrderHashAsync(orderHash, configs.DISPENSER_ADDRESS, false); const signedOrder = { ...order, - signature, + ecSignature: signature, }; const signedOrderHash = ZeroEx.getOrderHashHex(signedOrder); const payload = JSON.stringify(signedOrder); diff --git a/packages/tslint-config/.npmignore b/packages/tslint-config/.npmignore new file mode 100644 index 000000000..1767d198e --- /dev/null +++ b/packages/tslint-config/.npmignore @@ -0,0 +1,6 @@ +.* +yarn-error.log +node_modules/ +/scripts/ +/rules/ +tsconfig.json diff --git a/packages/tslint-config/CHANGELOG.md b/packages/tslint-config/CHANGELOG.md index 04d705941..18e4980e7 100644 --- a/packages/tslint-config/CHANGELOG.md +++ b/packages/tslint-config/CHANGELOG.md @@ -1,6 +1,14 @@ # CHANGELOG -## v0.5.0 - _TBD, 2018_ +## v0.4.9 - _February 9, 2018_ + + * Move devDeps to deps to fix missed dependency issue in published package. + +## v0.4.8 - _February 9, 2018_ + + * Fix publish issue where custom TSLint rules were not being included (#389) + +## v0.4.7 - _February 7, 2018_ * Modified custom 'underscore-privates' rule, changing it to 'underscore-private-and-protected' requiring underscores to be prepended to both private and protected variable names (#354) diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index d48f17954..3f431f1b4 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/tslint-config", - "version": "0.4.7", + "version": "0.4.9", "description": "Lint rules related to 0xProject for TSLint", "main": "tslint.json", "scripts": { @@ -9,11 +9,6 @@ "clean": "shx rm -rf lib", "lint": "tslint --project . 'rules/**/*.ts'" }, - "files": [ - "tslint.js", - "README.md", - "LICENSE" - ], "repository": { "type": "git", "url": "git://github.com/0xProject/0x.js.git" @@ -37,12 +32,12 @@ "devDependencies": { "@types/lodash": "^4.14.86", "shx": "^0.2.2", - "tslint": "5.8.0", - "tslint-eslint-rules": "^4.1.1", "typescript": "2.7.1" }, "dependencies": { "lodash": "^4.17.4", + "tslint": "5.8.0", + "tslint-eslint-rules": "^4.1.1", "tslint-react": "^3.2.0" } } diff --git a/packages/tslint-config/scripts/postpublish.js b/packages/tslint-config/scripts/postpublish.js index 7fa452b08..b3e5407c8 100644 --- a/packages/tslint-config/scripts/postpublish.js +++ b/packages/tslint-config/scripts/postpublish.js @@ -2,13 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils.getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch (function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/types/.npmignore b/packages/types/.npmignore new file mode 100644 index 000000000..ad5ffcd56 --- /dev/null +++ b/packages/types/.npmignore @@ -0,0 +1,5 @@ +.* +yarn-error.log +/scripts/ +/src/ +tsconfig.json diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index 316d92713..b1cb721d2 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## v0.2.1 - _February 9, 2018_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) + ## v0.2.0 - _February 7, 2018_ * Added BlockLiteralParam and BlockParam, refactored out of 0x.js types. (#355) diff --git a/packages/types/package.json b/packages/types/package.json index 6b5d7f82e..7b956375b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/types", - "version": "0.2.0", + "version": "0.2.2", "description": "0x types", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -20,11 +20,11 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/types/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", + "@0xproject/tslint-config": "^0.4.9", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9" + "web3-typescript-typings": "^0.9.10" }, "dependencies": { "bignumber.js": "~4.1.0", diff --git a/packages/types/scripts/postpublish.js b/packages/types/scripts/postpublish.js index 7fa452b08..b3e5407c8 100644 --- a/packages/types/scripts/postpublish.js +++ b/packages/types/scripts/postpublish.js @@ -2,13 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils.getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch (function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/utils/.npmignore b/packages/utils/.npmignore new file mode 100644 index 000000000..ad5ffcd56 --- /dev/null +++ b/packages/utils/.npmignore @@ -0,0 +1,5 @@ +.* +yarn-error.log +/scripts/ +/src/ +tsconfig.json diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index b94e2ccee..19ee80e4f 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## v0.3.2 - _February 9, 2018_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) + ## v0.3.0 - _February 5, 2018_ * Fix a bug related to event signature collisions (argument indexes aren't included in event signatures) in the abi_decoder. The decoder used to throw on unknown events with identical signatures as a known event (except indexes). (#366) diff --git a/packages/utils/package.json b/packages/utils/package.json index f25295754..c0e887e70 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/utils", - "version": "0.3.1", + "version": "0.3.3", "description": "0x TS utils", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -20,14 +20,14 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/utils/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", - "@0xproject/types": "^0.2.0", + "@0xproject/tslint-config": "^0.4.9", + "@0xproject/types": "^0.2.2", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9" + "web3-typescript-typings": "^0.9.10" }, "dependencies": { "bignumber.js": "~4.1.0", diff --git a/packages/utils/scripts/postpublish.js b/packages/utils/scripts/postpublish.js index 7fa452b08..b3e5407c8 100644 --- a/packages/utils/scripts/postpublish.js +++ b/packages/utils/scripts/postpublish.js @@ -2,13 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils.getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch (function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/web3-typescript-typings/.gitignore b/packages/web3-typescript-typings/.gitignore deleted file mode 100644 index 85dcc16df..000000000 --- a/packages/web3-typescript-typings/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.git -node_modules diff --git a/packages/web3-typescript-typings/.npmignore b/packages/web3-typescript-typings/.npmignore new file mode 100644 index 000000000..104d718ed --- /dev/null +++ b/packages/web3-typescript-typings/.npmignore @@ -0,0 +1,3 @@ +.* +yarn-error.log +/scripts/ diff --git a/packages/web3-typescript-typings/package.json b/packages/web3-typescript-typings/package.json index 6f7106b56..654dd8619 100644 --- a/packages/web3-typescript-typings/package.json +++ b/packages/web3-typescript-typings/package.json @@ -1,6 +1,6 @@ { "name": "web3-typescript-typings", - "version": "0.9.9", + "version": "0.9.10", "description": "Typescript type definitions for web3", "main": "index.d.ts", "types": "index.d.ts", diff --git a/packages/web3-typescript-typings/scripts/postpublish.js b/packages/web3-typescript-typings/scripts/postpublish.js index 16d67e03f..b3e5407c8 100644 --- a/packages/web3-typescript-typings/scripts/postpublish.js +++ b/packages/web3-typescript-typings/scripts/postpublish.js @@ -2,14 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils - .getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch(function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/web3-typescript-typings/yarn.lock b/packages/web3-typescript-typings/yarn.lock deleted file mode 100644 index f1d0f843a..000000000 --- a/packages/web3-typescript-typings/yarn.lock +++ /dev/null @@ -1,197 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@types/bignumber.js@^4.0.2": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@types/bignumber.js/-/bignumber.js-4.0.2.tgz#22a16946c9faa9f2c9c0ad4c7c3734a3033320ae" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -babel-code-frame@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4" - dependencies: - chalk "^1.1.0" - esutils "^2.0.2" - js-tokens "^3.0.0" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -bignumber.js@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.0.2.tgz#2d1dc37ee5968867ecea90b6da4d16e68608d21d" - -brace-expansion@^1.1.7: - version "1.1.8" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -chalk@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -colors@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" - -commander@^2.9.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -diff@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.0.tgz#056695150d7aa93237ca7e378ac3b1682b7963b9" - -escape-string-regexp@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -glob@^7.1.1: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -js-tokens@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-parse@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" - -resolve@^1.3.2: - version "1.3.3" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5" - dependencies: - path-parse "^1.0.5" - -semver@^5.3.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" - -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -tslib@^1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec" - -tslint-config-0xproject@^0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/tslint-config-0xproject/-/tslint-config-0xproject-0.0.2.tgz#39901e0c0b3e9388f00092a28b90c015395d5bba" - dependencies: - tslint-react "^3.0.0" - -tslint-react@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-3.1.0.tgz#a4de1a22fef41b663fa44daae27cbf04dc8a59d6" - dependencies: - tsutils "^1.7.0" - -tslint@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.5.0.tgz#10e8dab3e3061fa61e9442e8cee3982acf20a6aa" - dependencies: - babel-code-frame "^6.22.0" - colors "^1.1.2" - commander "^2.9.0" - diff "^3.2.0" - glob "^7.1.1" - minimatch "^3.0.4" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.7.1" - tsutils "^2.5.1" - -tsutils@^1.7.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0" - -tsutils@^2.5.1: - version "2.8.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.8.0.tgz#0160173729b3bf138628dd14a1537e00851d814a" - dependencies: - tslib "^1.7.1" - -typescript@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" diff --git a/packages/web3-wrapper/.npmignore b/packages/web3-wrapper/.npmignore new file mode 100644 index 000000000..ad5ffcd56 --- /dev/null +++ b/packages/web3-wrapper/.npmignore @@ -0,0 +1,5 @@ +.* +yarn-error.log +/scripts/ +/src/ +tsconfig.json diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md index 899482c4c..eb31f7e3c 100644 --- a/packages/web3-wrapper/CHANGELOG.md +++ b/packages/web3-wrapper/CHANGELOG.md @@ -1,3 +1,5 @@ # CHANGELOG -## vx.x.x +## v0.1.12 _February 9, 2018_ + + * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 49342ed92..0df426df6 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.1.11", + "version": "0.1.13", "description": "Wraps around web3 and gives a nicer interface", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -20,17 +20,17 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.7", - "@0xproject/types": "^0.2.0", + "@0xproject/tslint-config": "^0.4.9", + "@0xproject/types": "^0.2.2", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9" + "web3-typescript-typings": "^0.9.10" }, "dependencies": { - "@0xproject/utils": "^0.3.1", + "@0xproject/utils": "^0.3.3", "lodash": "^4.17.4", "web3": "^0.20.0" } diff --git a/packages/web3-wrapper/scripts/postpublish.js b/packages/web3-wrapper/scripts/postpublish.js index 7fa452b08..b3e5407c8 100644 --- a/packages/web3-wrapper/scripts/postpublish.js +++ b/packages/web3-wrapper/scripts/postpublish.js @@ -2,13 +2,4 @@ const postpublish_utils = require('../../../scripts/postpublish_utils'); const packageJSON = require('../package.json'); const subPackageName = packageJSON.name; - -postpublish_utils.getLatestTagAndVersionAsync(subPackageName) - .then(function(result) { - const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); - const assets = []; - return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); - }) - .catch (function(err) { - throw err; - }); +postpublish_utils.standardPostPublishAsync(subPackageName);
\ No newline at end of file diff --git a/packages/website/package.json b/packages/website/package.json index c8fc78474..a89bc0de3 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/website", - "version": "0.0.13", + "version": "0.0.15", "private": true, "description": "Website and 0x portal dapp", "scripts": { @@ -18,9 +18,9 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.32.1", - "@0xproject/subproviders": "^0.4.0", - "@0xproject/utils": "^0.3.1", + "0x.js": "^0.32.3", + "@0xproject/subproviders": "^0.4.2", + "@0xproject/utils": "^0.3.3", "accounting": "^0.4.1", "basscss": "^8.0.3", "blockies": "^0.0.2", @@ -98,7 +98,7 @@ "style-loader": "0.13.x", "tslint": "5.8.0", "typescript": "2.7.1", - "web3-typescript-typings": "^0.9.9", + "web3-typescript-typings": "^0.9.10", "webpack": "^3.1.0", "webpack-dev-middleware": "^1.10.0", "webpack-dev-server": "^2.5.0" diff --git a/scripts/postpublish_utils.js b/scripts/postpublish_utils.js index c4ca917da..7ce01189c 100644 --- a/scripts/postpublish_utils.js +++ b/scripts/postpublish_utils.js @@ -29,7 +29,7 @@ module.exports = { }; }); }, - publishReleaseNotes: function(tag, releaseName, assets) { + publishReleaseNotesAsync: function(tag, releaseName, assets) { console.log('POSTPUBLISH: Releasing ', releaseName, '...'); return publishReleaseAsync({ token: githubPersonalAccessToken, @@ -49,5 +49,16 @@ module.exports = { const releaseName = subPackageName + ' v' + version; return releaseName; }, + standardPostPublishAsync: function(subPackageName) { + return this.getLatestTagAndVersionAsync(subPackageName) + .then(function(result) { + const releaseName = this.getReleaseName(subPackageName, result.version); + const assets = []; + return this.publishReleaseNotesAsync(result.tag, releaseName, assets); + }.bind(this)) + .catch(function(err) { + throw err; + }); + }, generatedDocsDirectoryName, }; |