sveltejs · dummdidumm · Aug 30, 2022 · Aug 30, 2022 · Aug 30, 2022
diff --git a/.changeset/four-meals-learn.md b/.changeset/four-meals-learn.md
@@ -0,0 +1,6 @@
+---
+'create-svelte': patch
+'@sveltejs/kit': patch
+---
+
+[chore] bump ts version and ensure it works with latest changes
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
 		"svelte": "^3.48.0",
 		"tiny-glob": "^0.2.9",
 		"turbo": "^1.3.4",
-		"typescript": "^4.7.4"
+		"typescript": "^4.8.2"
 	},
 	"packageManager": "pnpm@7.9.5",
 	"engines": {

diff --git a/packages/adapter-auto/package.json b/packages/adapter-auto/package.json
@@ -36,6 +36,6 @@
 	},
 	"devDependencies": {
 		"@types/node": "^16.11.36",
-		"typescript": "^4.7.4"
+		"typescript": "^4.8.2"
 	}
 }
diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json
@@ -35,6 +35,6 @@
 	"devDependencies": {
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@types/node": "^16.11.36",
-		"typescript": "^4.7.4"
+		"typescript": "^4.8.2"
 	}
 }
diff --git a/packages/adapter-cloudflare/package.json b/packages/adapter-cloudflare/package.json
@@ -38,7 +38,7 @@
 	"devDependencies": {
 		"@types/node": "^16.11.36",
 		"@types/ws": "^8.5.3",
-		"typescript": "^4.7.4"
+		"typescript": "^4.8.2"
 	},
 	"publishConfig": {
 		"access": "public"

diff --git a/packages/adapter-netlify/package.json b/packages/adapter-netlify/package.json
@@ -47,7 +47,7 @@
 		"@types/set-cookie-parser": "^2.4.2",
 		"rimraf": "^3.0.2",
 		"rollup": "^2.78.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"uvu": "^0.5.3"
 	}
 }
diff --git a/packages/adapter-node/package.json b/packages/adapter-node/package.json
@@ -41,7 +41,7 @@
 		"rimraf": "^3.0.2",
 		"rollup": "^2.78.1",
 		"sirv": "^2.0.2",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"uvu": "^0.5.3"
 	},
 	"dependencies": {

diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json
@@ -30,7 +30,7 @@
 		"playwright-chromium": "^1.25.0",
 		"sirv": "^2.0.2",
 		"svelte": "^3.48.0",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"uvu": "^0.5.3",
 		"vite": "^3.1.0-beta.1"
 	}

diff --git a/packages/adapter-vercel/package.json b/packages/adapter-vercel/package.json
@@ -34,6 +34,6 @@
 	"devDependencies": {
 		"@sveltejs/kit": "workspace:*",
 		"@types/node": "^16.11.36",
-		"typescript": "^4.7.4"
+		"typescript": "^4.8.2"
 	}
 }
diff --git a/packages/create-svelte/templates/default/package.json b/packages/create-svelte/templates/default/package.json
@@ -12,7 +12,7 @@
 		"@sveltejs/kit": "workspace:*",
 		"svelte": "^3.48.0",
 		"svelte-preprocess": "^4.10.6",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module",

diff --git a/packages/create-svelte/templates/libskeleton/package.template.json b/packages/create-svelte/templates/libskeleton/package.template.json
@@ -11,7 +11,7 @@
 		"@sveltejs/package": "workspace:*",
 		"svelte": "^3.44.0",
 		"tslib": "^2.3.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"

diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -36,7 +36,7 @@
 		"rollup": "^2.78.1",
 		"svelte": "^3.48.0",
 		"svelte-preprocess": "^4.10.6",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"uvu": "^0.5.3",
 		"vite": "^3.1.0-beta.1"
 	},

diff --git a/packages/kit/src/core/sync/write_types/index.js b/packages/kit/src/core/sync/write_types/index.js
@@ -181,7 +181,7 @@ function update_types(config, routes, route) {
 			`type OutputDataShape<T> = MaybeWithVoid<Omit<App.PageData, RequiredKeys<T>> & Partial<Pick<App.PageData, keyof T & keyof App.PageData>> & Record<string, any>>`
 		);
 		// null & {} == null, we need to prevent that in some situations
-		declarations.push(`type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;`);
+		declarations.push(`type EnsureParentData<T> = T extends null | undefined ? {} : T;`);
 	}
 
 	if (route.leaf) {

diff --git a/packages/kit/src/core/sync/write_types/test/layout-advanced/_expected/$types.d.ts b/packages/kit/src/core/sync/write_types/test/layout-advanced/_expected/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type LayoutParams = RouteParams & {};
 type LayoutParentData = EnsureParentData<{}>;
 

diff --git a/packages/kit/src/core/sync/write_types/test/layout-advanced/_expected/(main)/$types.d.ts b/packages/kit/src/core/sync/write_types/test/layout-advanced/_expected/(main)/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type PageParentData = EnsureParentData<import('../$types.js').LayoutData>;
 type LayoutParams = RouteParams & {};
 type LayoutServerParentData = EnsureParentData<import('../$types.js').LayoutServerData>;

diff --git a/packages/kit/src/core/sync/write_types/test/layout-advanced/_expected/(main)/sub/$types.d.ts b/packages/kit/src/core/sync/write_types/test/layout-advanced/_expected/(main)/sub/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type PageParentData = Omit<
 	EnsureParentData<import('../../$types.js').LayoutData>,
 	keyof import('../$types.js').LayoutData

diff --git a/packages/kit/src/core/sync/write_types/test/layout/_expected/$types.d.ts b/packages/kit/src/core/sync/write_types/test/layout/_expected/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type PageServerParentData = EnsureParentData<LayoutServerData>;
 type PageParentData = EnsureParentData<LayoutData>;
 type LayoutParams = RouteParams & {};

diff --git a/...es/kit/src/core/sync/write_types/test/simple-page-server-and-shared/_expected/$types.d.ts b/...es/kit/src/core/sync/write_types/test/simple-page-server-and-shared/_expected/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type PageServerParentData = EnsureParentData<LayoutServerData>;
 type PageParentData = EnsureParentData<LayoutData>;
 type LayoutParams = RouteParams & {};

diff --git a/packages/kit/src/core/sync/write_types/test/simple-page-server-only/_expected/$types.d.ts b/packages/kit/src/core/sync/write_types/test/simple-page-server-only/_expected/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type PageServerParentData = EnsureParentData<LayoutServerData>;
 type PageParentData = EnsureParentData<LayoutData>;
 type LayoutParams = RouteParams & {};

diff --git a/packages/kit/src/core/sync/write_types/test/simple-page-shared-only/_expected/$types.d.ts b/packages/kit/src/core/sync/write_types/test/simple-page-shared-only/_expected/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type PageParentData = EnsureParentData<LayoutData>;
 type LayoutParams = RouteParams & {};
 type LayoutParentData = EnsureParentData<{}>;

diff --git a/...src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/_expected/$types.d.ts b/...src/core/sync/write_types/test/slugs-layout-not-all-pages-have-load/_expected/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type LayoutParams = RouteParams & { rest?: string; slug?: string };
 type LayoutParentData = EnsureParentData<{}>;
 

diff --git a/...e/sync/write_types/test/slugs-layout-not-all-pages-have-load/_expected/nested/$types.d.ts b/...e/sync/write_types/test/slugs-layout-not-all-pages-have-load/_expected/nested/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type LayoutParams = RouteParams & { rest?: string };
 type LayoutParentData = EnsureParentData<import('../$types.js').LayoutData>;
 

diff --git a/...te_types/test/slugs-layout-not-all-pages-have-load/_expected/nested/[...rest]/$types.d.ts b/...te_types/test/slugs-layout-not-all-pages-have-load/_expected/nested/[...rest]/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type PageParentData = Omit<
 	EnsureParentData<import('../../$types.js').LayoutData>,
 	keyof import('../$types.js').LayoutData

diff --git a/...write_types/test/slugs-layout-not-all-pages-have-load/_expected/nested/[slug]/$types.d.ts b/...write_types/test/slugs-layout-not-all-pages-have-load/_expected/nested/[slug]/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type PageParentData = EnsureParentData<import('../../$types.js').LayoutData>;
 
 export type PageServerData = null;

diff --git a/packages/kit/src/core/sync/write_types/test/slugs/_expected/$types.d.ts b/packages/kit/src/core/sync/write_types/test/slugs/_expected/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type LayoutParams = RouteParams & { rest?: string; slug?: string };
 type LayoutParentData = EnsureParentData<{}>;
 

diff --git a/packages/kit/src/core/sync/write_types/test/slugs/_expected/[...rest]/$types.d.ts b/packages/kit/src/core/sync/write_types/test/slugs/_expected/[...rest]/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type PageParentData = EnsureParentData<import('../$types.js').LayoutData>;
 
 export type PageServerData = null;

diff --git a/packages/kit/src/core/sync/write_types/test/slugs/_expected/[slug]/$types.d.ts b/packages/kit/src/core/sync/write_types/test/slugs/_expected/[slug]/$types.d.ts
@@ -10,7 +10,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Partial<Pick<App.PageData, keyof T & keyof App.PageData>> &
 		Record<string, any>
 >;
-type EnsureParentData<T> = NonNullable<T> extends never ? {} : T;
+type EnsureParentData<T> = T extends null | undefined ? {} : T;
 type PageParentData = EnsureParentData<import('../$types.js').LayoutData>;
 
 export type PageServerData = null;

diff --git a/packages/kit/test/apps/amp/package.json b/packages/kit/test/apps/amp/package.json
@@ -18,7 +18,7 @@
 		"purify-css": "^1.2.5",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"

diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json
@@ -17,7 +17,7 @@
 		"rimraf": "^3.0.2",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"

diff --git a/...ages/kit/test/apps/basics/src/routes/load/server-data-reuse/with-server-load/+page.svelte b/...ages/kit/test/apps/basics/src/routes/load/server-data-reuse/with-server-load/+page.svelte
@@ -1,6 +1,6 @@
-<script lang="ts">
+<script>
 	/** @type {import('./$types').PageData} */
-	export let data 
+	export let data;
 </script>
 
 <p>Page with server load</p>

diff --git a/packages/kit/test/apps/dev-only/package.json b/packages/kit/test/apps/dev-only/package.json
@@ -15,7 +15,7 @@
 		"rimraf": "^3.0.2",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"

diff --git a/packages/kit/test/apps/options-2/package.json b/packages/kit/test/apps/options-2/package.json
@@ -17,7 +17,7 @@
 		"cross-env": "^7.0.3",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"

diff --git a/packages/kit/test/apps/options/package.json b/packages/kit/test/apps/options/package.json
@@ -16,7 +16,7 @@
 		"cross-env": "^7.0.3",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"

diff --git a/packages/kit/test/apps/writes/package.json b/packages/kit/test/apps/writes/package.json
@@ -17,7 +17,7 @@
 		"rimraf": "^3.0.2",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"

diff --git a/packages/kit/test/prerendering/basics/package.json b/packages/kit/test/prerendering/basics/package.json
@@ -13,7 +13,7 @@
 		"@sveltejs/kit": "workspace:*",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"uvu": "^0.5.3",
 		"vite": "^3.1.0-beta.1"
 	},

diff --git a/packages/kit/test/prerendering/fallback/package.json b/packages/kit/test/prerendering/fallback/package.json
@@ -13,7 +13,7 @@
 		"@sveltejs/kit": "workspace:*",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"uvu": "^0.5.3",
 		"vite": "^3.1.0-beta.1"
 	},

diff --git a/packages/kit/test/prerendering/options/package.json b/packages/kit/test/prerendering/options/package.json
@@ -13,7 +13,7 @@
 		"@sveltejs/kit": "workspace:*",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"uvu": "^0.5.3",
 		"vite": "^3.1.0-beta.1"
 	},

diff --git a/packages/kit/test/prerendering/paths-base/package.json b/packages/kit/test/prerendering/paths-base/package.json
@@ -13,7 +13,7 @@
 		"@sveltejs/kit": "workspace:*",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"uvu": "^0.5.3",
 		"vite": "^3.1.0-beta.1"
 	},

diff --git a/packages/kit/test/prerendering/trailing-slash/package.json b/packages/kit/test/prerendering/trailing-slash/package.json
@@ -13,7 +13,7 @@
 		"@sveltejs/kit": "workspace:*",
 		"svelte": "^3.48.0",
 		"svelte-check": "^2.7.1",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"uvu": "^0.5.4",
 		"vite": "^3.1.0-beta.1"
 	},

diff --git a/packages/package/package.json b/packages/package/package.json
@@ -19,7 +19,7 @@
 		"@types/node": "^16.11.36",
 		"svelte": "^3.48.0",
 		"svelte-preprocess": "^4.10.6",
-		"typescript": "^4.7.4",
+		"typescript": "^4.8.2",
 		"uvu": "^0.5.3"
 	},
 	"peerDependencies": {