Skip to content

fix(core): revert Function constructor regression in sub-composition scripts #1075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miguel-heygen merged 2 commits into from
May 25, 2026
+9 −8
Merged

fix(core): revert Function constructor regression in sub-composition scripts #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f4ae53
fix(core): revert Function constructor back to inline IIFE for compos…
miguel-heygen May 25, 2026
6d97c3d
fix(core): restore IIFE with </script> escaping for composition scripts
miguel-heygen May 25, 2026
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
7 changes: 4 additions & 3 deletions packages/core/src/compiler/compositionScoping.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,14 +572,15 @@ window.__afterTimeline = window.__timelines.scene;
expect(scoped).toContain('[data-composition-id="chrome-overlay"] .child-element');
});

it("wraps scoped composition script source as a string literal", () => {
it("escapes </script> in scoped composition script source to prevent injection", () => {
const wrapped = wrapScopedCompositionScript(
'window.payload = "</script><script>window.pwned = true;</script>";',
"scene",
);

expect(wrapped).toContain('Function("document", "gsap", "window", "__hyperframes", ');
expect(wrapped).toContain('\\"</script><script>window.pwned = true;</script>\\"');
expect(wrapped).toContain("(function(document, gsap, window, __hyperframes)");
expect(wrapped).not.toContain("</script><script>");
expect(wrapped).toContain("<\\/script>");
});

it("wraps unscoped composition script source as a string literal", () => {
Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/compiler/compositionScoping.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@
const authoredRootIdFormsLiteral = JSON.stringify(
getAuthoredRootIdSelectorForms(authoredRootId?.trim() || ""),
);
const sourceLiteral = JSON.stringify(source);
return `(function(){
var __hfCompId = ${compositionIdLiteral};
var __hfTimelineCompId = ${timelineCompositionIdLiteral};
Expand Down Expand Up @@ -486,8 +485,9 @@
});
var __hfRun = function() {
try {
var __hfScript = Function("document", "gsap", "window", "__hyperframes", ${sourceLiteral});
__hfScript.call(window, __hfScopedDocument, __hfScopedGsap, __hfScopedWindow, __hfScopedHyperframes);
(function(document, gsap, window, __hyperframes) {
${source.replace(/<\/(script)/gi, "<\\/$1")}

Check warning

Code scanning / CodeQL

Unsafe code constructed from library input Medium

This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
This string concatenation which depends on
library input
Loading
is later
interpreted as code
Loading
.
}).call(window, __hfScopedDocument, __hfScopedGsap, __hfScopedWindow, __hfScopedHyperframes);
} catch (_err) {
console.error(__hfErrorLabel, __hfCompId, _err);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/compiler/htmlBundler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,8 +758,8 @@ describe("bundleToSingleHtml", () => {
expect(bundled).toContain('[data-composition-id="scene"] .title { color: red; }');
expect(bundled).toContain("new Proxy(window.document");
expect(bundled).toContain("new Proxy(__hfBaseGsap");
expect(bundled).toContain('Function("document", "gsap", "window", "__hyperframes",');
expect(bundled).toContain("tl.to('.title'");
expect(bundled).toContain("(function(document, gsap, window, __hyperframes)");
expect(bundled).toContain('tl.to(".title"');
});

it("isolates sibling instances of the same external sub-composition", async () => {
Expand Down
Loading