replace funcs in page; use x/net fork

diff --git a/go.mod b/go.mod
index 4a7affafa2087b51c568135d487d719c339c0afd..b1c251b266588c710195fd406514072b500b4b03 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -5,3 +5,5 @@ go 1.22.4
 require golang.org/x/net v0.27.0
 
 require git.earlybird.gay/today-app v0.0.0-20240813010007-675f08ae35b1
+
+replace golang.org/x/net => git.earlybird.gay/x/net v0.28.1

diff --git a/go.sum b/go.sum
index e4e88d5dcb33d1cf12bcf9de95ac6e7544851463..1da235ddd2d2657dcafa3afd998d95f73f37e161 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,4 @@
 git.earlybird.gay/today-app v0.0.0-20240813010007-675f08ae35b1 h1:Fbz2uRIWK6CR+jcNN0KQrna4u/kYZccn2obcla7dPfQ=
 git.earlybird.gay/today-app v0.0.0-20240813010007-675f08ae35b1/go.mod h1:AxsoC2ERffYriW60C1vdV34ew6JPKxllG9mHOTs128I=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+git.earlybird.gay/x/net v0.28.1 h1:KgeNTRFt7fJfuJcwoyeNf3g/sLQfi/+647DHslFkrv4=
+git.earlybird.gay/x/net v0.28.1/go.mod h1:K1yf3vIKjz6W4AnxgoJ67k6p0Aa5x9BcCuE/GdiZ0FA=

diff --git a/internal/compile/compile.go b/internal/compile/compile.go
index 8d3279bb2a634903e15264bf819794c26c6980e4..e7001a25cabe21e5252fa9c911b7568ad2389d22 100644 (file)
--- a/internal/compile/compile.go
+++ b/internal/compile/compile.go
@@ -8,6 +8,7 @@ import (
        "regexp"
        "strings"
 
+       "git.earlybird.gay/today-engine/htmltree"
        "git.earlybird.gay/today-engine/include"
        "git.earlybird.gay/today-engine/render"
        "golang.org/x/net/html"
@@ -65,6 +66,13 @@ func Compile(root TemplateSource, transform ...func(root *html.Node)) (Result, e
                Data: "{{ $compute := .compute }}",
        }, document.FirstChild)
 
+       // Replace template functions in the root before we add any subsources
+       htmltree.Walk(document, func(n *html.Node) (bool, error) {
+               // Replace template functions with namespaced functions.
+               replaceTemplateFuncs(root, n)
+               return false, nil
+       })
+
        // Insert component sources into document
        for name, subSource := range fullDependencies {
                // Easiest way to tell right now is what isn't a template source,