Merge branch 'master' into greenkeeper/@types/rimraf-2.0.2

3 files changed, 9 insertions, 10 deletions

diff --git a/webpack/plugins/const.ts b/webpack/plugins/const.ts
index ccfcb45260..f64160b01a 100644
--- a/webpack/plugins/const.ts
+++ b/webpack/plugins/const.ts
@@ -7,7 +7,8 @@ import * as webpack from 'webpack';
 import version from '../../src/version';
 const constants = require('../../src/const.json');
 
-export default () => new webpack.DefinePlugin({
+export default lang => new webpack.DefinePlugin({
 	VERSION: JSON.stringify(version),
+	LANG: JSON.stringify(lang),
 	THEME_COLOR: JSON.stringify(constants.themeColor)
 });
diff --git a/webpack/plugins/index.ts b/webpack/plugins/index.ts
index 99b16c2b05..345af7df9e 100644
--- a/webpack/plugins/index.ts
+++ b/webpack/plugins/index.ts
@@ -2,25 +2,23 @@ const StringReplacePlugin = require('string-replace-webpack-plugin');
 
 import constant from './const';
 import hoist from './hoist';
-//import minify from './minify';
+import minify from './minify';
 import banner from './banner';
 
-/*
 const env = process.env.NODE_ENV;
 const isProduction = env === 'production';
-*/
 
-export default version => {
+export default (version, lang) => {
 	const plugins = [
-		constant(),
+		constant(lang),
 		new StringReplacePlugin(),
 		hoist()
 	];
-/*
+
 	if (isProduction) {
 		plugins.push(minify());
 	}
-*/
+
 	plugins.push(banner(version));
 
 	return plugins;
diff --git a/webpack/plugins/minify.ts b/webpack/plugins/minify.ts
index ec4c9b3405..e46d4c5a10 100644
--- a/webpack/plugins/minify.ts
+++ b/webpack/plugins/minify.ts
@@ -1,3 +1,3 @@
-const UglifyEsPlugin = require('uglify-es-webpack-plugin');
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 
-export default () => new UglifyEsPlugin();
+export default () => new UglifyJsPlugin();