mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 10:26:08 +01:00 
			
		
		
		
	server-esm: Handle two more async imports
This commit is contained in:
		| @@ -7,6 +7,7 @@ import Expression from "./expression.js"; | |||||||
| import NoteSet from "../note_set.js"; | import NoteSet from "../note_set.js"; | ||||||
| import becca from "../../../becca/becca.js"; | import becca from "../../../becca/becca.js"; | ||||||
| import utils from "../../utils.js"; | import utils from "../../utils.js"; | ||||||
|  | import beccaService from "../../../becca/becca_service.js"; | ||||||
|  |  | ||||||
| class NoteFlatTextExp extends Expression { | class NoteFlatTextExp extends Expression { | ||||||
|     private tokens: string[]; |     private tokens: string[]; | ||||||
| @@ -18,8 +19,6 @@ class NoteFlatTextExp extends Expression { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     execute(inputNoteSet: NoteSet, executionContext: any, searchContext: SearchContext) { |     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(); |         const resultNoteSet = new NoteSet(); | ||||||
|  |  | ||||||
|         /** |         /** | ||||||
|   | |||||||
| @@ -4,10 +4,6 @@ let shaca: Shaca; | |||||||
|  |  | ||||||
| class AbstractShacaEntity { | class AbstractShacaEntity { | ||||||
|     get shaca(): Shaca { |     get shaca(): Shaca { | ||||||
|         if (!shaca) { |  | ||||||
|             shaca = require('../shaca'); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         return shaca; |         return shaca; | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user