mirror of
https://github.com/heygen-com/hyperframes.git
synced 2026-11-18 07:50:13 +00:00
fix(studio-server): inline scripts in HTML take only the root pass
This commit is contained in:
@@ -360,12 +360,12 @@ describe("renaming a folder over the route", () => {
|
||||
writeFileSync(join(project, "compositions", "assets", "bg.png"), "x");
|
||||
writeFileSync(
|
||||
join(project, "compositions", "hero.html"),
|
||||
'<img src="assets/logo.png"><img src="assets/logo final.png"><img src="assets/bg.png final.png"><img src="assets/bg.png)final.png"><img srcset="assets/bg.png 2x" src="assets/bg.png">',
|
||||
'<img src="assets/logo.png"><img src="assets/logo final.png"><img src="assets/bg.png final.png"><img src="assets/bg.png)final.png"><img srcset="assets/bg.png 2x" src="assets/bg.png"><script>fetch("assets/bg.png")</script>',
|
||||
);
|
||||
|
||||
expect((await renameIn(project, "compositions/assets", "compositions/media")).status).toBe(200);
|
||||
expect(readFileSync(join(project, "compositions", "hero.html"), "utf8")).toBe(
|
||||
'<img src="assets/logo.png"><img src="assets/logo final.png"><img src="assets/bg.png final.png"><img src="assets/bg.png)final.png"><img srcset="media/bg.png 2x" src="media/bg.png">',
|
||||
'<img src="assets/logo.png"><img src="assets/logo final.png"><img src="assets/bg.png final.png"><img src="assets/bg.png)final.png"><img srcset="media/bg.png 2x" src="media/bg.png"><script>fetch("assets/bg.png")</script>',
|
||||
);
|
||||
expect(readFileSync(join(project, "compositions", "app.js"), "utf8")).toBe(
|
||||
'fetch("assets/bg.png")',
|
||||
|
||||
@@ -671,6 +671,7 @@ function readableText(file: string): string | null {
|
||||
const escapeRegExp = (text: string) => text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
||||
|
||||
const MAX_REST = 256;
|
||||
const INLINE_SCRIPT = /<script\b[^>]*>[\s\S]*?<\/script>/gi;
|
||||
// Where a reference ends inside text: its end, `)`, a query or fragment, a srcset comma or width/density.
|
||||
const REFERENCE_END = /^(?:$|\)(?=$|[\s;,])|[?#]|,\s|\s+\d+(?:\.\d+)?[wx](?![\w.]))/;
|
||||
const SEPARATOR = String.raw`\\{0,2}[\\/]`;
|
||||
@@ -852,9 +853,15 @@ function updateReferences(
|
||||
const parent = parentFolderEdits.get(relative(projectDir, dirname(file)).split(sep).join("/"));
|
||||
// Script and data paths resolve against the page, not their own folder: only the root pass reads them.
|
||||
const kind = /\.css$/i.test(file) ? "css" : /\.html$/i.test(file) ? "html" : null;
|
||||
const beside = kind && parent?.[kind];
|
||||
const beside = (kind && parent?.[kind]?.(content)) || [];
|
||||
const scripts = kind === "html" ? [...content.matchAll(INLINE_SCRIPT)] : [];
|
||||
const outside = beside.filter((edit) =>
|
||||
scripts.every(
|
||||
(script) => edit.at < script.index || edit.at >= script.index + script[0].length,
|
||||
),
|
||||
);
|
||||
// A bare path in a folder's file is relative to that folder, so its edit wins where both start.
|
||||
const updated = applyEdits(content, [...(beside?.(content) ?? []), ...rootEdits(content)]);
|
||||
const updated = applyEdits(content, [...outside, ...rootEdits(content)]);
|
||||
if (updated !== content) {
|
||||
replaceFileAtomically(file, updated, statSync(file).mode);
|
||||
updatedCount++;
|
||||
|
||||
Reference in New Issue
Block a user