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/lazy-boats-stay.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: remove empty nodes from serialized server load data
3 changes: 2 additions & 1 deletion packages/kit/src/runtime/server/page/data_serializer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as devalue from 'devalue';
import { compact } from '../../../utils/array.js';
import { create_async_iterator } from '../../../utils/streaming.js';
import {
clarify_devalue_error,
Expand Down Expand Up @@ -96,7 +97,7 @@ export function server_data_serializer(event, event_state, options) {
const close = `</script>\n`;

return {
data: `[${strings.join(',')}]`,
data: `[${compact(strings).join(',')}]`,
chunks: promise_id > 1 ? iterator.iterate((str) => open + str + close) : null
};
}
Expand Down
8 changes: 6 additions & 2 deletions packages/kit/src/runtime/server/page/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,10 @@ export async function render_page(
}
});

data_serializer.add_node(i, server_data);
if (node) {
data_serializer.add_node(i, server_data);
}

data_serializer_json?.add_node(i, server_data);

return server_data;
Expand Down Expand Up @@ -348,7 +351,8 @@ export async function render_page(
branch: ssr === false ? [] : compact(branch),
action_result,
fetched,
data_serializer
data_serializer:
ssr === false ? server_data_serializer(event, event_state, options) : data_serializer
});
} catch (e) {
// if we end up here, it means the data loaded successfully
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/** @type {import('./$types').PageServerLoad} */
export function load() {
return { answer: 42 };
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<script>
/** @type {import('./$types').PageData} */
export let data;
</script>

<h1>{data.answer}</h1>
5 changes: 5 additions & 0 deletions packages/kit/test/apps/basics/test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@ test.describe('Load', () => {
);
});

test('Server data serialization removes empty nodes', async ({ page }) => {
await page.goto('/load/serialization-empty-node');
expect(await page.textContent('h1')).toBe('42');
});

test('POST fetches are serialized', async ({ page, javaScriptEnabled }) => {
/** @type {string[]} */
const requests = [];
Expand Down
Loading