Skip to content

fix: transform JS files containing </script> to escape template literals #7987

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
graphite-app merged 1 commit into from
Jan 21, 2026
Merged

fix: transform JS files containing </script> to escape template literals #7987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 1 deletion crates/rolldown/src/utils/pre_process_ecma_ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,12 @@ impl PreProcessEcmaAst {
// Step 3: Transform TypeScript and jsx.
// Note: Currently, oxc_transform supports es syntax up to ES2024 (unicode-sets-regex).
let is_not_js = !matches!(parsed_type, OxcParseType::Js);
if is_not_js || bundle_options.transform_options.should_transform_js() {

if is_not_js
|| bundle_options.transform_options.should_transform_js()
// Run transformer on JS files containing `</script` to handle tagged template literals.
|| memchr::memmem::find(ast.source().as_bytes(), "</script".as_bytes()).is_some()
{
ast.program.with_mut(|WithMutFields { program, allocator, .. }| {
// Pass file path only for non-JS modules (TS/TSX/JSX) to enable tsconfig discovery.
// For plain JS files, we skip tsconfig lookup since they don't need TS-specific transformations.
Expand Down
10 changes: 0 additions & 10 deletions crates/rolldown/tests/rolldown/issues/6829/_config.json
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions crates/rolldown/tests/rolldown/issues/6829/_test.mjs
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions crates/rolldown/tests/rolldown/issues/6829/artifacts.snap
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions crates/rolldown/tests/snapshots/integration_rolldown__filename_with_hash.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5014,10 +5014,6 @@ expression: output
- main-!~{000}~.js => main-D7G5mb2I.js
- dynamic-!~{001}~.js => dynamic-BMZTHQfH.js

# tests/rolldown/issues/6829

- main-!~{000}~.js => main-vaEeLWmo.js

# tests/rolldown/issues/6879

- main-!~{000}~.js => main-9vfNU47B.js
Expand Down
2 changes: 1 addition & 1 deletion crates/rolldown_common/src/inner_bundler_options/types/transform_option/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ impl TryFrom<TransformOptions> for oxc::transformer::TransformOptions {
// helper_loader: options
// .helpers
// .map_or_else(HelperLoaderOptions::default, HelperLoaderOptions::from),
plugins: options.plugins.map(oxc::transformer::PluginsOptions::from).unwrap_or_default(),
plugins: oxc::transformer::PluginsOptions::from(options.plugins.unwrap_or_default()),
..Default::default()
})
}
Expand Down
17 changes: 17 additions & 0 deletions packages/rolldown/tests/fixtures/issues/6829/_config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { defineTest } from "rolldown-tests";
import { expect } from "vitest";

export default defineTest({
config: {
input: "./main.js",
},
afterTest(output) {
const chunk = output.output.find(
(chunk) => chunk.type === "chunk" && chunk.isEntry,
);
expect(chunk).toBeDefined();
if (chunk?.type === "chunk") {
expect(chunk.code).toContain(` String.raw(_templateObject || (_templateObject = _taggedTemplateLiteral(["<\\/script>"])))`);
}
},
});
0 ...lldown/tests/rolldown/issues/6829/main.js → ...lldown/tests/fixtures/issues/6829/main.js
View file
Open in desktop
File renamed without changes.
Loading