diff --git a/src/generators/nodes/Element.ts b/src/generators/nodes/Element.ts index 48852c27ea..b94cf88a65 100644 --- a/src/generators/nodes/Element.ts +++ b/src/generators/nodes/Element.ts @@ -433,8 +433,8 @@ export default class Element extends Node { if (isVoidElementName(node.name)) return open + '>'; - if (node.name === 'script' || node.name === 'style') { - return `${open}>${node.data}`; + if (node.name === 'script') { + return `${open}>${node.children[0].data}`; } return `${open}>${node.children.map(toHTML).join('')}`; diff --git a/src/generators/server-side-rendering/visitors/Element.ts b/src/generators/server-side-rendering/visitors/Element.ts index 486f0f01a3..9ef9289d88 100644 --- a/src/generators/server-side-rendering/visitors/Element.ts +++ b/src/generators/server-side-rendering/visitors/Element.ts @@ -68,8 +68,8 @@ export default function visitElement( if (node.name === 'textarea' && textareaContents !== undefined) { generator.append(textareaContents); - } else if (node.name === 'script' || node.name === 'style') { - generator.append(escape(node.data)); + } else if (node.name === 'script') { + generator.append(node.children[0].data); } else { node.children.forEach((child: Node) => { visit(generator, block, child); diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts index a659dc6d3d..8b701cae1d 100644 --- a/src/parse/state/tag.ts +++ b/src/parse/state/tag.ts @@ -224,10 +224,22 @@ export default function tag(parser: Parser) { ); parser.read(/<\/textarea>/); element.end = parser.index; - } else if (name === 'script' || name === 'style') { + } else if (name === 'script') { // special case - element.data = parser.readUntil(new RegExp(``)); - parser.eat(``, true); + const start = parser.index; + const data = parser.readUntil(/<\/script>/); + const end = parser.index; + element.children.push({ start, end, type: 'Text', data }); + parser.eat('', true); + element.end = parser.index; + } else if (name === 'style') { + // special case + element.children = readSequence( + parser, + () => + parser.template.slice(parser.index, parser.index + 8) === '' + ); + parser.read(/<\/style>/); element.end = parser.index; } else { parser.stack.push(element); diff --git a/test/runtime/samples/non-root-style-interpolation/_config.js b/test/runtime/samples/non-root-style-interpolation/_config.js new file mode 100644 index 0000000000..326d17e3b1 --- /dev/null +++ b/test/runtime/samples/non-root-style-interpolation/_config.js @@ -0,0 +1,15 @@ +export default { + data: { + color: 'red', + }, + + html: ` +
+ + foo +
`, +}; diff --git a/test/runtime/samples/non-root-style-interpolation/main.html b/test/runtime/samples/non-root-style-interpolation/main.html new file mode 100644 index 0000000000..b49fc101a7 --- /dev/null +++ b/test/runtime/samples/non-root-style-interpolation/main.html @@ -0,0 +1,8 @@ +
+ + foo +
diff --git a/test/runtime/samples/script-style-non-top-level/_config.js b/test/runtime/samples/script-style-non-top-level/_config.js new file mode 100644 index 0000000000..1aade72239 --- /dev/null +++ b/test/runtime/samples/script-style-non-top-level/_config.js @@ -0,0 +1,8 @@ +export default { + html: ` +
+ + +
+ ` +}; \ No newline at end of file diff --git a/test/runtime/samples/script-style-non-top-level/main.html b/test/runtime/samples/script-style-non-top-level/main.html new file mode 100644 index 0000000000..94cf72e4bd --- /dev/null +++ b/test/runtime/samples/script-style-non-top-level/main.html @@ -0,0 +1,4 @@ +
+ + +
\ No newline at end of file