@sveltejs/kit 1.0.0-next.447 → 1.0.0-next.448

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.447",
+  "version": "1.0.0-next.448",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",
@@ -50,9 +50,8 @@
   "files": [
     "src",
     "!src/**/*.spec.js",
-    "!src/packaging/test",
     "!src/core/**/fixtures",
-    "!src/core/sync/create_manifest_data/test",
+    "!src/core/**/test",
     "types",
     "svelte-kit.js"
   ],
@@ -77,7 +76,7 @@
   },
   "types": "types/index.d.ts",
   "engines": {
-    "node": ">=16.9"
+    "node": ">=16.14"
   },
   "scripts": {
     "build": "npm run types",
@@ -87,7 +86,7 @@
     "format": "npm run lint -- --write",
     "test": "npm run test:unit && npm run test:integration",
     "test:integration": "pnpm run -r --workspace-concurrency 1 --filter=\"./test/**\" test",
-    "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\" -i packaging",
+    "test:unit": "uvu src \"(spec\\.js|test[\\\\/]index\\.js)\"",
     "types": "node scripts/extract-types.js",
     "postinstall": "node svelte-kit.js sync"
   }

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

@@ -299,15 +299,6 @@ export async function render_response({
 			);
 		}
 
-		if (branch.some((node) => node.server_data)) {
-			serialized_data.push(
-				render_json_payload_script(
-					{ type: 'server_data' },
-					branch.map(({ server_data }) => server_data)
-				)
-			);
-		}
-
 		if (validation_errors) {
 			serialized_data.push(
 				render_json_payload_script({ type: 'validation_errors' }, validation_errors)

package/types/internal.d.ts

@@ -133,7 +133,6 @@ export interface PageNode {
 
 export type PayloadScriptAttributes =
 	| { type: 'data'; url: string; body?: string }
-	| { type: 'server_data' }
 	| { type: 'validation_errors' };
 
 export interface PrerenderDependency {

package/src/core/sync/write_types/test/layout/+layout.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		shared: 'shared'
-	};
-}

package/src/core/sync/write_types/test/layout/+layout.server.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		server: 'server'
-	};
-}

package/src/core/sync/write_types/test/layout/+page.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		pageShared: 'pageShared'
-	};
-}

package/src/core/sync/write_types/test/layout/+page.server.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		pageServer: 'pageServer'
-	};
-}

package/src/core/sync/write_types/test/layout/_expected/$types.d.ts

@@ -1,67 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageServerParentData = EnsureParentData<LayoutServerData>;
-type PageParentData = EnsureParentData<LayoutData>;
-type LayoutParams = RouteParams & {};
-type LayoutServerParentData = EnsureParentData<{}>;
-type LayoutParentData = EnsureParentData<{}>;
-
-export type PageServerLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.ServerLoad<RouteParams, PageServerParentData, OutputData>;
-export type PageServerLoadEvent = Parameters<PageServerLoad>[0];
-export type Errors = null;
-export type PageServerData = Kit.AwaitedProperties<
-	Awaited<ReturnType<typeof import('../../../../../../../../+page.server.js').load>>
->;
-export type PageLoad<
-	OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>
-> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData>;
-export type PageLoadEvent = Parameters<PageLoad>[0];
-export type PageData = Omit<
-	PageParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+page.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+page.js').load>>
-	>;
-export type Action = Kit.Action<RouteParams>;
-export type LayoutServerLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.ServerLoad<LayoutParams, LayoutServerParentData, OutputData>;
-export type LayoutServerLoadEvent = Parameters<LayoutServerLoad>[0];
-export type LayoutServerData = Kit.AwaitedProperties<
-	Awaited<ReturnType<typeof import('../../../../../../../../+layout.server.js').load>>
->;
-export type LayoutLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.Load<LayoutParams, LayoutServerData, LayoutParentData, OutputData>;
-export type LayoutLoadEvent = Parameters<LayoutLoad>[0];
-export type LayoutData = Omit<
-	LayoutParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>;

package/src/core/sync/write_types/test/layout-advanced/(main)/+layout.server.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		main: 'main'
-	};
-}

package/src/core/sync/write_types/test/layout-advanced/(main)/+page.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		page: 'page'
-	};
-}

package/src/core/sync/write_types/test/layout-advanced/(main)/sub/+page.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		sub: 'sub'
-	};
-}

package/src/core/sync/write_types/test/layout-advanced/+layout.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		root: 'root'
-	};
-}

package/src/core/sync/write_types/test/layout-advanced/_expected/$types.d.ts

@@ -1,32 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type LayoutParams = RouteParams & {};
-type LayoutParentData = EnsureParentData<{}>;
-
-export type LayoutServerData = null;
-export type LayoutLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.Load<LayoutParams, LayoutServerData, LayoutParentData, OutputData>;
-export type LayoutLoadEvent = Parameters<LayoutLoad>[0];
-export type LayoutData = Omit<
-	LayoutParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>;

package/src/core/sync/write_types/test/layout-advanced/_expected/(main)/$types.d.ts

@@ -1,42 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageParentData = EnsureParentData<import('../$types.js').LayoutData>;
-type LayoutParams = RouteParams & {};
-type LayoutServerParentData = EnsureParentData<import('../$types.js').LayoutServerData>;
-type LayoutParentData = EnsureParentData<import('../$types.js').LayoutData>;
-
-export type PageServerData = null;
-export type PageLoad<
-	OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>
-> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData>;
-export type PageLoadEvent = Parameters<PageLoad>[0];
-export type PageData = Omit<
-	PageParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../(main)/+page.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../(main)/+page.js').load>>
-	>;
-export type LayoutServerLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.ServerLoad<LayoutParams, LayoutServerParentData, OutputData>;
-export type LayoutServerLoadEvent = Parameters<LayoutServerLoad>[0];
-export type LayoutServerData = Kit.AwaitedProperties<
-	Awaited<ReturnType<typeof import('../../../../../../../../../(main)/+layout.server.js').load>>
->;
-export type LayoutData = Omit<LayoutParentData, keyof LayoutServerData> & LayoutServerData;

package/src/core/sync/write_types/test/layout-advanced/_expected/(main)/sub/$types.d.ts

@@ -1,33 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageParentData = Omit<
-	EnsureParentData<import('../../$types.js').LayoutData>,
-	keyof import('../$types.js').LayoutData
-> &
-	EnsureParentData<import('../$types.js').LayoutData>;
-
-export type PageServerData = null;
-export type PageLoad<
-	OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>
-> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData>;
-export type PageLoadEvent = Parameters<PageLoad>[0];
-export type PageData = Omit<
-	PageParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../../(main)/sub/+page.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../../(main)/sub/+page.js').load>>
-	>;

package/src/core/sync/write_types/test/simple-page-server-and-shared/+page.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		shared: 'shared'
-	};
-}

package/src/core/sync/write_types/test/simple-page-server-and-shared/+page.server.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		server: 'server'
-	};
-}

package/src/core/sync/write_types/test/simple-page-server-and-shared/_expected/$types.d.ts

@@ -1,44 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageServerParentData = EnsureParentData<LayoutServerData>;
-type PageParentData = EnsureParentData<LayoutData>;
-type LayoutParams = RouteParams & {};
-type LayoutParentData = EnsureParentData<{}>;
-
-export type PageServerLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.ServerLoad<RouteParams, PageServerParentData, OutputData>;
-export type PageServerLoadEvent = Parameters<PageServerLoad>[0];
-export type Errors = null;
-export type PageServerData = Kit.AwaitedProperties<
-	Awaited<ReturnType<typeof import('../../../../../../../../+page.server.js').load>>
->;
-export type PageLoad<
-	OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>
-> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData>;
-export type PageLoadEvent = Parameters<PageLoad>[0];
-export type PageData = Omit<
-	PageParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+page.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+page.js').load>>
-	>;
-export type Action = Kit.Action<RouteParams>;
-export type LayoutServerData = null;
-export type LayoutData = LayoutParentData;

package/src/core/sync/write_types/test/simple-page-server-only/+page.server.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		foo: 'bar'
-	};
-}

package/src/core/sync/write_types/test/simple-page-server-only/_expected/$types.d.ts

@@ -1,30 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageServerParentData = EnsureParentData<LayoutServerData>;
-type PageParentData = EnsureParentData<LayoutData>;
-type LayoutParams = RouteParams & {};
-type LayoutParentData = EnsureParentData<{}>;
-
-export type PageServerLoad<
-	OutputData extends OutputDataShape<PageServerParentData> = OutputDataShape<PageServerParentData>
-> = Kit.ServerLoad<RouteParams, PageServerParentData, OutputData>;
-export type PageServerLoadEvent = Parameters<PageServerLoad>[0];
-export type Errors = null;
-export type PageServerData = Kit.AwaitedProperties<
-	Awaited<ReturnType<typeof import('../../../../../../../../+page.server.js').load>>
->;
-export type PageData = Omit<PageParentData, keyof PageServerData> & PageServerData;
-export type Action = Kit.Action<RouteParams>;
-export type LayoutServerData = null;
-export type LayoutData = LayoutParentData;

package/src/core/sync/write_types/test/simple-page-shared-only/+page.js

@@ -1,5 +0,0 @@
-export function load() {
-	return {
-		shared: 'shared'
-	};
-}

package/src/core/sync/write_types/test/simple-page-shared-only/_expected/$types.d.ts

@@ -1,33 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageParentData = EnsureParentData<LayoutData>;
-type LayoutParams = RouteParams & {};
-type LayoutParentData = EnsureParentData<{}>;
-
-export type PageServerData = null;
-export type PageLoad<
-	OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>
-> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData>;
-export type PageLoadEvent = Parameters<PageLoad>[0];
-export type PageData = Omit<
-	PageParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+page.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+page.js').load>>
-	>;
-export type LayoutServerData = null;
-export type LayoutData = LayoutParentData;

package/src/core/sync/write_types/test/slugs/+layout.js

@@ -1 +0,0 @@
-export function load() {}

package/src/core/sync/write_types/test/slugs/+layout.svelte

@@ -1 +0,0 @@
-export function load() {}

package/src/core/sync/write_types/test/slugs/[...rest]/+page.js

@@ -1,3 +0,0 @@
-export function load() {
-	return { rest: 'rest' };
-}

package/src/core/sync/write_types/test/slugs/[slug]/+page.js

@@ -1,3 +0,0 @@
-export function load() {
-	return { slug: 'slug' };
-}

package/src/core/sync/write_types/test/slugs/_expected/$types.d.ts

@@ -1,32 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type LayoutParams = RouteParams & { rest?: string; slug?: string };
-type LayoutParentData = EnsureParentData<{}>;
-
-export type LayoutServerData = null;
-export type LayoutLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.Load<LayoutParams, LayoutServerData, LayoutParentData, OutputData>;
-export type LayoutLoadEvent = Parameters<LayoutLoad>[0];
-export type LayoutData = Omit<
-	LayoutParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>;

package/src/core/sync/write_types/test/slugs/_expected/[...rest]/$types.d.ts

@@ -1,29 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = { rest: string };
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageParentData = EnsureParentData<import('../$types.js').LayoutData>;
-
-export type PageServerData = null;
-export type PageLoad<
-	OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>
-> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData>;
-export type PageLoadEvent = Parameters<PageLoad>[0];
-export type PageData = Omit<
-	PageParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../[...rest]/+page.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../[...rest]/+page.js').load>>
-	>;

package/src/core/sync/write_types/test/slugs/_expected/[slug]/$types.d.ts

@@ -1,29 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = { slug: string };
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageParentData = EnsureParentData<import('../$types.js').LayoutData>;
-
-export type PageServerData = null;
-export type PageLoad<
-	OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>
-> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData>;
-export type PageLoadEvent = Parameters<PageLoad>[0];
-export type PageData = Omit<
-	PageParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../[slug]/+page.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../[slug]/+page.js').load>>
-	>;

package/src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/+layout.js

@@ -1 +0,0 @@
-export function load() {}

package/src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/+layout.svelte

@@ -1 +0,0 @@
-export function load() {}

package/src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/_expected/$types.d.ts

@@ -1,30 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type LayoutParams = RouteParams & { rest?: string; slug?: string };
-type LayoutParentData = EnsureParentData<{}>;
-
-export type LayoutServerData = null;
-export type LayoutLoad<
-	OutputData extends OutputDataShape<LayoutParentData> = OutputDataShape<LayoutParentData>
-> = Kit.Load<LayoutParams, LayoutServerData, LayoutParentData, OutputData>;
-export type LayoutLoadEvent = Parameters<LayoutLoad>[0];
-export type LayoutData = Omit<
-	LayoutParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../+layout.js').load>>
-	>;

package/src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/_expected/nested/$types.d.ts

@@ -1,32 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = {};
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type LayoutParams = RouteParams & { rest?: string };
-type LayoutParentData = EnsureParentData<import('../$types.js').LayoutData>;
-
-export type LayoutServerData = null;
-export type LayoutLoad<
-	OutputData extends (Partial<App.PageData> & Record<string, any>) | void =
-		| (Partial<App.PageData> & Record<string, any>)
-		| void
-> = Kit.Load<LayoutParams, LayoutServerData, LayoutParentData, OutputData>;
-export type LayoutLoadEvent = Parameters<LayoutLoad>[0];
-export type LayoutData = Omit<
-	LayoutParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../nested/+layout.js').load>>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<ReturnType<typeof import('../../../../../../../../../nested/+layout.js').load>>
-	>;

package/src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/_expected/nested/[...rest]/$types.d.ts

@@ -1,37 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = { rest: string };
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageParentData = Omit<
-	EnsureParentData<import('../../$types.js').LayoutData>,
-	keyof import('../$types.js').LayoutData
-> &
-	EnsureParentData<import('../$types.js').LayoutData>;
-
-export type PageServerData = null;
-export type PageLoad<
-	OutputData extends OutputDataShape<PageParentData> = OutputDataShape<PageParentData>
-> = Kit.Load<RouteParams, PageServerData, PageParentData, OutputData>;
-export type PageLoadEvent = Parameters<PageLoad>[0];
-export type PageData = Omit<
-	PageParentData,
-	keyof Kit.AwaitedProperties<
-		Awaited<
-			ReturnType<typeof import('../../../../../../../../../../nested/[...rest]/+page.js').load>
-		>
-	>
-> &
-	Kit.AwaitedProperties<
-		Awaited<
-			ReturnType<typeof import('../../../../../../../../../../nested/[...rest]/+page.js').load>
-		>
-	>;

package/src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/_expected/nested/[slug]/$types.d.ts

@@ -1,17 +0,0 @@
-import type * as Kit from '@sveltejs/kit';
-
-type RouteParams = { slug: string };
-type MaybeWithVoid<T> = {} extends T ? T | void : T;
-export type RequiredKeys<T> = {
-	[K in keyof T]-?: {} extends { [P in K]: T[K] } ? never : K;
-}[keyof T];
-type OutputDataShape<T> = MaybeWithVoid<
-	Omit<App.PageData, RequiredKeys<T>> &
-		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
-		Record<string, any>
->;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
-type PageParentData = EnsureParentData<import('../../$types.js').LayoutData>;
-
-export type PageServerData = null;
-export type PageData = PageParentData;

package/src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/nested/+layout.js

@@ -1 +0,0 @@
-export function load() {}

package/src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/nested/+layout.svelte

@@ -1 +0,0 @@
-export function load() {}

package/src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/nested/[...rest]/+page.js

@@ -1,3 +0,0 @@
-export function load() {
-	return { rest: 'rest' };
-}