Merge remote-tracking branch 'upstream/development' into sol-doc

2018-08-31 09:22:05 -04:00
parent 9a4e6da02f 675964dc5c
commit 72419816a8
161 changed files with 3037 additions and 1181 deletions
--- a/packages/typescript-typings/package.json
+++ b/packages/typescript-typings/package.json
@@ -6,8 +6,7 @@
    },
    "description": "0x project typescript type definitions",
    "scripts": {
-        "watch_without_deps": "tsc -w",
-        "build": "tsc",
+        "build": "tsc -b",
        "clean": "shx rm -rf lib"
    },
    "repository": {
@@ -32,6 +31,7 @@
    },
    "devDependencies": {
        "copyfiles": "^2.0.0",
+        "typescript": "3.0.1",
        "shx": "^0.2.2"
    },
    "publishConfig": {
--- a/packages/typescript-typings/tsconfig.json
+++ b/packages/typescript-typings/tsconfig.json
@@ -1,6 +1,7 @@
 {
    "extends": "../../tsconfig",
    "compilerOptions": {
-        "outDir": "lib"
+        "outDir": "lib",
+        "rootDir": "."
    }
 }
--- a/packages/typescript-typings/types/react-typist/index.d.ts
+++ b/packages/typescript-typings/types/react-typist/index.d.ts
@@ -0,0 +1 @@
+declare module 'react-typist';