Skip to content

Ensure cache key generated during ssr matches what is generated durin… #14563

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

Merged
merged 3 commits into from
Sep 30, 2025
+10 −5
Merged

Ensure cache key generated during ssr matches what is generated durin… #14563

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
7990691
Ensure cache key generated during ssr matches what is generated durin…
lettucebowler Sep 29, 2025
8ed08a4
another one
dummdidumm Sep 30, 2025
9560abf
Update .changeset/dry-ideas-ring.md
dummdidumm Sep 30, 2025
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/dry-ideas-ring.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: ensure cache key is consistent between client/server
7 changes: 3 additions & 4 deletions packages/kit/src/runtime/app/server/remote/query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,10 @@ export function query(validate_or_fn, maybe_fn) {
);
}

const cache = get_cache(__, state);
const key = stringify_remote_arg(arg, state.transport);

if (__.id) {
refreshes[__.id + '/' + key] = cache[key] = Promise.resolve(value);
const cache = get_cache(__, state);
const key = stringify_remote_arg(arg, state.transport);
refreshes[create_remote_cache_key(__.id, key)] = cache[key] = Promise.resolve(value);
}
};

Expand Down
3 changes: 2 additions & 1 deletion packages/kit/src/runtime/server/page/render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { add_resolution_suffix } from '../../pathname.js';
import { with_request_store } from '@sveltejs/kit/internal/server';
import { text_encoder } from '../../utils.js';
import { get_global_name } from '../utils.js';
import { create_remote_cache_key } from '../../shared.js';

// TODO rename this function/module

Expand Down Expand Up @@ -493,7 +494,7 @@ export async function render_response({
if (!info.id) continue;

for (const key in cache) {
remote[key ? info.id + '/' + key : info.id] = await cache[key];
remote[create_remote_cache_key(info.id, key)] = await cache[key];
}
}

Expand Down
Loading