MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/nginx-proxy-vite-deps' into 'develop' 

fix(nginx): proxy Vite dev server deps for HMR in multi-node setup NOCHANGELOG

See merge request funkwhale/funkwhale!2919
This commit is contained in:
Arne Bollinger 2025-05-30 19:56:21 +00:00
parent 6eddef1e1b 0d9c5e77c4
commit 719a9f7e4a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compose/etc/nginx/conf.dev
View File

@ -74,6 +74,11 @@ server {
proxy_pass http://funkwhale-api; proxy_pass http://funkwhale-api;
} }
location /node_modules/.vite/ {
include /etc/nginx/funkwhale_proxy.conf;
proxy_pass http://funkwhale-front;
}
location ~ ^/@(vite-plugin-pwa|vite|id)/ { location ~ ^/@(vite-plugin-pwa|vite|id)/ {
include /etc/nginx/funkwhale_proxy.conf; include /etc/nginx/funkwhale_proxy.conf;
proxy_pass http://funkwhale-front; proxy_pass http://funkwhale-front;

7
front/src/style/bootstrap-icons/font/bootstrap-icons.scss vendored
View File

@ -5,11 +5,10 @@
*/ */
$bootstrap-icons-font: "bootstrap-icons" !default; $bootstrap-icons-font: "bootstrap-icons" !default;
$bootstrap-icons-font-dir: "./fonts" !default; $bootstrap-icons-font-dir: "~/style/bootstrap-icons/font/fonts" !default;
$bootstrap-icons-font-file: "#{$bootstrap-icons-font-dir}/#{$bootstrap-icons-font}" !default; $bootstrap-icons-font-file: "#{$bootstrap-icons-font-dir}/#{$bootstrap-icons-font}" !default;
$bootstrap-icons-font-hash: "24e3eb84d0bcaf83d77f904c78ac1f47" !default; $bootstrap-icons-font-src: url("#{$bootstrap-icons-font-file}.woff2") format("woff2"),
$bootstrap-icons-font-src: url("#{$bootstrap-icons-font-file}.woff2?#{$bootstrap-icons-font-hash}") format("woff2"), url("#{$bootstrap-icons-font-file}.woff") format("woff") !default;
url("#{$bootstrap-icons-font-file}.woff?#{$bootstrap-icons-font-hash}") format("woff") !default;
@font-face { @font-face {
font-display: block; font-display: block;

2
front/src/style/font.scss
View File

@ -1,4 +1,4 @@
@import url("~/style/bootstrap-icons/font/bootstrap-icons.css"); @use "~/style/bootstrap-icons/font/bootstrap-icons.scss";
@font-face { @font-face {
font-family: Lato; font-family: Lato;