get it working

packages/kit/package.json

@@ -12,7 +12,7 @@
  "dependencies": {
  "@sveltejs/vite-plugin-svelte": "^1.0.1",
  "cookie": "^0.5.0",
- "devalue": "^3.0.1",
+ "devalue": "^3.1.0",
  "kleur": "^4.1.4",
  "magic-string": "^0.26.2",
  "mime": "^3.0.0",

packages/kit/src/runtime/server/data/index.js

@@ -39,6 +39,7 @@ export async function render_data(event, route, options, state) {
  );
 
  url.searchParams.delete('__invalid');
+ url.searchParams.delete('__id');
 
  const new_event = { ...event, url };
 

packages/kit/src/runtime/server/page/render.js

@@ -174,6 +174,29 @@ export async function render_response({
  /** @param {string} path */
  const prefixed = (path) => (path.startsWith('/') ? path : `${assets}/${path}`);
 
+ const serialized = { data: '', errors: 'null' };
+
+ try {
+ serialized.data = devalue(branch.map(({ server_data }) => server_data));
+ } catch (e) {
+ // TODO if we wanted to get super fancy we could track down the origin of the `load`
+ // function, but it would mean passing more stuff around than we currently do
+ const error = /** @type {any} */ (e);
+ const match = /\[(\d+)\]\.data\.(.+)/.exec(error.path);
+ if (match) throw new Error(`${error.message} (data.${match[2]})`);
+ throw error;
+ }
+
+ if (validation_errors) {
+ try {
+ serialized.errors = devalue(validation_errors);
+ } catch (e) {
+ const error = /** @type {any} */ (e);
+ if (error.path) throw new Error(`${error.message} (errors.${error.path})`);
+ throw error;
+ }
+ }
+
  // prettier-ignore
  const init_app = `
  import { set_public_env, start } from ${s(prefixed(entry.file))};

packages/kit/src/runtime/server/utils.js

@@ -118,9 +118,17 @@ export function allowed_methods(mod) {
 
 /** @param {any} data */
 export function data_response(data) {
- return new Response(`window.__sveltekit_data = ${devalue(data)}`, {
- headers: {
- 'content-type': 'application/javascript'
- }
- });
+ try {
+ return new Response(`window.__sveltekit_data = ${devalue(data)}`, {
+ headers: {
+ 'content-type': 'application/javascript'
+ }
+ });
+ } catch (e) {
+ return new Response(`throw new Error(${JSON.stringify(e.message)})`, {
+ headers: {
+ 'content-type': 'application/javascript'
+ }
+ });
+ }
 }

packages/kit/test/apps/basics/src/routes/shadowed/serialization/+page.server.js

@@ -1,5 +1,11 @@
+class Nope {
+ toString() {
+ return 'should not see me'
+ }
+}
+
 export function load() {
  return {
- regex: /nope/
+ nope: new Nope()
  };
 }

packages/kit/test/apps/basics/src/routes/shadowed/serialization/+page.svelte

@@ -3,4 +3,4 @@
  export let data;
 </script>
 
-<h1>{data.regex.test('nope')}</h1>
+<h1>{data.nope}</h1>

packages/kit/test/apps/basics/test/test.js

@@ -291,7 +291,7 @@ test.describe('Shadowed pages', () => {
 
  expect(await page.textContent('h1')).toBe('500');
  expect(await page.textContent('#message')).toBe(
- 'This is your custom error page saying: "data.regex returned from \'load\' in src/routes/shadowed/serialization/+page.server.js cannot be serialized as JSON"'
+ 'This is your custom error page saying: "Cannot stringify arbitrary non-POJOs (data.nope)"'
  );
  });
  }
@@ -579,7 +579,7 @@ test.describe('Errors', () => {
  expect(lines[1]).toContain('+page.server.js:4:8');
  }
 
- const error = read_errors('/errors/page-endpoint/get-implicit');
+ const error = read_errors('/errors/page-endpoint/get-implicit/__data.js');
  expect(error).toContain('oops');
  });