graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-10 05:33:08 +02:00
Code Issues 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

50
gulpfile.ts
View file

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

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 getVersion;
export default meta.version as string;

124
webpack.config.ts
View file

@ -4,77 +4,73 @@
import * as webpack from 'webpack';
const StringReplacePlugin = require('string-replace-webpack-plugin');
import getVersion from './src/version';
import version from './src/version';
const constants = require('./src/const.json');
const env = process.env.NODE_ENV;
const isProduction = env === 'production';
module.exports = new Promise(async resolve => {
const version = await getVersion.then();
const pack: webpack.Configuration = {
entry: {
'desktop': './src/web/app/desktop/script.js',
'mobile': './src/web/app/mobile/script.js',
'dev': './src/web/app/dev/script.js',
'auth': './src/web/app/auth/script.js'
},
module: {
rules: [
{
enforce: 'pre',
test: /\.tag$/,
exclude: /node_modules/,
loader: StringReplacePlugin.replace({
replacements: [
{ pattern: /\$theme\-color\-foreground/g, replacement: () => constants.themeColorForeground },
{ pattern: /\$theme\-color/g, replacement: () => constants.themeColor },
]
})
},
{
test: /\.tag$/,
exclude: /node_modules/,
loader: 'riot-tag-loader',
query: {
hot: false,
style: 'stylus',
expr: false,
compact: true,
parserOptions: {
style: {
compress: true
}
const pack: webpack.Configuration = {
entry: {
'desktop': './src/web/app/desktop/script.js',
'mobile': './src/web/app/mobile/script.js',
'dev': './src/web/app/dev/script.js',
'auth': './src/web/app/auth/script.js'
},
module: {
rules: [
{
enforce: 'pre',
test: /\.tag$/,
exclude: /node_modules/,
loader: StringReplacePlugin.replace({
replacements: [
{ pattern: /\$theme\-color\-foreground/g, replacement: () => constants.themeColorForeground },
{ pattern: /\$theme\-color/g, replacement: () => constants.themeColor },
]
})
},
{
test: /\.tag$/,
exclude: /node_modules/,
loader: 'riot-tag-loader',
query: {
hot: false,
style: 'stylus',
expr: false,
compact: true,
parserOptions: {
style: {
compress: true
}
}
},
{
test: /\.styl$/,
exclude: /node_modules/,
use: [
{ loader: 'style-loader' },
{ loader: 'css-loader' },
{ loader: 'stylus-loader' }
]
}
]
},
plugins: [
new webpack.DefinePlugin({
VERSION: JSON.stringify(version),
THEME_COLOR: JSON.stringify(constants.themeColor)
}),
new StringReplacePlugin()
],
output: {
filename: `[name]/script.${version}.js`
}
};
if (isProduction) {
//pack.plugins.push(new webpack.optimize.UglifyJsPlugin());
},
{
test: /\.styl$/,
exclude: /node_modules/,
use: [
{ loader: 'style-loader' },
{ loader: 'css-loader' },
{ loader: 'stylus-loader' }
]
}
]
},
plugins: [
new webpack.DefinePlugin({
VERSION: JSON.stringify(version),
THEME_COLOR: JSON.stringify(constants.themeColor)
}),
new StringReplacePlugin()
],
output: {
filename: `[name]/script.${version}.js`
}
};
resolve(pack);
});
if (isProduction) {
//pack.plugins.push(new webpack.optimize.UglifyJsPlugin());
}
module.exports = pack;