This commit is contained in:
syuilo 2018-03-02 19:20:52 +09:00
parent cafc666ed7
commit 52b4e7b574
2 changed files with 4 additions and 15 deletions

View file

@ -111,23 +111,11 @@ gulp.task('default', ['build']);
gulp.task('build:client', [ gulp.task('build:client', [
'build:ts', 'build:ts',
'build:js', 'build:js',
'webpack',
'build:client:script', 'build:client:script',
'build:client:pug', 'build:client:pug',
'copy:client' '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.task('build:client:script', () =>
gulp.src(['./src/web/app/boot.js', './src/web/app/safe.js']) gulp.src(['./src/web/app/boot.js', './src/web/app/safe.js'])
.pipe(replace('VERSION', JSON.stringify(version))) .pipe(replace('VERSION', JSON.stringify(version)))
@ -147,8 +135,7 @@ gulp.task('build:client:styles', () =>
); );
gulp.task('copy:client', [ gulp.task('copy:client', [
'build:client:script', 'build:client:script'
'webpack'
], () => ], () =>
gulp.src([ gulp.src([
'./assets/**/*', './assets/**/*',

View file

@ -13,7 +13,9 @@
"start": "node ./built", "start": "node ./built",
"debug": "DEBUG=misskey:* node ./built", "debug": "DEBUG=misskey:* node ./built",
"swagger": "node ./swagger.js", "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", "rebuild": "gulp rebuild",
"clean": "gulp clean", "clean": "gulp clean",
"cleanall": "gulp cleanall", "cleanall": "gulp cleanall",