diff --git a/apps/server/src/share/routes.ts b/apps/server/src/share/routes.ts index f53d83980..7af761830 100644 --- a/apps/server/src/share/routes.ts +++ b/apps/server/src/share/routes.ts @@ -18,6 +18,7 @@ import utils, { isDev, safeExtractMessageAndStackFromError } from "../services/u import options from "../services/options.js"; import { t } from "i18next"; import shareThemeRoot from "@triliumnext/share-theme/templates/page.ejs"; +import shareThemeCss from "@triliumnext/share-theme/styles.css"; import ejs from "ejs"; function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } { @@ -212,7 +213,10 @@ function register(router: Router) { if (useDefaultView) { console.log("Got share theme path", shareThemeRoot); - const ejsResult = ejs.render(shareThemeRoot, opts, { + const ejsResult = ejs.render(shareThemeRoot, { + shareThemeCss, + ...opts + }, { includer(originalPath, parsedPath: string) { console.log("Path ", originalPath, parsedPath); throw new Error("Hi"); diff --git a/apps/server/src/types.d.ts b/apps/server/src/types.d.ts index c171ad747..c302e27d8 100644 --- a/apps/server/src/types.d.ts +++ b/apps/server/src/types.d.ts @@ -33,3 +33,8 @@ declare module "@triliumnext/share-theme/*.ejs" { const content: string; export default content; } + +declare module "@triliumnext/share-theme/styles.css" { + const content: string; + export default content; +} diff --git a/packages/share-theme/package.json b/packages/share-theme/package.json index 966871bd3..96b7a574b 100644 --- a/packages/share-theme/package.json +++ b/packages/share-theme/package.json @@ -13,7 +13,8 @@ "test": "esrun src/scripts/test.ts" }, "exports": { - "./*": "./src/*" + "./templates/*": "./src/templates/*", + "./*": "./dist/*" }, "author": "", "license": "ISC", diff --git a/packages/share-theme/src/templates/page.ejs b/packages/share-theme/src/templates/page.ejs index b37e07db7..8d556be8e 100644 --- a/packages/share-theme/src/templates/page.ejs +++ b/packages/share-theme/src/templates/page.ejs @@ -56,6 +56,9 @@ const customServerYml = `- url: "{protocol}://{domain}:{port}/etapi" <% if (note.hasLabel("shareDisallowRobotIndexing")) { %> <% } %> + <% const pageTitle = `${note.title}${note.noteId !== subRoot.note.noteId ? ` - ${subRoot.note.title}` : ""}`;