diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:13:30 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-08 03:13:30 +0800 |
| commit | 5aaf87d61260ec4723e7eb0a887629b057454957 (patch) | |
| tree | 0637dfabfec4e71f5cc7d3b2f46712572bb58ce0 /packages/0x.js/package.json | |
| parent | 10478a6b2fd1f2a01597a88afde9cf582640a849 (diff) | |
| parent | 96b31f39749fb32bd89978245c79aa637791336c (diff) | |
| download | dexon-0x-contracts-5aaf87d61260ec4723e7eb0a887629b057454957.tar.gz dexon-0x-contracts-5aaf87d61260ec4723e7eb0a887629b057454957.tar.zst dexon-0x-contracts-5aaf87d61260ec4723e7eb0a887629b057454957.zip | |
Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils
* v2-prototype:
Fix tslint issues
Fix tslint failure
Pass in fee and assetAmount rather then the whole signedOrder
Fix missing paths
Revert to returning orderState on invalid order
- Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming
Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary.
Fixed path
Use source-map-support package to include correct line numbers in mocha
move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers
Diffstat (limited to 'packages/0x.js/package.json')
| -rw-r--r-- | packages/0x.js/package.json | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index d18960b5d..96e870851 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -20,17 +20,17 @@ "build:all": "run-p build:umd:prod build:commonjs; exit 0;", "pre_build": "run-s generate_contract_wrappers copy_artifacts", "copy_artifacts": "copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts", - "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers", - "lint": "tslint --project . --exclude **/src/contract_wrappers/generated/**/*", + "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers", + "lint": "tslint --project . --exclude **/src/generated_contract_wrapper/**/*", "test:circleci": "run-s test:coverage", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", "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 _bundles lib test_temp scripts src/contract_wrappers/generated", + "clean": "shx rm -rf _bundles lib test_temp scripts src/generated_contract_wrappers", "build:umd:prod": "NODE_ENV=production webpack", "build:commonjs": "tsc && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", - "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit", + "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit", "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:stage": "node scripts/stage_docs.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", @@ -54,9 +54,9 @@ "../contract-wrappers/src/contract_wrappers/token_transfer_proxy_wrapper.ts", "../contract-wrappers/src/contract_wrappers/token_wrapper.ts", "../order-watcher/src/order_watcher/order_watcher.ts", - "./src/contract_wrappers/generated/ether_token.ts", - "./src/contract_wrappers/generated/token.ts", - "./src/contract_wrappers/generated/exchange.ts" + "./src/generated_contract_wrappers/ether_token.ts", + "./src/generated_contract_wrappers/token.ts", + "./src/generated_contract_wrappers/exchange.ts" ], "s3BucketPath": "s3://doc-jsons/0x.js/", "s3StagingBucketPath": "s3://staging-doc-jsons/0x.js/" |