diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-04-02 17:56:46 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-02 17:56:46 +0800 |
commit | 51f2a20b2a51616ea49c9eff46e6ac99cf7a185a (patch) | |
tree | 3393fc8846277a5f14fac155f8f5884bc0aac87a | |
parent | 333a23f22254f3fdb117781728d029638a364ba0 (diff) | |
parent | 3bf3f479f50e62673b49de09bdbdc812e1e9e476 (diff) | |
download | dexon-0x-contracts-51f2a20b2a51616ea49c9eff46e6ac99cf7a185a.tar.gz dexon-0x-contracts-51f2a20b2a51616ea49c9eff46e6ac99cf7a185a.tar.zst dexon-0x-contracts-51f2a20b2a51616ea49c9eff46e6ac99cf7a185a.zip |
Merge branch 'development' into feature/metacoin
36 files changed, 76 insertions, 30 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 2072184cc..a6a9402c6 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -27,6 +27,7 @@ "build:commonjs": "tsc && copyfiles -u 2 './src/artifacts/**/*.json' ./lib/src/artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "test:commonjs": "run-s build:commonjs run_mocha", "run_mocha": "mocha lib/test/**/*_test.js --timeout 10000 --bail --exit", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:stage": "yarn build && node ./scripts/stage_docs.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" diff --git a/packages/abi-gen/CHANGELOG.json b/packages/abi-gen/CHANGELOG.json index 9aa3a3c9b..ac0f83da6 100644 --- a/packages/abi-gen/CHANGELOG.json +++ b/packages/abi-gen/CHANGELOG.json @@ -6,7 +6,8 @@ { "note": "Dependencies updated" } - ] + ], + "isPublished": true }, { "version": "0.2.5", diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index c5bf1fa89..4bd2d5296 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -8,7 +8,8 @@ "build:watch": "tsc -w", "lint": "tslint --project . 'src/**/*.ts'", "clean": "shx rm -rf lib scripts", - "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts" + "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "bin": { "abi-gen": "lib/index.js" diff --git a/packages/assert/CHANGELOG.json b/packages/assert/CHANGELOG.json index c047d5df1..84fce1ca8 100644 --- a/packages/assert/CHANGELOG.json +++ b/packages/assert/CHANGELOG.json @@ -6,7 +6,8 @@ { "note": "Dependencies updated" } - ] + ], + "isPublished": true }, { "version": "0.2.0", diff --git a/packages/assert/package.json b/packages/assert/package.json index 1e51f42c9..2f657ba8e 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -14,7 +14,8 @@ "test": "run-s clean build run_mocha", "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", - "test:circleci": "yarn test:coverage" + "test:circleci": "yarn test:coverage", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "license": "Apache-2.0", "repository": { diff --git a/packages/base-contract/CHANGELOG.json b/packages/base-contract/CHANGELOG.json index 224c6828f..3b8b22a57 100644 --- a/packages/base-contract/CHANGELOG.json +++ b/packages/base-contract/CHANGELOG.json @@ -23,7 +23,8 @@ { "note": "Dependencies updated" } - ] + ], + "isPublished": true }, { "version": "0.0.2", diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index fce16e0c7..009aa9625 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -14,6 +14,7 @@ "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", "lint": "tslint --project ." + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "license": "Apache-2.0", "repository": { diff --git a/packages/connect/CHANGELOG.json b/packages/connect/CHANGELOG.json index db9dc0fa5..7ef29bddd 100644 --- a/packages/connect/CHANGELOG.json +++ b/packages/connect/CHANGELOG.json @@ -6,7 +6,8 @@ { "note": "Dependencies updated" } - ] + ], + "isPublished": true }, { "version": "0.6.4", diff --git a/packages/connect/package.json b/packages/connect/package.json index 4e95124c9..5d0c7ee27 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -22,6 +22,7 @@ "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", "test:circleci": "yarn test:coverage", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:stage": "yarn build && node ./scripts/stage_docs.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" diff --git a/packages/deployer/package.json b/packages/deployer/package.json index 438c2a8d7..5a2903cd6 100644 --- a/packages/deployer/package.json +++ b/packages/deployer/package.json @@ -17,6 +17,7 @@ "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", "test:circleci": "yarn test:coverage", "docs:stage": "yarn build && node ./scripts/stage_docs.js", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" }, diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json index 97707701b..42c7534d3 100644 --- a/packages/dev-utils/CHANGELOG.json +++ b/packages/dev-utils/CHANGELOG.json @@ -6,7 +6,8 @@ { "note": "Dependencies updated" } - ] + ], + "isPublished": true }, { "version": "0.3.1", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 364074ae0..f81c37fc2 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -13,7 +13,8 @@ "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", "clean": "shx rm -rf lib scripts", - "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'" + "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "license": "Apache-2.0", "repository": { diff --git a/packages/json-schemas/CHANGELOG.json b/packages/json-schemas/CHANGELOG.json index d6fd7dc49..3ea1e7512 100644 --- a/packages/json-schemas/CHANGELOG.json +++ b/packages/json-schemas/CHANGELOG.json @@ -6,7 +6,8 @@ { "note": "Dependencies updated" } - ] + ], + "isPublished": true }, { "version": "0.7.13", diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 91513f890..f546df5ad 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -14,6 +14,7 @@ "run_mocha": "mocha lib/test/**/*_test.js", "clean": "shx rm -rf lib test_temp scripts", "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:stage": "yarn build && node ./scripts/stage_docs.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index e270ff6db..c453517a1 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -13,7 +13,7 @@ "convert_changelogs": "run-s build script:convert_changelogs", "script:deps_versions": "node ./lib/deps_versions.js", "script:publish": "IS_DRY_RUN=true node ./lib/publish.js", - "script:convert_changelogs": "node ./lib/convert_changelogs.js" + "script:convert_changelogs": "node ./lib/convert_changelogs.js", }, "repository": { "type": "git", diff --git a/packages/monorepo-scripts/src/postpublish_utils.ts b/packages/monorepo-scripts/src/postpublish_utils.ts index 93d55115e..236b54379 100644 --- a/packages/monorepo-scripts/src/postpublish_utils.ts +++ b/packages/monorepo-scripts/src/postpublish_utils.ts @@ -112,7 +112,13 @@ export const postpublishUtils = { this.updateChangelogIsPublished(packageName); }, getReleaseNotes(packageName: string) { - const changelogJSONPath = path.join(constants.monorepoRootPath, 'packages', packageName, 'CHANGELOG.json'); + const packageNameWithNamespace = packageName.replace('@0xproject/', ''); + const changelogJSONPath = path.join( + constants.monorepoRootPath, + 'packages', + packageNameWithNamespace, + 'CHANGELOG.json', + ); const changelogJSON = fs.readFileSync(changelogJSONPath, 'utf-8'); const changelogs = JSON.parse(changelogJSON); const latestLog = changelogs[0]; @@ -130,7 +136,13 @@ export const postpublishUtils = { return 'N/A'; }, updateChangelogIsPublished(packageName: string) { - const changelogJSONPath = path.join(constants.monorepoRootPath, 'packages', packageName, 'CHANGELOG.json'); + const packageNameWithNamespace = packageName.replace('@0xproject/', ''); + const changelogJSONPath = path.join( + constants.monorepoRootPath, + 'packages', + packageNameWithNamespace, + 'CHANGELOG.json', + ); const changelogJSON = fs.readFileSync(changelogJSONPath, 'utf-8'); const changelogs = JSON.parse(changelogJSON); const latestLog = changelogs[0]; diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json index 828701e35..5131bdbe4 100644 --- a/packages/react-docs/CHANGELOG.json +++ b/packages/react-docs/CHANGELOG.json @@ -22,7 +22,8 @@ "pr": 465 } ], - "timestamp": 1522658513 + "timestamp": 1522658513, + "isPublished": true }, { "version": "0.0.3", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 045164112..15e6a10d5 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -8,7 +8,8 @@ "lint": "tslint --project . 'src/**/*.ts' 'src/**/*.tsx'", "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", "build:watch": "tsc -w", - "clean": "shx rm -rf lib scripts" + "clean": "shx rm -rf lib scripts", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "author": "Fabio Berger", "license": "Apache-2.0", diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json index 4fb786e70..248b740bc 100644 --- a/packages/react-shared/CHANGELOG.json +++ b/packages/react-shared/CHANGELOG.json @@ -13,6 +13,7 @@ "note": "Reorganized colors and added new ones" } ], - "timestamp": 1522658513 + "timestamp": 1522658513, + "isPublished": true } ] diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 1313701d1..3a6d6a24e 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -8,7 +8,8 @@ "lint": "tslint --project . 'src/**/*.ts' 'src/**/*.tsx'", "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", "build:watch": "tsc -w", - "clean": "shx rm -rf lib scripts" + "clean": "shx rm -rf lib scripts", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "author": "Fabio Berger", "license": "Apache-2.0", diff --git a/packages/sol-cov/CHANGELOG.json b/packages/sol-cov/CHANGELOG.json index 5a6f2bf1c..1e5abb5a0 100644 --- a/packages/sol-cov/CHANGELOG.json +++ b/packages/sol-cov/CHANGELOG.json @@ -6,6 +6,7 @@ { "note": "Dependencies updated" } - ] + ], + "isPublished": true } ] diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index 8a5c6fa5c..fd9ebe905 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -14,6 +14,7 @@ "run_mocha": "mocha lib/test/**/*_test.js", "clean": "shx rm -rf lib scripts", "build": "copyfiles 'test/fixtures/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:stage": "yarn build && node ./scripts/stage_docs.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" diff --git a/packages/sra-report/CHANGELOG.json b/packages/sra-report/CHANGELOG.json index e6555b4e7..c97879278 100644 --- a/packages/sra-report/CHANGELOG.json +++ b/packages/sra-report/CHANGELOG.json @@ -7,7 +7,8 @@ "pr": 451 } ], - "timestamp": 1522658513 + "timestamp": 1522658513, + "isPublished": true }, { "version": "0.0.2", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index 68f304869..b156e6fe5 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -7,12 +7,13 @@ "scripts": { "build:watch": "tsc -w", "clean": "shx rm -rf lib scripts", - "build": "tsc", + "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "lint": "tslint --project . 'src/**/*.ts' 'test/**/*.ts'", "test": "run-s clean build copy_test_environments copy_test_fixtures run_mocha", "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures", "copy_test_environments": "copyfiles -u 2 './test/environments/**/*.json' ./lib/test/environments", - "run_mocha": "mocha lib/test/**/*_test.js" + "run_mocha": "mocha lib/test/**/*_test.js", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "bin": { "sra-report": "lib/index.js" diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json index c5528f707..464e4699d 100644 --- a/packages/subproviders/CHANGELOG.json +++ b/packages/subproviders/CHANGELOG.json @@ -11,7 +11,8 @@ "pr": 465 } ], - "timestamp": 1522658513 + "timestamp": 1522658513, + "isPublished": true }, { "version": "0.8.0", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 79bd81209..4532d3caf 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -18,6 +18,7 @@ "test:all": "run-s test:unit test:integration", "test:unit": "run-s clean build run_mocha_unit", "test:integration": "run-s clean build run_mocha_integration", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:stage": "yarn build && node ./scripts/stage_docs.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" diff --git a/packages/tslint-config/CHANGELOG.json b/packages/tslint-config/CHANGELOG.json index 654fceed1..c0aa3b39a 100644 --- a/packages/tslint-config/CHANGELOG.json +++ b/packages/tslint-config/CHANGELOG.json @@ -6,7 +6,8 @@ { "note": "Dependencies updated" } - ] + ], + "isPublished": true }, { "version": "0.4.9", diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index 08f3735b3..ef14c2a5d 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -7,7 +7,8 @@ "build:watch": "tsc -w", "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", "clean": "shx rm -rf lib scripts", - "lint": "tslint --project . 'rules/**/*.ts'" + "lint": "tslint --project . 'rules/**/*.ts'", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "repository": { "type": "git", diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index 2f40cd886..998da0879 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -10,7 +10,8 @@ { "note": "Dependencies updated" } - ] + ], + "isPublished": true }, { "version": "0.4.0", diff --git a/packages/types/package.json b/packages/types/package.json index 588700a49..a656aa753 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -8,7 +8,8 @@ "build:watch": "tsc -w", "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", "clean": "shx rm -rf lib scripts", - "lint": "tslint --project . 'src/**/*.ts'" + "lint": "tslint --project . 'src/**/*.ts'", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "license": "Apache-2.0", "repository": { diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json index 9f03d1587..4e24094eb 100644 --- a/packages/typescript-typings/CHANGELOG.json +++ b/packages/typescript-typings/CHANGELOG.json @@ -2,6 +2,7 @@ { "version": "0.0.2", "changes": [], - "timestamp": 1522658513 + "timestamp": 1522658513, + "isPublished": true } ] diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json index c6986f69f..bec1b97c4 100644 --- a/packages/typescript-typings/package.json +++ b/packages/typescript-typings/package.json @@ -4,7 +4,8 @@ "description": "0x project typescript type definitions", "scripts": { "build": "tsc && copyfiles -u 1 './lib/**/*' ./scripts", - "clean": "shx rm -rf scripts" + "clean": "shx rm -rf scripts", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "repository": { "type": "git", diff --git a/packages/utils/CHANGELOG.json b/packages/utils/CHANGELOG.json index c4b01e7be..7335e3eb7 100644 --- a/packages/utils/CHANGELOG.json +++ b/packages/utils/CHANGELOG.json @@ -10,7 +10,8 @@ { "note": "Dependencies updated" } - ] + ], + "isPublished": true }, { "version": "0.4.3", diff --git a/packages/utils/package.json b/packages/utils/package.json index 021ccac61..ba11c2e06 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -8,7 +8,8 @@ "build:watch": "tsc -w", "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", "clean": "shx rm -rf lib scripts", - "lint": "tslint --project . 'src/**/*.ts'" + "lint": "tslint --project . 'src/**/*.ts'", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js" }, "license": "Apache-2.0", "repository": { diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index ecfb9251c..1712c2ca7 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -25,7 +25,8 @@ "pr": 465 } ], - "timestamp": 1522658513 + "timestamp": 1522658513, + "isPublished": true }, { "version": "0.3.0", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 7abfbf7f3..9a67d2d1d 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -9,6 +9,7 @@ "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts", "clean": "shx rm -rf lib scripts", "lint": "tslint --project . 'src/**/*.ts'", + "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:stage": "yarn build && node ./scripts/stage_docs.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json" |