From 2482ef02bd31bea0488c6973cf01855b64751be6 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Tue, 25 May 2021 21:17:15 +0200
Subject: [PATCH] Fix for imports

---
 Makefile       | 3 +++
 src/locutus.ts | 2 +-
 src/main.ts    | 2 +-
 tsconfig.json  | 2 +-
 www/index.html | 8 ++++----
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index fb21cbd..775df9c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ ${OUT}/locutus.js ${OUT}/usimp.js: src/locutus.ts src/usimp.ts
 
 build: ${OUT}/locutus.js ${OUT}/usimp.js
 	perl -i -pE 's/(\?v=[0-9]+\.[0-9]+\.[0-9]+\+)([0-9]+)/($$1).($$2+1)/eg' www/index.html
+	perl -i -pE \
+		"s/^(import .*)\"(.*?)(\.js)?(\?.*?)?\"/(\$$1).(\"\\\".\/\$$2.js$$(grep -oE '\?v=[0-9]+\.[0-9]+\.[0-9]+\+[0-9]+' www/index.html | tail -n 1)\\\"\")/ge" \
+		www/res/scripts/*.js
 
 clean:
 	rm -rf "${OUT}"
diff --git a/src/locutus.ts b/src/locutus.ts
index 9d33442..58a5cc1 100644
--- a/src/locutus.ts
+++ b/src/locutus.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import * as USIMP from "./usimp";
+import * as USIMP from "usimp";
 
 export class App {
     account: USIMP.Account | null;
diff --git a/src/main.ts b/src/main.ts
index a07ad01..a525990 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,6 @@
 "use strict";
 
-import * as Locutus from "./locutus";
+import * as Locutus from "locutus";
 
 window.addEventListener("DOMContentLoaded", () => {
     // Remove <noscript> tags
diff --git a/tsconfig.json b/tsconfig.json
index 1da7943..1ba721e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
     "target": "ES2020",
-    "module": "es2020",
+    "module": "ES2020",
     "outDir": "www/res/scripts",
     "rootDir": "src",
     "strict": true,
diff --git a/www/index.html b/www/index.html
index 926f5a8..f0080c1 100644
--- a/www/index.html
+++ b/www/index.html
@@ -19,10 +19,10 @@ Distributed, end-to-end encrypted instant messaging."/>
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <link rel="icon" sizes="64x64" href="/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" href="/res/styles/styles.css?v=0.0.0+10" type="text/css"/>
-    <script type="module" src="/res/scripts/usimp.js?v=0.0.0+10"></script>
-    <script type="module" src="/res/scripts/locutus.js?v=0.0.0+10"></script>
-    <script type="module" src="/res/scripts/main.js?v=0.0.0+10"></script>
+    <link rel="stylesheet" href="/res/styles/styles.css?v=0.0.0+85" type="text/css"/>
+    <script type="module" src="/res/scripts/usimp.js?v=0.0.0+85"></script>
+    <script type="module" src="/res/scripts/locutus.js?v=0.0.0+85"></script>
+    <script type="module" src="/res/scripts/main.js?v=0.0.0+85"></script>
     <meta http-equiv="Content-Security-Policy" content="
         default-src 'none';
         style-src 'self';