diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-06 17:10:27 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-06 17:10:27 +0800 |
| commit | cbfed99bc6f9c86dee2dc31cafe401ded0fc9084 (patch) | |
| tree | 6a1608b6fca9366f6b407e8a2cf746a79b86858b /packages/0x.js | |
| parent | 05b9dfbe30c55a67e6d2d63898f52e5fa412fcfb (diff) | |
| parent | 39570a9663abae56b0220745306386197fae65c1 (diff) | |
| download | dexon-0x-contracts-cbfed99bc6f9c86dee2dc31cafe401ded0fc9084.tar.gz dexon-0x-contracts-cbfed99bc6f9c86dee2dc31cafe401ded0fc9084.tar.zst dexon-0x-contracts-cbfed99bc6f9c86dee2dc31cafe401ded0fc9084.zip | |
Merge branch 'v2-prototype' into fixes/misc-small-fixes
* v2-prototype:
Remove TranslatedText
Fix prettier
Add back UMD bundles for 0x.js
Move portal disclaimer to the account management section
Move prices into portal
Use stricter check for subscribe input text
Make buttons stack on mobile
Do not show subscribe form if language is not english
Address PR feedback
Lint and cleanup
Implement subscription form
Add styled-components and polished
Have basic newsletter subscribe form working
Diffstat (limited to 'packages/0x.js')
| -rw-r--r-- | packages/0x.js/package.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index e8b944498..4365edba6 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -17,7 +17,7 @@ "scripts": { "watch": "tsc -w", "prebuild": "run-s clean generate_contract_wrappers", - "build": "tsc && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", + "build": "run-p build:umd:prod build:commonjs; exit 0;", "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 && prettier --write 'src/contract_wrappers/generated/**.ts'", "lint": "tslint --project .", "test:circleci": "run-s test:coverage", @@ -26,6 +26,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 _bundles lib test_temp scripts src/contract_wrappers/generated", + "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", "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:stage": "node scripts/stage_docs.js", |