Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/grumpy-onions-applaud.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@sveltejs/kit": patch
---

[fix] fallback should still be generated when prerender is disabled
22 changes: 15 additions & 7 deletions packages/kit/src/core/adapt/prerender.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,22 @@ function chooseErrorHandler(log, onError) {
const OK = 2;
const REDIRECT = 3;

/** @param {{
/**
* @param {{
* cwd: string;
* out: string;
* log: Logger;
* config: import('types/config').ValidatedConfig;
* build_data: import('types/internal').BuildData;
* fallback?: string;
* all: boolean; // disregard `export const prerender = true`
* }} opts */
* }} 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`);
Expand Down Expand Up @@ -264,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);
}
}

Expand Down
20 changes: 9 additions & 11 deletions packages/kit/src/core/adapt/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
}
};
}