summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-02-23 18:06:36 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-02-23 18:06:36 +0000
commit62829b6bd885ef09d2060d1230c5b5c4a1e62eb1 (patch)
tree3c70b5ef0de4966b7051c40b08dce3e1242349d1 /config
parent43fa9c1f1a40903f6416b954c326d67259c7290a (diff)
parent1c4b8c1a50f6df18811c3af1820a76565da25619 (diff)
downloadgitlab-ce-62829b6bd885ef09d2060d1230c5b5c4a1e62eb1.tar.gz
Merge branch '28450-test-compiling-frontend-assets-for-production-in-ci' into 'master'
Resolve "Test compiling frontend assets for production in CI" Closes #28450 See merge request !9396
Diffstat (limited to 'config')
-rw-r--r--config/dependency_decisions.yml6
-rw-r--r--config/webpack.config.js14
2 files changed, 20 insertions, 0 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml
index 7336d7c842a..072ed8a3864 100644
--- a/config/dependency_decisions.yml
+++ b/config/dependency_decisions.yml
@@ -320,3 +320,9 @@
:why: https://github.com/shinnn/spdx-license-ids/blob/v1.2.2/LICENSE
:versions: []
:when: 2017-02-08 22:35:00.225232000 Z
+- - :approve
+ - opener
+ - :who: Mike Greiling
+ :why: https://github.com/domenic/opener/blob/1.4.3/LICENSE.txt
+ :versions: []
+ :when: 2017-02-21 22:33:41.729629000 Z
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 15899993874..e754f68553a 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -5,12 +5,14 @@ var path = require('path');
var webpack = require('webpack');
var StatsPlugin = require('stats-webpack-plugin');
var CompressionPlugin = require('compression-webpack-plugin');
+var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
var ROOT_PATH = path.resolve(__dirname, '..');
var IS_PRODUCTION = process.env.NODE_ENV === 'production';
var IS_DEV_SERVER = process.argv[1].indexOf('webpack-dev-server') !== -1;
var DEV_SERVER_PORT = parseInt(process.env.DEV_SERVER_PORT, 10) || 3808;
var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false';
+var WEBPACK_REPORT = process.env.WEBPACK_REPORT;
var config = {
context: path.join(ROOT_PATH, 'app/assets/javascripts'),
@@ -120,4 +122,16 @@ if (IS_DEV_SERVER) {
config.output.publicPath = '//localhost:' + DEV_SERVER_PORT + config.output.publicPath;
}
+if (WEBPACK_REPORT) {
+ config.plugins.push(
+ new BundleAnalyzerPlugin({
+ analyzerMode: 'static',
+ generateStatsFile: true,
+ openAnalyzer: false,
+ reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'),
+ statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'),
+ })
+ );
+}
+
module.exports = config;