gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2518 from vector-im/rav/ignore_olm_if_missing 

Avoid errors if olm is missing
This commit is contained in:
Richard van der Hoff 2016-10-27 10:28:27 +01:00 committed by GitHub
parent b174d49f9d a86f2720bc
commit 5e84a6c39e
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webpack.config.js
View File

@ -102,3 +102,12 @@ module.exports = {
], ],
devtool: 'source-map' devtool: 'source-map'
}; };
// olm is an optional dependency. Ignore it if it's not installed, to avoid a
// scary-looking error.
try {
require('olm');
} catch (e) {
console.log("Olm is not installed; not shipping it");
delete(module.exports.entry["olm"]);
}