Merge pull request #1188 from lightpanda-io/script-load-order

krichprollsch · web-flow · commit cc83d8554251 · 2025-10-28T14:12:31.000+01:00
add a test for script load order
diff --git a/src/browser/ScriptManager.zig b/src/browser/ScriptManager.zig
@@ -643,6 +643,18 @@ pub const PendingScript = struct {
         // if async isn't known, it'll fallback to defer.
 
         const script = &self.script;
+
+        // Module scripts are deferred by default.
+        // https://v8.dev/features/modules#defer
+        if (script.kind == .module) {
+            return &self.manager.deferreds;
+        }
+
+        // Script is not a module but inline, we ignore async/defer properties.
+        if (script.source == .@"inline") {
+            return &self.manager.scripts;
+        }
+
         if (script.is_async) {
             return &self.manager.asyncs;
         }
@@ -651,12 +663,6 @@ pub const PendingScript = struct {
             return &self.manager.deferreds;
         }
 
-        // Module scripts are deferred by default.
-        // https://v8.dev/features/modules#defer
-        if (script.kind == .module) {
-            return &self.manager.deferreds;
-        }
-
         return &self.manager.scripts;
     }
 };
diff --git a/src/browser/html/elements.zig b/src/browser/html/elements.zig
@@ -1350,6 +1350,7 @@ test "Browser: HTML.HtmlScriptElement" {
     try testing.htmlRunner("html/script/import.html");
     try testing.htmlRunner("html/script/dynamic_import.html");
     try testing.htmlRunner("html/script/importmap.html");
+    try testing.htmlRunner("html/script/order.html");
 }
 
 test "Browser: HTML.HtmlSlotElement" {
diff --git a/src/tests/html/script/order.html b/src/tests/html/script/order.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<script src="../../testing.js"></script>
+
+<script defer id="remote_defer" src="order_defer.js"></script>
+<script defer id="remote_async" src="order_async.js"></script>
+
+<script type=module id="inline_module">
+    // inline module is always deferred.
+    list += 'g';
+    testing.expectEqual('abcdefg', list);
+</script>
+
+<script>
+    var list = '';
+</script>
+
+<script id="remote" src="order.js"></script>
+
+<script async id="inline_async">
+    // inline script ignore async
+    list += 'b';
+    testing.expectEqual('ab', list);
+</script>
+
+<script defer id="inline_defer">
+    // inline script ignore defer
+    list += 'c';
+    testing.expectEqual('abc', list);
+</script>
+
+<script id="default">
+    // simple inline script
+    list += 'd';
+    testing.expectEqual('abcd', list);
+</script>
diff --git a/src/tests/html/script/order.js b/src/tests/html/script/order.js
@@ -0,0 +1,2 @@
+list += 'a';
+testing.expectEqual('a', list);
diff --git a/src/tests/html/script/order_async.js b/src/tests/html/script/order_async.js
@@ -0,0 +1,3 @@
+list += 'f';
+testing.expectEqual('abcdef', list);
+
diff --git a/src/tests/html/script/order_defer.js b/src/tests/html/script/order_defer.js
@@ -0,0 +1,2 @@
+list += 'e';
+testing.expectEqual('abcde', list);

Original file line number	Diff line number	Diff line change
`@@ -1350,6 +1350,7 @@ test "Browser: HTML.HtmlScriptElement" {`
`1350`	`1350`	`try testing.htmlRunner("html/script/import.html");`
`1351`	`1351`	`try testing.htmlRunner("html/script/dynamic_import.html");`
`1352`	`1352`	`try testing.htmlRunner("html/script/importmap.html");`
	`1353`	`+ try testing.htmlRunner("html/script/order.html");`
`1353`	`1354`	`}`
`1354`	`1355`
`1355`	`1356`	`test "Browser: HTML.HtmlSlotElement" {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+list += 'a';`
	`2`	`+testing.expectEqual('a', list);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+list += 'f';`
	`2`	`+testing.expectEqual('abcdef', list);`
	`3`	`+`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+list += 'e';`
	`2`	`+testing.expectEqual('abcde', list);`