Export: do not create subdirectories for links ending with .html - fixes

sveltejs#1043
NOtherDev · Jan 8, 2020 · 614da0b · 614da0b
1 parent 636739f
commit 614da0b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/api/export.ts b/src/api/export.ts
@@ -112,7 +112,7 @@ async function _export({
 		const is_html = type === 'text/html';
 
 		if (is_html) {
-			if (pathname !== '/service-worker-index.html') {
+			if (pathname !== '/service-worker-index.html' && !file.endsWith('.html')) {
 				file = file === '' ? 'index.html' : `${file}/index.html`;
 			}
 			body = minify_html(body);

diff --git a/test/apps/export/src/routes/boom/[a]/[b].html.svelte b/test/apps/export/src/routes/boom/[a]/[b].html.svelte
@@ -0,0 +1,12 @@
+<script context="module">
+	export function preload({ params }) {
+		return params;
+	}
+</script>
+
+<script>
+	export let a;
+	export let b;
+</script>
+
+<p>{a}/{b}.html</p>
diff --git a/test/apps/export/src/routes/boom/[a]/index.svelte b/test/apps/export/src/routes/boom/[a]/index.svelte
@@ -12,4 +12,5 @@
 
 {#each list as b}
 	<a href="boom/{a}/{b}">{a}/{b}</a>
+	<a href="boom/{a}/{b}.html">{a}/{b}.html</a>
 {/each}
diff --git a/test/apps/export/test.ts b/test/apps/export/test.ts
@@ -23,7 +23,8 @@ describe('export', function() {
 		for (let a = 1; a <= 20; a += 1) {
 			boom.push(`boom/${a}/index.html`);
 			for (let b = 1; b <= 20; b += 1) {
-				boom.push(`boom/${a}/${b}/index.html`);
+                boom.push(`boom/${a}/${b}.html`);
+                boom.push(`boom/${a}/${b}/index.html`);
 			}
 		}