serialize initial data with devalue

packages/kit/src/runtime/client/client.js

@@ -1281,31 +1281,21 @@ export function create_client({ target, base, trailing_slash }) {
  });
  },
 
- _hydrate: async ({ status, error, node_ids, params, routeId }) => {
+ _hydrate: async ({
+ status,
+ error,
+ node_ids,
+ params,
+ routeId,
+ data: server_data_nodes,
+ errors: validation_errors
+ }) => {
  const url = new URL(location.href);
 
  /** @type {import('./types').NavigationFinished | undefined} */
  let result;
 
  try {
- /**
- * @param {string} type
- * @param {any} fallback
- */
- const parse = (type, fallback) => {
- const script = document.querySelector(`script[sveltekit\\:data-type="${type}"]`);
- return script?.textContent ? JSON.parse(script.textContent) : fallback;
- };
- /**
- * @type {Array<import('types').ServerDataNode | null>}
- * On initial navigation, this will only consist of data nodes or `null`.
- * A possible error is passed through the `error` property, in which case
- * the last entry of `node_ids` is an error page and the last entry of
- * `server_data_nodes` is `null`.
- */
- const server_data_nodes = parse('server_data', []);
- const validation_errors = parse('validation_errors', undefined);
-
  const branch_promises = node_ids.map(async (n, i) => {
  return load_node({
  loader: nodes[n],

packages/kit/src/runtime/client/start.js

@@ -20,6 +20,8 @@ export { set_public_env } from '../env-public.js';
  * node_ids: number[];
  * params: Record<string, string>;
  * routeId: string | null;
+ * data: Array<import('types').ServerDataNode | import('types').ServerErrorNode | null>;
+ * errors: Record<string, any> | null;
  * };
  * }} opts
  */

packages/kit/src/runtime/client/types.d.ts

@@ -27,6 +27,8 @@ export interface Client {
  node_ids: number[];
  params: Record<string, string>;
  routeId: string | null;
+ data: Array<import('types').ServerDataNode | import('types').ServerErrorNode | null>;
+ errors: Record<string, any>;
  }) => Promise<void>;
  _start_router: () => void;
 }

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

@@ -272,7 +272,6 @@ export async function respond(request, options, state) {
  // == because it could be undefined (in dev) or null (in build, because of JSON.stringify)
  const node = n == undefined ? n : await options.manifest._.nodes[n]();
  return load_server_data({
- dev: options.dev,
  event,
  state,
  node,

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

@@ -166,7 +166,6 @@ export async function render_page(event, route, page, options, state, resolve_op
  }
 
  return await load_server_data({
- dev: options.dev,
  event,
  state,
  node,

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

@@ -3,15 +3,14 @@ import { disable_search, make_trackable } from '../../../utils/url.js';
 /**
  * Calls the user's `load` function.
  * @param {{
- * dev: boolean;
  * event: import('types').RequestEvent;
  * state: import('types').SSRState;
  * node: import('types').SSRNode | undefined;
  * parent: () => Promise<Record<string, any>>;
  * }} opts
  * @returns {Promise<import('types').ServerDataNode | null>}
  */
-export async function load_server_data({ dev, event, state, node, parent }) {
+export async function load_server_data({ event, state, node, parent }) {
  if (!node?.server) return null;
 
  const uses = {
@@ -53,10 +52,6 @@ export async function load_server_data({ dev, event, state, node, parent }) {
 
  const data = result ? await unwrap_promises(result) : null;
 
- if (dev) {
- check_serializability(data, /** @type {string} */ (node.server_id), 'data');
- }
-
  return {
  type: 'data',
  data,
@@ -127,42 +122,3 @@ async function unwrap_promises(object) {
 
  return unwrapped;
 }
-
-/**
- * Check that the data can safely be serialized to JSON
- * @param {any} value
- * @param {string} id
- * @param {string} path
- */
-function check_serializability(value, id, path) {
- const type = typeof value;
-
- if (type === 'string' || type === 'boolean' || type === 'number' || type === 'undefined') {
- // primitives are fine
- return;
- }
-
- if (type === 'object') {
- // nulls are fine...
- if (!value) return;
-
- // ...so are plain arrays...
- if (Array.isArray(value)) {
- value.forEach((child, i) => {
- check_serializability(child, id, `${path}[${i}]`);
- });
- return;
- }
-
- // ...and objects
- const tag = Object.prototype.toString.call(value);
- if (tag === '[object Object]') {
- for (const key in value) {
- check_serializability(value[key], id, `${path}.${key}`);
- }
- return;
- }
- }
-
- throw new Error(`${path} returned from 'load' in ${id} cannot be serialized as JSON`);
-}

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

@@ -191,7 +191,9 @@ export async function render_response({
  error: ${error && serialize_error(error, e => e.stack)},
  node_ids: [${branch.map(({ node }) => node.index).join(', ')}],
  params: ${devalue(event.params)},
- routeId: ${s(event.routeId)}
+ routeId: ${s(event.routeId)},
+ data: ${devalue(branch.map(({ server_data }) => server_data))},
+ errors: ${validation_errors ? devalue(validation_errors) : 'null'}
  }` : 'null'}
  });
  `;

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

@@ -35,7 +35,6 @@ export async function respond_with_error({ event, options, state, status, error,
  const default_layout = await options.manifest._.nodes[0](); // 0 is always the root layout
 
  const server_data_promise = load_server_data({
- dev: options.dev,
  event,
  state,
  node: default_layout,

packages/kit/test/apps/basics/src/routes/load/devalue/+page.svelte

@@ -0,0 +1 @@
+<a href="/load/devalue/regex">/load/devalue/regex</a>

packages/kit/test/apps/basics/src/routes/load/devalue/regex/+page.server.js

@@ -0,0 +1,6 @@
+/** @type {import('./$types').PageServerLoad} */
+export function load() {
+ return {
+ regex: /hello/
+ };
+}

packages/kit/test/apps/basics/src/routes/load/devalue/regex/+page.svelte

@@ -0,0 +1,6 @@
+<script>
+ /** @type {import('./$types').PageData} */
+ export let data;
+</script>
+
+<h1>{data.regex.test('hello')}</h1>

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

@@ -892,6 +892,13 @@ test.describe('Load', () => {
  expect(await page.textContent('h1')).toBe('foo.bar: Custom layout');
  expect(await page.textContent('h2')).toBe('pagedata: pagedata');
  });
+
+ test.only('Serializes non-JSON data', async ({ page, clicknav }) => {
+ await page.goto('/load/devalue');
+ await clicknav('[href="/load/devalue/regex"]');
+
+ expect(await page.textContent('h1')).toBe(true);
+ });
 });
 
 test.describe('Method overrides', () => {

packages/kit/test/apps/basics/vite.config.js.timestamp-1661481874774.mjs

@@ -0,0 +1,23 @@
+// vite.config.js
+import * as path from "path";
+import { sveltekit } from "@sveltejs/kit/vite";
+var config = {
+ build: {
+ minify: false
+ },
+ clearScreen: false,
+ optimizeDeps: {
+ include: ["cookie", "marked"]
+ },
+ plugins: [sveltekit()],
+ server: {
+ fs: {
+ allow: [path.resolve("../../../src")]
+ }
+ }
+};
+var vite_config_default = config;
+export {
+ vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcuanMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvVXNlcnMvcmljaC9EZXZlbG9wbWVudC9TVkVMVEUvS0lUL2tpdC9wYWNrYWdlcy9raXQvdGVzdC9hcHBzL2Jhc2ljc1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3JpY2gvRGV2ZWxvcG1lbnQvU1ZFTFRFL0tJVC9raXQvcGFja2FnZXMva2l0L3Rlc3QvYXBwcy9iYXNpY3Mvdml0ZS5jb25maWcuanNcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfaW1wb3J0X21ldGFfdXJsID0gXCJmaWxlOi8vL1VzZXJzL3JpY2gvRGV2ZWxvcG1lbnQvU1ZFTFRFL0tJVC9raXQvcGFja2FnZXMva2l0L3Rlc3QvYXBwcy9iYXNpY3Mvdml0ZS5jb25maWcuanNcIjtpbXBvcnQgKiBhcyBwYXRoIGZyb20gJ3BhdGgnO1xuaW1wb3J0IHsgc3ZlbHRla2l0IH0gZnJvbSAnQHN2ZWx0ZWpzL2tpdC92aXRlJztcblxuLyoqIEB0eXBlIHtpbXBvcnQoJ3ZpdGUnKS5Vc2VyQ29uZmlnfSAqL1xuY29uc3QgY29uZmlnID0ge1xuXHRidWlsZDoge1xuXHRcdG1pbmlmeTogZmFsc2Vcblx0fSxcblx0Y2xlYXJTY3JlZW46IGZhbHNlLFxuXHRvcHRpbWl6ZURlcHM6IHtcblx0XHQvLyBmb3IgQ0ksIHdlIG5lZWQgdG8gZXhwbGljaXRseSBwcmVidW5kbGUgZGVwcywgc2luY2Vcblx0XHQvLyB0aGUgcmVsb2FkIGNvbmZ1c2VzIFBsYXl3cmlnaHRcblx0XHRpbmNsdWRlOiBbJ2Nvb2tpZScsICdtYXJrZWQnXVxuXHR9LFxuXHRwbHVnaW5zOiBbc3ZlbHRla2l0KCldLFxuXHRzZXJ2ZXI6IHtcblx0XHRmczoge1xuXHRcdFx0YWxsb3c6IFtwYXRoLnJlc29sdmUoJy4uLy4uLy4uL3NyYycpXVxuXHRcdH1cblx0fVxufTtcblxuZXhwb3J0IGRlZmF1bHQgY29uZmlnO1xuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUE4WCxZQUFZLFVBQVU7QUFDcFosU0FBUyxpQkFBaUI7QUFHMUIsSUFBTSxTQUFTO0FBQUEsRUFDZCxPQUFPO0FBQUEsSUFDTixRQUFRO0FBQUEsRUFDVDtBQUFBLEVBQ0EsYUFBYTtBQUFBLEVBQ2IsY0FBYztBQUFBLElBR2IsU0FBUyxDQUFDLFVBQVUsUUFBUTtBQUFBLEVBQzdCO0FBQUEsRUFDQSxTQUFTLENBQUMsVUFBVSxDQUFDO0FBQUEsRUFDckIsUUFBUTtBQUFBLElBQ1AsSUFBSTtBQUFBLE1BQ0gsT0FBTyxDQUFNLGFBQVEsY0FBYyxDQUFDO0FBQUEsSUFDckM7QUFBQSxFQUNEO0FBQ0Q7QUFFQSxJQUFPLHNCQUFROyIsCiAgIm5hbWVzIjogW10KfQo=