chore: bump version of go tools, go compiler, and goquery (fixes CVE) (#1031)

Author: a-h

.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

.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'

.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

.version

@@ -1 +1 @@
-0.2.810
+0.3.812

README.md

@@ -28,12 +28,6 @@ cd cmd/templ
 go build
 ```
 
-### nix-update-gomod2nix
-
-```sh
-gomod2nix
-```
-
 ### install-snapshot
 
 Build and install current version.

cmd/templ/generatecmd/run/testprogram/go.mod.embed

@@ -1,3 +1,3 @@
 module testprogram
 
-go 1.22.6
+go 1.23

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
 

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
 				}

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")

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
 			}