diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-06-16 15:16:52 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-06-16 19:21:15 -0500 |
commit | 3265670327ed8900f2cb6a3df5eec05de3f93096 (patch) | |
tree | 048fa8e2f8a485a0ab27fcfbc8f978961c580765 /config | |
parent | e0dbfacf6eae0ef6ce1f641e5057bc89c9478b47 (diff) | |
download | gitlab-ce-3265670327ed8900f2cb6a3df5eec05de3f93096.tar.gz |
refactor zopfli fallback configfix-atom-eslint
Diffstat (limited to 'config')
-rw-r--r-- | config/webpack.config.js | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index ad6bd88020d..fb91ffef7e7 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -18,15 +18,6 @@ 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: { @@ -233,12 +224,12 @@ if (IS_PRODUCTION) { // zopfli requires a lot of compute time and is disabled in CI if (!NO_COMPRESSION) { - config.plugins.push( - new CompressionPlugin({ - asset: '[path].gz[query]', - algorithm: ZOPFLI_AVAILABLE ? 'zopfli' : 'gzip', - }) - ); + // gracefully fall back to gzip if `node-zopfli` is unavailable (e.g. in CentOS 6) + try { + config.plugins.push(new CompressionPlugin({ algorithm: 'zopfli' })); + } catch(err) { + config.plugins.push(new CompressionPlugin({ algorithm: 'gzip' })); + } } } |