1 files changed, 10 insertions, 15 deletions

diff --git a/echo/template_renderer.go b/echo/template_renderer.go
index 0bafd92..7bfd006 100644
--- a/echo/template_renderer.go
+++ b/echo/template_renderer.go
@@ -3,8 +3,8 @@ package echo
 import (
         "html/template"
         "io"
+        "io/fs"
         "net/http"
-        "os"
         "path/filepath"
 
         "github.com/labstack/echo/v4"
@@ -15,16 +15,16 @@ type TemplateChecker interface {
 }
 
 type TemplateRenderer struct {
-        path  string
-        glob  string
-        funcs template.FuncMap
-        cache *template.Template
+        templates fs.FS
+        glob      string
+        funcs     template.FuncMap
+        cache     *template.Template
 }
 
-func NewTemplateRenderer(path, glob string, funcs template.FuncMap) (*TemplateRenderer, error) {
+func NewTemplateRenderer(templates fs.FS, glob string, funcs template.FuncMap) (*TemplateRenderer, error) {
         var err error
 
-        r := &TemplateRenderer{path: path, glob: glob, funcs: funcs}
+        r := &TemplateRenderer{templates: templates, glob: glob, funcs: funcs}
         r.cache, err = r.loadTemplates()
         if err != nil {
                 return nil, err
@@ -36,7 +36,7 @@ func NewTemplateRenderer(path, glob string, funcs template.FuncMap) (*TemplateRe
 func (r *TemplateRenderer) loadTemplates() (*template.Template, error) {
         t := template.New("").Funcs(r.funcs)
 
-        err := filepath.Walk(r.path, func(path string, info os.FileInfo, err error) error {
+        err := fs.WalkDir(r.templates, ".", func(path string, info fs.DirEntry, err error) error {
                 if err != nil {
                         return err
                 }
@@ -44,17 +44,12 @@ func (r *TemplateRenderer) loadTemplates() (*template.Template, error) {
                 if !info.IsDir() {
                         _, fn := filepath.Split(path)
                         if ok, _ := filepath.Match(r.glob, fn); ok {
-                                fc, err := os.ReadFile(path)
+                                fc, err := fs.ReadFile(r.templates, path)
                                 if err != nil {
                                         return err
                                 }
 
-                                rp, err := filepath.Rel(r.path, path)
-                                if err != nil {
-                                        return err
-                                }
-
-                                _, err = t.New(rp).Parse(string(fc))
+                                _, err = t.New(path).Parse(string(fc))
                                 if err != nil {
                                         return err
                                 }