heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Refactoring

Browse source
This commit is contained in:
syuilo 2017-03-23 00:41:11 +09:00
parent ef8b09a690
commit 8a369c994b
3 changed files with 86 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gulpfile.ts
View file

@ -20,7 +20,7 @@ import imagemin = require('gulp-imagemin');
import * as rename from 'gulp-rename'; import * as rename from 'gulp-rename';
import * as mocha from 'gulp-mocha'; import * as mocha from 'gulp-mocha';
import * as replace from 'gulp-replace'; import * as replace from 'gulp-replace';
import getVersion from './src/version'; import version from './src/version';
const env = process.env.NODE_ENV; const env = process.env.NODE_ENV;
const isProduction = env === 'production'; const isProduction = env === 'production';
@ -129,21 +129,16 @@ gulp.task('build:client', [
'copy:client' 'copy:client'
]); ]);
gulp.task('build:client:scripts', done => { gulp.task('build:client:scripts', () =>
getVersion.then(version => {
require('./webpack.config').then(webpackOptions => {
es.merge( es.merge(
webpack(webpackOptions, require('webpack')) webpack(require('./webpack.config'), require('webpack'))
.pipe(gulp.dest('./built/web/assets/')) as any, .pipe(gulp.dest('./built/web/assets/')) as any,
gulp.src('./src/web/app/client/script.js') gulp.src('./src/web/app/client/script.js')
.pipe(replace('VERSION', JSON.stringify(version))) .pipe(replace('VERSION', JSON.stringify(version)))
//.pipe(isProduction ? uglify() : gutil.noop()) //.pipe(isProduction ? uglify() : gutil.noop())
.pipe(gulp.dest('./built/web/assets/client/')) as any .pipe(gulp.dest('./built/web/assets/client/')) as any
)
); );
done();
});
});
});
gulp.task('build:client:styles', () => gulp.task('build:client:styles', () =>
gulp.src('./src/web/app/init.css') gulp.src('./src/web/app/init.css')
@ -172,8 +167,7 @@ gulp.task('build:client:pug', [
'copy:client', 'copy:client',
'build:client:scripts', 'build:client:scripts',
'build:client:styles' 'build:client:styles'
], done => { ], () =>
getVersion.then(version => {
gulp.src('./src/web/app/*/view.pug') gulp.src('./src/web/app/*/view.pug')
.pipe(pug({ .pipe(pug({
locals: { locals: {
@ -181,7 +175,5 @@ gulp.task('build:client:pug', [
themeColor: constants.themeColor themeColor: constants.themeColor
} }
})) }))
.pipe(gulp.dest('./built/web/app/')); .pipe(gulp.dest('./built/web/app/'))
done(); );
});
});

12
src/version.ts
View file

@ -1,9 +1,7 @@
const getVersion = new Promise<string>(async resolve => { /**
const ぱっけーじ = require('../package.json'); * Version
*/
const version = ぱっけーじ.version; const meta = require('../package.json');
resolve(version); export default meta.version as string;
});
export default getVersion;

8
webpack.config.ts
View file

@ -4,15 +4,12 @@
import * as webpack from 'webpack'; import * as webpack from 'webpack';
const StringReplacePlugin = require('string-replace-webpack-plugin'); const StringReplacePlugin = require('string-replace-webpack-plugin');
import getVersion from './src/version'; import version from './src/version';
const constants = require('./src/const.json'); const constants = require('./src/const.json');
const env = process.env.NODE_ENV; const env = process.env.NODE_ENV;
const isProduction = env === 'production'; const isProduction = env === 'production';
module.exports = new Promise(async resolve => {
const version = await getVersion.then();
const pack: webpack.Configuration = { const pack: webpack.Configuration = {
entry: { entry: {
'desktop': './src/web/app/desktop/script.js', 'desktop': './src/web/app/desktop/script.js',
@ -76,5 +73,4 @@ module.exports = new Promise(async resolve => {
//pack.plugins.push(new webpack.optimize.UglifyJsPlugin()); //pack.plugins.push(new webpack.optimize.UglifyJsPlugin());
} }
resolve(pack); module.exports = pack;
});