blog @main -
refs -
log -
-
https://git.jolheiser.com/blog.git
My nonexistent blog
chore: update templ
Signed-off-by: jolheiser <git@jolheiser.com>
Signature
-----BEGIN SSH SIGNATURE-----
U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgBTEvCQk6VqUAdN2RuH6bj1dNkY
oOpbPWj+jw4ua1B1cAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
AAAAQHR4FsHcOL4KVJlnvj3bLYdF/H1KvtkPo4xojWu997vkBiqvbbUBRuNdqZAbf59STW
oqATEuLRC9bQKAwdcIXQ0=
-----END SSH SIGNATURE-----
6 changed files, 111 additions(+), 87 deletions(-)
diff --git a/flake.lock b/flake.lock
index daaaf1e6cd10f38cd6cdfcffc70cec73f2b1677c..f5bcb522d6f69dcc5e62033951b6297b31a4d3aa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,11 +41,11 @@ "nixpkgs"
]
},
"locked": {
- "lastModified": 1694102001,
- "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=",
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
- "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
@@ -63,11 +63,11 @@ "nixpkgs"
]
},
"locked": {
- "lastModified": 1705314449,
- "narHash": "sha256-yfQQ67dLejP0FLK76LKHbkzcQqNIrux6MFe32MMFGNQ=",
+ "lastModified": 1722589758,
+ "narHash": "sha256-sbbA8b6Q2vB/t/r1znHawoXLysCyD4L/6n6/RykiSnA=",
"owner": "nix-community",
"repo": "gomod2nix",
- "rev": "30e3c3a9ec4ac8453282ca7f67fca9e1da12c3e6",
+ "rev": "4e08ca09253ef996bd4c03afa383b23e35fe28a1",
"type": "github"
},
"original": {
@@ -78,11 +78,11 @@ }
},
"nixpkgs": {
"locked": {
- "lastModified": 1710106936,
- "narHash": "sha256-VBjP7qVARzQ+TJDhQA7P9Da8QVm9ChHf/p3U16LtMjU=",
+ "lastModified": 1728679842,
+ "narHash": "sha256-c8LQCDsH4h5MRoeq3grbDhvk5FLEsv8xXFY/pFcFLrE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "132580d70a73003f4302840e71b3e0e93935fafc",
+ "rev": "e857941615688e07a70163fd83a60cf3221bb013",
"type": "github"
},
"original": {
@@ -122,11 +122,11 @@ ],
"xc": "xc"
},
"locked": {
- "lastModified": 1709917943,
- "narHash": "sha256-zDQxUFSmG/VX+xtK+nZ3ObRMVcMjjx+EUAxHLNcHHF8=",
+ "lastModified": 1728028863,
+ "narHash": "sha256-NEkcOnjMN+fI9/Lejy6As3/Cd0rxqU4c4Dwt7OYiiLM=",
"owner": "a-h",
"repo": "templ",
- "rev": "df2a32403bb4a8e4745ac10ddc8b3e77386d8045",
+ "rev": "318249d145b66fe1d66e34abf2321c86e1dfbc52",
"type": "github"
},
"original": {
@@ -144,11 +144,11 @@ "nixpkgs"
]
},
"locked": {
- "lastModified": 1703164129,
- "narHash": "sha256-kCcCqqwvjN07H8FPG4tXsRVRcMqT8dUNt9pwW1kKAe8=",
+ "lastModified": 1724404748,
+ "narHash": "sha256-p6rXzNiDm2uBvO1MLzC5pJp/0zRNzj/snBzZI0ce62s=",
"owner": "joerdav",
"repo": "xc",
- "rev": "0655cccfcf036556aeaddfb8f45dc7e8dd1b3680",
+ "rev": "960ff9f109d47a19122cfb015721a76e3a0f23a2",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index cef6a9fdfccae38fbceb771767c5dde25f92bd3d..a1035961990ef9c3456531756fbb44e2041919d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,34 +7,37 @@ inputs.nixpkgs.follows = "nixpkgs";
};
};
- outputs = {
- self,
- nixpkgs,
- templ,
- } @ inputs: let
- system = "x86_64-linux";
- pkgs = nixpkgs.legacyPackages.${system};
- templ = inputs.templ.packages.${system}.templ;
- in {
- packages.${system}.default = pkgs.buildGoModule {
- pname = "blog.jolheiser.com";
- version = "blog";
- src = ./.;
- vendorHash = nixpkgs.lib.fileContents ./go.mod.sri;
- nativeBuildInputs = [templ];
- excludedPackages = ".";
- postBuild = ''
- export BLOG_REF=${self.rev or "main"}
- go generate
- mv out $out
- '';
+ outputs =
+ {
+ self,
+ nixpkgs,
+ templ,
+ }@inputs:
+ let
+ system = "x86_64-linux";
+ pkgs = nixpkgs.legacyPackages.${system};
+ templ = inputs.templ.packages.${system}.templ;
+ in
+ {
+ packages.${system}.default = pkgs.buildGoModule {
+ pname = "blog.jolheiser.com";
+ version = "blog";
+ src = ./.;
+ vendorHash = nixpkgs.lib.fileContents ./go.mod.sri;
+ nativeBuildInputs = [ templ ];
+ excludedPackages = ".";
+ postBuild = ''
+ export BLOG_REF=${self.rev or "main"}
+ go generate
+ mv out $out
+ '';
+ };
+ devShells.default = pkgs.mkShell {
+ nativeBuildInputs = with pkgs; [
+ go
+ templ
+ vscode-langservers-extracted
+ ];
+ };
};
- devShells.default = pkgs.mkShell {
- nativeBuildInputs = with pkgs; [
- go
- templ
- vscode-langservers-extracted
- ];
- };
- };
}
diff --git a/go.mod b/go.mod
index 7ceafc376a1ad3103fb558460bda9de589c7ba7a..e83daac31f4290202ee032f1f498df6067f1bfaf 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.21.6
require (
github.com/BurntSushi/toml v1.3.2
- github.com/a-h/templ v0.2.543
+ github.com/a-h/templ v0.2.778
github.com/alecthomas/chroma/v2 v2.12.0
github.com/gorilla/feeds v1.1.2
github.com/yuin/goldmark v1.7.0
diff --git a/go.mod.sri b/go.mod.sri
index 8d173c1399888091ee2009049373bbc9d824186e..7787f01765df1420a0e1db54ada9b7c5842e76af 100644
--- a/go.mod.sri
+++ b/go.mod.sri
@@ -1 +1 @@
-sha256-kBUyYzHuCrNgD/KMXqrsd1V1xqpQmBADURIOh9CUFso=
\ No newline at end of file
+sha256-AdXfH+hHYm0KXW9eXquZnWt49EimmMjpbUYOMEvamX8=
\ No newline at end of file
diff --git a/go.sum b/go.sum
index b6480dd6af6a990164073d9407775bc0744bff4a..5623fc73ffd61df27ee192120e5fa9d9d3d8ec3e 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,7 @@
github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/a-h/templ v0.2.543 h1:8YyLvyUtf0/IE2nIwZ62Z/m2o2NqwhnMynzOL78Lzbk=
-github.com/a-h/templ v0.2.543/go.mod h1:jP908DQCwI08IrnTalhzSEH9WJqG/Q94+EODQcJGFUA=
+github.com/a-h/templ v0.2.778 h1:VzhOuvWECrwOec4790lcLlZpP4Iptt5Q4K9aFxQmtaM=
+github.com/a-h/templ v0.2.778/go.mod h1:lq48JXoUvuQrU0VThrK31yFwdRjTCnIE5bcPCM9IP1w=
github.com/alecthomas/assert/v2 v2.2.1 h1:XivOgYcduV98QCahG8T5XTezV5bylXe+lBxLG2K2ink=
github.com/alecthomas/assert/v2 v2.2.1/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs=
diff --git a/templates_templ.go b/templates_templ.go
index 3e781cce77b0a845b8054ebf0c0fed2cdae9aa72..265e3907885666585761805e55ee48fd6d4297af 100644
--- a/templates_templ.go
+++ b/templates_templ.go
@@ -1,23 +1,29 @@
// Code generated by templ - DO NOT EDIT.
-// templ: version: v0.2.608
+// templ: version: v0.2.786
package main
//lint:file-ignore SA4006 This context is only used if a nested component is present.
import "github.com/a-h/templ"
-import "context"
-import "io"
-import "bytes"
+import templruntime "github.com/a-h/templ/runtime"
import "fmt"
func baseTemplate(title, description string) templ.Component {
- return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
if !templ_7745c5c3_IsBuffer {
- templ_7745c5c3_Buffer = templ.GetBuffer()
- defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
}
ctx = templ.InitializeContext(ctx)
templ_7745c5c3_Var1 := templ.GetChildren(ctx)
@@ -76,19 +82,24 @@ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</body></html>")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- if !templ_7745c5c3_IsBuffer {
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
- }
return templ_7745c5c3_Err
})
}
func IndexTemplate(articles Articles) templ.Component {
- return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
if !templ_7745c5c3_IsBuffer {
- templ_7745c5c3_Buffer = templ.GetBuffer()
- defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
}
ctx = templ.InitializeContext(ctx)
templ_7745c5c3_Var5 := templ.GetChildren(ctx)
@@ -96,12 +107,18 @@ if templ_7745c5c3_Var5 == nil {
templ_7745c5c3_Var5 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- templ_7745c5c3_Var6 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+ templ_7745c5c3_Var6 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
if !templ_7745c5c3_IsBuffer {
- templ_7745c5c3_Buffer = templ.GetBuffer()
- defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
}
+ ctx = templ.InitializeContext(ctx)
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<header><h1>jolheiser</h1><p>Just a guy living in the middle of nowhere who likes to hack on open-source.</p></header><main>")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
@@ -165,28 +182,30 @@ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</main>")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- if !templ_7745c5c3_IsBuffer {
- _, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer)
- }
return templ_7745c5c3_Err
})
templ_7745c5c3_Err = baseTemplate("jolheiser's blog", "Hahaha yes.....YES!").Render(templ.WithChildren(ctx, templ_7745c5c3_Var6), templ_7745c5c3_Buffer)
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- if !templ_7745c5c3_IsBuffer {
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
- }
return templ_7745c5c3_Err
})
}
func ArticleTemplate(article Article) templ.Component {
- return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+ return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil {
+ return templ_7745c5c3_CtxErr
+ }
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
if !templ_7745c5c3_IsBuffer {
- templ_7745c5c3_Buffer = templ.GetBuffer()
- defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
}
ctx = templ.InitializeContext(ctx)
templ_7745c5c3_Var10 := templ.GetChildren(ctx)
@@ -194,12 +213,18 @@ if templ_7745c5c3_Var10 == nil {
templ_7745c5c3_Var10 = templ.NopComponent
}
ctx = templ.ClearChildren(ctx)
- templ_7745c5c3_Var11 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
- templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+ templ_7745c5c3_Var11 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) {
+ templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context
+ templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W)
if !templ_7745c5c3_IsBuffer {
- templ_7745c5c3_Buffer = templ.GetBuffer()
- defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+ defer func() {
+ templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err == nil {
+ templ_7745c5c3_Err = templ_7745c5c3_BufErr
+ }
+ }()
}
+ ctx = templ.InitializeContext(ctx)
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<header><h1><a href=\"/\"><small>jolheiser</small></a></h1><hr><h2>")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
@@ -273,18 +298,14 @@ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">source</a></footer>")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- if !templ_7745c5c3_IsBuffer {
- _, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer)
- }
return templ_7745c5c3_Err
})
templ_7745c5c3_Err = baseTemplate(article.Title, article.Summary).Render(templ.WithChildren(ctx, templ_7745c5c3_Var11), templ_7745c5c3_Buffer)
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- if !templ_7745c5c3_IsBuffer {
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
- }
return templ_7745c5c3_Err
})
}
+
+var _ = templruntime.GeneratedTemplate