From 7e32ff6f9149502a51573c34cec21289db42363f Mon Sep 17 00:00:00 2001 From: "Felipe M." Date: Fri, 4 Apr 2025 18:45:21 +0200 Subject: [PATCH 1/3] fix: use fs.FS instead of embed.FS as argument --- template/engine.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template/engine.go b/template/engine.go index 53414d3..13bf561 100644 --- a/template/engine.go +++ b/template/engine.go @@ -2,9 +2,9 @@ package template import ( "bytes" - "embed" "fmt" "html/template" + "io/fs" ) // Engine is a template engine @@ -24,7 +24,7 @@ func (e *Engine) Render(name string, data any) ([]byte, error) { } // NewTemplateEngine creates a new template engine from the given templates -func NewEngine(templates embed.FS) (*Engine, error) { +func NewEngine(templates fs.FS) (*Engine, error) { tmpls, err := template.ParseFS(templates, "**/*.html") if err != nil { return nil, fmt.Errorf("failed to parse templates: %w", err) From 1823a432f86ed58460d44a831384150e9923c49e Mon Sep 17 00:00:00 2001 From: "Felipe M." Date: Fri, 4 Apr 2025 19:03:58 +0200 Subject: [PATCH 2/3] fix(templates): match html files in root folder too --- template/engine.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/engine.go b/template/engine.go index 13bf561..d672983 100644 --- a/template/engine.go +++ b/template/engine.go @@ -25,7 +25,7 @@ func (e *Engine) Render(name string, data any) ([]byte, error) { // NewTemplateEngine creates a new template engine from the given templates func NewEngine(templates fs.FS) (*Engine, error) { - tmpls, err := template.ParseFS(templates, "**/*.html") + tmpls, err := template.ParseFS(templates, "*.html", "**/*.html") if err != nil { return nil, fmt.Errorf("failed to parse templates: %w", err) } From c8b78dbb86d555934b4d25db33f2bd74286853da Mon Sep 17 00:00:00 2001 From: "Felipe M." Date: Fri, 4 Apr 2025 19:17:28 +0200 Subject: [PATCH 3/3] fix(templates): match *.html only --- template/engine.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/engine.go b/template/engine.go index d672983..2e1e3ac 100644 --- a/template/engine.go +++ b/template/engine.go @@ -25,7 +25,7 @@ func (e *Engine) Render(name string, data any) ([]byte, error) { // NewTemplateEngine creates a new template engine from the given templates func NewEngine(templates fs.FS) (*Engine, error) { - tmpls, err := template.ParseFS(templates, "*.html", "**/*.html") + tmpls, err := template.ParseFS(templates, "*.html") if err != nil { return nil, fmt.Errorf("failed to parse templates: %w", err) }