From a551d0a6ddbc25f53612702ec7c6fa6ff2ca3aba Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Thu, 23 Aug 2018 16:45:18 -0700 Subject: fix: Use yarn version 1.9.4 on CI --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0d3c2f108..2f139841b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,8 +18,8 @@ jobs: - yarn-packages-master - yarn-packages- - run: - name: yarn - command: yarn --frozen-lockfile install || true + name: install-yarn + command: sudo npm install --global yarn@1.9.4 - run: name: yarn command: yarn --frozen-lockfile install @@ -254,4 +254,4 @@ workflows: - build - submit-coverage: requires: - - test-rest \ No newline at end of file + - test-rest -- cgit v1.2.3 From 7e9ba50502548c6c50ff8a402db416bf1dc9aac3 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Mon, 27 Aug 2018 15:59:43 +1000 Subject: Issue #1025 BlockParam unroll BlockParam unrolls into number | BlockParamLiteral, though BlockParamLiteral does not get imported. This results in type build errors in downstream projects where tslint checks libs --- packages/contract_templates/contract.handlebars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'; -- cgit v1.2.3 From 38abeaed9cd2bfaad82db367a54fe35337d846ff Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sun, 26 Aug 2018 23:05:04 +0100 Subject: Fix sra-spec `main` and `types` in package.json --- packages/sra-spec/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sra-spec/package.json b/packages/sra-spec/package.json index 706f9f0aa..ccb7ccb71 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", -- cgit v1.2.3 From e6cb2e0fcd33858d7775871807eb834f78cdc53d Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sun, 26 Aug 2018 20:54:15 +0100 Subject: Change exit code to failure --- packages/monorepo-scripts/src/test_installation.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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( -- cgit v1.2.3 From fffa96bba75df15965b0be8cc19a8e30a975a39c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sun, 26 Aug 2018 23:35:47 +0100 Subject: Move md files to lib folder during build --- packages/sra-spec/package.json | 4 +++- packages/sra-spec/src/md/index.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/sra-spec/package.json b/packages/sra-spec/package.json index ccb7ccb71..9a192d46f 100644 --- a/packages/sra-spec/package.json +++ b/packages/sra-spec/package.json @@ -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 && 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(), }; -- cgit v1.2.3 From 82e51b878780a8d1001470c5408db0bbea53b59e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sun, 26 Aug 2018 23:43:19 +0100 Subject: Fix command --- packages/sra-spec/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sra-spec/package.json b/packages/sra-spec/package.json index 9a192d46f..f0820e136 100644 --- a/packages/sra-spec/package.json +++ b/packages/sra-spec/package.json @@ -17,7 +17,7 @@ "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", "test:circleci": "yarn test:coverage", "clean": "shx rm -rf lib", - "build": "tsc && copy_md_files && 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", -- cgit v1.2.3