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

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.
This commit is contained in:
Richard van der Hoff 2017-06-01 15:46:37 +01:00 committed by GitHub
parent 33cf39e9a0
commit e868dbbb94
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webpack.config.js
View File

@ -10,7 +10,7 @@ module.exports = {
// We ship olm.js as a separate lump of javascript. This makes it get // 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 // 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 // (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 // point, so that it doesn't block the pageload, but that is a separate
@ -99,7 +99,6 @@ module.exports = {
}, },
}, },
externals: { externals: {
"olm": "Olm",
// Don't try to bundle electron: leave it as a commonjs dependency // Don't try to bundle electron: leave it as a commonjs dependency
// (the 'commonjs' here means it will output a 'require') // (the 'commonjs' here means it will output a 'require')
"electron": "commonjs electron", "electron": "commonjs electron",