Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 20:06:08 +01:00
Code Issues Packages Projects Releases Activity

fix(server): not running in prod due to webpack change

Browse Source
This commit is contained in:
Elian Doran
2024-12-19 18:16:46 +02:00
parent cb488eb333
commit 42a7556c55
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app.ts
View File

@@ -57,7 +57,7 @@ app.use(`/icon.png`, express.static(path.join(scriptDir, 'public/icon.png')));
app.use(sessionParser);
app.use(favicon(`${scriptDir}/../images/app-icons/icon.ico`));
assets.register(app);
await assets.register(app);
routes.register(app);
custom.register(app);
error_handlers.register(app);

7
src/routes/assets.ts
View File

@@ -4,8 +4,6 @@ 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,9 +15,12 @@ const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOp
return express.static(root, options);
};
function register(app: express.Application) {
async function register(app: express.Application) {
const srcRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
if (env.isDev()) {
const webpack = (await import("webpack")).default;
const webpackMiddleware = (await import("webpack-dev-middleware")).default;
const frontendCompiler = webpack({
mode: "development",
entry: {