From ea0fe37ab68a601c37f67225632ba129034d158f Mon Sep 17 00:00:00 2001 From: Miguel Angel Simon Sierra Date: Sat, 3 Oct 2026 17:41:00 -0700 Subject: [PATCH] fix(studio-server): inline scripts in HTML take only the root pass --- .../src/routes/files.renameReferences.test.ts | 4 ++-- packages/studio-server/src/routes/files.ts | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/studio-server/src/routes/files.renameReferences.test.ts b/packages/studio-server/src/routes/files.renameReferences.test.ts index 05586ca5de..b946412baf 100644 --- a/packages/studio-server/src/routes/files.renameReferences.test.ts +++ b/packages/studio-server/src/routes/files.renameReferences.test.ts @@ -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"), - '', + '', ); expect((await renameIn(project, "compositions/assets", "compositions/media")).status).toBe(200); expect(readFileSync(join(project, "compositions", "hero.html"), "utf8")).toBe( - '', + '', ); expect(readFileSync(join(project, "compositions", "app.js"), "utf8")).toBe( 'fetch("assets/bg.png")', diff --git a/packages/studio-server/src/routes/files.ts b/packages/studio-server/src/routes/files.ts index 53f835f519..1658c3a14b 100644 --- a/packages/studio-server/src/routes/files.ts +++ b/packages/studio-server/src/routes/files.ts @@ -671,6 +671,7 @@ function readableText(file: string): string | null { const escapeRegExp = (text: string) => text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); const MAX_REST = 256; +const INLINE_SCRIPT = /]*>[\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++;