mirror/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2026-01-06 12:59:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(nx/server): serve most assets for dist

Browse Source
This commit is contained in:
Elian Doran
2025-04-24 13:18:06 +03:00
parent 5911eaf6b2
commit 11955ae56e
2 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/server/src/routes/assets.ts
View File

@@ -18,6 +18,7 @@ const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOp
async function register(app: express.Application) {
const srcRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), "..");
const distDir = path.dirname(process.argv[1]);
if (isDev) {
const publicUrl = process.env.TRILIUM_PUBLIC_SERVER;
if (!publicUrl) {
@@ -36,10 +37,11 @@ async function register(app: express.Application) {
}));
app.use(`/${assetPath}/images`, persistentCacheStatic(path.join(srcRoot, "assets", "images")));
} 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}/stylesheets`, persistentCacheStatic(path.join(srcRoot, "public/stylesheets")));
app.use(`/${assetPath}/images`, persistentCacheStatic(path.join(srcRoot, "..", "images")));
const clientStaticCache = persistentCacheStatic(path.join(distDir, "public"));
app.use(`/${assetPath}/app`, clientStaticCache);
app.use(`/${assetPath}/app-dist`, clientStaticCache);
app.use(`/${assetPath}/stylesheets`, persistentCacheStatic(path.join(distDir, "public", "stylesheets")));
app.use(`/${assetPath}/images`, persistentCacheStatic(path.join(distDir, "public", "images")));
}
app.use(`/${assetPath}/fonts`, persistentCacheStatic(path.join(srcRoot, "public/fonts")));
app.use(`/assets/vX/fonts`, express.static(path.join(srcRoot, "public/fonts")));
@@ -48,7 +50,7 @@ async function register(app: express.Application) {
app.use(`/${assetPath}/libraries`, persistentCacheStatic(path.join(srcRoot, "public/libraries")));
app.use(`/assets/vX/libraries`, express.static(path.join(srcRoot, "..", "libraries")));
const nodeModulesDir = path.join(srcRoot, "..", "node_modules");
const nodeModulesDir = isDev ? path.join(srcRoot, "..", "node_modules") : path.join(distDir, "node_modules");
app.use(`/node_modules/@excalidraw/excalidraw/dist/fonts/`, express.static(path.join(nodeModulesDir, "@excalidraw/excalidraw/dist/prod/fonts/")));
app.use(`/${assetPath}/node_modules/@excalidraw/excalidraw/dist/fonts/`, persistentCacheStatic(path.join(nodeModulesDir, "@excalidraw/excalidraw/dist/prod/fonts/")));
@@ -71,8 +73,6 @@ async function register(app: express.Application) {
// i18n
app.use(`/${assetPath}/translations/`, persistentCacheStatic(path.join(srcRoot, "public", "translations/")));
app.use(`/${assetPath}/node_modules/eslint/bin/`, persistentCacheStatic(path.join(nodeModulesDir, "eslint/bin/")));
// Deprecated, https://www.npmjs.com/package/autocomplete.js?activeTab=readme
app.use(`/${assetPath}/node_modules/autocomplete.js/dist/`, persistentCacheStatic(path.join(nodeModulesDir, "autocomplete.js/dist/")));

47
apps/server/webpack.config.cjs
View File

@@ -1,9 +1,47 @@
const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
const CopyPlugin = require('copy-webpack-plugin');
const { join } = require('path');
const { join, default: path } = require('path');
const outputDir = join(__dirname, 'dist');
function buildFilesToCopy() {
const files = [{
from: "node_modules/better-sqlite3/build/Release",
to: join(outputDir, "Release")
}];
files.push({
from: "../client/dist",
to: join(outputDir, "public")
});
const nodePaths = [
"@excalidraw/excalidraw/dist/prod/fonts/",
"katex/dist",
"boxicons/css",
"boxicons/fonts",
"jquery/dist",
"jquery-hotkeys",
"autocomplete.js/dist",
"normalize.css",
"jquery.fancytree/dist",
"codemirror/lib",
"codemirror/addon",
"codemirror/mode",
"codemirror/keymap",
"@highlightjs/cdn-assets"
];
for (const nodePath of nodePaths) {
files.push({
from: join("node_modules", nodePath),
to: join(outputDir, "node_modules", nodePath)
})
}
return files;
}
module.exports = {
output: {
path: outputDir
@@ -20,12 +58,7 @@ module.exports = {
generatePackageJson: true,
}),
new CopyPlugin({
patterns: [
{
from: "node_modules/better-sqlite3/build/Release",
to: join(outputDir, "Release")
},
]
patterns: buildFilesToCopy()
})
]
};