diff options
| author | Shpuld Shpludson <shp@cock.li> | 2018-12-13 14:42:58 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2018-12-13 14:42:58 +0000 |
| commit | dbe79a3c2673b9a14bd8f3b037eca5999dd6a018 (patch) | |
| tree | dc01a9b95e98e8268b913ab209adffcece43a135 /build/webpack.prod.conf.js | |
| parent | c824d2537884fb736ce7fe1263875b87d3c00c81 (diff) | |
| parent | c54eb1ecad33c4e45868ca35bcaa5404a1bfd0cd (diff) | |
Merge branch 'dev-qol' into 'develop'
Several fixes to make life of contributors a tiny bit easier.
See merge request pleroma/pleroma-fe!409
Diffstat (limited to 'build/webpack.prod.conf.js')
| -rw-r--r-- | build/webpack.prod.conf.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 6119f700..c02f8e86 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -7,8 +7,13 @@ var baseWebpackConfig = require('./webpack.base.conf') var ExtractTextPlugin = require('extract-text-webpack-plugin') var HtmlWebpackPlugin = require('html-webpack-plugin') var env = process.env.NODE_ENV === 'testing' - ? require('../config/test.env') - : config.build.env + ? require('../config/test.env') + : config.build.env + +let commitHash = require('child_process') + .execSync('git rev-parse --short HEAD') + .toString(); +console.log(commitHash) var webpackConfig = merge(baseWebpackConfig, { module: { @@ -29,7 +34,9 @@ var webpackConfig = merge(baseWebpackConfig, { plugins: [ // http://vuejs.github.io/vue-loader/workflow/production.html new webpack.DefinePlugin({ - 'process.env': env + 'process.env': env, + 'COMMIT_HASH': JSON.stringify(commitHash), + 'DEV_OVERRIDES': JSON.stringify(undefined) }), new webpack.optimize.UglifyJsPlugin({ compress: { |
