From 62803a1817934a542b009091fddae68f73db44e8 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Mon, 5 Jan 2026 14:42:32 +0200 Subject: [PATCH] chore(server): set up dependency to trilium-core --- apps/server/package.json | 1 + apps/server/tsconfig.app.json | 3 +++ apps/server/tsconfig.json | 3 +++ packages/trilium-core/package.json | 2 +- pnpm-lock.yaml | 7 +++++-- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/apps/server/package.json b/apps/server/package.json index ecde429862..0f067c321e 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -40,6 +40,7 @@ "@electron/remote": "2.1.3", "@preact/preset-vite": "2.10.2", "@triliumnext/commons": "workspace:*", + "@triliumnext/core": "workspace:*", "@triliumnext/express-partial-content": "workspace:*", "@triliumnext/highlightjs": "workspace:*", "@triliumnext/turndown-plugin-gfm": "workspace:*", diff --git a/apps/server/tsconfig.app.json b/apps/server/tsconfig.app.json index 79dd0b7709..b416e1af91 100644 --- a/apps/server/tsconfig.app.json +++ b/apps/server/tsconfig.app.json @@ -46,6 +46,9 @@ }, { "path": "../../packages/commons/tsconfig.lib.json" + }, + { + "path": "../../packages/trilium-core/tsconfig.lib.json" } ] } diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json index 6bc2242953..ae11c06bcd 100644 --- a/apps/server/tsconfig.json +++ b/apps/server/tsconfig.json @@ -15,6 +15,9 @@ { "path": "../../packages/commons" }, + { + "path": "../../packages/trilium-core" + }, { "path": "./tsconfig.app.json" }, diff --git a/packages/trilium-core/package.json b/packages/trilium-core/package.json index c34bfce2a2..7e6df61d35 100644 --- a/packages/trilium-core/package.json +++ b/packages/trilium-core/package.json @@ -2,7 +2,7 @@ "name": "@triliumnext/core", "version": "1.0.0", "description": "", - "main": "index.js", + "main": "src/index.ts", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 31fc4bd627..fc5d57faf4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -525,6 +525,9 @@ importers: '@triliumnext/commons': specifier: workspace:* version: link:../../packages/commons + '@triliumnext/core': + specifier: workspace:* + version: link:../../packages/trilium-core '@triliumnext/express-partial-content': specifier: workspace:* version: link:../../packages/express-partial-content @@ -1441,6 +1444,8 @@ importers: specifier: 5.1.0 version: 5.1.0(karma@6.4.4(bufferutil@4.0.9)(utf-8-validate@6.0.5)) + packages/trilium-core: {} + packages/turndown-plugin-gfm: devDependencies: turndown: @@ -15428,8 +15433,6 @@ snapshots: '@ckeditor/ckeditor5-utils': 47.3.0 '@ckeditor/ckeditor5-watchdog': 47.3.0 es-toolkit: 1.39.5 - transitivePeerDependencies: - - supports-color '@ckeditor/ckeditor5-dev-build-tools@54.2.3(@swc/helpers@0.5.17)(tslib@2.8.1)(typescript@5.9.3)': dependencies: