diff options
author | Marin Jankovski <marin@gitlab.com> | 2017-06-12 10:13:18 +0000 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2017-06-12 10:13:18 +0000 |
commit | 5478ff6dc2ad59a7c7d91f61339e8acee9bbb434 (patch) | |
tree | f2fdf28be042ca4f13c7bfc623a21fdd21b6cb0a | |
parent | 1feb0894f73142c0127db86a3a84833d501e474f (diff) | |
parent | 010a83de19f3f1a992ee661c0b23449e8fd70a64 (diff) | |
download | gitlab-ce-5478ff6dc2ad59a7c7d91f61339e8acee9bbb434.tar.gz |
Merge branch 'fall-back-to-gzip-when-missing-optional-deps' into 'master'
Fall back to gzip when missing optional zopfli dependency
See merge request !12068
-rw-r--r-- | config/webpack.config.js | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 04f5a2beb2a..c5060669da1 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -18,6 +18,15 @@ var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false'; var WEBPACK_REPORT = process.env.WEBPACK_REPORT; var NO_COMPRESSION = process.env.NO_COMPRESSION; +// optional dependency `node-zopfli` is unavailable on CentOS 6 +var ZOPFLI_AVAILABLE; +try { + require.resolve('node-zopfli'); + ZOPFLI_AVAILABLE = true; +} catch(err) { + ZOPFLI_AVAILABLE = false; +} + var config = { // because sqljs requires fs. node: { @@ -226,7 +235,7 @@ if (IS_PRODUCTION) { config.plugins.push( new CompressionPlugin({ asset: '[path].gz[query]', - algorithm: 'zopfli', + algorithm: ZOPFLI_AVAILABLE ? 'zopfli' : 'gzip', }) ); } |