Skip to content

Commit

Permalink
fix: check ssr option when doing final response render (#11032)
Browse files Browse the repository at this point in the history
fixes #11031

#10988 introduced a regression where the response during prerendering would always have SSR enabled. This PR fixes this by setting it according to the SSR page option.
  • Loading branch information
eltigerchino committed Nov 14, 2023
1 parent d0dc8c4 commit aeaf164
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .changeset/great-dryers-grin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: correctly prerender pages that use browser globals and have SSR turned off
2 changes: 1 addition & 1 deletion packages/kit/src/runtime/server/page/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ export async function render_page(event, page, options, manifest, state, resolve
resolve_opts,
page_config: {
csr: get_option(nodes, 'csr') ?? true,
ssr: true
ssr: get_option(nodes, 'ssr') ?? true
},
status,
error: null,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export const prerender = true;
export const ssr = false;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<h1>Hello world!</h1>
<p>{window.location.origin}</p>
10 changes: 10 additions & 0 deletions packages/kit/test/apps/basics/test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,16 @@ test.describe('Page options', () => {
await page.goto('/transform-page-chunk');
expect(await page.getAttribute('meta[name="transform-page"]', 'content')).toBe('Worked!');
});

test('prerenders page that uses browser globals with ssr=false', async ({
page,
javaScriptEnabled
}) => {
test.skip(process.env.DEV, 'skip when in dev mode');
test.skip(!javaScriptEnabled, 'skip when JavaScript is disabled');
await page.goto('/prerendering/no-ssr');
await expect(page.getByText('Hello world!')).toBeVisible();
});
});

test.describe('$app/environment', () => {
Expand Down

0 comments on commit aeaf164

Please sign in to comment.