Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/browser/ScriptManager.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
};
Expand Down
1 change: 1 addition & 0 deletions src/browser/html/elements.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
35 changes: 35 additions & 0 deletions src/tests/html/script/order.html
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 2 additions & 0 deletions src/tests/html/script/order.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
list += 'a';
testing.expectEqual('a', list);
3 changes: 3 additions & 0 deletions src/tests/html/script/order_async.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
list += 'f';
testing.expectEqual('abcdef', list);

2 changes: 2 additions & 0 deletions src/tests/html/script/order_defer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
list += 'e';
testing.expectEqual('abcde', list);