Merge branch 'main' into add_go_expressions_in_script_elements

a-h · web-flow · commit 2d5e5841452d · 2025-03-15T16:19:48.000Z
diff --git a/.version b/.version
@@ -1 +1 @@
-0.3.839
+0.3.841
diff --git a/docs/docs/15-component-libraries/_category_.json b/docs/docs/15-component-libraries/_category_.json
@@ -0,0 +1,4 @@
+{
+  "position": 15,
+  "label": "Component Libraries"
+}
diff --git a/docs/docs/15-component-libraries/index.md b/docs/docs/15-component-libraries/index.md
@@ -0,0 +1,38 @@
+# Component Libraries
+
+Component libraries in the templ ecosystem provide ready-to-use UI elements.
+
+## templUI
+
+![templUI Banner](/img/ecosystem/templui.png)
+
+### About
+
+templUI is the premier UI component library built specifically for templ. It combines the type-safety of Go with the interactivity of Alpine.js and the styling power of Tailwind CSS to create beautiful, responsive web applications.
+
+### Features
+
+- **30+ Ready-made Components**: Buttons, cards, modals, charts, and more
+- **Enterprise-Ready**: Built for production with security in mind
+- **CSP Compliant**: Works seamlessly with Content Security Policy
+- **Type-Safe**: Full Go type system integration and checking
+- **Customizable**: Easily adapt to match your brand identity
+
+### Example
+
+```go
+import "github.com/axzilla/templui/components"
+
+templ ExamplePage() {
+  @components.Button(components.ButtonProps{
+    Text: "Click me",
+    IconRight: icons.ArrowRight(icons.IconProps{Size: "16"}),
+  })
+}
+```
+
+### Links
+
+- [Documentation](https://templui.io)
+- [GitHub](https://github.com/axzilla/templui)
+- [Quick Start Template](https://github.com/axzilla/templui-quickstart)
diff --git a/docs/docs/16-faq/_category_.json b/docs/docs/16-faq/_category_.json
@@ -1,4 +1,4 @@
 {
-  "position": 15,
+  "position": 16,
   "label": "FAQ"
 }
diff --git a/docs/docs/16-faq/index.md b/docs/docs/16-faq/index.md
diff --git a/docs/static/img/ecosystem/templui.png b/docs/static/img/ecosystem/templui.png
diff --git a/generator/generator.go b/generator/generator.go
@@ -674,12 +674,17 @@ func (g *generator) writeWhitespaceTrailer(indentLevel int, n parser.TrailingSpa
 }
 
 func (g *generator) writeDocType(indentLevel int, n parser.DocType) (err error) {
-	if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf("<!doctype %s>", n.Value)); err != nil {
+	if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf("<!doctype %s>", escapeQuotes(n.Value))); err != nil {
 		return err
 	}
 	return nil
 }
 
+func escapeQuotes(s string) string {
+	quoted := strconv.Quote(s)
+	return quoted[1 : len(quoted)-1]
+}
+
 func (g *generator) writeIfExpression(indentLevel int, n parser.IfExpression, nextNode parser.Node) (err error) {
 	var r parser.Range
 	// if
@@ -1132,8 +1137,7 @@ func (g *generator) writeBoolConstantAttribute(indentLevel int, attr parser.Bool
 func (g *generator) writeConstantAttribute(indentLevel int, attr parser.ConstantAttribute) (err error) {
 	name := html.EscapeString(attr.Name)
 	value := html.EscapeString(attr.Value)
-	value = strconv.Quote(value)
-	value = value[1 : len(value)-1]
+	value = escapeQuotes(value)
 	if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(` %s=\"%s\"`, name, value)); err != nil {
 		return err
 	}
@@ -1612,8 +1616,7 @@ func (g *generator) writeWhitespace(indentLevel int, n parser.Whitespace) (err e
 }
 
 func (g *generator) writeText(indentLevel int, n parser.Text) (err error) {
-	quoted := strconv.Quote(n.Value)
-	_, err = g.w.WriteStringLiteral(indentLevel, quoted[1:len(quoted)-1])
+	_, err = g.w.WriteStringLiteral(indentLevel, escapeQuotes(n.Value))
 	return err
 }
 
diff --git a/generator/test-doctype-html4/expected.html b/generator/test-doctype-html4/expected.html
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>title</title>
+  </head>
+  <body>content</body>
+</html>
diff --git a/generator/test-doctype-html4/render_test.go b/generator/test-doctype-html4/render_test.go
@@ -0,0 +1,23 @@
+package testdoctype
+
+import (
+	_ "embed"
+	"testing"
+
+	"github.com/a-h/templ/generator/htmldiff"
+)
+
+//go:embed expected.html
+var expected string
+
+func Test(t *testing.T) {
+	component := Layout("title", "content")
+
+	diff, err := htmldiff.Diff(component, expected)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if diff != "" {
+		t.Error(diff)
+	}
+}
diff --git a/generator/test-doctype-html4/template.templ b/generator/test-doctype-html4/template.templ
@@ -0,0 +1,14 @@
+package testdoctype
+
+templ Layout(title, content string) {
+	<!DOCTYPE HTML PUBLIC "http://www.w3.org/TR/html4/loose.dtd">
+	<html lang="en">
+		<head>
+			<meta charset="UTF-8"/>
+			<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+			<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+			<title>{ title }</title>
+		</head>
+		<body>{ content }</body>
+	</html>
+}
diff --git a/generator/test-doctype-html4/template_templ.go b/generator/test-doctype-html4/template_templ.go
diff --git a/storybook/storybook.go b/storybook/storybook.go
@@ -109,7 +109,7 @@ func (sh *Storybook) Build(ctx context.Context) (err error) {
 	if err != nil {
 		return
 	}
-	if ctx.Err() != nil {
+	if err = ctx.Err(); err != nil {
 		return
 	}
 
@@ -119,7 +119,7 @@ func (sh *Storybook) Build(ctx context.Context) (err error) {
 	if err != nil {
 		return
 	}
-	if ctx.Err() != nil {
+	if err = ctx.Err(); err != nil {
 		return
 	}
 
@@ -133,7 +133,7 @@ func (sh *Storybook) Build(ctx context.Context) (err error) {
 	} else {
 		sh.Log.Info("Storybook is up-to-date, skipping build step.")
 	}
-	if ctx.Err() != nil {
+	if err = ctx.Err(); err != nil {
 		return
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "position": 15,`
	`2`	`+ "position": 16,`
`3`	`3`	`"label": "FAQ"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -674,12 +674,17 @@ func (g *generator) writeWhitespaceTrailer(indentLevel int, n parser.TrailingSpa`
`674`	`674`	`}`
`675`	`675`
`676`	`676`	`func (g *generator) writeDocType(indentLevel int, n parser.DocType) (err error) {`
`677`		`- if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf("<!doctype %s>", n.Value)); err != nil {`
	`677`	`+ if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf("<!doctype %s>", escapeQuotes(n.Value))); err != nil {`
`678`	`678`	`return err`
`679`	`679`	`}`
`680`	`680`	`return nil`
`681`	`681`	`}`
`682`	`682`
	`683`	`+func escapeQuotes(s string) string {`
	`684`	`+ quoted := strconv.Quote(s)`
	`685`	`+ return quoted[1 : len(quoted)-1]`
	`686`	`+}`
	`687`	`+`
`683`	`688`	`func (g *generator) writeIfExpression(indentLevel int, n parser.IfExpression, nextNode parser.Node) (err error) {`
`684`	`689`	`var r parser.Range`
`685`	`690`	`// if`
`@@ -1132,8 +1137,7 @@ func (g *generator) writeBoolConstantAttribute(indentLevel int, attr parser.Bool`
`1132`	`1137`	`func (g *generator) writeConstantAttribute(indentLevel int, attr parser.ConstantAttribute) (err error) {`
`1133`	`1138`	`name := html.EscapeString(attr.Name)`
`1134`	`1139`	`value := html.EscapeString(attr.Value)`
`1135`		`- value = strconv.Quote(value)`
`1136`		`- value = value[1 : len(value)-1]`
	`1140`	`+ value = escapeQuotes(value)`
`1137`	`1141`	if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(` %s=\"%s\"`, name, value)); err != nil {
`1138`	`1142`	`return err`
`1139`	`1143`	`}`
`@@ -1612,8 +1616,7 @@ func (g *generator) writeWhitespace(indentLevel int, n parser.Whitespace) (err e`
`1612`	`1616`	`}`
`1613`	`1617`
`1614`	`1618`	`func (g *generator) writeText(indentLevel int, n parser.Text) (err error) {`
`1615`		`- quoted := strconv.Quote(n.Value)`
`1616`		`- _, err = g.w.WriteStringLiteral(indentLevel, quoted[1:len(quoted)-1])`
	`1619`	`+ _, err = g.w.WriteStringLiteral(indentLevel, escapeQuotes(n.Value))`
`1617`	`1620`	`return err`
`1618`	`1621`	`}`
`1619`	`1622`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func (sh *Storybook) Build(ctx context.Context) (err error) {`
`109`	`109`	`if err != nil {`
`110`	`110`	`return`
`111`	`111`	`}`
`112`		`- if ctx.Err() != nil {`
	`112`	`+ if err = ctx.Err(); err != nil {`
`113`	`113`	`return`
`114`	`114`	`}`
`115`	`115`
`@@ -119,7 +119,7 @@ func (sh *Storybook) Build(ctx context.Context) (err error) {`
`119`	`119`	`if err != nil {`
`120`	`120`	`return`
`121`	`121`	`}`
`122`		`- if ctx.Err() != nil {`
	`122`	`+ if err = ctx.Err(); err != nil {`
`123`	`123`	`return`
`124`	`124`	`}`
`125`	`125`
`@@ -133,7 +133,7 @@ func (sh *Storybook) Build(ctx context.Context) (err error) {`
`133`	`133`	`} else {`
`134`	`134`	`sh.Log.Info("Storybook is up-to-date, skipping build step.")`
`135`	`135`	`}`
`136`		`- if ctx.Err() != nil {`
	`136`	`+ if err = ctx.Err(); err != nil {`
`137`	`137`	`return`
`138`	`138`	`}`
`139`	`139`