Commit 5478ff6d authored by Marin Jankovski's avatar Marin Jankovski

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
parents 1feb0894 010a83de
...@@ -18,6 +18,15 @@ var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false'; ...@@ -18,6 +18,15 @@ var DEV_SERVER_LIVERELOAD = process.env.DEV_SERVER_LIVERELOAD !== 'false';
var WEBPACK_REPORT = process.env.WEBPACK_REPORT; var WEBPACK_REPORT = process.env.WEBPACK_REPORT;
var NO_COMPRESSION = process.env.NO_COMPRESSION; 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 = { var config = {
// because sqljs requires fs. // because sqljs requires fs.
node: { node: {
...@@ -226,7 +235,7 @@ if (IS_PRODUCTION) { ...@@ -226,7 +235,7 @@ if (IS_PRODUCTION) {
config.plugins.push( config.plugins.push(
new CompressionPlugin({ new CompressionPlugin({
asset: '[path].gz[query]', asset: '[path].gz[query]',
algorithm: 'zopfli', algorithm: ZOPFLI_AVAILABLE ? 'zopfli' : 'gzip',
}) })
); );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment