Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix session subscription tracking #4550

Merged
merged 3 commits into from Apr 8, 2022
Merged

fix session subscription tracking #4550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7feb3f3
fix session subscription tracking - closes #793
Rich-Harris Apr 6, 2022
b8dbcb7
simplify
Rich-Harris Apr 6, 2022
32d2dd6
fix/simplify
Rich-Harris Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/odd-coats-shake.md
View file
Open in desktop
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

Fix session store subscription tracking during SSR
21 changes: 9 additions & 12 deletions packages/kit/src/runtime/server/page/render.js
View file
Open in desktop
Expand Up @@ -91,7 +91,14 @@ export async function render_response({
stores: {
page: writable(null),
navigating: writable(null),
session,
/** @type {import('svelte/store').Writable<App.Session>} */
session: {
...session,
subscribe: (fn) => {
is_private = true;
return session.subscribe(fn);
}
},
updated
},
/** @type {import('types').Page} */
Expand Down Expand Up @@ -129,17 +136,7 @@ export async function render_response({
props[`props_${i}`] = await branch[i].loaded.props;
}

let session_tracking_active = false;
const unsubscribe = session.subscribe(() => {
if (session_tracking_active) is_private = true;
});
session_tracking_active = true;

try {
rendered = options.root.render(props);
} finally {
unsubscribe();
}
rendered = options.root.render(props);
} else {
rendered = { head: '', html: '', css: { code: '', map: null } };
}
Expand Down
16 changes: 16 additions & 0 deletions packages/kit/test/apps/basics/src/routes/caching/private/uses-session-in-init.svelte
View file
Open in desktop
@@ -0,0 +1,16 @@
<script context="module">
/** @type {import('@sveltejs/kit').Load} */
export async function load() {
return {
maxage: 30
};
}
</script>

<script>
import { session } from '$app/stores';

const session_exists = !!$session;
</script>

<h1>this page will be cached for 30 seconds ({session_exists})</h1>
6 changes: 5 additions & 1 deletion ...outes/caching/private/uses-session.svelte → ...ching/private/uses-session-in-load.svelte
View file
Open in desktop
Expand Up @@ -12,4 +12,8 @@
}
</script>

<h1>this page will be cached for 30 seconds</h1>
<script>
export let session_exists;
</script>

<h1>this page will be cached for 30 seconds ({session_exists})</h1>
9 changes: 7 additions & 2 deletions packages/kit/test/apps/basics/test/test.js
View file
Open in desktop
Expand Up @@ -305,8 +305,13 @@ test.describe.parallel('Caching', () => {
expect(response.headers()['cache-control']).toBe('public, max-age=30');
});

test('sets cache-control: private if page uses session', async ({ request }) => {
const response = await request.get('/caching/private/uses-session');
test('sets cache-control: private if page uses session in load', async ({ request }) => {
const response = await request.get('/caching/private/uses-session-in-load');
expect(response.headers()['cache-control']).toBe('private, max-age=30');
});

test('sets cache-control: private if page uses session in init', async ({ request }) => {
const response = await request.get('/caching/private/uses-session-in-init');
expect(response.headers()['cache-control']).toBe('private, max-age=30');
});

Expand Down