diff --git a/apps/server/package.json b/apps/server/package.json index a05626348..9530f7b11 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -252,6 +252,11 @@ "glob": "**/*", "input": "packages/share-theme/src/templates", "output": "share-theme/templates" + }, + { + "glob": "**/*", + "input": "packages/share-theme/dist", + "output": "share-theme/public" } ] } diff --git a/apps/server/src/assets/views/share/page.ejs b/apps/server/src/assets/views/share/page.ejs index 2fba4702b..ca57aa895 100644 --- a/apps/server/src/assets/views/share/page.ejs +++ b/apps/server/src/assets/views/share/page.ejs @@ -13,10 +13,7 @@ <% } %> - - <% if (!note.isLabelTruthy("shareOmitDefaultCss")) { %> - - <% } %> + <% for (const cssRelation of note.getRelations("shareCss")) { %> <% } %> diff --git a/apps/server/src/routes/assets.ts b/apps/server/src/routes/assets.ts index c11742132..c5795e7cf 100644 --- a/apps/server/src/routes/assets.ts +++ b/apps/server/src/routes/assets.ts @@ -48,6 +48,7 @@ async function register(app: express.Application) { app.use(`/assets/vX/stylesheets`, express.static(path.join(srcRoot, "public/stylesheets"))); app.use(`/${assetUrlFragment}/libraries`, persistentCacheStatic(path.join(srcRoot, "public/libraries"))); app.use(`/assets/vX/libraries`, express.static(path.join(srcRoot, "..", "libraries"))); + app.use(`/share/assets`, express.static(path.join(resourceDir, "share-theme", "public"))); } export default { diff --git a/packages/share-theme/src/templates/page.ejs b/packages/share-theme/src/templates/page.ejs index 1b528a4b3..db175740a 100644 --- a/packages/share-theme/src/templates/page.ejs +++ b/packages/share-theme/src/templates/page.ejs @@ -51,6 +51,9 @@ const customServerYml = `- url: "{protocol}://{domain}:{port}/etapi" <% if (note.type === "text" || note.type === "book") { %> <% } %> + <% if (!note.isLabelTruthy("shareOmitDefaultCss")) { %> + + <% } %> <% for (const cssRelation of note.getRelations("shareCss")) { %> <% } %>