@sveltejs/kit 1.0.0-next.511 → 1.0.0-next.513

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.511",
+  "version": "1.0.0-next.513",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -26,12 +26,12 @@
   "devDependencies": {
     "@playwright/test": "^1.25.0",
     "@types/connect": "^3.4.35",
-    "@types/marked": "^4.0.3",
+    "@types/marked": "^4.0.7",
     "@types/mime": "^3.0.0",
     "@types/node": "^16.11.36",
     "@types/sade": "^1.7.4",
     "@types/set-cookie-parser": "^2.4.2",
-    "marked": "^4.0.16",
+    "marked": "^4.1.1",
     "rollup": "^2.78.1",
     "svelte": "^3.48.0",
     "svelte-preprocess": "^4.10.6",

package/src/constants.js

@@ -4,4 +4,4 @@ export const SVELTE_KIT_ASSETS = '/_svelte_kit_assets';
 
 export const GENERATED_COMMENT = '// this file is generated — do not edit it\n';
 
-export const DATA_SUFFIX = '/__data.js';
+export const DATA_SUFFIX = '/__data.json';

package/src/core/adapt/builder.js

@@ -5,6 +5,7 @@ import { pipeline } from 'stream';
 import { promisify } from 'util';
 import { copy, rimraf, mkdirp } from '../../utils/filesystem.js';
 import { generate_manifest } from '../generate_manifest/index.js';
+import { affects_path } from '../../utils/routing.js';
 
 const pipe = promisify(pipeline);
 
@@ -46,11 +47,14 @@ export function create_builder({ config, build_data, routes, prerendered, log })
 
 				return {
 					id: route.id,
-					segments: route.id.split('/').map((segment) => ({
-						dynamic: segment.includes('['),
-						rest: segment.includes('[...'),
-						content: segment
-					})),
+					segments: route.id
+						.split('/')
+						.filter(affects_path)
+						.map((segment) => ({
+							dynamic: segment.includes('['),
+							rest: segment.includes('[...'),
+							content: segment
+						})),
 					pattern: route.pattern,
 					methods: Array.from(methods)
 				};

package/src/core/sync/sync.js

@@ -18,9 +18,17 @@ export function init(config, mode) {
 	if (fs.existsSync('src/app.d.ts')) {
 		const content = fs.readFileSync('src/app.d.ts', 'utf-8');
 		if (content.includes('PageError')) {
-			throw new Error(
-				'App.PageError has been renamed to App.Error — please update your src/app.d.ts'
-			);
+			if (content.includes('// interface PageError')) {
+				fs.writeFileSync(
+					'src/app.d.ts',
+					content.replace(/\/\/ interface PageError/g, '// interface Error')
+				);
+				console.warn('App.PageError has been renamed to App.Error — we updated your src/app.d.ts');
+			} else {
+				throw new Error(
+					'App.PageError has been renamed to App.Error — please update your src/app.d.ts'
+				);
+			}
 		}
 	}
 

package/src/core/sync/write_types/index.js

@@ -617,7 +617,7 @@ export function tweak_types(content, is_server) {
 					}
 				}
 			}
-			modified ||= _modified;
+			modified = modified || _modified;
 			return _modified;
 		}
 

package/src/runtime/app/forms.js

@@ -25,6 +25,7 @@ export function enhance(form, submit = () => {}) {
 	 */
 	const fallback_callback = async ({ action, result }) => {
 		if (result.type === 'success') {
+			form.reset();
 			await invalidateAll();
 		}
 

package/src/runtime/client/client.js

@@ -1,7 +1,13 @@
 import { onMount, tick } from 'svelte';
 import { make_trackable, decode_params, normalize_path } from '../../utils/url.js';
 import { find_anchor, get_base_uri, scroll_state } from './utils.js';
-import { lock_fetch, unlock_fetch, initial_fetch, subsequent_fetch } from './fetcher.js';
+import {
+	lock_fetch,
+	unlock_fetch,
+	initial_fetch,
+	subsequent_fetch,
+	native_fetch
+} from './fetcher.js';
 import { parse } from './parse.js';
 
 import Root from '__GENERATED__/root.svelte';
@@ -10,6 +16,7 @@ import { HttpError, Redirect } from '../control.js';
 import { stores } from './singletons.js';
 import { DATA_SUFFIX } from '../../constants.js';
 import { unwrap_promises } from '../../utils/promises.js';
+import * as devalue from 'devalue';
 
 const SCROLL_KEY = 'sveltekit:scroll';
 const INDEX_KEY = 'sveltekit:index';
@@ -1479,8 +1486,6 @@ export function create_client({ target, base, trailing_slash }) {
 	};
 }
 
-let data_id = 1;
-
 /**
  * @param {URL} url
  * @param {boolean[]} invalid
@@ -1489,25 +1494,20 @@ let data_id = 1;
 async function load_data(url, invalid) {
 	const data_url = new URL(url);
 	data_url.pathname = url.pathname.replace(/\/$/, '') + DATA_SUFFIX;
-	data_url.searchParams.set('__invalid', invalid.map((x) => (x ? 'y' : 'n')).join(''));
-	data_url.searchParams.set('__id', String(data_id++));
-
-	// The __data.js file is generated by the server and looks like
-	// `window.__sveltekit_data = ${devalue.uneval(data)}`. We do this instead
-	// of `export const data` because modules are cached indefinitely,
-	// and that would cause memory leaks.
-	//
-	// The data is read and deleted in the same tick as the promise
-	// resolves, so it's not vulnerable to race conditions
-	await import(/* @vite-ignore */ data_url.href);
 
-	// @ts-expect-error
-	const server_data = window.__sveltekit_data;
+	const res = await native_fetch(data_url.href, {
+		headers: {
+			'x-sveltekit-invalidated': invalid.map((x) => (x ? '1' : '')).join(',')
+		}
+	});
+	const server_data = await res.text();
 
-	// @ts-expect-error
-	delete window.__sveltekit_data;
+	if (!res.ok) {
+		// error message is a JSON-stringified string which devalue can't handle at the top level
+		throw new Error(JSON.parse(server_data));
+	}
 
-	return server_data;
+	return devalue.parse(server_data);
 }
 
 /**

package/src/runtime/client/fetcher.js

@@ -2,7 +2,7 @@ import { hash } from '../hash.js';
 
 let loading = 0;
 
-const native_fetch = window.fetch;
+export const native_fetch = window.fetch;
 
 export function lock_fetch() {
 	loading += 1;

package/src/runtime/server/data/index.js

@@ -15,7 +15,7 @@ import { DATA_SUFFIX } from '../../../constants.js';
  */
 export async function render_data(event, route, options, state) {
 	if (!route.page) {
-		// requesting /__data.js should fail for a +server.js
+		// requesting /__data.json should fail for a +server.js
 		return new Response(undefined, {
 			status: 404
 		});
@@ -25,10 +25,8 @@ export async function render_data(event, route, options, state) {
 		const node_ids = [...route.page.layouts, route.page.leaf];
 
 		const invalidated =
-			event.url.searchParams
-				.get('__invalid')
-				?.split('')
-				.map((x) => x === 'y') ?? node_ids.map(() => true);
+			event.request.headers.get('x-sveltekit-invalidated')?.split(',').map(Boolean) ??
+			node_ids.map(() => true);
 
 		let aborted = false;
 
@@ -38,9 +36,6 @@ export async function render_data(event, route, options, state) {
 			options.trailing_slash
 		);
 
-		url.searchParams.delete('__invalid');
-		url.searchParams.delete('__id');
-
 		const new_event = { ...event, url };
 
 		const functions = node_ids.map((n, i) => {

package/src/runtime/server/index.js

@@ -3,6 +3,7 @@ import { render_page } from './page/index.js';
 import { render_response } from './page/render.js';
 import { respond_with_error } from './page/respond_with_error.js';
 import { coalesce_to_error } from '../../utils/error.js';
+import { is_form_content_type } from '../../utils/http.js';
 import { GENERIC_ERROR, handle_fatal_error } from './utils.js';
 import { decode_params, disable_search, normalize_path } from '../../utils/url.js';
 import { exec } from '../../utils/routing.js';
@@ -24,12 +25,10 @@ export async function respond(request, options, state) {
 	let url = new URL(request.url);
 
 	if (options.csrf.check_origin) {
-		const type = request.headers.get('content-type')?.split(';')[0];
-
 		const forbidden =
 			request.method === 'POST' &&
 			request.headers.get('origin') !== url.origin &&
-			(type === 'application/x-www-form-urlencoded' || type === 'multipart/form-data');
+			is_form_content_type(request);
 
 		if (forbidden) {
 			return new Response(`Cross-site ${request.method} form submissions are forbidden`, {
@@ -292,7 +291,7 @@ export async function respond(request, options, state) {
 					// add headers/cookies here, rather than inside `resolve`, so that we
 					// can do it once for all responses instead of once per `return`
 					if (!is_data_request) {
-						// we only want to set cookies on __data.js requests, we don't
+						// we only want to set cookies on __data.json requests, we don't
 						// want to cache stuff erroneously etc
 						for (const key in headers) {
 							const value = headers[key];

package/src/runtime/server/page/actions.js

@@ -1,6 +1,6 @@
 import { error, json } from '../../../exports/index.js';
 import { normalize_error } from '../../../utils/error.js';
-import { negotiate } from '../../../utils/http.js';
+import { is_form_content_type, negotiate } from '../../../utils/http.js';
 import { HttpError, Redirect, ValidationError } from '../../control.js';
 import { handle_error_and_jsonify } from '../utils.js';
 
@@ -180,9 +180,10 @@ export async function call_action(event, actions) {
 		throw new Error(`No action with name '${name}' found`);
 	}
 
-	const type = event.request.headers.get('content-type')?.split('; ')[0];
-	if (type !== 'application/x-www-form-urlencoded' && type !== 'multipart/form-data') {
-		throw new Error(`Actions expect form-encoded data (received ${type})`);
+	if (!is_form_content_type(event.request)) {
+		throw new Error(
+			`Actions expect form-encoded data (received ${event.request.headers.get('content-type')}`
+		);
 	}
 
 	return action(event);

package/src/runtime/server/page/index.js

@@ -205,10 +205,10 @@ export async function render_page(event, route, page, options, state, resolve_op
 
 					if (err instanceof Redirect) {
 						if (state.prerendering && should_prerender_data) {
-							const body = `window.__sveltekit_data = ${JSON.stringify({
+							const body = devalue.stringify({
 								type: 'redirect',
 								location: err.location
-							})}`;
+							});
 
 							state.prerendering.dependencies.set(data_pathname, {
 								response: new Response(body),
@@ -260,10 +260,10 @@ export async function render_page(event, route, page, options, state, resolve_op
 		}
 
 		if (state.prerendering && should_prerender_data) {
-			const body = `window.__sveltekit_data = ${devalue.uneval({
+			const body = devalue.stringify({
 				type: 'data',
 				nodes: branch.map((branch_node) => branch_node?.server_data)
-			})}`;
+			});
 
 			state.prerendering.dependencies.set(data_pathname, {
 				response: new Response(body),

package/src/runtime/server/utils.js

@@ -70,17 +70,17 @@ export function allowed_methods(mod) {
 /** @param {any} data */
 export function data_response(data) {
 	const headers = {
-		'content-type': 'application/javascript',
+		'content-type': 'application/json',
 		'cache-control': 'private, no-store'
 	};
 
 	try {
-		return new Response(`window.__sveltekit_data = ${devalue.uneval(data)}`, { headers });
+		return new Response(devalue.stringify(data), { headers });
 	} catch (e) {
 		const error = /** @type {any} */ (e);
 		const match = /\[(\d+)\]\.data\.(.+)/.exec(error.path);
 		const message = match ? `${error.message} (data.${match[2]})` : error.message;
-		return new Response(`throw new Error(${JSON.stringify(message)})`, { headers });
+		return new Response(JSON.stringify(message), { headers, status: 500 });
 	}
 }
 

package/src/utils/http.js

@@ -53,3 +53,20 @@ export function negotiate(accept, types) {
 
 	return accepted;
 }
+
+/**
+ * Returns `true` if the request contains a `content-type` header with the given type
+ * @param {Request} request
+ * @param  {...string} types
+ */
+export function is_content_type(request, ...types) {
+	const type = request.headers.get('content-type')?.split(';', 1)[0].trim() ?? '';
+	return types.includes(type);
+}
+
+/**
+ * @param {Request} request
+ */
+export function is_form_content_type(request) {
+	return is_content_type(request, 'application/x-www-form-urlencoded', 'multipart/form-data');
+}