Merge pull request #1160 from sveltejs/gh-1108

Rich-Harris · web-flow · commit a33dfe5bf3a0 · 2018-02-09T08:24:05.000-05:00
remove <noscript> elements in DOM mode (#1108)
diff --git a/src/generators/nodes/Element.ts b/src/generators/nodes/Element.ts
@@ -162,6 +162,8 @@ export default class Element extends Node {
 			this.generator.slots.add(slotName);
 		}
 
+		if (this.name === 'noscript') return;
+
 		const childState = {
 			parentNode: this.var,
 			parentNodes: parentNodes && block.getUniqueName(`${this.var}_nodes`) // if we're in unclaimable territory, i.e. <head>, parentNodes is null
@@ -423,6 +425,8 @@ export default class Element extends Node {
 					: escapeHTML(node.data);
 			}
 
+			if (node.name === 'noscript') return '';
+
 			let open = `<${node.name}`;
 
 			if (node._needsCssAttribute) {
diff --git a/test/runtime/samples/noscript-removal/_config.js b/test/runtime/samples/noscript-removal/_config.js
@@ -0,0 +1,9 @@
+export default {
+	'skip-ssr': true,
+
+	html: `
+	<div>foo</div>
+
+	<div>foo<div>foo</div></div>
+`,
+};
diff --git a/test/runtime/samples/noscript-removal/main.html b/test/runtime/samples/noscript-removal/main.html
@@ -0,0 +1,5 @@
+<noscript>foo</noscript>
+
+<div>foo<noscript>foo</noscript></div>
+
+<div>foo<div>foo<noscript>foo</noscript></div></div>

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,8 @@ export default class Element extends Node {`
`162`	`162`	`this.generator.slots.add(slotName);`
`163`	`163`	`}`
`164`	`164`
	`165`	`+ if (this.name === 'noscript') return;`
	`166`	`+`
`165`	`167`	`const childState = {`
`166`	`168`	`parentNode: this.var,`
`167`	`169`	parentNodes: parentNodes && block.getUniqueName(`${this.var}_nodes`) // if we're in unclaimable territory, i.e. <head>, parentNodes is null
`@@ -423,6 +425,8 @@ export default class Element extends Node {`
`423`	`425`	`: escapeHTML(node.data);`
`424`	`426`	`}`
`425`	`427`
	`428`	`+ if (node.name === 'noscript') return '';`
	`429`	`+`
`426`	`430`	let open = `<${node.name}`;
`427`	`431`
`428`	`432`	`if (node._needsCssAttribute) {`