Skip to content

Commit

Permalink
fix: don't automatically prerender non-SSR'd pages (#9352)
Browse files Browse the repository at this point in the history
reverts #8131
This reverts the optimisation wherein pages with ssr = false and no explicit prerender = false would automatically be prerendered, as it turns out to be unsafe.

fixes #9275
fixes #8428
  • Loading branch information
Rich-Harris committed Mar 8, 2023
1 parent 696fec9 commit b575287
Show file tree
Hide file tree
Showing 23 changed files with 7 additions and 191 deletions.
5 changes: 5 additions & 0 deletions .changeset/cuddly-kangaroos-rush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: don't automatically prerender non-SSR'd pages
10 changes: 1 addition & 9 deletions packages/kit/src/core/postbuild/analyse.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,7 @@ async function analyse({ manifest_path, env }) {
validate_common_exports(page.universal, page.universal_id);
}

const should_prerender = get_option(nodes, 'prerender');
prerender =
should_prerender === true ||
// Try prerendering if ssr is false and no server needed. Set it to 'auto' so that
// the route is not removed from the manifest, there could be a server load function.
// People can opt out of this behavior by explicitly setting prerender to false
(should_prerender !== false && get_option(nodes, 'ssr') === false && !page?.server?.actions
? 'auto'
: should_prerender ?? false);
prerender = get_option(nodes, 'prerender') ?? false;

config = get_config(nodes);
}
Expand Down
27 changes: 1 addition & 26 deletions packages/kit/src/runtime/server/page/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,38 +79,13 @@ export async function render_page(event, page, options, manifest, state, resolve
// it's crucial that we do this before returning the non-SSR response, otherwise
// SvelteKit will erroneously believe that the path has been prerendered,
// causing functions to be omitted from the manifesst generated later
const should_prerender = get_option(nodes, 'prerender');

const should_prerender = get_option(nodes, 'prerender') ?? false;
if (should_prerender) {
const mod = leaf_node.server;
if (mod?.actions) {
throw new Error('Cannot prerender pages with actions');
}
} else if (state.prerendering) {
// Try to render the shell when ssr is false and prerendering not explicitly disabled.
// People can opt out of this behavior by explicitly setting prerender to false.
if (
should_prerender !== false &&
get_option(nodes, 'ssr') === false &&
!leaf_node.server?.actions
) {
return await render_response({
branch: [],
fetched: [],
page_config: {
ssr: false,
csr: get_option(nodes, 'csr') ?? true
},
status,
error: null,
event,
options,
manifest,
state,
resolve_opts
});
}

// if the page isn't marked as prerenderable, then bail out at this point
return new Response(undefined, {
status: 204
Expand Down
1 change: 0 additions & 1 deletion packages/kit/test/prerendering/ssr-false/.gitignore

This file was deleted.

21 changes: 0 additions & 21 deletions packages/kit/test/prerendering/ssr-false/package.json

This file was deleted.

1 change: 0 additions & 1 deletion packages/kit/test/prerendering/ssr-false/src/app.d.ts

This file was deleted.

11 changes: 0 additions & 11 deletions packages/kit/test/prerendering/ssr-false/src/app.html

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions packages/kit/test/prerendering/ssr-false/svelte.config.js

This file was deleted.

39 changes: 0 additions & 39 deletions packages/kit/test/prerendering/ssr-false/test/test.js

This file was deleted.

16 changes: 0 additions & 16 deletions packages/kit/test/prerendering/ssr-false/tsconfig.json

This file was deleted.

27 changes: 0 additions & 27 deletions packages/kit/test/prerendering/ssr-false/vite.config.js

This file was deleted.

16 changes: 0 additions & 16 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b575287

Please sign in to comment.