Merge pull request #505 from Mas0nShi/504-Fixes-XmlParser-error-parse…

…-with-tags #504@patch: Fixes XmlParser error parse with tags.
capricorn86 · Jun 14, 2022 · f9d55eb · f9d55eb
2 parents 8ece290 + c5052fb
commit f9d55eb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/packages/happy-dom/src/xml-parser/XMLParser.ts b/packages/happy-dom/src/xml-parser/XMLParser.ts
@@ -11,7 +11,7 @@ import INode from '../nodes/node/INode';
 import IElement from '../nodes/element/IElement';
 import HTMLLinkElement from '../nodes/html-link-element/HTMLLinkElement';
 
-const MARKUP_REGEXP = /<(\/?)([a-z][-.0-9_a-z]*)\s*([^>]*?)(\/?)>/gi;
+const MARKUP_REGEXP = /<(\/?)([a-z][-.0-9_a-z]*)\s*([^<>]*?)(\/?)>/gi;
 const COMMENT_REGEXP = /<!--(.*?)-->|<([!?])([^>]*)>/gi;
 const DOCUMENT_TYPE_ATTRIBUTE_REGEXP = /"([^"]+)"/gm;
 const ATTRIBUTE_REGEXP = /([^\s=]+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|(\S+)))/gms;

diff --git a/packages/happy-dom/test/xml-parser/XMLParser.test.ts b/packages/happy-dom/test/xml-parser/XMLParser.test.ts
@@ -185,6 +185,21 @@ describe('XMLParser', () => {
 					<template></template>
 				</div>`.replace(/[\s]/gm, '')
 			);
+
+			const root2 = XMLParser.parse(
+				window.document,
+				`<html>
+	<head>
+		<title>Title</title>
+	</head>
+	<body>
+		<script type="text/javascript">var vars = []; for (var i=0;i<vars.length;i++) {}</script>
+	</body>
+</html>`
+			);
+			expect((<IHTMLElement>root2.children[0].children[1].children[0]).innerText).toBe(
+				'var vars = []; for (var i=0;i<vars.length;i++) {}'
+			);
 		});
 
 		it('Handles unclosed regular elements.', () => {