From 92fdbe15df179fe6f1d4015e266b6046ad644319 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 27 Aug 2020 13:24:04 +0200
Subject: [PATCH] pass olm paths to main fn

so build can adjust the file paths,
and we can prevent olm from loading by not passing them
---
 index.html        |  6 +++++-
 scripts/build.mjs | 14 +++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index cdf0ad4f..b09286a0 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,11 @@
         </script>
 		<script id="main" type="module">
 			import {main} from "./src/main.js";
-			main(document.body);
+			main(document.body, {
+                wasm: "lib/olm/olm.wasm",
+                legacyBundle: "lib/olm/olm_legacy.js",
+                wasmBundle: "lib/olm/olm.js",
+            });
 		</script>
         <script id="service-worker" type="disabled">
             if('serviceWorker' in navigator) {
diff --git a/scripts/build.mjs b/scripts/build.mjs
index 892e27f0..1b57ca58 100644
--- a/scripts/build.mjs
+++ b/scripts/build.mjs
@@ -58,6 +58,12 @@ program.parse(process.argv);
 const {debug, noOffline} = program;
 const offline = !noOffline;
 
+const olmFiles = {
+    wasm: "olm-4289088762.wasm",
+    legacyBundle: "olm_legacy-3232457086.js",
+    wasmBundle: "olm-1421970081.js",
+};
+
 async function build() {
     // only used for CSS for now, using legacy for all targets for now
     const legacy = true;
@@ -73,6 +79,8 @@ async function build() {
     // clear target dir
     await removeDirIfExists(targetDir);
     await createDirs(targetDir, themes);
+    // copy assets
+    await copyFolder(path.join(projectDir, "lib/olm/"), targetDir, );
     // also creates the directories where the theme css bundles are placed in,
     // so do it first
     const themeAssets = await copyThemeAssets(themes, legacy);
@@ -154,9 +162,9 @@ async function buildHtml(doc, version, assetPaths, manifestPath) {
         theme.attr("href", assetPaths.cssThemeBundle(themeName));
     });
     doc("script#main").replaceWith(
-        `<script type="module">import {main} from "./${assetPaths.jsBundle()}"; main(document.body);</script>` +
+        `<script type="module">import {main} from "./${assetPaths.jsBundle()}"; main(document.body, ${JSON.stringify(olmFiles)});</script>` +
         `<script type="text/javascript" nomodule src="${assetPaths.jsLegacyBundle()}"></script>` +
-        `<script type="text/javascript" nomodule>${PROJECT_ID}Bundle.main(document.body);</script>`);
+        `<script type="text/javascript" nomodule>${PROJECT_ID}Bundle.main(document.body, ${JSON.stringify(olmFiles)});</script>`);
     removeOrEnableScript(doc("script#service-worker"), offline);
 
     const versionScript = doc("script#version");
@@ -338,7 +346,7 @@ async function copyFolder(srcRoot, dstRoot, filter) {
         if (dirEnt.isDirectory()) {
             await fs.mkdir(dstPath);
             Object.assign(assetPaths, await copyFolder(srcPath, dstPath, filter));
-        } else if (dirEnt.isFile() && filter(srcPath)) {
+        } else if ((dirEnt.isFile() || dirEnt.isSymbolicLink()) && (!filter || filter(srcPath))) {
             const content = await fs.readFile(srcPath);
             const hashedDstPath = resource(dstPath, content);
             await fs.writeFile(hashedDstPath, content);