diff options
author | Fabio Berger <me@fabioberger.com> | 2018-08-27 17:34:45 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-08-27 17:34:45 +0800 |
commit | 51161784e8aa0142556363de1f32298967e4b53c (patch) | |
tree | f194affc5537f8ba4ceded88ea030837b1501bfc /packages | |
parent | c4dadf4bfd5b955221d5e8cd5e702720efd7873b (diff) | |
parent | cb7660fbe70db233579104fbf5845181232c83ec (diff) | |
download | dexon-0x-contracts-51161784e8aa0142556363de1f32298967e4b53c.tar dexon-0x-contracts-51161784e8aa0142556363de1f32298967e4b53c.tar.gz dexon-0x-contracts-51161784e8aa0142556363de1f32298967e4b53c.tar.bz2 dexon-0x-contracts-51161784e8aa0142556363de1f32298967e4b53c.tar.lz dexon-0x-contracts-51161784e8aa0142556363de1f32298967e4b53c.tar.xz dexon-0x-contracts-51161784e8aa0142556363de1f32298967e4b53c.tar.zst dexon-0x-contracts-51161784e8aa0142556363de1f32298967e4b53c.zip |
Merge branch 'development' of github.com:0xProject/0x-monorepo into development
* 'development' of github.com:0xProject/0x-monorepo:
Fix command
Move md files to lib folder during build
Change exit code to failure
Fix sra-spec `main` and `types` in package.json
Issue #1025 BlockParam unroll
fix: Use yarn version 1.9.4 on CI
Diffstat (limited to 'packages')
-rw-r--r-- | packages/contract_templates/contract.handlebars | 2 | ||||
-rw-r--r-- | packages/monorepo-scripts/src/test_installation.ts | 4 | ||||
-rw-r--r-- | packages/sra-spec/package.json | 8 | ||||
-rw-r--r-- | packages/sra-spec/src/md/index.ts | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/packages/contract_templates/contract.handlebars b/packages/contract_templates/contract.handlebars index 5c36a765d..466893aa7 100644 --- a/packages/contract_templates/contract.handlebars +++ b/packages/contract_templates/contract.handlebars @@ -2,7 +2,7 @@ // tslint:disable:no-unused-variable // tslint:disable:no-unbound-method import { BaseContract } from '@0xproject/base-contract'; -import { BlockParam, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; +import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types'; import { BigNumber, classUtils, logUtils } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as ethers from 'ethers'; diff --git a/packages/monorepo-scripts/src/test_installation.ts b/packages/monorepo-scripts/src/test_installation.ts index 87c4ad1d7..10709af25 100644 --- a/packages/monorepo-scripts/src/test_installation.ts +++ b/packages/monorepo-scripts/src/test_installation.ts @@ -85,11 +85,13 @@ function logIfDefined(x: any): void { logIfDefined(packageError.error.stdout); logIfDefined(packageError.error.stack); }); + process.exit(1); + } else { process.exit(0); } })().catch(err => { utils.log(`Unexpected error: ${err.message}`); - process.exit(0); + process.exit(1); }); async function testInstallPackageAsync( diff --git a/packages/sra-spec/package.json b/packages/sra-spec/package.json index 706f9f0aa..f0820e136 100644 --- a/packages/sra-spec/package.json +++ b/packages/sra-spec/package.json @@ -5,8 +5,8 @@ "node": ">=6.12" }, "description": "Standard Relayer API Open API Spec", - "main": "lib/src/index.js", - "types": "lib/src/index.d.ts", + "main": "lib/index.js", + "types": "lib/index.d.ts", "scripts": { "serve": "redoc-cli serve lib/api.json --watch", "watch_without_deps": "run-p build-json:watch serve", @@ -17,9 +17,10 @@ "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", "test:circleci": "yarn test:coverage", "clean": "shx rm -rf lib", - "build": "tsc && yarn build-json", + "build": "tsc && yarn copy_md_files && yarn build-json", "build-json": "ts-node build_scripts/buildJson.ts", "build-json:watch": "chokidar 'src/**/*' -c 'yarn build-json' ", + "copy_md_files": "copyfiles -u 2 './src/md/**/*.md' ./lib/md", "deploy-site": "discharge deploy" }, "repository": { @@ -42,6 +43,7 @@ "@types/node": "^10.5.3", "chai": "^4.0.1", "chokidar-cli": "^1.2.0", + "copyfiles": "^2.0.0", "dirty-chai": "^2.0.1", "discharge": "^0.7.1", "mocha": "^4.0.1", diff --git a/packages/sra-spec/src/md/index.ts b/packages/sra-spec/src/md/index.ts index 076c3c45c..0d1147aa0 100644 --- a/packages/sra-spec/src/md/index.ts +++ b/packages/sra-spec/src/md/index.ts @@ -1,5 +1,5 @@ import { readFileSync } from 'fs'; export const md = { - introduction: readFileSync('src/md/introduction.md').toString(), + introduction: readFileSync('lib/md/introduction.md').toString(), }; |