Merge branch 'master' into master

Author: piotr-oles

test/integration/index.spec.js

@@ -6,13 +6,13 @@ var path = require('path');
 var webpack = require('webpack');
 var ForkTsCheckerWebpackPlugin = require('../../lib/index');
 
-chai.config.truncateThreshold = 0
+chai.config.truncateThreshold = 0;
 var expect = chai.expect;
 
 var webpackMajorVersion = require('./webpackVersion')();
 
 describe('[INTEGRATION] index', function () {
-  this.timeout(30000);
+  this.timeout(60000);
   var plugin;
 
   function createCompiler(options, happyPackMode) {

test/integration/vue.spec.js

@@ -11,7 +11,7 @@ var IncrementalChecker = require('../../lib/IncrementalChecker');
 var webpackMajorVersion = require('./webpackVersion')();
 
 describe('[INTEGRATION] vue', function () {
-  this.timeout(30000);
+  this.timeout(60000);
   process.setMaxListeners(20);   
   var plugin;
   var files;