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

fix(monorepo/{client,server}): loading of fonts

Browse Source
This commit is contained in:
Elian Doran 2025-04-24 22:36:10 +03:00
parent 7935b250d0
commit be79eb41da
No known key found for this signature in database
10 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
apps/server/src/public/fonts/Inter/Inter-Italic-VariableFont_opsz,wght.ttf → apps/client/src/fonts/Inter/Inter-Italic-VariableFont_opsz,wght.ttf
View File

0
apps/server/src/public/fonts/Inter/Inter-VariableFont_opsz,wght.ttf → apps/client/src/fonts/Inter/Inter-VariableFont_opsz,wght.ttf
View File

0
apps/server/src/public/fonts/Inter/OFL.txt → apps/client/src/fonts/Inter/OFL.txt
View File

0
apps/server/src/public/fonts/Inter/README.txt → apps/client/src/fonts/Inter/README.txt
View File

0
apps/server/src/public/fonts/JetBrainsMono-Light.woff2 → apps/client/src/fonts/JetBrainsMono-Light.woff2
View File

0
apps/server/src/public/fonts/Montserrat-Light.ttf → apps/client/src/fonts/Montserrat-Light.ttf
View File

0
apps/server/src/public/fonts/Montserrat-SemiBold.ttf → apps/client/src/fonts/Montserrat-SemiBold.ttf
View File

2
apps/client/src/stylesheets/theme-next/base.css
View File

@ -7,7 +7,7 @@
@font-face {
font-family: "Inter";
src: url(../../fonts/Inter/Inter-VariableFont_opsz\,wght.ttf);
src: url(../../fonts/Inter/Inter-VariableFont_opsz,wght.ttf);
}
/*

1
apps/client/webpack.config.js
View File

@ -56,6 +56,7 @@ module.exports = {
"./src/assets",
"./src/stylesheets",
"./src/libraries",
"./src/fonts"
],
styles: [],
stylePreprocessorOptions: {

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

@ -36,6 +36,9 @@ async function register(app: express.Application) {
app.use(`/${assetPath}/libraries`, proxy(publicUrl, {
proxyReqPathResolver: (req) => "/libraries" + req.url
}));
app.use(`/${assetPath}/fonts`, proxy(publicUrl, {
proxyReqPathResolver: (req) => "/fonts" + req.url
}));
app.use(`/${assetPath}/images`, persistentCacheStatic(path.join(srcRoot, "assets", "images")));
} else {
const clientStaticCache = persistentCacheStatic(path.join(resourceDir, "public"));
@ -43,9 +46,9 @@ async function register(app: express.Application) {
app.use(`/${assetPath}/app-dist`, clientStaticCache);
app.use(`/${assetPath}/stylesheets`, persistentCacheStatic(path.join(resourceDir, "public", "stylesheets")));
app.use(`/${assetPath}/libraries`, persistentCacheStatic(path.join(resourceDir, "public", "libraries")));
app.use(`/${assetPath}/fonts`, persistentCacheStatic(path.join(resourceDir, "public", "fonts")));
app.use(`/${assetPath}/images`, persistentCacheStatic(path.join(resourceDir, "assets", "images")));
}
app.use(`/${assetPath}/fonts`, persistentCacheStatic(path.join(srcRoot, "public/fonts")));
app.use(`/assets/vX/fonts`, express.static(path.join(srcRoot, "public/fonts")));
app.use(`/assets/vX/images`, express.static(path.join(srcRoot, "..", "images")));
app.use(`/assets/vX/stylesheets`, express.static(path.join(srcRoot, "public/stylesheets")));