From ea1bca05c7c43fb6b1c353d55db7b9ccf3018c14 Mon Sep 17 00:00:00 2001
From: Pierre Tachoire <pierre@lightpanda.io>
Date: Fri, 8 Aug 2025 14:30:41 +0200
Subject: [PATCH 1/5] fix no-script default value

---
 src/main.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.zig b/src/main.zig
index cb99d227..c89fec20 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -442,7 +442,7 @@ fn parseFetchArgs(
     args: *std.process.ArgIterator,
 ) !Command.Fetch {
     var dump: bool = false;
-    var noscript: bool = true;
+    var noscript: bool = false;
     var url: ?[]const u8 = null;
     var common: Command.Common = .{};
 

From 3d0928a449b1c8a71182ab2342c3fd55040393d3 Mon Sep 17 00:00:00 2001
From: Pierre Tachoire <pierre@lightpanda.io>
Date: Fri, 8 Aug 2025 15:18:11 +0200
Subject: [PATCH 2/5] add a --with_base option to fetch

with_base option adds a <base> tag to the dump for better offline preview.
---
 src/browser/dump.zig |  9 +++++++++
 src/main.zig         | 22 ++++++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/browser/dump.zig b/src/browser/dump.zig
index 68dc6086..2513dae5 100644
--- a/src/browser/dump.zig
+++ b/src/browser/dump.zig
@@ -23,6 +23,7 @@ const Walker = @import("dom/walker.zig").WalkerChildren;
 
 pub const Opts = struct {
     exclude_scripts: bool = false,
+    include_base: ?[]const u8 = null,
 };
 
 // writer must be a std.io.Writer
@@ -91,6 +92,14 @@ pub fn writeNode(node: *parser.Node, opts: Opts, writer: anytype) anyerror!void
             // void elements can't have any content.
             if (try isVoid(parser.nodeToElement(node))) return;
 
+            // If we wrote the <header> and we want to include a <base>, add it
+            // now.
+            if (opts.include_base != null and tag_type == .head) {
+                try writer.writeAll("<base href=\"");
+                try writer.writeAll(opts.include_base.?);
+                try writer.writeAll("\">");
+            }
+
             if (tag_type == .script) {
                 try writer.writeAll(try parser.nodeTextContent(node) orelse "");
             } else {
diff --git a/src/main.zig b/src/main.zig
index c89fec20..70dda469 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -134,7 +134,10 @@ fn run(alloc: Allocator) !void {
 
             // dump
             if (opts.dump) {
-                try page.dump(.{ .exclude_scripts = opts.noscript }, std.io.getStdOut());
+                try page.dump(.{
+                    .exclude_scripts = opts.noscript,
+                    .include_base = if (opts.withbase) page.url.raw else null,
+                }, std.io.getStdOut());
             }
         },
         else => unreachable,
@@ -213,6 +216,7 @@ const Command = struct {
         dump: bool = false,
         common: Common,
         noscript: bool = false,
+        withbase: bool = false,
     };
 
     const Common = struct {
@@ -277,6 +281,7 @@ const Command = struct {
             \\--dump          Dumps document to stdout.
             \\                Defaults to false.
             \\--noscript      Exclude <script> tags in dump. Defaults to false.
+            \\--with_base     Add a <base> tag in dump. Defaults to false.
             \\
         ++ common_options ++
             \\
@@ -351,13 +356,19 @@ fn inferMode(opt: []const u8) ?App.RunMode {
         return .serve;
     }
 
+    if (std.mem.startsWith(u8, opt, "--") == false) {
+        return .fetch;
+    }
+
     if (std.mem.eql(u8, opt, "--dump")) {
         return .fetch;
     }
+
     if (std.mem.eql(u8, opt, "--noscript")) {
         return .fetch;
     }
-    if (std.mem.startsWith(u8, opt, "--") == false) {
+
+    if (std.mem.eql(u8, opt, "--with_base")) {
         return .fetch;
     }
 
@@ -443,6 +454,7 @@ fn parseFetchArgs(
 ) !Command.Fetch {
     var dump: bool = false;
     var noscript: bool = false;
+    var withbase: bool = false;
     var url: ?[]const u8 = null;
     var common: Command.Common = .{};
 
@@ -457,6 +469,11 @@ fn parseFetchArgs(
             continue;
         }
 
+        if (std.mem.eql(u8, "--with_base", opt)) {
+            withbase = true;
+            continue;
+        }
+
         if (try parseCommonArg(allocator, opt, args, &common)) {
             continue;
         }
@@ -483,6 +500,7 @@ fn parseFetchArgs(
         .dump = dump,
         .common = common,
         .noscript = noscript,
+        .withbase = withbase,
     };
 }
 

From 7ffdee0d7f696340be0175b1b3d896ea48bbea3b Mon Sep 17 00:00:00 2001
From: Pierre Tachoire <pierre@lightpanda.io>
Date: Fri, 8 Aug 2025 15:20:01 +0200
Subject: [PATCH 3/5] node: add baseURI getter

---
 src/browser/dom/node.zig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/browser/dom/node.zig b/src/browser/dom/node.zig
index 08c8f42e..3a2f47be 100644
--- a/src/browser/dom/node.zig
+++ b/src/browser/dom/node.zig
@@ -111,6 +111,9 @@ pub const Node = struct {
     // --------
 
     // Read-only attributes
+    pub fn get_baseURI(_: *parser.Node, page: *Page) ![]const u8 {
+        return page.url.raw;
+    }
 
     pub fn get_firstChild(self: *parser.Node) !?Union {
         const res = try parser.nodeFirstChild(self);
@@ -737,6 +740,10 @@ test "Browser.DOM.node" {
         .{ "link.normalize()", "undefined" },
     }, .{});
 
+    try runner.testCases(&.{
+        .{ "link.baseURI", "https://lightpanda.io/opensource-browser/" },
+    }, .{});
+
     try runner.testCases(&.{
         .{ "content.removeChild(append) !== undefined", "true" },
         .{ "last_child.__proto__.constructor.name !== 'HTMLHeadingElement'", "true" },

From 5e30a3997e7d345526ad3956dad1dffabdeb2c8f Mon Sep 17 00:00:00 2001
From: Pierre Tachoire <pierre@lightpanda.io>
Date: Fri, 8 Aug 2025 16:17:52 +0200
Subject: [PATCH 4/5] typo fix

Co-authored-by: Karl Seguin <karlseguin@users.noreply.github.com>
---
 src/browser/dump.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/dump.zig b/src/browser/dump.zig
index 2513dae5..cf110420 100644
--- a/src/browser/dump.zig
+++ b/src/browser/dump.zig
@@ -92,7 +92,7 @@ pub fn writeNode(node: *parser.Node, opts: Opts, writer: anytype) anyerror!void
             // void elements can't have any content.
             if (try isVoid(parser.nodeToElement(node))) return;
 
-            // If we wrote the <header> and we want to include a <base>, add it
+            // If we wrote the <head> and we want to include a <base>, add it
             // now.
             if (opts.include_base != null and tag_type == .head) {
                 try writer.writeAll("<base href=\"");

From dc23a74e7bf0138049f3aa313c638b08c4d954c5 Mon Sep 17 00:00:00 2001
From: Pierre Tachoire <pierre@lightpanda.io>
Date: Fri, 8 Aug 2025 18:31:08 +0200
Subject: [PATCH 5/5] add <base> in the DOM tree

---
 src/browser/dump.zig |  9 ---------
 src/browser/page.zig | 35 +++++++++++++++++++++++++++++++++--
 src/main.zig         |  2 +-
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/browser/dump.zig b/src/browser/dump.zig
index cf110420..68dc6086 100644
--- a/src/browser/dump.zig
+++ b/src/browser/dump.zig
@@ -23,7 +23,6 @@ const Walker = @import("dom/walker.zig").WalkerChildren;
 
 pub const Opts = struct {
     exclude_scripts: bool = false,
-    include_base: ?[]const u8 = null,
 };
 
 // writer must be a std.io.Writer
@@ -92,14 +91,6 @@ pub fn writeNode(node: *parser.Node, opts: Opts, writer: anytype) anyerror!void
             // void elements can't have any content.
             if (try isVoid(parser.nodeToElement(node))) return;
 
-            // If we wrote the <head> and we want to include a <base>, add it
-            // now.
-            if (opts.include_base != null and tag_type == .head) {
-                try writer.writeAll("<base href=\"");
-                try writer.writeAll(opts.include_base.?);
-                try writer.writeAll("\">");
-            }
-
             if (tag_type == .script) {
                 try writer.writeAll(try parser.nodeTextContent(node) orelse "");
             } else {
diff --git a/src/browser/page.zig b/src/browser/page.zig
index eff09152..ba57167b 100644
--- a/src/browser/page.zig
+++ b/src/browser/page.zig
@@ -141,8 +141,13 @@ pub const Page = struct {
         repeat_delay.* = 100 * std.time.ns_per_ms;
     }
 
+    pub const DumpOpts = struct {
+        exclude_scripts: bool = false,
+        with_base: bool = false,
+    };
+
     // dump writes the page content into the given file.
-    pub fn dump(self: *const Page, opts: Dump.Opts, out: std.fs.File) !void {
+    pub fn dump(self: *const Page, opts: DumpOpts, out: std.fs.File) !void {
         if (self.raw_data) |raw_data| {
             // raw_data was set if the document was not HTML, dump the data content only.
             return try out.writeAll(raw_data);
@@ -150,7 +155,33 @@ pub const Page = struct {
 
         // if the page has a pointer to a document, dumps the HTML.
         const doc = parser.documentHTMLToDocument(self.window.document);
-        try Dump.writeHTML(doc, opts, out);
+
+        // if the base si requested, add the base's node in the document's headers.
+        if (opts.with_base) {
+            try self.addDOMTreeBase();
+        }
+
+        try Dump.writeHTML(doc, .{
+            .exclude_scripts = opts.exclude_scripts,
+        }, out);
+    }
+
+    // addDOMTreeBase modifies the page's document to add a <base> tag after
+    // <head>.
+    // If <head> is missing, the function returns silently.
+    fn addDOMTreeBase(self: *const Page) !void {
+        const doc = parser.documentHTMLToDocument(self.window.document);
+        std.debug.assert(doc.is_html);
+
+        // find <head> tag
+        const list = try parser.documentGetElementsByTagName(doc, "head");
+        const head = try parser.nodeListItem(list, 0) orelse return;
+
+        const base = try parser.documentCreateElement(doc, "base");
+        try parser.elementSetAttribute(base, "href", self.url.raw);
+
+        const Node = @import("dom/node.zig").Node;
+        try Node.prepend(head, &[_]Node.NodeOrText{.{ .node = parser.elementToNode(base) }});
     }
 
     pub fn fetchModuleSource(ctx: *anyopaque, src: []const u8) !?[]const u8 {
diff --git a/src/main.zig b/src/main.zig
index 70dda469..4ca6db09 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -136,7 +136,7 @@ fn run(alloc: Allocator) !void {
             if (opts.dump) {
                 try page.dump(.{
                     .exclude_scripts = opts.noscript,
-                    .include_base = if (opts.withbase) page.url.raw else null,
+                    .with_base = opts.withbase,
                 }, std.io.getStdOut());
             }
         },