From feafd5702747eaff76675f57a5886d4ba3f8d3d1 Mon Sep 17 00:00:00 2001 From: "F. Eugene Aumson" Date: Tue, 19 Jun 2018 19:50:09 -0400 Subject: make metacoin tsconfig independent --- packages/metacoin/tsconfig.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'packages/metacoin') diff --git a/packages/metacoin/tsconfig.json b/packages/metacoin/tsconfig.json index 8b4cd47a2..bc3bd1e94 100644 --- a/packages/metacoin/tsconfig.json +++ b/packages/metacoin/tsconfig.json @@ -1,7 +1,16 @@ { - "extends": "../../tsconfig", "compilerOptions": { - "outDir": "lib" + "outDir": "lib", + "lib": ["es2017"], + "skipLibCheck": true, + "typeRoots": [ + "comment: for building within 0x-monorepo:", + "../../node_modules/@0xproject/typescript-typings/types", + "../../node_modules/@types", + "comment: for building in an isolated environment:", + "node_modules/@0xproject/typescript-typings/types", + "node_modules/@types" + ] }, "include": ["src/**/*", "test/**/*"] } -- cgit v1.2.3 From 457f951aaf589670b3edd11be7849ac17ef7e6f4 Mon Sep 17 00:00:00 2001 From: "F. Eugene Aumson" Date: Tue, 19 Jun 2018 19:50:32 -0400 Subject: add missing metacoin dependencies --- packages/metacoin/package.json | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packages/metacoin') diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 6db14334e..1a7b75f73 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -36,11 +36,15 @@ "@0xproject/subproviders": "^0.10.4", "@0xproject/tslint-config": "^0.4.20", "@0xproject/types": "^0.8.1", + "@0xproject/typescript-typings": "^0.4.1", "@0xproject/utils": "^0.7.1", "@0xproject/web3-wrapper": "^0.7.1", + "@types/mocha": "^5.2.2", + "copyfiles": "^2.0.0", "ethereum-types": "^0.0.1", "ethers": "3.0.22", "lodash": "^4.17.4", + "run-s": "^0.0.0", "web3-provider-engine": "^14.0.4" }, "devDependencies": { -- cgit v1.2.3 From 663f9657ea208060abd23485a1b607fbc3cde67e Mon Sep 17 00:00:00 2001 From: "F. Eugene Aumson" Date: Tue, 19 Jun 2018 19:54:35 -0400 Subject: ethereum-types now only has v0.0.2, no 0.0.1 --- packages/metacoin/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/metacoin') diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 1a7b75f73..6156571a4 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -41,7 +41,7 @@ "@0xproject/web3-wrapper": "^0.7.1", "@types/mocha": "^5.2.2", "copyfiles": "^2.0.0", - "ethereum-types": "^0.0.1", + "ethereum-types": "^0.0.2", "ethers": "3.0.22", "lodash": "^4.17.4", "run-s": "^0.0.0", -- cgit v1.2.3 From 4012e31115dd0571d742b42a48094f41fd53a460 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Thu, 21 Jun 2018 19:17:33 -0700 Subject: Use make-promises-safe as a preloader instead of manually importing --- packages/metacoin/package.json | 2 +- packages/metacoin/test/metacoin_test.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'packages/metacoin') diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index 6db14334e..61ee8280e 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -17,7 +17,7 @@ "rebuild_and_test": "run-s build test", "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", "test:profile": "SOLIDITY_PROFILER=true run-s build run_mocha profiler:report:html", - "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js lib/test/global_hooks.js --bail --exit --timeout 10000", + "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js lib/test/global_hooks.js --bail --exit --timeout 10000", "generate_contract_wrappers": "abi-gen --abis 'artifacts/Metacoin.json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers --backend ethers", "coverage:report:text": "istanbul report text", "coverage:report:html": "istanbul report html && open coverage/index.html", diff --git a/packages/metacoin/test/metacoin_test.ts b/packages/metacoin/test/metacoin_test.ts index 78de57a2a..89c2c3b4c 100644 --- a/packages/metacoin/test/metacoin_test.ts +++ b/packages/metacoin/test/metacoin_test.ts @@ -3,7 +3,6 @@ import { ContractArtifact } from '@0xproject/sol-compiler'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import { LogWithDecodedArgs } from 'ethereum-types'; -import 'make-promises-safe'; import * as MetacoinArtifact from '../artifacts/Metacoin.json'; import { MetacoinContract, TransferContractEventArgs } from '../src/contract_wrappers/metacoin'; -- cgit v1.2.3