[fix] fallback should still be generated when prerender is disabled (#…

…2128)
sveltejs · Aug 11, 2021 · c3ca3fb · c3ca3fb
1 parent 1bed886
commit c3ca3fb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/.changeset/grumpy-onions-applaud.md b/.changeset/grumpy-onions-applaud.md
@@ -0,0 +1,5 @@
+---
+"@sveltejs/kit": patch
+---
+
+[fix] fallback should still be generated when prerender is disabled
diff --git a/packages/kit/src/core/adapt/prerender.js b/packages/kit/src/core/adapt/prerender.js
@@ -93,6 +93,10 @@ const REDIRECT = 3;
  * }} opts
  */
 export async function prerender({ cwd, out, log, config, build_data, fallback, all }) {
+	if (!config.kit.prerender.enabled && !fallback) {
+		return;
+	}
+
 	__fetch_polyfill();
 
 	const dir = resolve_path(cwd, `${SVELTE_KIT}/output`);
@@ -266,13 +270,15 @@ export async function prerender({ cwd, out, log, config, build_data, fallback, a
 		}
 	}
 
-	for (const entry of config.kit.prerender.pages) {
-		if (entry === '*') {
-			for (const entry of build_data.entries) {
+	if (config.kit.prerender.enabled) {
+		for (const entry of config.kit.prerender.pages) {
+			if (entry === '*') {
+				for (const entry of build_data.entries) {
+					await visit(entry, null);
+				}
+			} else {
 				await visit(entry, null);
 			}
-		} else {
-			await visit(entry, null);
 		}
 	}
 

diff --git a/packages/kit/src/core/adapt/utils.js b/packages/kit/src/core/adapt/utils.js
@@ -31,17 +31,15 @@ export function get_utils({ cwd, config, build_data, log }) {
 		},
 
 		async prerender({ all = false, dest, fallback }) {
-			if (config.kit.prerender.enabled) {
-				await prerender({
-					out: dest,
-					all,
-					cwd,
-					config,
-					build_data,
-					fallback,
-					log
-				});
-			}
+			await prerender({
+				out: dest,
+				all,
+				cwd,
+				config,
+				build_data,
+				fallback,
+				log
+			});
 		}
 	};
 }