From efdf79feaa08f02620adbcabeeea063abb9bee01 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Thu, 19 Jun 2025 22:01:01 +0300
Subject: [PATCH] refactor(client): circular dependency causing test failure

---
 apps/client/src/components/app_context.ts  | 2 +-
 apps/client/src/services/script_context.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/client/src/components/app_context.ts b/apps/client/src/components/app_context.ts
index 0cf5058ed..443014572 100644
--- a/apps/client/src/components/app_context.ts
+++ b/apps/client/src/components/app_context.ts
@@ -1,5 +1,4 @@
 import froca from "../services/froca.js";
-import bundleService from "../services/bundle.js";
 import RootCommandExecutor from "./root_command_executor.js";
 import Entrypoints, { type SqlExecuteResults } from "./entrypoints.js";
 import options from "../services/options.js";
@@ -470,6 +469,7 @@ export class AppContext extends Component {
 
         this.tabManager.loadTabs();
 
+        const bundleService = (await import("../services/bundle.js")).default;
         setTimeout(() => bundleService.executeStartupBundles(), 2000);
     }
 
diff --git a/apps/client/src/services/script_context.ts b/apps/client/src/services/script_context.ts
index 27a8a7d44..7c15db1ae 100644
--- a/apps/client/src/services/script_context.ts
+++ b/apps/client/src/services/script_context.ts
@@ -1,4 +1,4 @@
-import FrontendScriptApi, { type Entity } from "./frontend_script_api.js";
+import type { Entity } from "./frontend_script_api.js";
 import utils from "./utils.js";
 import froca from "./froca.js";
 
@@ -14,6 +14,8 @@ async function ScriptContext(startNoteId: string, allNoteIds: string[], originEn
         throw new Error(`Could not find start note ${startNoteId}.`);
     }
 
+    const FrontendScriptApi = (await import("./frontend_script_api.js")).default;
+
     return {
         modules: modules,
         notes: utils.toObject(allNotes, (note) => [note.noteId, note]),