From e868dbbb9445f1b8cebc0c6e384d1a4ea689cb3e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <github@rvanderhoff.org.uk>
Date: Thu, 1 Jun 2017 15:46:37 +0100
Subject: [PATCH] No need to make olm an external (#4139)

matrix-js-sdk now loads olm from global.Olm instead of requiring it
(https://github.com/matrix-org/matrix-js-sdk/pull/446), so we no longer need to
define it as an external.
---
 webpack.config.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index efeab7fe8b..5d4fef72a9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -10,7 +10,7 @@ module.exports = {
 
         // We ship olm.js as a separate lump of javascript. This makes it get
         // loaded via a separate <script/> tag in index.html (which loads it
-        // into the browser global `Olm`), and define it as an external below.
+        // into the browser global `Olm`, where js-sdk expects to find it).
         //
         // (we should probably make js-sdk load it asynchronously at some
         // point, so that it doesn't block the pageload, but that is a separate
@@ -99,7 +99,6 @@ module.exports = {
         },
     },
     externals: {
-        "olm": "Olm",
         // Don't try to bundle electron: leave it as a commonjs dependency
         // (the 'commonjs' here means it will output a 'require')
         "electron": "commonjs electron",