From ab5ed47364c7f717601d66ae8b47b8b76df281b0 Mon Sep 17 00:00:00 2001
From: Guilherme Soares <guilhermesoares1970@gmail.com>
Date: Sun, 8 Dec 2024 16:07:17 +0000
Subject: [PATCH] chore: update generated code to return nil instead of
 generated value

---
 benchmarks/templ/template_templ.go            |  2 +-
 .../testwatch/testdata/templates_templ.go     |  2 +-
 cmd/templ/lspcmd/httpdebug/list_templ.go      |  2 +-
 .../testproject/testdata/remotechild_templ.go |  2 +-
 .../testdata/remoteparent_templ.go            |  4 ++--
 .../testproject/testdata/templates_templ.go   |  2 +-
 .../visualize/sourcemapvisualisation_templ.go |  4 ++--
 examples/blog/posts_templ.go                  | 18 ++++++++---------
 .../templates_templ.go                        |  2 +-
 examples/counter-basic/components_templ.go    |  6 +++---
 .../counter/components/components_templ.go    |  4 ++--
 .../external-libraries/components_templ.go    |  2 +-
 examples/hello-world-ssr/hello_templ.go       |  2 +-
 examples/hello-world-static/hello_templ.go    |  2 +-
 examples/integration-chi/home_templ.go        |  2 +-
 examples/integration-echo/home_templ.go       |  2 +-
 examples/integration-gin/home_templ.go        |  2 +-
 .../components_templ.go                       |  2 +-
 examples/integration-gofiber/home_templ.go    |  4 ++--
 .../integration-react/components_templ.go     |  4 ++--
 .../internationalization/components_templ.go  |  2 +-
 examples/static-generator/blog_templ.go       |  8 ++++----
 examples/streaming/main_templ.go              |  4 ++--
 examples/suspense/main_templ.go               | 14 ++++++-------
 .../components/templsyntax_templ.go           |  2 +-
 examples/typescript/components/index_templ.go |  2 +-
 generator/generator.go                        |  6 +++---
 generator/test-a-href/template_templ.go       |  2 +-
 .../test-attribute-errors/template_templ.go   |  2 +-
 .../test-attribute-escaping/template_templ.go |  2 +-
 generator/test-call/template_templ.go         | 18 ++++++++---------
 .../test-cancelled-context/template_templ.go  |  2 +-
 .../test-complex-attributes/template_templ.go |  2 +-
 .../template_templ.go                         |  2 +-
 generator/test-context/template_templ.go      |  2 +-
 .../test-css-middleware/template_templ.go     |  2 +-
 generator/test-css-usage/template_templ.go    | 20 +++++++++----------
 generator/test-doctype/template_templ.go      |  2 +-
 .../test-element-attributes/template_templ.go |  2 +-
 generator/test-elseif/template_templ.go       |  2 +-
 generator/test-for/template_templ.go          |  2 +-
 generator/test-form-action/template_templ.go  |  2 +-
 generator/test-go-comments/template_templ.go  |  2 +-
 .../template_templ.go                         |  2 +-
 generator/test-html-comment/template_templ.go |  4 ++--
 generator/test-html/template_templ.go         |  2 +-
 generator/test-if/template_templ.go           |  2 +-
 generator/test-ifelse/template_templ.go       |  2 +-
 generator/test-import/template_templ.go       | 14 ++++++-------
 generator/test-method/template_templ.go       |  2 +-
 generator/test-once/template_templ.go         |  6 +++---
 generator/test-raw-elements/template_templ.go |  2 +-
 .../test-script-inline/template_templ.go      |  2 +-
 .../test-script-usage-nonce/template_templ.go |  6 +++---
 generator/test-script-usage/template_templ.go |  8 ++++----
 .../test-spread-attributes/template_templ.go  |  2 +-
 .../test-string-errors/template_templ.go      |  2 +-
 generator/test-string/template_templ.go       |  2 +-
 generator/test-switch/template_templ.go       |  2 +-
 .../test-switchdefault/template_templ.go      |  2 +-
 .../test-templ-element/template_templ.go      | 10 +++++-----
 .../template_templ.go                         |  2 +-
 .../test-text-whitespace/template_templ.go    | 10 +++++-----
 generator/test-text/template_templ.go         |  2 +-
 generator/test-void/template_templ.go         |  2 +-
 .../template_templ.go                         | 10 +++++-----
 turbo/stream_templ.go                         |  4 ++--
 67 files changed, 138 insertions(+), 138 deletions(-)

diff --git a/benchmarks/templ/template_templ.go b/benchmarks/templ/template_templ.go
index 8ae289302..eb129170d 100644
--- a/benchmarks/templ/template_templ.go
+++ b/benchmarks/templ/template_templ.go
@@ -110,7 +110,7 @@ func Render(p Person) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/cmd/templ/generatecmd/testwatch/testdata/templates_templ.go b/cmd/templ/generatecmd/testwatch/testdata/templates_templ.go
index 34b582b65..938618f6f 100644
--- a/cmd/templ/generatecmd/testwatch/testdata/templates_templ.go
+++ b/cmd/templ/generatecmd/testwatch/testdata/templates_templ.go
@@ -47,7 +47,7 @@ func Page(count int) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/cmd/templ/lspcmd/httpdebug/list_templ.go b/cmd/templ/lspcmd/httpdebug/list_templ.go
index fa4feeef1..49b64413c 100644
--- a/cmd/templ/lspcmd/httpdebug/list_templ.go
+++ b/cmd/templ/lspcmd/httpdebug/list_templ.go
@@ -91,7 +91,7 @@ func list(uris []string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/cmd/templ/testproject/testdata/remotechild_templ.go b/cmd/templ/testproject/testdata/remotechild_templ.go
index 4437f3980..2544e0425 100644
--- a/cmd/templ/testproject/testdata/remotechild_templ.go
+++ b/cmd/templ/testproject/testdata/remotechild_templ.go
@@ -32,7 +32,7 @@ func Remote() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/cmd/templ/testproject/testdata/remoteparent_templ.go b/cmd/templ/testproject/testdata/remoteparent_templ.go
index 99ca718a9..9323cdf61 100644
--- a/cmd/templ/testproject/testdata/remoteparent_templ.go
+++ b/cmd/templ/testproject/testdata/remoteparent_templ.go
@@ -32,7 +32,7 @@ func RemoteInclusionTest() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -61,7 +61,7 @@ func Remote2() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/cmd/templ/testproject/testdata/templates_templ.go b/cmd/templ/testproject/testdata/templates_templ.go
index 30e9fa9db..2bffb2427 100644
--- a/cmd/templ/testproject/testdata/templates_templ.go
+++ b/cmd/templ/testproject/testdata/templates_templ.go
@@ -47,7 +47,7 @@ func Page(count int) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/cmd/templ/visualize/sourcemapvisualisation_templ.go b/cmd/templ/visualize/sourcemapvisualisation_templ.go
index 652360dd5..1793a8be8 100644
--- a/cmd/templ/visualize/sourcemapvisualisation_templ.go
+++ b/cmd/templ/visualize/sourcemapvisualisation_templ.go
@@ -172,7 +172,7 @@ func combine(templFileName string, left, right templ.Component) templ.Component
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -288,7 +288,7 @@ func mappedCharacter(s string, sourceID, targetID string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/blog/posts_templ.go b/examples/blog/posts_templ.go
index 7cbb1458a..29c560b64 100644
--- a/examples/blog/posts_templ.go
+++ b/examples/blog/posts_templ.go
@@ -50,7 +50,7 @@ func headerTemplate(name string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -92,7 +92,7 @@ func footerTemplate() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -121,7 +121,7 @@ func navTemplate() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -191,7 +191,7 @@ func layout(name string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -256,7 +256,7 @@ func postsTemplate(posts []Post) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -297,13 +297,13 @@ func home() templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			return templ_7745c5c3_Err
+			return nil
 		})
 		templ_7745c5c3_Err = layout("Home").Render(templ.WithChildren(ctx, templ_7745c5c3_Var12), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -344,13 +344,13 @@ func posts(posts []Post) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			return templ_7745c5c3_Err
+			return nil
 		})
 		templ_7745c5c3_Err = layout("Posts").Render(templ.WithChildren(ctx, templ_7745c5c3_Var14), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/content-security-policy/templates_templ.go b/examples/content-security-policy/templates_templ.go
index 465ea4db2..5e8d63646 100644
--- a/examples/content-security-policy/templates_templ.go
+++ b/examples/content-security-policy/templates_templ.go
@@ -42,7 +42,7 @@ func template() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/counter-basic/components_templ.go b/examples/counter-basic/components_templ.go
index 3ab36307c..38234dcb1 100644
--- a/examples/counter-basic/components_templ.go
+++ b/examples/counter-basic/components_templ.go
@@ -60,7 +60,7 @@ func counts(global, user int) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -89,7 +89,7 @@ func form() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -130,7 +130,7 @@ func page(global, user int) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/counter/components/components_templ.go b/examples/counter/components/components_templ.go
index 87b7dcdaf..e2f134159 100644
--- a/examples/counter/components/components_templ.go
+++ b/examples/counter/components/components_templ.go
@@ -118,7 +118,7 @@ func counts(global, session int) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -155,7 +155,7 @@ func Page(global, session int) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/external-libraries/components_templ.go b/examples/external-libraries/components_templ.go
index 09bda08a7..c2d9108f1 100644
--- a/examples/external-libraries/components_templ.go
+++ b/examples/external-libraries/components_templ.go
@@ -61,7 +61,7 @@ func page(data []TimeValue) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/hello-world-ssr/hello_templ.go b/examples/hello-world-ssr/hello_templ.go
index 195f8e45a..e35e08da8 100644
--- a/examples/hello-world-ssr/hello_templ.go
+++ b/examples/hello-world-ssr/hello_templ.go
@@ -45,7 +45,7 @@ func hello(name string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/hello-world-static/hello_templ.go b/examples/hello-world-static/hello_templ.go
index 9b16bede3..c3816cb5c 100644
--- a/examples/hello-world-static/hello_templ.go
+++ b/examples/hello-world-static/hello_templ.go
@@ -45,7 +45,7 @@ func hello(name string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/integration-chi/home_templ.go b/examples/integration-chi/home_templ.go
index 3fdc396fa..dff7eefe8 100644
--- a/examples/integration-chi/home_templ.go
+++ b/examples/integration-chi/home_templ.go
@@ -32,7 +32,7 @@ func Home() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/integration-echo/home_templ.go b/examples/integration-echo/home_templ.go
index 3fdc396fa..dff7eefe8 100644
--- a/examples/integration-echo/home_templ.go
+++ b/examples/integration-echo/home_templ.go
@@ -32,7 +32,7 @@ func Home() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/integration-gin/home_templ.go b/examples/integration-gin/home_templ.go
index f406aed88..13985a671 100644
--- a/examples/integration-gin/home_templ.go
+++ b/examples/integration-gin/home_templ.go
@@ -32,7 +32,7 @@ func Home() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/integration-go-echarts/components_templ.go b/examples/integration-go-echarts/components_templ.go
index 3b53d847f..859a9cacf 100644
--- a/examples/integration-go-echarts/components_templ.go
+++ b/examples/integration-go-echarts/components_templ.go
@@ -42,7 +42,7 @@ func Home(chart *charts.Bar) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/integration-gofiber/home_templ.go b/examples/integration-gofiber/home_templ.go
index cbd0403a5..3bc5794a1 100644
--- a/examples/integration-gofiber/home_templ.go
+++ b/examples/integration-gofiber/home_templ.go
@@ -67,7 +67,7 @@ func Home(name string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -96,7 +96,7 @@ func NotFound() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/integration-react/components_templ.go b/examples/integration-react/components_templ.go
index d654d32f3..52276999c 100644
--- a/examples/integration-react/components_templ.go
+++ b/examples/integration-react/components_templ.go
@@ -45,7 +45,7 @@ func Hello(name string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -84,7 +84,7 @@ func page() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/internationalization/components_templ.go b/examples/internationalization/components_templ.go
index 7520a8805..2ccfa47f6 100644
--- a/examples/internationalization/components_templ.go
+++ b/examples/internationalization/components_templ.go
@@ -73,7 +73,7 @@ func page() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/static-generator/blog_templ.go b/examples/static-generator/blog_templ.go
index 24a2f044e..eff4a463a 100644
--- a/examples/static-generator/blog_templ.go
+++ b/examples/static-generator/blog_templ.go
@@ -50,7 +50,7 @@ func headerComponent(title string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -100,7 +100,7 @@ func contentComponent(title string, body templ.Component) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -141,7 +141,7 @@ func contentPage(title string, body templ.Component) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -210,7 +210,7 @@ func indexPage(posts []Post) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/streaming/main_templ.go b/examples/streaming/main_templ.go
index 0736fbbcb..c94756a1e 100644
--- a/examples/streaming/main_templ.go
+++ b/examples/streaming/main_templ.go
@@ -97,7 +97,7 @@ func Page(data chan string) templ.Component {
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				return templ_7745c5c3_Err
+				return nil
 			})
 			templ_7745c5c3_Err = templ.Flush().Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
@@ -108,7 +108,7 @@ func Page(data chan string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/suspense/main_templ.go b/examples/suspense/main_templ.go
index 286700b9f..78777645a 100644
--- a/examples/suspense/main_templ.go
+++ b/examples/suspense/main_templ.go
@@ -124,7 +124,7 @@ func Slot(name string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -153,7 +153,7 @@ func A() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -182,7 +182,7 @@ func B() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -211,7 +211,7 @@ func C() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -272,7 +272,7 @@ func Page(data chan SlotContents) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			return templ_7745c5c3_Err
+			return nil
 		})
 		templ_7745c5c3_Err = templ.Flush().Render(templ.WithChildren(ctx, templ_7745c5c3_Var8), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
@@ -316,7 +316,7 @@ func Page(data chan SlotContents) templ.Component {
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				return templ_7745c5c3_Err
+				return nil
 			})
 			templ_7745c5c3_Err = templ.Flush().Render(templ.WithChildren(ctx, templ_7745c5c3_Var9), templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
@@ -327,7 +327,7 @@ func Page(data chan SlotContents) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/syntax-and-usage/components/templsyntax_templ.go b/examples/syntax-and-usage/components/templsyntax_templ.go
index d614dcbb0..cd939634f 100644
--- a/examples/syntax-and-usage/components/templsyntax_templ.go
+++ b/examples/syntax-and-usage/components/templsyntax_templ.go
@@ -55,7 +55,7 @@ func list(items []string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/examples/typescript/components/index_templ.go b/examples/typescript/components/index_templ.go
index 1bf1d7883..8eea7da77 100644
--- a/examples/typescript/components/index_templ.go
+++ b/examples/typescript/components/index_templ.go
@@ -57,7 +57,7 @@ func Page(attributeData Data, scriptData Data) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/generator.go b/generator/generator.go
index 943c695b5..af3eda69b 100644
--- a/generator/generator.go
+++ b/generator/generator.go
@@ -452,8 +452,8 @@ func (g *generator) writeTemplate(nodeIdx int, t parser.HTMLTemplate) error {
 		if err = g.writeNodes(indentLevel, stripWhitespace(t.Children), nil); err != nil {
 			return err
 		}
-		// return templ_7745c5c3_Err
-		if _, err = g.w.WriteIndent(indentLevel, "return templ_7745c5c3_Err\n"); err != nil {
+		// return nil
+		if _, err = g.w.WriteIndent(indentLevel, "return nil\n"); err != nil {
 			return err
 		}
 		indentLevel--
@@ -760,7 +760,7 @@ func (g *generator) writeBlockTemplElementExpression(indentLevel int, n parser.T
 		return err
 	}
 	// return nil
-	if _, err = g.w.WriteIndent(indentLevel, "return templ_7745c5c3_Err\n"); err != nil {
+	if _, err = g.w.WriteIndent(indentLevel, "return nil\n"); err != nil {
 		return err
 	}
 	indentLevel--
diff --git a/generator/test-a-href/template_templ.go b/generator/test-a-href/template_templ.go
index e4c1fea13..2b15189e7 100644
--- a/generator/test-a-href/template_templ.go
+++ b/generator/test-a-href/template_templ.go
@@ -50,7 +50,7 @@ func render() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-attribute-errors/template_templ.go b/generator/test-attribute-errors/template_templ.go
index 197d9baa8..78edec11d 100644
--- a/generator/test-attribute-errors/template_templ.go
+++ b/generator/test-attribute-errors/template_templ.go
@@ -82,7 +82,7 @@ func TestComponent(err error) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-attribute-escaping/template_templ.go b/generator/test-attribute-escaping/template_templ.go
index bcf6c36ed..706243702 100644
--- a/generator/test-attribute-escaping/template_templ.go
+++ b/generator/test-attribute-escaping/template_templ.go
@@ -41,7 +41,7 @@ func BasicTemplate(url string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-call/template_templ.go b/generator/test-call/template_templ.go
index 9d61306a0..d8634e619 100644
--- a/generator/test-call/template_templ.go
+++ b/generator/test-call/template_templ.go
@@ -60,13 +60,13 @@ func showAll() templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			return templ_7745c5c3_Err
+			return nil
 		})
 		templ_7745c5c3_Err = wrapChildren().Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -95,7 +95,7 @@ func a() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -128,7 +128,7 @@ func b(child templ.Component) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -170,7 +170,7 @@ func c(text string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -199,7 +199,7 @@ func d() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -228,7 +228,7 @@ func e() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -265,7 +265,7 @@ func showOne(component templ.Component) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -302,7 +302,7 @@ func wrapChildren() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-cancelled-context/template_templ.go b/generator/test-cancelled-context/template_templ.go
index 4919b7665..aafab1856 100644
--- a/generator/test-cancelled-context/template_templ.go
+++ b/generator/test-cancelled-context/template_templ.go
@@ -28,7 +28,7 @@ func EmptyComponent() templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-complex-attributes/template_templ.go b/generator/test-complex-attributes/template_templ.go
index fe7cdf850..90536e470 100644
--- a/generator/test-complex-attributes/template_templ.go
+++ b/generator/test-complex-attributes/template_templ.go
@@ -32,7 +32,7 @@ func ComplexAttributes() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-constant-attribute-escaping/template_templ.go b/generator/test-constant-attribute-escaping/template_templ.go
index ba858ddd4..af9e39e29 100644
--- a/generator/test-constant-attribute-escaping/template_templ.go
+++ b/generator/test-constant-attribute-escaping/template_templ.go
@@ -32,7 +32,7 @@ func BasicTemplate() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-context/template_templ.go b/generator/test-context/template_templ.go
index 7d9dabc30..a62b4bfe3 100644
--- a/generator/test-context/template_templ.go
+++ b/generator/test-context/template_templ.go
@@ -70,7 +70,7 @@ func render() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-css-middleware/template_templ.go b/generator/test-css-middleware/template_templ.go
index 5e992de5c..89546249b 100644
--- a/generator/test-css-middleware/template_templ.go
+++ b/generator/test-css-middleware/template_templ.go
@@ -73,7 +73,7 @@ func render(s string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-css-usage/template_templ.go b/generator/test-css-usage/template_templ.go
index ca6e6d455..1d45e658f 100644
--- a/generator/test-css-usage/template_templ.go
+++ b/generator/test-css-usage/template_templ.go
@@ -37,7 +37,7 @@ func StyleTagsAreSupported() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -98,7 +98,7 @@ func CSSComponentsAreSupported() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -169,7 +169,7 @@ func CSSComponentsAndConstantsAreSupported() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -217,7 +217,7 @@ func MapsCanBeUsedToConditionallySetClasses() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -285,7 +285,7 @@ func KVCanBeUsedToConditionallySetClasses() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -333,7 +333,7 @@ func PsuedoAttributesAndComplexClassNamesAreSupported() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -381,7 +381,7 @@ func ClassNamesAreHTMLEscaped() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -461,7 +461,7 @@ func CSSComponentsCanBeUsedWithArguments() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -518,7 +518,7 @@ func Rotate(degrees float64) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -580,7 +580,7 @@ func TestComponent() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-doctype/template_templ.go b/generator/test-doctype/template_templ.go
index 49803f73f..baefd8873 100644
--- a/generator/test-doctype/template_templ.go
+++ b/generator/test-doctype/template_templ.go
@@ -58,7 +58,7 @@ func Layout(title, content string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-element-attributes/template_templ.go b/generator/test-element-attributes/template_templ.go
index 2082d996e..9ff771827 100644
--- a/generator/test-element-attributes/template_templ.go
+++ b/generator/test-element-attributes/template_templ.go
@@ -167,7 +167,7 @@ func render(p person) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-elseif/template_templ.go b/generator/test-elseif/template_templ.go
index dc6c86b71..49af560b7 100644
--- a/generator/test-elseif/template_templ.go
+++ b/generator/test-elseif/template_templ.go
@@ -137,7 +137,7 @@ func render(d data) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-for/template_templ.go b/generator/test-for/template_templ.go
index 7a0f6f602..f5234bd6a 100644
--- a/generator/test-for/template_templ.go
+++ b/generator/test-for/template_templ.go
@@ -47,7 +47,7 @@ func render(items []string) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-form-action/template_templ.go b/generator/test-form-action/template_templ.go
index 3e7f21691..400666352 100644
--- a/generator/test-form-action/template_templ.go
+++ b/generator/test-form-action/template_templ.go
@@ -50,7 +50,7 @@ func render() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-go-comments/template_templ.go b/generator/test-go-comments/template_templ.go
index 53146250c..9b0778d7d 100644
--- a/generator/test-go-comments/template_templ.go
+++ b/generator/test-go-comments/template_templ.go
@@ -45,7 +45,7 @@ func render(content string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-go-template-in-templ/template_templ.go b/generator/test-go-template-in-templ/template_templ.go
index 507983d7c..a750e14ec 100644
--- a/generator/test-go-template-in-templ/template_templ.go
+++ b/generator/test-go-template-in-templ/template_templ.go
@@ -44,7 +44,7 @@ func Example() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-html-comment/template_templ.go b/generator/test-html-comment/template_templ.go
index cb3071526..ca38a5c28 100644
--- a/generator/test-html-comment/template_templ.go
+++ b/generator/test-html-comment/template_templ.go
@@ -69,7 +69,7 @@ func render(content string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -111,7 +111,7 @@ func paragraph(content string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-html/template_templ.go b/generator/test-html/template_templ.go
index 1a6d15935..afeddcfa9 100644
--- a/generator/test-html/template_templ.go
+++ b/generator/test-html/template_templ.go
@@ -110,7 +110,7 @@ func render(p person) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-if/template_templ.go b/generator/test-if/template_templ.go
index 335ac8048..4efcaa6bc 100644
--- a/generator/test-if/template_templ.go
+++ b/generator/test-if/template_templ.go
@@ -49,7 +49,7 @@ func render(d data) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-ifelse/template_templ.go b/generator/test-ifelse/template_templ.go
index 815eaeeba..8c791eacd 100644
--- a/generator/test-ifelse/template_templ.go
+++ b/generator/test-ifelse/template_templ.go
@@ -49,7 +49,7 @@ func render(d data) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-import/template_templ.go b/generator/test-import/template_templ.go
index 0dde67bee..1ce0dd8d2 100644
--- a/generator/test-import/template_templ.go
+++ b/generator/test-import/template_templ.go
@@ -40,7 +40,7 @@ func listItem() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -77,7 +77,7 @@ func list() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -130,7 +130,7 @@ func main() templ.Component {
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				return templ_7745c5c3_Err
+				return nil
 			})
 			templ_7745c5c3_Err = listItem().Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
@@ -156,7 +156,7 @@ func main() templ.Component {
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				return templ_7745c5c3_Err
+				return nil
 			})
 			templ_7745c5c3_Err = listItem().Render(templ.WithChildren(ctx, templ_7745c5c3_Var6), templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
@@ -182,19 +182,19 @@ func main() templ.Component {
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				return templ_7745c5c3_Err
+				return nil
 			})
 			templ_7745c5c3_Err = listItem().Render(templ.WithChildren(ctx, templ_7745c5c3_Var7), templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			return templ_7745c5c3_Err
+			return nil
 		})
 		templ_7745c5c3_Err = list().Render(templ.WithChildren(ctx, templ_7745c5c3_Var4), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-method/template_templ.go b/generator/test-method/template_templ.go
index c3d5e1786..b1c6b7ddc 100644
--- a/generator/test-method/template_templ.go
+++ b/generator/test-method/template_templ.go
@@ -49,7 +49,7 @@ func (d Data) Method() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-once/template_templ.go b/generator/test-once/template_templ.go
index c1a160cb4..282306ada 100644
--- a/generator/test-once/template_templ.go
+++ b/generator/test-once/template_templ.go
@@ -46,7 +46,7 @@ func hello(label, name string) templ.Component {
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			return templ_7745c5c3_Err
+			return nil
 		})
 		templ_7745c5c3_Err = helloHandle.Once().Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
@@ -82,7 +82,7 @@ func hello(label, name string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -115,7 +115,7 @@ func render() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-raw-elements/template_templ.go b/generator/test-raw-elements/template_templ.go
index 7d8ad17e4..4f6f25b3e 100644
--- a/generator/test-raw-elements/template_templ.go
+++ b/generator/test-raw-elements/template_templ.go
@@ -40,7 +40,7 @@ func Example() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-script-inline/template_templ.go b/generator/test-script-inline/template_templ.go
index f8812e5b9..9f145d5c4 100644
--- a/generator/test-script-inline/template_templ.go
+++ b/generator/test-script-inline/template_templ.go
@@ -64,7 +64,7 @@ func InlineJavascript(a string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-script-usage-nonce/template_templ.go b/generator/test-script-usage-nonce/template_templ.go
index 59a3e08b3..c73474d7f 100644
--- a/generator/test-script-usage-nonce/template_templ.go
+++ b/generator/test-script-usage-nonce/template_templ.go
@@ -97,7 +97,7 @@ func Button(text string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -165,7 +165,7 @@ func ThreeButtons() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -227,7 +227,7 @@ func Conditional(show bool) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-script-usage/template_templ.go b/generator/test-script-usage/template_templ.go
index 4f4557add..938451d39 100644
--- a/generator/test-script-usage/template_templ.go
+++ b/generator/test-script-usage/template_templ.go
@@ -97,7 +97,7 @@ func Button(text string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -196,7 +196,7 @@ func ThreeButtons() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -258,7 +258,7 @@ func Conditional(show bool) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -310,7 +310,7 @@ func ScriptOnLoad() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-spread-attributes/template_templ.go b/generator/test-spread-attributes/template_templ.go
index 702793d00..6bd9d5b10 100644
--- a/generator/test-spread-attributes/template_templ.go
+++ b/generator/test-spread-attributes/template_templ.go
@@ -60,7 +60,7 @@ func BasicTemplate(spread templ.Attributes) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-string-errors/template_templ.go b/generator/test-string-errors/template_templ.go
index 99a4830a7..1995127de 100644
--- a/generator/test-string-errors/template_templ.go
+++ b/generator/test-string-errors/template_templ.go
@@ -82,7 +82,7 @@ func TestComponent(err error) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-string/template_templ.go b/generator/test-string/template_templ.go
index d3a24b796..b2de39d4c 100644
--- a/generator/test-string/template_templ.go
+++ b/generator/test-string/template_templ.go
@@ -84,7 +84,7 @@ func render(s string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-switch/template_templ.go b/generator/test-switch/template_templ.go
index 778bc5b0f..e25a6dfea 100644
--- a/generator/test-switch/template_templ.go
+++ b/generator/test-switch/template_templ.go
@@ -50,7 +50,7 @@ func render(input string) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-switchdefault/template_templ.go b/generator/test-switchdefault/template_templ.go
index b7066c911..a226611ac 100644
--- a/generator/test-switchdefault/template_templ.go
+++ b/generator/test-switchdefault/template_templ.go
@@ -50,7 +50,7 @@ func template(input string) templ.Component {
 				return templ_7745c5c3_Err
 			}
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-templ-element/template_templ.go b/generator/test-templ-element/template_templ.go
index cba7593ee..bd7f0bf11 100644
--- a/generator/test-templ-element/template_templ.go
+++ b/generator/test-templ-element/template_templ.go
@@ -55,7 +55,7 @@ func wrapper(index int) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -132,25 +132,25 @@ func template() templ.Component {
 					if templ_7745c5c3_Err != nil {
 						return templ_7745c5c3_Err
 					}
-					return templ_7745c5c3_Err
+					return nil
 				})
 				templ_7745c5c3_Err = wrapper(3).Render(templ.WithChildren(ctx, templ_7745c5c3_Var6), templ_7745c5c3_Buffer)
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				return templ_7745c5c3_Err
+				return nil
 			})
 			templ_7745c5c3_Err = wrapper(2).Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			return templ_7745c5c3_Err
+			return nil
 		})
 		templ_7745c5c3_Err = wrapper(1).Render(templ.WithChildren(ctx, templ_7745c5c3_Var4), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-templ-in-go-template/template_templ.go b/generator/test-templ-in-go-template/template_templ.go
index 8812d9a73..c62699478 100644
--- a/generator/test-templ-in-go-template/template_templ.go
+++ b/generator/test-templ-in-go-template/template_templ.go
@@ -42,7 +42,7 @@ func greeting() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-text-whitespace/template_templ.go b/generator/test-text-whitespace/template_templ.go
index 9de890b38..26fc6447e 100644
--- a/generator/test-text-whitespace/template_templ.go
+++ b/generator/test-text-whitespace/template_templ.go
@@ -42,7 +42,7 @@ func WhitespaceIsAddedWithinTemplStatements() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -73,7 +73,7 @@ func InlineElementsAreNotPadded() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -104,7 +104,7 @@ func WhiteSpaceInHTMLIsNormalised() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -148,7 +148,7 @@ func WhiteSpaceAroundValues() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -207,7 +207,7 @@ func WhiteSpaceAroundTemplatedValues(prefix, statement string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-text/template_templ.go b/generator/test-text/template_templ.go
index b68f9d554..60dafec9a 100644
--- a/generator/test-text/template_templ.go
+++ b/generator/test-text/template_templ.go
@@ -58,7 +58,7 @@ func BasicTemplate(name string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-void/template_templ.go b/generator/test-void/template_templ.go
index 9f0470c13..5479e7b17 100644
--- a/generator/test-void/template_templ.go
+++ b/generator/test-void/template_templ.go
@@ -32,7 +32,7 @@ func render() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/generator/test-whitespace-around-go-keywords/template_templ.go b/generator/test-whitespace-around-go-keywords/template_templ.go
index a0c624527..7e49af087 100644
--- a/generator/test-whitespace-around-go-keywords/template_templ.go
+++ b/generator/test-whitespace-around-go-keywords/template_templ.go
@@ -54,7 +54,7 @@ func WhitespaceIsConsistentInIf(firstIf, secondIf bool) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -97,7 +97,7 @@ func WhitespaceIsConsistentInFalseIf() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -144,7 +144,7 @@ func WhitespaceIsConsistentInSwitch(i int) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -187,7 +187,7 @@ func WhitespaceIsConsistentInSwitchNoDefault() templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -241,7 +241,7 @@ func WhitespaceIsConsistentInFor(i int) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
diff --git a/turbo/stream_templ.go b/turbo/stream_templ.go
index 28fad5f00..b453b7624 100644
--- a/turbo/stream_templ.go
+++ b/turbo/stream_templ.go
@@ -66,7 +66,7 @@ func actionTemplate(action string, target string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }
 
@@ -121,7 +121,7 @@ func removeTemplate(action string, target string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		return templ_7745c5c3_Err
+		return nil
 	})
 }