From 86b74e0ebc2ff4d2adfb91f9c7508e535beb51b5 Mon Sep 17 00:00:00 2001 From: trev Date: Tue, 18 Mar 2025 17:41:29 -0400 Subject: [PATCH] fix: conditional client build --- server/.air.toml | 2 +- server/internal/handlers/client/client_prod.go | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/server/.air.toml b/server/.air.toml index 498951f..523e000 100644 --- a/server/.air.toml +++ b/server/.air.toml @@ -5,7 +5,7 @@ tmp_dir = "tmp" [build] args_bin = [] bin = "./tmp/main" - cmd = "go build -o ./tmp/main ." + cmd = "go build -tags dev -o ./tmp/main ." delay = 1000 exclude_dir = ["assets", "tmp", "vendor", "testdata"] exclude_file = [] diff --git a/server/internal/handlers/client/client_prod.go b/server/internal/handlers/client/client_prod.go index 60117c4..bd5e785 100644 --- a/server/internal/handlers/client/client_prod.go +++ b/server/internal/handlers/client/client_prod.go @@ -1,16 +1,24 @@ -// go:build !dev +//go:build !dev package client import ( "embed" + "io/fs" + "log" "net/http" ) -//go:embed client +//go:embed all:client var eclient embed.FS func init() { - fs := http.FS(eclient) + log.Println("Initializing client for production") + client, err := fs.Sub(eclient, "client") + if err != nil { + log.Fatalf("failed to get client: %v", err) + } + + fs := http.FS(client) embedfs = &fs }