Merge remote-tracking branch 'upstream/development' into website

# Conflicts:
#	packages/website/package.json
#	packages/website/ts/style/colors.ts

1 files changed, 4 insertions, 2 deletions

diff --git a/tsconfig.json b/tsconfig.json
index eaaca8e4e..3d2dc6da7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -30,11 +30,10 @@
         { "path": "./packages/contract-addresses" },
         { "path": "./packages/contract-artifacts" },
         { "path": "./packages/contract-wrappers" },
-        { "path": "./packages/contracts" },
+        { "path": "./contracts/core" },
         { "path": "./packages/dev-utils" },
         { "path": "./packages/ethereum-types" },
         { "path": "./packages/fill-scenarios" },
-        { "path": "./packages/instant" },
         { "path": "./packages/json-schemas" },
         { "path": "./packages/metacoin" },
         { "path": "./packages/migrations" },
@@ -57,5 +56,8 @@
         // Skipping website because it requires allowJs: false and this is
         // incompatible with project references.
         // { "path": "./packages/website" }
+        // Skipping instant because it only produces a UMD bundle
+        // which it uses webpack to create
+        // { "path": "./packages/instant" },
     ]
 }