From 165c93b248a18c36b950d6d318f1d8c2a3965a57 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 2 Mar 2018 19:20:52 +0900
Subject: [PATCH] :v:

---
 gulpfile.ts  | 15 +--------------
 package.json |  4 +++-
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/gulpfile.ts b/gulpfile.ts
index 736507bafb..aa67129149 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -111,23 +111,11 @@ gulp.task('default', ['build']);
 gulp.task('build:client', [
 	'build:ts',
 	'build:js',
-	'webpack',
 	'build:client:script',
 	'build:client:pug',
 	'copy:client'
 ]);
 
-gulp.task('webpack', done => {
-	const webpack = childProcess.spawn(
-		Path.join('.', 'node_modules', '.bin', 'webpack'),
-		['--config', './webpack/webpack.config.ts'], {
-			shell: true,
-			stdio: 'inherit'
-		});
-
-	webpack.on('exit', done);
-});
-
 gulp.task('build:client:script', () =>
 	gulp.src(['./src/web/app/boot.js', './src/web/app/safe.js'])
 		.pipe(replace('VERSION', JSON.stringify(version)))
@@ -147,8 +135,7 @@ gulp.task('build:client:styles', () =>
 );
 
 gulp.task('copy:client', [
-	'build:client:script',
-	'webpack'
+	'build:client:script'
 ], () =>
 		gulp.src([
 			'./assets/**/*',
diff --git a/package.json b/package.json
index 8aafb63401..03db892ec6 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,9 @@
 		"start": "node ./built",
 		"debug": "DEBUG=misskey:* node ./built",
 		"swagger": "node ./swagger.js",
-		"build": "gulp build",
+		"build": "./node_modules/.bin/webpack --config ./webpack/webpack.config.ts && gulp build",
+		"webpack": "./node_modules/.bin/webpack --config ./webpack/webpack.config.ts",
+		"gulp": "gulp build",
 		"rebuild": "gulp rebuild",
 		"clean": "gulp clean",
 		"cleanall": "gulp cleanall",