Skip to content
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

fix: SSR template escaping #12007

Merged
merged 3 commits into from
Jun 12, 2024
Merged

fix: SSR template escaping #12007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
292abdb
fix template escaping
gtm-nayan Jun 12, 2024
75badc6
formatting
gtm-nayan Jun 12, 2024
79866ed
Create late-zebras-argue.md
gtm-nayan Jun 12, 2024
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
5 changes: 5 additions & 0 deletions .changeset/late-zebras-argue.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"svelte": patch
---

fix: SSR template escaping
32 changes: 14 additions & 18 deletions packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,9 @@ import {
} from '../../../../internal/server/hydration.js';
import { filename, locator } from '../../../state.js';

export const block_open = string(BLOCK_OPEN);
export const block_close = string(BLOCK_CLOSE);
export const block_anchor = string(BLOCK_ANCHOR);

/** @param {string} value */
function string(value) {
return b.literal(sanitize_template_string(value));
}
export const block_open = b.literal(BLOCK_OPEN);
export const block_close = b.literal(BLOCK_CLOSE);
export const block_anchor = b.literal(BLOCK_ANCHOR);

/**
* @param {import('estree').Node} node
Expand Down Expand Up @@ -93,7 +88,8 @@ function serialize_template(template, out = b.id('$$payload.out'), operator = '+
if (!last) quasis.push((last = b.quasi('', false)));

if (node.type === 'Literal') {
last.value.raw += node.value;
last.value.raw +=
typeof node.value === 'string' ? sanitize_template_string(node.value) : node.value;
} else if (node.type === 'TemplateLiteral') {
last.value.raw += node.quasis[0].value.raw;
quasis.push(...node.quasis.slice(1));
Expand Down Expand Up @@ -1203,14 +1199,14 @@ const template_visitors = {
throw new Error('Node should have been handled elsewhere');
},
RegularElement(node, context) {
context.state.template.push(string(`<${node.name}`));
context.state.template.push(b.literal(`<${node.name}`));
const body = serialize_element_attributes(node, context);
context.state.template.push(string('>'));
context.state.template.push(b.literal('>'));

if ((node.name === 'script' || node.name === 'style') && node.fragment.nodes.length === 1) {
context.state.template.push(
string(/** @type {import('#compiler').Text} */ (node.fragment.nodes[0]).data),
string(`</${node.name}>`)
b.literal(/** @type {import('#compiler').Text} */ (node.fragment.nodes[0]).data),
b.literal(`</${node.name}>`)
);

return;
Expand Down Expand Up @@ -1285,7 +1281,7 @@ const template_visitors = {
}

if (!VoidElements.includes(node.name) && namespace !== 'foreign') {
state.template.push(string(`</${node.name}>`));
state.template.push(b.literal(`</${node.name}>`));
}

if (state.options.dev) {
Expand Down Expand Up @@ -1524,9 +1520,9 @@ const template_visitors = {
},
TitleElement(node, context) {
// title is guaranteed to contain only text/expression tag children
const template = [string('<title>')];
const template = [b.literal('<title>')];
process_children(node.fragment.nodes, { ...context, state: { ...context.state, template } });
template.push(string('</title>'));
template.push(b.literal('</title>'));

context.state.init.push(...serialize_template(template, b.id('$$payload.title'), '='));
},
Expand Down Expand Up @@ -1802,7 +1798,7 @@ function serialize_element_attributes(node, context) {
).value;
if (name !== 'class' || literal_value) {
context.state.template.push(
string(
b.literal(
` ${attribute.name}${
DOMBooleanAttributes.includes(name) && literal_value === true
? ''
Expand Down Expand Up @@ -1830,7 +1826,7 @@ function serialize_element_attributes(node, context) {

if (events_to_capture.size !== 0) {
for (const event of events_to_capture) {
context.state.template.push(string(` ${event}="this.__e=event"`));
context.state.template.push(b.literal(` ${event}="this.__e=event"`));
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/svelte/tests/runtime-legacy/samples/escape-template-literals/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { test } from '../../test';

export default test({
html: '<code>`${foo}\\n`</code>\n<div title="`${foo}\\n`">foo</div>\n<div>`${foo}\\n`</div>'
html: '<code>`${foo}\\n`</code>\n`\n<div title="`${foo}\\n`">foo</div>\n<div>`${foo}\\n`</div>'
});
1 change: 1 addition & 0 deletions packages/svelte/tests/runtime-legacy/samples/escape-template-literals/main.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
</script>

<code>`$&#123;foo}\n`</code>
{@html "`"}
<div title="`$&#123;foo}\n`">foo</div>
<Widget value="`$&#123;foo}\n`"/>
Loading