Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-10 07:15:51 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into feature/client_typescript_port1

Browse Source
This commit is contained in:
Elian Doran
2024-12-14 10:10:23 +02:00
parent 9e661ed684 5ea5bfdb59
commit c5d77df387
3 changed files with 285 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/routes/assets.ts
View File

@@ -4,6 +4,8 @@ import { fileURLToPath } from "url";
import express from "express";
import env from "../services/env.js";
import serveStatic from "serve-static";
import webpack from "webpack";
import webpackMiddleware from "webpack-dev-middleware";
const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOptions<express.Response<any, Record<string, any>>>) => {
if (!env.isDev()) {
@@ -17,7 +19,22 @@ const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOp
function register(app: express.Application) {
const srcRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
app.use(`/${assetPath}/app`, persistentCacheStatic(path.join(srcRoot, 'public/app')));
if (env.isDev()) {
const frontendCompiler = webpack({
mode: "development",
entry: {
setup: './src/public/app/setup.js',
mobile: './src/public/app/mobile.js',
desktop: './src/public/app/desktop.js',
},
devtool: 'source-map',
target: 'electron-renderer'
});
app.use(`/${assetPath}/app`, webpackMiddleware(frontendCompiler));
} else {
app.use(`/${assetPath}/app`, persistentCacheStatic(path.join(srcRoot, 'public/app')));
}
app.use(`/${assetPath}/app-dist`, persistentCacheStatic(path.join(srcRoot, 'public/app-dist')));
app.use(`/${assetPath}/fonts`, persistentCacheStatic(path.join(srcRoot, 'public/fonts')));
app.use(`/assets/vX/fonts`, express.static(path.join(srcRoot, 'public/fonts')));