Merge pull request #1766 from vector-im/rav/use_right_olm

webpack: always use the olm from vector-web
2016-07-13 09:48:08 +01:00 · 2016-07-13 09:48:08 +01:00 · 19dbd85d44
parent 74f459f8a4 ef4b604caf
commit 19dbd85d44
1 changed files with 4 additions and 0 deletions
--- a/webpack.config.js
+++ b/webpack.config.js
@ -43,6 +43,10 @@ module.exports = {

            // same goes for js-sdk
            "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'),
+
+            // make sure we use the version of olm from vector-web rather than
+            // js-sdk.
+            "olm": path.resolve('./node_modules/olm'),
        },
    },
    plugins: [