From 6101f62ceb8ef493e998db78f3f33ccd0b94a598 Mon Sep 17 00:00:00 2001
From: Arild Matsson <arild.matsson@gu.se>
Date: Thu, 4 Jan 2024 09:57:47 +0100
Subject: [PATCH] Fix unnecessary dynamic imports

---
 src/App.vue            | 10 +++++-----
 src/page/AppHeader.vue |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index fcd3a23..d088e6b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,10 +19,11 @@ import { computed } from "vue";
 import { useRoute } from "vue-router";
 import { useTitle } from "@vueuse/core";
 import { api } from "@/api/api";
+import * as util from "@/util";
 import { useAuth } from "@/auth/auth.composable";
 import useLocale from "@/i18n/locale.composable";
+import { useCorpusStore } from "@/store/corpus.store";
 import MessageToasts from "@/message/MessageToasts.vue";
-// Asset path transformation doesn't work in <source srcset> like in <img src>
 import usePageTitle from "@/page/title.composable";
 import Breadcrumb from "@/page/Breadcrumb.vue";
 import AppHeader from "./page/AppHeader.vue";
@@ -34,6 +35,7 @@ const { title } = usePageTitle();
 // Activate automatic updates of the HTML page title.
 useTitle(title, { titleTemplate: "%s | Mink" });
 const route = useRoute();
+const corpusStore = useCorpusStore();
 
 const isHome = computed(() => route.path == "/");
 
@@ -42,10 +44,8 @@ refreshJwt();
 
 if (import.meta.env.DEV) {
   window.api = api;
-  import("@/store/corpus.store").then(
-    (m) => (window.corpusStore = m.useCorpusStore())
-  );
-  import("@/util").then((m) => (window.util = m));
+  window.corpusStore = corpusStore;
+  window.util = util;
 }
 </script>
 
diff --git a/src/page/AppHeader.vue b/src/page/AppHeader.vue
index c580a73..a0b864c 100644
--- a/src/page/AppHeader.vue
+++ b/src/page/AppHeader.vue
@@ -3,6 +3,7 @@ import { getLogoutUrl } from "@/auth/auth";
 import { useAuth } from "@/auth/auth.composable";
 import LocaleSwitcher from "@/i18n/LocaleSwitcher.vue";
 import AdminModeBanner from "@/user/AdminModeBanner.vue";
+// Asset path transformation doesn't work in <source srcset> like in <img src>
 import logoSbxLight from "@/assets/sbx1r-light.svg";
 import Spinner from "@/spin/Spinner.vue";
 import MinkLogo from "./MinkLogo.vue";