Merge remote-tracking branch 'origin/main' into lightweight/bootstrap_ejs

This commit is contained in:
Elian Doran
2026-01-11 12:20:17 +02:00
13 changed files with 632 additions and 220 deletions

View File

@@ -38,7 +38,6 @@
"@anthropic-ai/sdk": "0.71.2",
"@braintree/sanitize-url": "7.1.1",
"@electron/remote": "2.1.3",
"@preact/preset-vite": "2.10.2",
"@triliumnext/commons": "workspace:*",
"@triliumnext/express-partial-content": "workspace:*",
"@triliumnext/highlightjs": "workspace:*",

View File

@@ -34,10 +34,8 @@ async function register(app: express.Application) {
const vite = await createViteServer({
server: { middlewareMode: true },
appType: "spa",
cacheDir: path.join(srcRoot, "../../.cache/vite"),
base: `/${assetUrlFragment}/`,
root: clientDir,
css: { devSourcemap: true }
configFile: path.join(clientDir, "vite.config.mts"),
base: `/${assetUrlFragment}/`
});
app.use(`/${assetUrlFragment}/`, (req, res, next) => {
if (req.url.startsWith("/images/")) {