diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7fd7c0641..56722a4a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,11 +12,11 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v25 + - uses: DeterminateSystems/nix-installer-action@v16 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} - - uses: DeterminateSystems/magic-nix-cache-action@v3 + - uses: DeterminateSystems/magic-nix-cache-action@v8 - name: Test run: nix develop --command xc test-cover @@ -42,11 +42,11 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v25 + - uses: DeterminateSystems/nix-installer-action@v16 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} - - uses: DeterminateSystems/magic-nix-cache-action@v3 + - uses: DeterminateSystems/magic-nix-cache-action@v8 - name: Lint run: nix develop --command xc lint @@ -56,11 +56,11 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v25 + - uses: DeterminateSystems/nix-installer-action@v16 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} - - uses: DeterminateSystems/magic-nix-cache-action@v3 + - uses: DeterminateSystems/magic-nix-cache-action@v8 - name: Generate run: nix develop --command xc ensure-generated @@ -70,11 +70,11 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v25 + - uses: DeterminateSystems/nix-installer-action@v16 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} - - uses: DeterminateSystems/magic-nix-cache-action@v3 + - uses: DeterminateSystems/magic-nix-cache-action@v8 - name: Fmt run: nix develop --command xc fmt diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index c8a3ccd45..2dff2bce6 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -29,7 +29,7 @@ jobs: fetch-depth: 0 - name: Setup Pages id: pages - uses: actions/configure-pages@v4 + uses: actions/configure-pages@v5 - uses: actions/setup-node@v4 with: node-version: '20' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d9fc1f2c9..c19a3ab06 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,8 +21,8 @@ jobs: with: go-version: 1.22 cache: true - - uses: ko-build/setup-ko@v0.6 - - uses: sigstore/cosign-installer@v3.3.0 + - uses: ko-build/setup-ko@v0.7 + - uses: sigstore/cosign-installer@v3.7.0 with: cosign-release: v2.2.3 - uses: goreleaser/goreleaser-action@v5 diff --git a/.version b/.version index a27b075aa..5015e0f4e 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -0.2.810 \ No newline at end of file +0.3.812 \ No newline at end of file diff --git a/README.md b/README.md index c477b7c3a..60482fd5b 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,6 @@ cd cmd/templ go build ``` -### nix-update-gomod2nix - -```sh -gomod2nix -``` - ### install-snapshot Build and install current version. diff --git a/cmd/templ/generatecmd/run/testprogram/go.mod.embed b/cmd/templ/generatecmd/run/testprogram/go.mod.embed index 719ef94b8..157fcea6e 100644 --- a/cmd/templ/generatecmd/run/testprogram/go.mod.embed +++ b/cmd/templ/generatecmd/run/testprogram/go.mod.embed @@ -1,3 +1,3 @@ module testprogram -go 1.22.6 +go 1.23 diff --git a/cmd/templ/generatecmd/testwatch/testdata/go.mod.embed b/cmd/templ/generatecmd/testwatch/testdata/go.mod.embed index eebb7ae9e..bff49743a 100644 --- a/cmd/templ/generatecmd/testwatch/testdata/go.mod.embed +++ b/cmd/templ/generatecmd/testwatch/testdata/go.mod.embed @@ -1,6 +1,6 @@ module templ/testproject -go 1.21 +go 1.23 require github.com/a-h/templ v0.2.513 // indirect diff --git a/cmd/templ/lspcmd/lsp_test.go b/cmd/templ/lspcmd/lsp_test.go index 2f3ef995d..b663f9d8b 100644 --- a/cmd/templ/lspcmd/lsp_test.go +++ b/cmd/templ/lspcmd/lsp_test.go @@ -216,7 +216,7 @@ func TestHover(t *testing.T) { expectedHover := protocol.Hover{ Contents: protocol.MarkupContent{ Kind: "markdown", - Value: "```go\npackage fmt\n```\n\n[`fmt` on pkg.go.dev](https://pkg.go.dev/fmt)", + Value: "```go\npackage fmt\n```\n\n---\n\n[`fmt` on pkg.go.dev](https://pkg.go.dev/fmt)", }, } if diff := lspdiff.Hover(expectedHover, *actual); diff != "" { @@ -233,9 +233,12 @@ func TestHover(t *testing.T) { expectedHover := protocol.Hover{ Contents: protocol.MarkupContent{ Kind: "markdown", - Value: "```go\nfunc fmt.Sprintf(format string, a ...any) string\n```\n\nSprintf formats according to a format specifier and returns the resulting string.\n\n\n[`fmt.Sprintf` on pkg.go.dev](https://pkg.go.dev/fmt#Sprintf)", + Value: "```go\nfunc fmt.Sprintf(format string, a ...any) string\n```\n\n---\n\nSprintf formats according to a format specifier and returns the resulting string.\n\n\n---\n\n[`fmt.Sprintf` on pkg.go.dev](https://pkg.go.dev/fmt#Sprintf)", }, } + if actual == nil { + return "expected hover to be non-nil", false + } if diff := lspdiff.Hover(expectedHover, *actual); diff != "" { return fmt.Sprintf("unexpected hover: %v", diff), false } diff --git a/cmd/templ/lspcmd/main.go b/cmd/templ/lspcmd/main.go index a887dd208..0efec626d 100644 --- a/cmd/templ/lspcmd/main.go +++ b/cmd/templ/lspcmd/main.go @@ -95,7 +95,7 @@ func run(ctx context.Context, log *zap.Logger, templStream jsonrpc2.Stream, args log.Info("creating gopls client") clientProxy, clientInit := proxy.NewClient(log, cache, diagnosticCache) - _, goplsConn, goplsServer := protocol.NewClient(context.Background(), clientProxy, jsonrpc2.NewStream(rwc), log) + _, goplsConn, goplsServer := protocol.NewClient(ctx, clientProxy, jsonrpc2.NewStream(rwc), log) defer goplsConn.Close() log.Info("creating proxy") diff --git a/cmd/templ/lspcmd/proxy/server.go b/cmd/templ/lspcmd/proxy/server.go index d7a1d36bf..d485c7d24 100644 --- a/cmd/templ/lspcmd/proxy/server.go +++ b/cmd/templ/lspcmd/proxy/server.go @@ -249,7 +249,6 @@ func (p *Server) Initialize(ctx context.Context, params *lsp.InitializeParams) ( isTemplFile, goURI := convertTemplToGoURI(uri) if !isTemplFile { - p.Log.Info("not a templ file", zap.String("uri", string(uri))) return nil } diff --git a/cmd/templ/testproject/testdata/go.mod.embed b/cmd/templ/testproject/testdata/go.mod.embed index eebb7ae9e..bff49743a 100644 --- a/cmd/templ/testproject/testdata/go.mod.embed +++ b/cmd/templ/testproject/testdata/go.mod.embed @@ -1,6 +1,6 @@ module templ/testproject -go 1.21 +go 1.23 require github.com/a-h/templ v0.2.513 // indirect diff --git a/examples/counter-basic/go.mod b/examples/counter-basic/go.mod index da715fd77..6d20a60a8 100644 --- a/examples/counter-basic/go.mod +++ b/examples/counter-basic/go.mod @@ -1,8 +1,8 @@ module github.com/a-h/templ/examples/counter-basic -go 1.21 +go 1.23 -toolchain go1.21.5 +toolchain go1.23.3 require github.com/a-h/templ v0.2.233 diff --git a/examples/counter/go.mod b/examples/counter/go.mod index a371da342..30bc1dbb0 100644 --- a/examples/counter/go.mod +++ b/examples/counter/go.mod @@ -1,8 +1,8 @@ module github.com/a-h/templ/examples/counter -go 1.21 +go 1.23 -toolchain go1.21.5 +toolchain go1.23.3 require ( github.com/a-h/templ v0.2.234-0.20230427112944-80f0dc03a8a8 @@ -45,8 +45,8 @@ require ( github.com/yuin/goldmark v1.7.4 // indirect golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect golang.org/x/mod v0.20.0 // indirect - golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.23.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.28.0 // indirect golang.org/x/tools v0.24.0 // indirect ) diff --git a/examples/counter/go.sum b/examples/counter/go.sum index 3e574d8f4..fa17dff6d 100644 --- a/examples/counter/go.sum +++ b/examples/counter/go.sum @@ -89,14 +89,14 @@ golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= diff --git a/examples/external-libraries/go.mod b/examples/external-libraries/go.mod index 015ad442e..60e60f6fa 100644 --- a/examples/external-libraries/go.mod +++ b/examples/external-libraries/go.mod @@ -1,8 +1,8 @@ module github.com/a-h/templ/examples/external-libraries -go 1.21 +go 1.23 -toolchain go1.21.5 +toolchain go1.23.3 require github.com/a-h/templ v0.2.304 diff --git a/examples/integration-chi/go.mod b/examples/integration-chi/go.mod index 46085e5f5..d570381a9 100644 --- a/examples/integration-chi/go.mod +++ b/examples/integration-chi/go.mod @@ -1,10 +1,12 @@ module github.com/a-h/templ/examples/integration-chi -go 1.21.1 +go 1.23 + +toolchain go1.23.3 require ( github.com/a-h/templ v0.2.364 - github.com/go-chi/chi/v5 v5.1.0 + github.com/go-chi/chi/v5 v5.2.0 ) replace github.com/a-h/templ => ../../ diff --git a/examples/integration-chi/go.sum b/examples/integration-chi/go.sum index 8f1a88d5a..15d0babd1 100644 --- a/examples/integration-chi/go.sum +++ b/examples/integration-chi/go.sum @@ -1,4 +1,4 @@ -github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw= -github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/go-chi/chi/v5 v5.2.0 h1:Aj1EtB0qR2Rdo2dG4O94RIU35w2lvQSj6BRA4+qwFL0= +github.com/go-chi/chi/v5 v5.2.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= diff --git a/examples/integration-gin/go.mod b/examples/integration-gin/go.mod index c51bbf1f5..864e5c64d 100644 --- a/examples/integration-gin/go.mod +++ b/examples/integration-gin/go.mod @@ -1,38 +1,51 @@ module github.com/a-h/templ/examples/integration-gin -go 1.21.1 +go 1.23 + +toolchain go1.23.3 require ( github.com/a-h/templ v0.2.663 - github.com/gin-gonic/gin v1.10.0 + github.com/gin-gonic/gin v1.10.1-0.20241230033924-23d6961aeb9d ) require ( - github.com/bytedance/sonic v1.11.9 // indirect - github.com/bytedance/sonic/loader v0.1.1 // indirect + github.com/bytedance/sonic v1.12.6 // indirect + github.com/bytedance/sonic/loader v0.2.1 // indirect github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.4 // indirect - github.com/gin-contrib/sse v0.1.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.7 // indirect + github.com/gin-contrib/sse v1.0.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.22.0 // indirect - github.com/goccy/go-json v0.10.3 // indirect + github.com/go-playground/validator/v10 v10.23.0 // indirect + github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect + github.com/goccy/go-json v0.10.4 // indirect + github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.2.8 // indirect + github.com/klauspost/cpuid/v2 v2.2.9 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/onsi/ginkgo/v2 v2.22.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.3 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.48.2 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect - golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.24.0 // indirect - golang.org/x/net v0.26.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/text v0.16.0 // indirect - google.golang.org/protobuf v1.34.2 // indirect + go.uber.org/mock v0.5.0 // indirect + golang.org/x/arch v0.12.0 // indirect + golang.org/x/crypto v0.31.0 // indirect + golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect + golang.org/x/mod v0.22.0 // indirect + golang.org/x/net v0.33.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + golang.org/x/tools v0.28.0 // indirect + google.golang.org/protobuf v1.36.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/examples/integration-gin/go.sum b/examples/integration-gin/go.sum index aab20068c..2b0d1c4de 100644 --- a/examples/integration-gin/go.sum +++ b/examples/integration-gin/go.sum @@ -1,7 +1,11 @@ github.com/bytedance/sonic v1.11.9 h1:LFHENlIY/SLzDWverzdOvgMztTxcfcF+cqNsz9pK5zg= github.com/bytedance/sonic v1.11.9/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= +github.com/bytedance/sonic v1.12.6 h1:/isNmCUF2x3Sh8RAp/4mh4ZGkcFAX/hLrzrK3AvpRzk= +github.com/bytedance/sonic v1.12.6/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iCjjJv3+E= +github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= @@ -11,10 +15,16 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gabriel-vasile/mimetype v1.4.4 h1:QjV6pZ7/XZ7ryI2KuyeEDE8wnh7fHP9YnQy+R0LnH8I= github.com/gabriel-vasile/mimetype v1.4.4/go.mod h1:JwLei5XPtWdGiMFB5Pjle1oEeoSeEuJfJE+TtfvdB/s= +github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA= +github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E= +github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0= github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/gin-gonic/gin v1.10.1-0.20241230033924-23d6961aeb9d h1:3+s8/96EWhqfcjxziXIe21i1IiVyclOZddVVSUCcgVI= +github.com/gin-gonic/gin v1.10.1-0.20241230033924-23d6961aeb9d/go.mod h1:n9YAH8YJcBQ0JmhP43dOtzM7D/2lv0joQZ+lgI67Bdw= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -23,16 +33,28 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao= github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o= +github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= +github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= +github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= @@ -43,15 +65,24 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU= +github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= +github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= +github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= +github.com/quic-go/quic-go v0.48.2 h1:wsKXZPeGWpMpCGSWqOcqpW2wZYic/8T3aqiOID0/KWE= +github.com/quic-go/quic-go v0.48.2/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -59,25 +90,49 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= +go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/arch v0.12.0 h1:UsYJhbzPYGsT0HbEdmYcqtCv8UNGvnaL561NnIUvaKg= +golang.org/x/arch v0.12.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo= +golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= +golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= +google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/examples/integration-go-echarts/go.mod b/examples/integration-go-echarts/go.mod index b6ffd9f15..f79c6f3cb 100644 --- a/examples/integration-go-echarts/go.mod +++ b/examples/integration-go-echarts/go.mod @@ -1,8 +1,8 @@ module github.com/a-h/templ/examples/integration-go-echarts -go 1.21 +go 1.23 -toolchain go1.21.5 +toolchain go1.23.3 require ( github.com/a-h/templ v0.2.529 diff --git a/examples/integration-gofiber/go.mod b/examples/integration-gofiber/go.mod index dd5718406..af59fd2f4 100644 --- a/examples/integration-gofiber/go.mod +++ b/examples/integration-gofiber/go.mod @@ -1,6 +1,8 @@ module github.com/a-h/templ/examples/integration-gofiber -go 1.21 +go 1.23 + +toolchain go1.23.3 require ( github.com/a-h/templ v0.2.747 @@ -18,7 +20,7 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.55.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect - golang.org/x/sys v0.21.0 // indirect + golang.org/x/sys v0.28.0 // indirect ) replace github.com/a-h/templ => ../../ diff --git a/examples/integration-gofiber/go.sum b/examples/integration-gofiber/go.sum index c6694a52f..c64a94a4e 100644 --- a/examples/integration-gofiber/go.sum +++ b/examples/integration-gofiber/go.sum @@ -26,5 +26,5 @@ github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVS github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= diff --git a/examples/integration-react/go.mod b/examples/integration-react/go.mod index 5489bada4..37941a778 100644 --- a/examples/integration-react/go.mod +++ b/examples/integration-react/go.mod @@ -1,6 +1,8 @@ module github.com/a-h/templ/examples/integration-react -go 1.21 +go 1.23 + +toolchain go1.23.3 require github.com/a-h/templ v0.2.513 diff --git a/examples/internationalization/go.mod b/examples/internationalization/go.mod index 60c9d97eb..9ea71373e 100644 --- a/examples/internationalization/go.mod +++ b/examples/internationalization/go.mod @@ -1,6 +1,8 @@ module github.com/a-h/templ/examples/internationalization -go 1.21.5 +go 1.23 + +toolchain go1.23.3 require ( github.com/a-h/templ v0.2.731 diff --git a/examples/static-generator/go.mod b/examples/static-generator/go.mod index d74d03ef1..4bf1f0965 100644 --- a/examples/static-generator/go.mod +++ b/examples/static-generator/go.mod @@ -1,8 +1,8 @@ module github.com/a-h/templ/examples/static-generator -go 1.21 +go 1.23 -toolchain go1.21.5 +toolchain go1.23.3 require ( github.com/a-h/templ v0.2.233 diff --git a/examples/streaming/go.mod b/examples/streaming/go.mod index 1ecbbcc7e..2df7ccf83 100644 --- a/examples/streaming/go.mod +++ b/examples/streaming/go.mod @@ -1,6 +1,8 @@ module githbu.com/a-h/templ/examples/streaming -go 1.21.5 +go 1.23 + +toolchain go1.23.3 replace github.com/a-h/templ => ../../ diff --git a/examples/suspense/go.mod b/examples/suspense/go.mod index 92bf26420..163331900 100644 --- a/examples/suspense/go.mod +++ b/examples/suspense/go.mod @@ -1,6 +1,8 @@ module githbu.com/a-h/templ/examples/suspense -go 1.21.5 +go 1.23 + +toolchain go1.23.3 replace github.com/a-h/templ => ../../ diff --git a/examples/typescript/go.mod b/examples/typescript/go.mod index 1176ace4b..4ff6ca6fe 100644 --- a/examples/typescript/go.mod +++ b/examples/typescript/go.mod @@ -1,6 +1,8 @@ module github.com/a-h/templ/examples/typescript -go 1.21.5 +go 1.23 + +toolchain go1.23.3 replace github.com/a-h/templ => ../../ diff --git a/flake.lock b/flake.lock index 5c609f0a0..c94b891f9 100644 --- a/flake.lock +++ b/flake.lock @@ -1,24 +1,6 @@ { "nodes": { "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -53,39 +35,34 @@ "type": "github" } }, - "gomod2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, + "nixpkgs": { "locked": { - "lastModified": 1722589758, - "narHash": "sha256-sbbA8b6Q2vB/t/r1znHawoXLysCyD4L/6n6/RykiSnA=", - "owner": "nix-community", - "repo": "gomod2nix", - "rev": "4e08ca09253ef996bd4c03afa383b23e35fe28a1", + "lastModified": 1735412871, + "narHash": "sha256-Qoz0ow6jDGUIBHxduc7Y1cjYFS71tvEGJV5Src/mj98=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9f94733f93e4fe6e82f516efae007096e4ab5a21", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "gomod2nix", + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", "type": "github" } }, - "nixpkgs": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1732053737, - "narHash": "sha256-A+F7WSHR29wIynmzbXMwgUb9rkNAeYwlN15Xm3vZjKk=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32754128c4ef529c567d216a783cb6fdd95ff196", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -93,29 +70,14 @@ "root": { "inputs": { "gitignore": "gitignore", - "gomod2nix": "gomod2nix", "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", "xc": "xc" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "xc": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 4a1a75814..179597664 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,8 @@ description = "templ"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; - gomod2nix = { - url = "github:nix-community/gomod2nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; gitignore = { url = "github:hercules-ci/gitignore.nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -17,7 +14,7 @@ }; }; - outputs = { self, nixpkgs, gomod2nix, gitignore, xc }: + outputs = { self, nixpkgs, nixpkgs-unstable, gitignore, xc }: let allSystems = [ "x86_64-linux" # 64-bit Intel/AMD Linux @@ -28,24 +25,19 @@ forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f { inherit system; pkgs = import nixpkgs { inherit system; }; + pkgs-unstable = import nixpkgs-unstable { inherit system; }; }); in { packages = forAllSystems ({ system, pkgs, ... }: - let - buildGoApplication = gomod2nix.legacyPackages.${system}.buildGoApplication; - in rec { default = templ; - templ = buildGoApplication { + templ = pkgs.buildGo123Module { name = "templ"; - src = gitignore.lib.gitignoreSource ./.; - # Update to latest Go version when https://nixpk.gs/pr-tracker.html?pr=324123 is backported to release-24.05. - go = pkgs.go; - # Must be added due to bug https://github.com/nix-community/gomod2nix/issues/120 - pwd = ./.; subPackages = [ "cmd/templ" ]; + src = gitignore.lib.gitignoreSource ./.; + vendorHash = "sha256-ipLn52MsgX7KQOJixYcwMR9TCeHz55kQQ7fgkIgnu7w="; CGO_ENABLED = 0; flags = [ "-trimpath" @@ -59,19 +51,18 @@ }); # `nix develop` provides a shell containing development tools. - devShell = forAllSystems ({ system, pkgs }: + devShell = forAllSystems ({ system, pkgs, pkgs-unstable, ... }: pkgs.mkShell { - buildInputs = with pkgs; [ - golangci-lint - cosign # Used to sign container images. - esbuild # Used to package JS examples. - go_1_22 - gomod2nix.legacyPackages.${system}.gomod2nix - gopls - goreleaser - gotestsum - ko # Used to build Docker images. - nodejs # Used to build templ-docs. + buildInputs = [ + pkgs.golangci-lint + pkgs.cosign # Used to sign container images. + pkgs.esbuild # Used to package JS examples. + pkgs.go + pkgs-unstable.gopls + pkgs.goreleaser + pkgs.gotestsum + pkgs.ko # Used to build Docker images. + pkgs.nodejs # Used to build templ-docs. xc.packages.${system}.xc ]; }); diff --git a/go.mod b/go.mod index 689be5bfc..3aca6ae21 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,11 @@ module github.com/a-h/templ -go 1.21 +go 1.23 + +toolchain go1.23.3 require ( - github.com/PuerkitoBio/goquery v1.8.1 + github.com/PuerkitoBio/goquery v1.10.1 github.com/a-h/htmlformat v0.0.0-20231108124658-5bd994fe268e github.com/a-h/parse v0.0.0-20240121214402-3caf7543159a github.com/a-h/protocol v0.0.0-20240704131721-1e461c188041 @@ -19,12 +21,12 @@ require ( go.lsp.dev/uri v0.3.0 go.uber.org/zap v1.27.0 golang.org/x/mod v0.20.0 - golang.org/x/sync v0.8.0 + golang.org/x/sync v0.10.0 golang.org/x/tools v0.24.0 ) require ( - github.com/andybalholm/cascadia v1.3.1 // indirect + github.com/andybalholm/cascadia v1.3.3 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/segmentio/asm v1.2.0 // indirect @@ -32,8 +34,8 @@ require ( github.com/stretchr/testify v1.8.4 // indirect go.lsp.dev/pkg v0.0.0-20210717090340-384b27a52fb2 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.28.0 // indirect - golang.org/x/sys v0.23.0 // indirect + golang.org/x/net v0.33.0 // indirect + golang.org/x/sys v0.28.0 // indirect ) // replace github.com/a-h/parse => /Users/adrian/github.com/a-h/parse diff --git a/go.sum b/go.sum index dbd0bce0e..39b4fb2a3 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM= -github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ= +github.com/PuerkitoBio/goquery v1.10.1 h1:Y8JGYUkXWTGRB6Ars3+j3kN0xg1YqqlwvdTV8WTFQcU= +github.com/PuerkitoBio/goquery v1.10.1/go.mod h1:IYiHrOMps66ag56LEH7QYDDupKXyo5A8qrjIx3ZtujY= github.com/a-h/htmlformat v0.0.0-20231108124658-5bd994fe268e h1:Eog54DQpku7NpPNff9wzQYT61TGu9jjq5N8UhAkqIgw= github.com/a-h/htmlformat v0.0.0-20231108124658-5bd994fe268e/go.mod h1:FMIm5afKmEfarNbIXOaPHFY8X7fo+fRQB6I9MPG2nB0= github.com/a-h/parse v0.0.0-20240121214402-3caf7543159a h1:vlmAfVwFK9sRpDlJyuHY8htP+KfGHB2VH02u0SoIufk= @@ -8,8 +8,8 @@ github.com/a-h/protocol v0.0.0-20240704131721-1e461c188041 h1:2enlC41iOwWklx9ZUq github.com/a-h/protocol v0.0.0-20240704131721-1e461c188041/go.mod h1:Gm0KywveHnkiIhqFSMZglXwWZRQICg3KDWLYdglv/d8= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= -github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= -github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= +github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM= +github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cli/browser v1.3.0 h1:LejqCrpWr+1pRqmEPDGnTZOjsMe7sehifLynZJuqJpo= @@ -55,42 +55,73 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/gomod2nix.toml b/gomod2nix.toml deleted file mode 100644 index 8fbaa3a59..000000000 --- a/gomod2nix.toml +++ /dev/null @@ -1,87 +0,0 @@ -schema = 3 - -[mod] - [mod."github.com/PuerkitoBio/goquery"] - version = "v1.8.1" - hash = "sha256-z2RaB8PVPEzSJdMUfkfNjT616yXWTjW2gkhNOh989ZU=" - [mod."github.com/a-h/htmlformat"] - version = "v0.0.0-20231108124658-5bd994fe268e" - hash = "sha256-YSl9GsXhc0L2oKGZLwwjUtpe5W6ra6kk74zvQdsDCMU=" - [mod."github.com/a-h/parse"] - version = "v0.0.0-20240121214402-3caf7543159a" - hash = "sha256-ee/g6xwwhtF7vVt3griUSh96Kz4z0hM5/tpXxHW6PZk=" - [mod."github.com/a-h/protocol"] - version = "v0.0.0-20240704131721-1e461c188041" - hash = "sha256-KSw8m+kVIubEi+nuS3dMdBw2ZZTlmcKD/hGbVRFaE5Q=" - [mod."github.com/andybalholm/brotli"] - version = "v1.1.0" - hash = "sha256-njLViV4v++ZdgOWGWzlvkefuFvA/nkugl3Ta/h1nu/0=" - [mod."github.com/andybalholm/cascadia"] - version = "v1.3.1" - hash = "sha256-M0u22DXSeXUaYtl1KoW1qWL46niFpycFkraCEQ/luYA=" - [mod."github.com/cenkalti/backoff/v4"] - version = "v4.3.0" - hash = "sha256-wfVjNZsGG1WoNC5aL+kdcy6QXPgZo4THAevZ1787md8=" - [mod."github.com/cli/browser"] - version = "v1.3.0" - hash = "sha256-06hcvQeOEm31clxkTuZ8ts8ZtdNKY575EsM1osRVpLg=" - [mod."github.com/fatih/color"] - version = "v1.16.0" - hash = "sha256-Aq/SM28aPJVzvapllQ64R/DM4aZ5CHPewcm/AUJPyJQ=" - [mod."github.com/fsnotify/fsnotify"] - version = "v1.7.0" - hash = "sha256-MdT2rQyQHspPJcx6n9ozkLbsktIOJutOqDuKpNAtoZY=" - [mod."github.com/google/go-cmp"] - version = "v0.6.0" - hash = "sha256-qgra5jze4iPGP0JSTVeY5qV5AvEnEu39LYAuUCIkMtg=" - [mod."github.com/mattn/go-colorable"] - version = "v0.1.13" - hash = "sha256-qb3Qbo0CELGRIzvw7NVM1g/aayaz4Tguppk9MD2/OI8=" - [mod."github.com/mattn/go-isatty"] - version = "v0.0.20" - hash = "sha256-qhw9hWtU5wnyFyuMbKx+7RB8ckQaFQ8D+8GKPkN3HHQ=" - [mod."github.com/natefinch/atomic"] - version = "v1.0.1" - hash = "sha256-fbOVHCwRNI8PFjC4o0YXpKZO0JU2aWTfH5c7WXXKMHg=" - [mod."github.com/rs/cors"] - version = "v1.11.0" - hash = "sha256-hF25bVehtWCQsxiOfLuL4Hv8NKVunEqLPk/Vcuheha0=" - [mod."github.com/segmentio/asm"] - version = "v1.2.0" - hash = "sha256-zbNuKxNrUDUc6IlmRQNuJQzVe5Ol/mqp7srDg9IMMqs=" - [mod."github.com/segmentio/encoding"] - version = "v0.4.0" - hash = "sha256-4pWI9eTZRRDP9kO8rG6vbLCtBVVRLtbCJKd0Z2+8JoU=" - [mod."github.com/stretchr/testify"] - version = "v1.8.4" - hash = "sha256-MoOmRzbz9QgiJ+OOBo5h5/LbilhJfRUryvzHJmXAWjo=" - [mod."go.lsp.dev/jsonrpc2"] - version = "v0.10.0" - hash = "sha256-RbRsMYVBLR7ZDHHGMooycrkdbIauMXkQjVOGP7ggSgM=" - [mod."go.lsp.dev/pkg"] - version = "v0.0.0-20210717090340-384b27a52fb2" - hash = "sha256-TxS0Iqe1wbIaFe7MWZJRQdgqhKE8i8CggaGSV9zU1Vg=" - [mod."go.lsp.dev/uri"] - version = "v0.3.0" - hash = "sha256-jGP0N7Gf+bql5oJraUo33sXqWg7AKOTj0D8b4paV4dc=" - [mod."go.uber.org/multierr"] - version = "v1.11.0" - hash = "sha256-Lb6rHHfR62Ozg2j2JZy3MKOMKdsfzd1IYTR57r3Mhp0=" - [mod."go.uber.org/zap"] - version = "v1.27.0" - hash = "sha256-8655KDrulc4Das3VRduO9MjCn8ZYD5WkULjCvruaYsU=" - [mod."golang.org/x/mod"] - version = "v0.20.0" - hash = "sha256-nXYnY2kpbVkaZ/7Mf7FmxwGDX7N4cID3gKjGghmVRp4=" - [mod."golang.org/x/net"] - version = "v0.28.0" - hash = "sha256-WdH/mgsX/CB+CiYtXEwJAXHN8FgtW2YhFcWwrrHNBLo=" - [mod."golang.org/x/sync"] - version = "v0.8.0" - hash = "sha256-usvF0z7gq1vsX58p4orX+8WHlv52pdXgaueXlwj2Wss=" - [mod."golang.org/x/sys"] - version = "v0.23.0" - hash = "sha256-tC6QVLu72bADgINz26FUGdmYqKgsU45bHPg7sa0ZV7w=" - [mod."golang.org/x/tools"] - version = "v0.24.0" - hash = "sha256-2LBEW//aW8qrHc26F6Ma7CsYJRaCALfi0xQl2KgWems=" diff --git a/parser/v2/calltemplateparser_test.go b/parser/v2/calltemplateparser_test.go index 5f9db107e..d4df203b7 100644 --- a/parser/v2/calltemplateparser_test.go +++ b/parser/v2/calltemplateparser_test.go @@ -89,7 +89,7 @@ func TestCallTemplateExpressionParser(t *testing.T) { t.Errorf("failed to parse at %d", input.Index()) } if diff := cmp.Diff(tt.expected, result); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } diff --git a/parser/v2/childrenparser_test.go b/parser/v2/childrenparser_test.go index 2422884ff..2789c3719 100644 --- a/parser/v2/childrenparser_test.go +++ b/parser/v2/childrenparser_test.go @@ -41,7 +41,7 @@ func TestChildrenExpressionParser(t *testing.T) { t.Errorf("failed to parse at %d", input.Index()) } if diff := cmp.Diff(tt.expected, result); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } diff --git a/parser/v2/cssparser_test.go b/parser/v2/cssparser_test.go index da758cf2d..0c89aa918 100644 --- a/parser/v2/cssparser_test.go +++ b/parser/v2/cssparser_test.go @@ -74,7 +74,7 @@ func TestExpressionCSSPropertyParser(t *testing.T) { t.Fatalf("failed to parse at %d", input.Index()) } if diff := cmp.Diff(tt.expected, result); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } @@ -115,7 +115,7 @@ func TestConstantCSSPropertyParser(t *testing.T) { t.Fatalf("failed to parse at %d", input.Index()) } if diff := cmp.Diff(tt.expected, result); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } @@ -330,7 +330,7 @@ background-color: { prop }; t.Fatalf("failed to parse at %d", input.Index()) } if diff := cmp.Diff(tt.expected, result); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } diff --git a/parser/v2/doctypeparser_test.go b/parser/v2/doctypeparser_test.go index 9ebcc81f6..d9fe9c234 100644 --- a/parser/v2/doctypeparser_test.go +++ b/parser/v2/doctypeparser_test.go @@ -54,7 +54,7 @@ func TestDocTypeParser(t *testing.T) { t.Fatalf("failed to parse at %d", input.Index()) } if diff := cmp.Diff(tt.expected, result); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } diff --git a/parser/v2/elementparser_test.go b/parser/v2/elementparser_test.go index 2bab6fcff..a044ddf58 100644 --- a/parser/v2/elementparser_test.go +++ b/parser/v2/elementparser_test.go @@ -557,7 +557,7 @@ if test { t.Errorf("failed to parse at %v", input.Position()) } if diff := cmp.Diff(tt.expected, result); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } @@ -1666,7 +1666,7 @@ amount is charged`, t.Fatalf("failed to parse at %d", input.Index()) } if diff := cmp.Diff(tt.expected, result); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } diff --git a/parser/v2/gocommentparser_test.go b/parser/v2/gocommentparser_test.go index a0275acaa..dcb18ac30 100644 --- a/parser/v2/gocommentparser_test.go +++ b/parser/v2/gocommentparser_test.go @@ -60,7 +60,7 @@ on multiple lines */`, t.Fatalf("failed to parse at %d", input.Index()) } if diff := cmp.Diff(tt.expected, result); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } diff --git a/parser/v2/goexpression/parse.go b/parser/v2/goexpression/parse.go index 367c853aa..b7dcdd5e4 100644 --- a/parser/v2/goexpression/parse.go +++ b/parser/v2/goexpression/parse.go @@ -313,11 +313,11 @@ func extract(content string, extractor Extractor) (start, end int, err error) { if !ok { return true } - if fn.Name.Name != "templ_container" { + if fn.Name == nil || fn.Name.Name != "templ_container" { err = ErrContainerFuncNotFound return false } - if fn.Body.List == nil || len(fn.Body.List) == 0 { + if fn.Body == nil || len(fn.Body.List) == 0 { err = ErrExpectedNodeNotFound return false } diff --git a/parser/v2/htmlcommentparser_test.go b/parser/v2/htmlcommentparser_test.go index 735a4820c..3d05c8488 100644 --- a/parser/v2/htmlcommentparser_test.go +++ b/parser/v2/htmlcommentparser_test.go @@ -65,7 +65,7 @@ func TestHTMLCommentParser(t *testing.T) { t.Fatalf("failed to parse at %d", input.Index()) } if diff := cmp.Diff(tt.expected, result); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } diff --git a/parser/v2/packageparser_test.go b/parser/v2/packageparser_test.go index a8b0f0f1f..421b1dd5d 100644 --- a/parser/v2/packageparser_test.go +++ b/parser/v2/packageparser_test.go @@ -47,7 +47,7 @@ func TestPackageParserErrors(t *testing.T) { t.Errorf("expected parsing to fail, but it succeeded") } if diff := cmp.Diff(tt.expected, err); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } diff --git a/parser/v2/templateparser_test.go b/parser/v2/templateparser_test.go index 6b0eff2db..5cf1ee7fd 100644 --- a/parser/v2/templateparser_test.go +++ b/parser/v2/templateparser_test.go @@ -859,7 +859,7 @@ func TestTemplateParser(t *testing.T) { case tt.expectError && ok: t.Errorf("Success=%v want=%v", ok, !tt.expectError) case !tt.expectError && diff != "": - t.Errorf(diff) + t.Error(diff) } }) } @@ -891,7 +891,7 @@ func TestTemplateParserErrors(t *testing.T) { t.Error("expected failure, but got success") } if diff := cmp.Diff(tt.expected, err.Error()); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } diff --git a/parser/v2/types.go b/parser/v2/types.go index 34186c438..71bad4f8e 100644 --- a/parser/v2/types.go +++ b/parser/v2/types.go @@ -973,7 +973,7 @@ func (tee TemplElementExpression) Write(w io.Writer, indent int) error { return err } if string(sourceLines[i]) != string(reformattedSourceLines[i]) { - if _, err := io.WriteString(w, string(sourceLines[i])); err != nil { + if _, err := w.Write(sourceLines[i]); err != nil { return err } continue diff --git a/runtime_test.go b/runtime_test.go index 4f3d34f18..95c7a268b 100644 --- a/runtime_test.go +++ b/runtime_test.go @@ -75,10 +75,10 @@ func TestCSSHandler(t *testing.T) { h := templ.NewCSSHandler(tt.input...) h.ServeHTTP(w, &http.Request{}) if diff := cmp.Diff(tt.expectedMIMEType, w.Header().Get("Content-Type")); diff != "" { - t.Errorf(diff) + t.Error(diff) } if diff := cmp.Diff(tt.expectedBody, w.Body.String()); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } @@ -134,10 +134,10 @@ func TestCSSMiddleware(t *testing.T) { w := httptest.NewRecorder() tt.handler.ServeHTTP(w, tt.input) if diff := cmp.Diff(tt.expectedMIMEType, w.Header().Get("Content-Type")); diff != "" { - t.Errorf(diff) + t.Error(diff) } if diff := cmp.Diff(tt.expectedBody, w.Body.String()); diff != "" { - t.Errorf(diff) + t.Error(diff) } }) } @@ -149,28 +149,28 @@ var cssInputs = []any{ templ.ConstantCSSClass("d"), // ConstantCSSClass templ.ComponentCSSClass{ID: "e", Class: ".e{color:red}"}, // ComponentCSSClass map[string]bool{"f": true, "ff": false}, // map[string]bool - templ.KV[string, bool]("g", true), // KeyValue[string, bool] - templ.KV[string, bool]("gg", false), // KeyValue[string, bool] + templ.KV("g", true), // KeyValue[string, bool] + templ.KV("gg", false), // KeyValue[string, bool] []templ.KeyValue[string, bool]{ templ.KV("h", true), templ.KV("hh", false), }, // []KeyValue[string, bool] - templ.KV[templ.CSSClass, bool](templ.ConstantCSSClass("i"), true), // KeyValue[CSSClass, bool] - templ.KV[templ.CSSClass, bool](templ.ConstantCSSClass("ii"), false), // KeyValue[CSSClass, bool] - templ.KV[templ.ComponentCSSClass, bool](templ.ComponentCSSClass{ + templ.KV(templ.ConstantCSSClass("i"), true), // KeyValue[CSSClass, bool] + templ.KV(templ.ConstantCSSClass("ii"), false), // KeyValue[CSSClass, bool] + templ.KV(templ.ComponentCSSClass{ ID: "j", Class: ".j{color:red}", }, true), // KeyValue[ComponentCSSClass, bool] - templ.KV[templ.ComponentCSSClass, bool](templ.ComponentCSSClass{ + templ.KV(templ.ComponentCSSClass{ ID: "jj", Class: ".jj{color:red}", }, false), // KeyValue[ComponentCSSClass, bool] - templ.CSSClasses{templ.ConstantCSSClass("k")}, // CSSClasses - func() templ.CSSClass { return templ.ConstantCSSClass("l") }, // func() CSSClass - templ.CSSClass(templ.ConstantCSSClass("m")), // CSSClass - customClass{name: "n"}, // CSSClass - []templ.CSSClass{customClass{name: "n"}}, // []CSSClass - templ.KV[templ.ConstantCSSClass, bool](templ.ConstantCSSClass("o"), true), // KeyValue[ConstantCSSClass, bool] + templ.CSSClasses{templ.ConstantCSSClass("k")}, // CSSClasses + func() templ.CSSClass { return templ.ConstantCSSClass("l") }, // func() CSSClass + templ.CSSClass(templ.ConstantCSSClass("m")), // CSSClass + customClass{name: "n"}, // CSSClass + []templ.CSSClass{customClass{name: "n"}}, // []CSSClass + templ.KV(templ.ConstantCSSClass("o"), true), // KeyValue[ConstantCSSClass, bool] []templ.KeyValue[templ.ConstantCSSClass, bool]{ templ.KV(templ.ConstantCSSClass("p"), true), templ.KV(templ.ConstantCSSClass("pp"), false), diff --git a/storybook/_example/go.mod b/storybook/_example/go.mod index ab1fdfa69..492f44ed7 100644 --- a/storybook/_example/go.mod +++ b/storybook/_example/go.mod @@ -1,6 +1,6 @@ module github.com/a-h/templ/storybook/example -go 1.21 +go 1.23 toolchain go1.23.3