From 7f2caa00cbcf5c5b77c03ebedb1a959ba8644997 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Tue, 23 Jul 2024 19:07:39 +0300
Subject: [PATCH 1/2] test: Remove commented-out code

---
 spec/search/search.spec.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/search/search.spec.ts b/spec/search/search.spec.ts
index ac9679971..a058ae895 100644
--- a/spec/search/search.spec.ts
+++ b/spec/search/search.spec.ts
@@ -4,7 +4,6 @@ import BBranch from "../../src/becca/entities/bbranch.js";
 import SearchContext from "../../src/services/search/search_context.js";
 import dateUtils from "../../src/services/date_utils.js";
 import becca from "../../src/becca/becca.js";
-// const { NoteBuilder, findNoteByTitle, note } = require('./becca_mocking');
 import becca_mocking from "./becca_mocking.js";
 
 describe('Search', () => {

From 3aa38b998aef7ab3d94ca9cf127c6c0630ba1985 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Tue, 23 Jul 2024 19:14:33 +0300
Subject: [PATCH 2/2] server: Address requested changes

---
 src/routes/api/image.ts      | 6 +++---
 src/services/export/zip.ts   | 4 ++--
 src/services/resource_dir.ts | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/routes/api/image.ts b/src/routes/api/image.ts
index 6e76326d3..890b4a88a 100644
--- a/src/routes/api/image.ts
+++ b/src/routes/api/image.ts
@@ -7,7 +7,7 @@ import { Request, Response } from 'express';
 import BNote from "../../becca/entities/bnote.js";
 import BRevision from "../../becca/entities/brevision.js";
 import { AppRequest } from '../route-interface';
-import resource_dir from "../../services/resource_dir.js";
+import { RESOURCE_DIR } from "../../services/resource_dir.js";
 
 function returnImageFromNote(req: Request, res: Response) {
     const image = becca.getNote(req.params.noteId);
@@ -24,7 +24,7 @@ function returnImageFromRevision(req: Request, res: Response) {
 function returnImageInt(image: BNote | BRevision | null, res: Response) {
     if (!image) {
         res.set('Content-Type', 'image/png');
-        return res.send(fs.readFileSync(`${resource_dir.RESOURCE_DIR}/db/image-deleted.png`));
+        return res.send(fs.readFileSync(`${RESOURCE_DIR}/db/image-deleted.png`));
     } else if (!["image", "canvas", "mermaid"].includes(image.type)) {
         return res.sendStatus(400);
     }
@@ -66,7 +66,7 @@ function returnAttachedImage(req: Request, res: Response) {
 
     if (!attachment) {
         res.set('Content-Type', 'image/png');
-        return res.send(fs.readFileSync(`${resource_dir.RESOURCE_DIR}/db/image-deleted.png`));
+        return res.send(fs.readFileSync(`${RESOURCE_DIR}/db/image-deleted.png`));
     }
 
     if (!["image"].includes(attachment.role)) {
diff --git a/src/services/export/zip.ts b/src/services/export/zip.ts
index 823029274..d198b0c92 100644
--- a/src/services/export/zip.ts
+++ b/src/services/export/zip.ts
@@ -20,7 +20,7 @@ import AttachmentMeta from "../meta/attachment_meta.js";
 import AttributeMeta from "../meta/attribute_meta.js";
 import BBranch from "../../becca/entities/bbranch.js";
 import { Response } from 'express';
-import resource_dir from "../resource_dir.js";
+import { RESOURCE_DIR } from "../resource_dir.js";
 
 async function exportToZip(taskContext: TaskContext, branch: BBranch, format: "html" | "markdown", res: Response | fs.WriteStream, setHeaders = true) {
     if (!['html', 'markdown'].includes(format)) {
@@ -473,7 +473,7 @@ ${markdownContent}`;
     }
 
     function saveCss(rootMeta: NoteMeta, cssMeta: NoteMeta) {
-        const cssContent = fs.readFileSync(`${resource_dir.RESOURCE_DIR}/libraries/ckeditor/ckeditor-content.css`);
+        const cssContent = fs.readFileSync(`${RESOURCE_DIR}/libraries/ckeditor/ckeditor-content.css`);
 
         archive.append(cssContent, { name: cssMeta.dataFileName });
     }
diff --git a/src/services/resource_dir.ts b/src/services/resource_dir.ts
index 14f286fd7..7e194dc67 100644
--- a/src/services/resource_dir.ts
+++ b/src/services/resource_dir.ts
@@ -2,7 +2,7 @@ import log from "./log.js";
 import path from "path";
 import fs from "fs";
 
-const RESOURCE_DIR = path.resolve(__dirname, "../..");
+export const RESOURCE_DIR = path.resolve(__dirname, "../..");
 
 // where the "trilium" executable is
 const ELECTRON_APP_ROOT_DIR = path.resolve(RESOURCE_DIR, "../..");