From 0a7828b9ae7e00fe876f5b26d81b8d616860d578 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Thu, 18 Jul 2024 23:39:04 +0300
Subject: [PATCH] server-esm: Handle two more async imports

---
 src/services/search/expressions/note_flat_text.ts | 3 +--
 src/share/shaca/entities/abstract_shaca_entity.ts | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/services/search/expressions/note_flat_text.ts b/src/services/search/expressions/note_flat_text.ts
index d433eb991..3bd101005 100644
--- a/src/services/search/expressions/note_flat_text.ts
+++ b/src/services/search/expressions/note_flat_text.ts
@@ -7,6 +7,7 @@ import Expression from "./expression.js";
 import NoteSet from "../note_set.js";
 import becca from "../../../becca/becca.js";
 import utils from "../../utils.js";
+import beccaService from "../../../becca/becca_service.js";
 
 class NoteFlatTextExp extends Expression {
     private tokens: string[];
@@ -18,8 +19,6 @@ class NoteFlatTextExp extends Expression {
     }
 
     execute(inputNoteSet: NoteSet, executionContext: any, searchContext: SearchContext) {
-        // has deps on SQL which breaks unit test so needs to be dynamically required
-        const beccaService = require('../../../becca/becca_service');
         const resultNoteSet = new NoteSet();
 
         /**
diff --git a/src/share/shaca/entities/abstract_shaca_entity.ts b/src/share/shaca/entities/abstract_shaca_entity.ts
index 6bf7c3d63..5ac1cbd5c 100644
--- a/src/share/shaca/entities/abstract_shaca_entity.ts
+++ b/src/share/shaca/entities/abstract_shaca_entity.ts
@@ -4,10 +4,6 @@ let shaca: Shaca;
 
 class AbstractShacaEntity {
     get shaca(): Shaca {
-        if (!shaca) {
-            shaca = require('../shaca');
-        }
-
         return shaca;
     }
 }