diff --git a/beszel/go.mod b/beszel/go.mod index 5e443b9..5abdae4 100644 --- a/beszel/go.mod +++ b/beszel/go.mod @@ -9,7 +9,6 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/gliderlabs/ssh v0.3.7 github.com/goccy/go-json v0.10.3 - github.com/labstack/echo/v5 v5.0.0-20230722203903-ec5b858dab61 github.com/pocketbase/dbx v1.10.1 github.com/pocketbase/pocketbase v0.23.0 github.com/rhysd/go-github-selfupdate v1.2.3 diff --git a/beszel/go.sum b/beszel/go.sum index 3ffb513..53194c6 100644 --- a/beszel/go.sum +++ b/beszel/go.sum @@ -187,8 +187,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/labstack/echo/v5 v5.0.0-20230722203903-ec5b858dab61 h1:FwuzbVh87iLiUQj1+uQUsuw9x5t9m5n5g7rG7o4svW4= -github.com/labstack/echo/v5 v5.0.0-20230722203903-ec5b858dab61/go.mod h1:paQfF1YtHe+GrGg5fOgjsjoCX/UKDr9bc1DoWpZfns8= github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0= github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= diff --git a/beszel/internal/hub/hub.go b/beszel/internal/hub/hub.go index e6cae14..3e81745 100644 --- a/beszel/internal/hub/hub.go +++ b/beszel/internal/hub/hub.go @@ -102,13 +102,13 @@ func (h *Hub) Run() { }) default: csp, cspExists := os.LookupEnv("CSP") - se.Router.Any("/", func(e *core.RequestEvent) error { + se.Router.Any("/{path...}", func(e *core.RequestEvent) error { if cspExists { e.Response.Header().Del("X-Frame-Options") e.Response.Header().Set("Content-Security-Policy", csp) } indexFallback := !strings.HasPrefix(e.Request.URL.Path, "/static/") - return apis.Static(site.Dist, indexFallback)(e) + return apis.Static(site.DistDirFS, indexFallback)(e) }) } return se.Next() diff --git a/beszel/site/embed.go b/beszel/site/embed.go index b716d0c..95b4f64 100644 --- a/beszel/site/embed.go +++ b/beszel/site/embed.go @@ -3,11 +3,11 @@ package site import ( "embed" - - "github.com/labstack/echo/v5" + "io/fs" ) //go:embed all:dist -var assets embed.FS +var distDir embed.FS -var Dist = echo.MustSubFS(assets, "dist") +// DistDirFS contains the embedded dist directory files (without the "dist" prefix) +var DistDirFS, _ = fs.Sub(distDir, "dist")