diff --git a/build.zig b/build.zig index d96c081..dd0e771 100644 --- a/build.zig +++ b/build.zig @@ -4,12 +4,6 @@ const zine = @import("zine"); pub fn build(b: *std.Build) !void { const drafts = b.option(bool, "drafts", "Build drafts") orelse false; - // Workaround for Zine's early return bug on macOS due to lazy dependencies - const zine_dep = b.dependencyFromBuildZig(zine, .{}); - if (zine_dep.builder.install_tls.step.dependencies.items.len == 0) { - return; - } - const compile_stylesheet = b.step("stylesheet", "Compile stylesheet from scss files"); const compile_stylesheet_cmd_out = b.run(&.{ "sass", @@ -40,12 +34,13 @@ pub fn build(b: *std.Build) !void { .force = true, }); website.step.dependOn(&install_stylesheet.step); - + website.addPassthruArgs(); if (drafts) { website.addArg("--drafts"); } - b.getInstallStep().dependOn(&website.step); + const dist = b.step("dist", "Build the website for production"); + dist.dependOn(&website.step); const serve = b.step("serve", "Start the Zine dev server"); const run_zine = zine.serve(b, .{ diff --git a/content/notes/markdown-overview/foo.zig b/content/notes/markdown-overview/foo.zig index 47f3715..dd0e771 100644 --- a/content/notes/markdown-overview/foo.zig +++ b/content/notes/markdown-overview/foo.zig @@ -2,15 +2,15 @@ const std = @import("std"); const zine = @import("zine"); pub fn build(b: *std.Build) !void { - const compile_stylesheet = b.step("stylesheet", "Compile altagos.css stylesheet from scss files"); - compile_stylesheet.result_cached = false; - std.debug.assert(try compile_stylesheet.addDirectoryWatchInput(b.path("style"))); + const drafts = b.option(bool, "drafts", "Build drafts") orelse false; + const compile_stylesheet = b.step("stylesheet", "Compile stylesheet from scss files"); const compile_stylesheet_cmd_out = b.run(&.{ "sass", "--no-source-map", "--no-color", - "style/index.scss", + "--load-path=./style", + "./style/index.scss", }); const compile_stylesheet_cmd = b.addWriteFile("altagos.css", compile_stylesheet_cmd_out); const install_stylesheet = b.addInstallDirectory(.{ @@ -29,17 +29,25 @@ pub fn build(b: *std.Build) !void { compile_stylesheet.dependOn(&install_stylesheet.step); const website = zine.website(b, .{ - .install_path = "website", + .output_path = "website", .build_assets = &.{stylesheet}, + .force = true, }); - website.step.dependOn(compile_stylesheet); - b.getInstallStep().dependOn(&website.step); + website.step.dependOn(&install_stylesheet.step); + website.addPassthruArgs(); + if (drafts) { + website.addArg("--drafts"); + } + + const dist = b.step("dist", "Build the website for production"); + dist.dependOn(&website.step); const serve = b.step("serve", "Start the Zine dev server"); const run_zine = zine.serve(b, .{ .build_assets = &.{stylesheet}, - // .debug = .{ .scopes = &.{"serve"} }, }); run_zine.step.dependOn(&install_stylesheet.step); + run_zine.addPassthruArgs(); + serve.dependOn(&run_zine.step); } diff --git a/layouts/index.shtml b/layouts/index.shtml index 75b8a7b..663834b 100644 --- a/layouts/index.shtml +++ b/layouts/index.shtml @@ -1,18 +1,11 @@ - -

- - - - +