Merge pull request #7 from sea-grass/development

v0.0.6

Author: sea-grass

site/pages/changelog.md

@@ -4,6 +4,14 @@ title: Changelog
 template: page.html
 ---
 
+## 0.0.6
+
+This release is a quick follow-up to the previous release to fix a bug with the theme shortcodes.
+
+### Shortcodes
+
+- `{{& theme.head }}` now correctly references theme assets according to the `url_prefix`, if provided.
+
 ## 0.0.5
 
 This PR contains many changes that are under the hood to support future features. User-facing changes include a more recent supported Zig version, updates to page parameters, more informative error messages, updates to shortcodes, and improvements to the markdown renderer.

src/main.zig

@@ -42,6 +42,7 @@ const BuildCommand = struct {
 
     pub const ParseError = error{
         Help,
+        MalformedUrlPrefix,
         MemoryError,
         MissingOutDir,
         MissingSiteRoot,
@@ -94,6 +95,12 @@ const BuildCommand = struct {
 
         const url_prefix: ?[]const u8 = if (res.args.prefix) |prefix| prefix else null;
 
+        if (url_prefix != null) {
+            if (!mem.startsWith(u8, url_prefix.?, "/")) {
+                return error.MalformedUrlPrefix;
+            }
+        }
+
         return .{
             .site_root = arena.allocator().dupe(u8, site_root) catch return error.MemoryError,
             .out_dir = arena.allocator().dupe(u8, out_dir_path) catch return error.MemoryError,
@@ -190,6 +197,10 @@ pub fn main() !void {
             log.err("Provided site root directory does not exist. Exiting.", .{});
             process.exit(1);
         },
+        BuildCommand.ParseError.MalformedUrlPrefix => {
+            log.err("Provided url prefix is invalid. Note that the url prefix must begin with a '/' character.", .{});
+            process.exit(1);
+        },
         else => process.exit(1),
     };
     defer build.deinit();

src/mustache.zig

@@ -320,12 +320,20 @@ fn MustacheWriterType(comptime Context: type, comptime Writer: type) type {
             }
 
             if (mem.eql(u8, key, "theme.head")) {
-                return try fmt.allocPrint(
-                    ctx.arena,
-                    \\<link rel="stylesheet" type="text/css" href="/bulma.css" />
-                ,
-                    .{},
-                );
+                return if (ctx.context.site_root.len == 0)
+                    try fmt.allocPrint(
+                        ctx.arena,
+                        \\<link rel="stylesheet" type="text/css" href="/bulma.css" />
+                    ,
+                        .{},
+                    )
+                else
+                    try fmt.allocPrint(
+                        ctx.arena,
+                        \\<link rel="stylesheet" type="text/css" href="{[site_root]s}/bulma.css" />
+                    ,
+                        .{ .site_root = ctx.context.site_root },
+                    );
             } else if (mem.eql(u8, key, "theme.body")) {
                 // theme.body can be used by themes to inject e.g. scripts.
                 // It's currently empty, but content authors are still recommended