Merge branch 'master' into greenkeeper/cz-conventional-changelog-2.1.0

Author: KnisterPeter

.vscode/tasks.json

@@ -1,23 +1,25 @@
 {
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
-  "version": "0.1.0",
-  "command": "npm",
-  "isShellCommand": true,
-  "showOutput": "silent",
-  "suppressTaskName": true,
-  "tasks": [
-    {
-      "taskName": "build",
-      "args": [
-        "run",
-        "build",
-        "--",
-        "--watch"
-      ],
-      "echoCommand": true,
-      "isBuildCommand": true,
-      "isWatching": true
-    }
-  ]
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "npm",
+            "script": "build:watch",
+            "group": {
+              "kind": "build",
+              "isDefault": true
+            },
+            "isBackground": true,
+            "presentation": {
+              "echo": true,
+              "reveal": "silent",
+              "focus": false,
+              "panel": "shared"
+            },
+            "problemMatcher": [
+                "$tsc-watch"
+            ]
+        }
+    ]
 }

package-lock.json

@@ -17,6 +17,7 @@
     "clean": "rimraf dist",
     "prebuild": "npm run clean",
     "build": "tsc --sourceMap",
+    "build:watch": "npm run build -- --watch",
     "build:inline": "tsc --inlineSourceMap",
     "pretest": "npm run clean && npm run build:inline",
     "test": "nyc ava",
@@ -38,7 +39,6 @@
   "devDependencies": {
     "@knisterpeter/standard-tslint": "^1.6.0",
     "@types/babel-generator": "^6.7.14",
-    "@types/chalk": "^0.4.31",
     "@types/diff": "^3.2.0",
     "@types/node": "^8.0.0",
     "@types/react": "^16.0.0",
@@ -63,7 +63,7 @@
     "astq": "^2.0.2",
     "babel-generator": "^6.24.1",
     "babylon": "7.0.0-beta.9",
-    "chalk": "2.1.0",
+    "chalk": "^2.3.0",
     "dts-dom": "^0.1.20",
     "get-stdin": "^5.0.1",
     "meow": "^3.7.0",

package.json

@@ -1,5 +1,5 @@
 import astToCode from 'babel-generator';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import * as dom from 'dts-dom';
 import { IOptions } from './index';
 import { propTypeQueryExpression, AstQuery } from './typings';

src/types.ts

@@ -1,6 +1,6 @@
 import test, { TestContext } from 'ava';
 
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import * as diff from 'diff';
 import * as fs from 'fs';
 import * as path from 'path';