Merge pull request #7387 from vector-im/matthew/webpack4

Webpack4
This commit is contained in:
Matthew Hodgson 2018-09-27 16:21:43 +01:00 committed by GitHub
commit a38661c0f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5905 additions and 1038 deletions

View file

@ -37,6 +37,14 @@
<section id="matrixchat" style="height: 100%;"></section>
<noscript>Sorry, Riot requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
<% for (var i=0; i < htmlWebpackPlugin.files.js.length; i++) {
if (_.endsWith(htmlWebpackPlugin.files.js[i], 'olm.js')) {
var array = htmlWebpackPlugin.files.js;
htmlWebpackPlugin.files.js.unshift(htmlWebpackPlugin.files.js[i]);
htmlWebpackPlugin.files.js.splice(i, 1);
}
}
for (var i=0; i < htmlWebpackPlugin.files.js.length; i++) {
// Not a particularly graceful way of not putting the indexeddb worker script
// into the main page
if (_.endsWith(htmlWebpackPlugin.files.js[i], 'indexeddb-worker.js')) {