From 7940c0901d4acff93169f62f4b80d58b287ca48e Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 6 Nov 2017 19:59:14 +0900
Subject: [PATCH] :v:

---
 gulpfile.ts                  | 4 ++--
 package.json                 | 3 ---
 src/index.ts                 | 2 +-
 src/utils/cli/progressbar.ts | 2 +-
 src/utils/logger.ts          | 4 ++--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/gulpfile.ts b/gulpfile.ts
index 4ee5fbce0e..448b6b7fef 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -13,7 +13,7 @@ import cssnano = require('gulp-cssnano');
 import * as uglifyComposer from 'gulp-uglify/composer';
 import pug = require('gulp-pug');
 import * as rimraf from 'rimraf';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import imagemin = require('gulp-imagemin');
 import * as rename from 'gulp-rename';
 import * as mocha from 'gulp-mocha';
@@ -123,7 +123,7 @@ gulp.task('build:client:script', () =>
 		.pipe(replace('VERSION', JSON.stringify(version)))
 		.pipe(isProduction ? uglify({
 			toplevel: true
-		}) : gutil.noop())
+		} as any) : gutil.noop())
 		.pipe(gulp.dest('./built/web/assets/')) as any
 );
 
diff --git a/package.json b/package.json
index da5badc94d..606ce9f0f0 100644
--- a/package.json
+++ b/package.json
@@ -60,8 +60,6 @@
 		"@types/riot": "3.6.1",
 		"@types/serve-favicon": "2.2.29",
 		"@types/uuid": "3.4.3",
-		"@types/webpack": "3.0.14",
-		"@types/uuid": "3.4.3",
 		"@types/webpack": "3.0.13",
 		"@types/webpack-stream": "3.2.8",
 		"@types/websocket": "0.0.34",
@@ -91,7 +89,6 @@
 		"swagger-jsdoc": "1.9.7",
 		"tslint": "5.8.0",
 		"uglify-es": "3.0.27",
-		"uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony",
 		"uglifyjs-webpack-plugin": "1.0.1",
 		"webpack": "3.8.1"
 	},
diff --git a/src/index.ts b/src/index.ts
index aa53c91239..218455d6f4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -8,7 +8,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as cluster from 'cluster';
 import * as debug from 'debug';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 // import portUsed = require('tcp-port-used');
 import isRoot = require('is-root');
 import { master } from 'accesses';
diff --git a/src/utils/cli/progressbar.ts b/src/utils/cli/progressbar.ts
index 4afb4b0904..72496fdedc 100644
--- a/src/utils/cli/progressbar.ts
+++ b/src/utils/cli/progressbar.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import * as readline from 'readline';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 
 /**
  * Progress bar
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
index ecfacbc952..fae1042c39 100644
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -1,8 +1,8 @@
-import * as chalk from 'chalk';
+import chalk, { Chalk } from 'chalk';
 
 export type LogLevel = 'Error' | 'Warn' | 'Info';
 
-function toLevelColor(level: LogLevel): chalk.ChalkStyle {
+function toLevelColor(level: LogLevel): Chalk {
 	switch (level) {
 		case 'Error': return chalk.red;
 		case 'Warn': return chalk.yellow;