wire things up

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

@@ -700,20 +700,20 @@ export function create_client({ target, base, trailing_slash }) {
 
  if (route.uses_server_data && invalid_server_nodes.some(Boolean)) {
  try {
- const res = await native_fetch(
- `${url.pathname}${url.pathname.endsWith('/') ? '' : '/'}__data.json${url.search}`,
- {
- headers: {
- 'x-sveltekit-invalidated': invalid_server_nodes.map((x) => (x ? '1' : '')).join(',')
- }
- }
+ const data_url = new URL(url);
+ data_url.pathname += `${url.pathname.endsWith('/') ? '' : '/'}__data.js`;
+ data_url.searchParams.set(
+ '__invalid',
+ invalid_server_nodes.map((x) => (x ? 'y' : 'n')).join('')
  );
 
- server_data = /** @type {import('types').ServerData} */ (await res.json());
+ await import(/* @vite-ignore */ data_url.href);
 
- if (!res.ok) {
- throw server_data;
- }
+ // @ts-expect-error
+ server_data = /** @type {import('types').ServerData} */ (window.__sveltekit_data);
+
+ // @ts-expect-error
+ delete window.__sveltekit_data;
  } catch (e) {
  // something went catastrophically wrong — bail and defer to the server
  native_navigation(url);

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

@@ -1,8 +1,8 @@
-import { HttpError, Redirect } from '../../../index/private.js';
+import { HttpError, Redirect } from '../../control.js';
 import { normalize_error } from '../../../utils/error.js';
 import { once } from '../../../utils/functions.js';
 import { load_server_data } from '../page/load_data.js';
-import { error_to_pojo } from '../utils.js';
+import { data_response, error_to_pojo } from '../utils.js';
 import devalue from 'devalue';
 
 /**
@@ -24,8 +24,10 @@ export async function render_data(event, route, options, state) {
  const node_ids = [...route.page.layouts, route.page.leaf];
 
  const invalidated =
- event.request.headers.get('x-sveltekit-invalidated')?.split(',').map(Boolean) ??
- node_ids.map(() => true);
+ event.url.searchParams
+ .get('__invalid')
+ ?.split('')
+ .map((x) => x === 'y') ?? node_ids.map(() => true);
 
  let aborted = false;
 
@@ -112,7 +114,7 @@ export async function render_data(event, route, options, state) {
  nodes: nodes.slice(0, length)
  };
 
- return new Response(`window.__data = ${devalue(server_data)}`);
+ return data_response(server_data);
  } catch (e) {
  const error = normalize_error(e);
 
@@ -123,10 +125,10 @@ export async function render_data(event, route, options, state) {
  location: error.location
  };
 
- return new Response(`window.__data = ${devalue(server_data)}`);
+ return data_response(server_data);
  } else {
  // TODO make it clearer that this was an unexpected error
- return new Response(`window.__data = ${devalue(error_to_pojo(error, options.get_stack))}`);
+ return data_response(error_to_pojo(error, options.get_stack));
  }
  }
 }

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

@@ -118,5 +118,9 @@ export function allowed_methods(mod) {
 
 /** @param {any} data */
 export function data_response(data) {
- return new Response(`window.__data = ${devalue(data)}`);
+ return new Response(`window.__sveltekit_data = ${devalue(data)}`, {
+ headers: {
+ 'content-type': 'application/javascript'
+ }
+ });
 }