Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-31 13:01:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

#12: Fix asset path

Browse Source
This commit is contained in:
Elian Doran 2024-05-11 23:16:50 +03:00
parent a9e92e95b3
commit ab5c7d5636
No known key found for this signature in database
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/routes/assets.ts
View File

@ -3,6 +3,7 @@ import path = require("path");
import express = require("express"); import express = require("express");
import env = require('../services/env'); import env = require('../services/env');
import serveStatic = require('serve-static'); import serveStatic = require('serve-static');
import utils = require('../services/utils');
const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOptions<express.Response<any, Record<string, any>>>) => { const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOptions<express.Response<any, Record<string, any>>>) => {
if (!env.isDev()) { if (!env.isDev()) {
@ -15,7 +16,14 @@ const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOp
}; };
function register(app: express.Application) { function register(app: express.Application) {
const root = path.join(__dirname, '..', '..', '..'); let root: string;
if (!utils.isElectron()) {
root = path.join(__dirname, '..', '..', '..');
} else {
root = path.join(__dirname, '..', '..', '..', '..', '..');
}
console.log("Asset root path is", path.resolve(root));
const clientRoot = path.join(root, 'client'); const clientRoot = path.join(root, 'client');
const commonRoot = path.join(root, 'common'); const commonRoot = path.join(root, 'common');