diff --git a/apps/server/package.json b/apps/server/package.json index 235c08535..a05626348 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -240,19 +240,20 @@ ".ejs": "text" } }, - "declarationRootDir": "apps/server/src" - }, - "configurations": { - "development": { - "minify": false, + "declarationRootDir": "apps/server/src", + "minify": false, "assets": [ { "glob": "**/*", "input": "apps/server/src/assets", "output": "assets" + }, + { + "glob": "**/*", + "input": "packages/share-theme/src/templates", + "output": "share-theme/templates" } ] - } } }, "build": { diff --git a/apps/server/src/share/routes.ts b/apps/server/src/share/routes.ts index 453a4762a..12d7967f6 100644 --- a/apps/server/src/share/routes.ts +++ b/apps/server/src/share/routes.ts @@ -17,7 +17,6 @@ import type SAttachment from "./shaca/entities/sattachment.js"; import utils, { isDev, safeExtractMessageAndStackFromError } from "../services/utils.js"; import options from "../services/options.js"; import { t } from "i18next"; -import shareTheme from "@triliumnext/share-theme/templates.js"; import ejs from "ejs"; function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } { @@ -211,8 +210,9 @@ function register(router: Router) { } if (useDefaultView) { - const result = shareTheme(opts); - res.send(result); + // Path is relative to apps/server/dist/assets/views + const shareThemePath = "../../share-theme/templates/page.ejs"; + res.render(shareThemePath, opts); } } diff --git a/apps/server/tsconfig.app.json b/apps/server/tsconfig.app.json index c4b63cde8..eb7f102aa 100644 --- a/apps/server/tsconfig.app.json +++ b/apps/server/tsconfig.app.json @@ -37,9 +37,6 @@ { "path": "../../packages/ckeditor5/tsconfig.lib.json" }, - { - "path": "../../packages/share-theme" - }, { "path": "../../packages/turndown-plugin-gfm/tsconfig.lib.json" },