kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fall-back-to-gzip-when-missing-optional-deps' into 'master'

Browse source 
Fall back to gzip when missing optional zopfli dependency

See merge request !12068
This commit is contained in:
Marin Jankovski 2017-06-12 10:13:18 +00:00
commit 5478ff6dc2
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
config/webpack.config.js
View file

@ -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',
})
);
}