From b3fa0c8dacb86e8e84ccad3451215402e1894cb9 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Tue, 11 Dec 2018 17:09:00 -0800 Subject: Fix project references for contracts packages (#1419) - Removed /packages/contracts - Removed /contracts/core - Added `yarn build:ts` to CI tests - Added each contracts "project" to root tsconfig.json --- .circleci/config.yml | 1 + tsconfig.json | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61e0bc5d3..68d8041a2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,6 +18,7 @@ jobs: name: yarn command: yarn --frozen-lockfile install || yarn --frozen-lockfile install - run: yarn build:ci:no_website + - run: yarn build:ts - save_cache: key: repo-{{ .Environment.CIRCLE_SHA1 }} paths: diff --git a/tsconfig.json b/tsconfig.json index b8b795aab..751115554 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,9 +20,18 @@ // any top-level TypeScript code. "include": [], "references": [ + { "path": "./contracts/examples" }, + { "path": "./contracts/extensions" }, + { "path": "./contracts/interfaces" }, + { "path": "./contracts/libs" }, + { "path": "./contracts/multisig" }, + { "path": "./contracts/protocol" }, + { "path": "./contracts/test-utils" }, + { "path": "./contracts/tokens" }, + { "path": "./contracts/utils" }, { "path": "./packages/0x.js" }, - { "path": "./packages/abi-gen" }, { "path": "./packages/abi-gen-wrappers" }, + { "path": "./packages/abi-gen" }, { "path": "./packages/assert" }, { "path": "./packages/asset-buyer" }, { "path": "./packages/base-contract" }, @@ -30,7 +39,6 @@ { "path": "./packages/contract-addresses" }, { "path": "./packages/contract-artifacts" }, { "path": "./packages/contract-wrappers" }, - { "path": "./contracts/core" }, { "path": "./packages/dev-utils" }, { "path": "./packages/ethereum-types" }, { "path": "./packages/fill-scenarios" }, -- cgit v1.2.3