From 6b07908cf7b6af6dde665968103a26e2e4645af5 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Thu, 4 Dec 2025 08:45:10 +0200
Subject: [PATCH] chore(server): fix some more dependencies to JSON

---
 apps/client/package.json         | 2 +-
 apps/server/spec/setup.ts        | 5 ++---
 apps/server/src/services/i18n.ts | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/client/package.json b/apps/client/package.json
index 9af6a8497..06dd7fb53 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -37,7 +37,7 @@
     "bootstrap": "5.3.8",
     "boxicons": "2.1.4",
     "clsx": "2.1.1",
-    "color": "5.0.3",    
+    "color": "5.0.3",
     "debounce": "3.0.0",
     "draggabilly": "3.0.0",
     "force-graph": "1.51.0",
diff --git a/apps/server/spec/setup.ts b/apps/server/spec/setup.ts
index 74e7ff746..4d002369c 100644
--- a/apps/server/spec/setup.ts
+++ b/apps/server/spec/setup.ts
@@ -1,7 +1,7 @@
 import { beforeAll } from "vitest";
 import i18next from "i18next";
 import { join } from "path";
-import dayjs from "dayjs";
+import { setDayjsLocale } from "@triliumnext/commons";
 
 // Initialize environment variables.
 process.env.TRILIUM_DATA_DIR = join(__dirname, "db");
@@ -25,6 +25,5 @@ beforeAll(async () => {
     });
 
     // Initialize dayjs
-    await import("dayjs/locale/en.js");
-    dayjs.locale("en");
+    await setDayjsLocale("en");
 });
diff --git a/apps/server/src/services/i18n.ts b/apps/server/src/services/i18n.ts
index 5da578c88..f77ec93ef 100644
--- a/apps/server/src/services/i18n.ts
+++ b/apps/server/src/services/i18n.ts
@@ -4,8 +4,7 @@ import sql_init from "./sql_init.js";
 import { join } from "path";
 import { getResourceDir } from "./utils.js";
 import hidden_subtree from "./hidden_subtree.js";
-import { LOCALES, setDayjsLocale, type Locale, type LOCALE_IDS } from "@triliumnext/commons";
-import dayjs, { Dayjs } from "dayjs";
+import { dayjs, LOCALES, setDayjsLocale, type Dayjs, type Locale, type LOCALE_IDS } from "@triliumnext/commons";
 
 export async function initializeTranslations() {
     const resourceDir = getResourceDir();