[fix] pre-render crawl parse with value-less attributes (#3668)

* use .substring, as .substr is apparently deprecated * fix parsing of attribute following value-less attribute * add test * add changeset
sveltejs · Feb 1, 2022 · 44a7c81 · 44a7c81
1 parent c1f5a13
commit 44a7c81
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/.changeset/proud-goats-hide.md b/.changeset/proud-goats-hide.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix parsing during pre-render crawl when there are HTML attributes without a value
diff --git a/packages/kit/src/core/adapt/prerender/crawl.js b/packages/kit/src/core/adapt/prerender/crawl.js
@@ -25,7 +25,7 @@ export function crawl(html) {
 			if (html[i + 1] === '!') {
 				i += 2;
 
-				if (html.substr(i, DOCTYPE.length).toUpperCase() === DOCTYPE) {
+				if (html.substring(i, DOCTYPE.length).toUpperCase() === DOCTYPE) {
 					i += DOCTYPE.length;
 					while (i < html.length) {
 						if (html[i++] === '>') {
@@ -35,10 +35,10 @@ export function crawl(html) {
 				}
 
 				// skip cdata
-				if (html.substr(i, CDATA_OPEN.length) === CDATA_OPEN) {
+				if (html.substring(i, CDATA_OPEN.length) === CDATA_OPEN) {
 					i += CDATA_OPEN.length;
 					while (i < html.length) {
-						if (html.substr(i, CDATA_CLOSE.length) === CDATA_CLOSE) {
+						if (html.substring(i, CDATA_CLOSE.length) === CDATA_CLOSE) {
 							i += CDATA_CLOSE.length;
 							continue main;
 						}
@@ -48,10 +48,10 @@ export function crawl(html) {
 				}
 
 				// skip comments
-				if (html.substr(i, COMMENT_OPEN.length) === COMMENT_OPEN) {
+				if (html.substring(i, COMMENT_OPEN.length) === COMMENT_OPEN) {
 					i += COMMENT_OPEN.length;
 					while (i < html.length) {
-						if (html.substr(i, COMMENT_CLOSE.length) === COMMENT_CLOSE) {
+						if (html.substring(i, COMMENT_CLOSE.length) === COMMENT_CLOSE) {
 							i += COMMENT_CLOSE.length;
 							continue main;
 						}
@@ -79,7 +79,7 @@ export function crawl(html) {
 						if (
 							html[i] === '<' &&
 							html[i + 1] === '/' &&
-							html.substr(i + 2, tag.length).toUpperCase() === tag
+							html.substring(i + 2, tag.length).toUpperCase() === tag
 						) {
 							continue main;
 						}
@@ -175,6 +175,8 @@ export function crawl(html) {
 									hrefs.push(src);
 								}
 							}
+						} else {
+							i -= 1;
 						}
 					}
 

diff --git a/packages/kit/src/core/adapt/prerender/fixtures/basic-href/input.html b/packages/kit/src/core/adapt/prerender/fixtures/basic-href/input.html
@@ -7,5 +7,8 @@
 	<body>
 		<a href="https://external.com">https://external.com</a>
 		<a href="/wheee">/wheee</a>
+		<a sveltekit:prefetch href="/wheee2">/wheee</a>
+		<a href="/wheee3" sveltekit:prefetch>/wheee</a>
+		<a href="/wheee4">/wheee</a>
 	</body>
 </html>
diff --git a/packages/kit/src/core/adapt/prerender/fixtures/basic-href/output.json b/packages/kit/src/core/adapt/prerender/fixtures/basic-href/output.json
@@ -1 +1 @@
-["/styles.css", "/favicon.png", "https://external.com", "/wheee"]
+["/styles.css", "/favicon.png", "https://external.com", "/wheee", "/wheee2", "/wheee3", "/wheee4"]