Merge branch 'master' into gh-7302

sveltejs · Nov 18, 2022 · 164788f · 164788f
2 parents 1314f50 + 0d45963
commit 164788f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/.changeset/wicked-kiwis-burn.md b/.changeset/wicked-kiwis-burn.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+[fix] adjust interfaces to fix type errors
diff --git a/packages/adapter-cloudflare-workers/package.json b/packages/adapter-cloudflare-workers/package.json
@@ -29,7 +29,7 @@
 		"check": "tsc"
 	},
 	"dependencies": {
-		"@cloudflare/workers-types": "^3.18.0",
+		"@cloudflare/workers-types": "^4.0.0",
 		"@iarna/toml": "^2.2.5",
 		"esbuild": "^0.15.12"
 	},

diff --git a/packages/adapter-cloudflare/package.json b/packages/adapter-cloudflare/package.json
@@ -32,7 +32,7 @@
 		"prepublishOnly": "pnpm build"
 	},
 	"dependencies": {
-		"@cloudflare/workers-types": "^3.18.0",
+		"@cloudflare/workers-types": "^4.0.0",
 		"esbuild": "^0.15.12",
 		"worktop": "0.8.0-next.14"
 	},

diff --git a/packages/kit/src/runtime/control.js b/packages/kit/src/runtime/control.js
@@ -21,7 +21,7 @@ export class HttpError {
 
 export class Redirect {
 	/**
-	 * @param {number} status
+	 * @param {300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308} status
 	 * @param {string} location
 	 */
 	constructor(status, location) {

diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
@@ -747,11 +747,11 @@ export function error(
 /**
  * The object returned by the `error` function
  */
-export interface HttpError extends UniqueInterface {
+export interface HttpError {
 	/** The HTTP status code */
 	status: number;
 	/** The error message */
-	body: { message: string } extends App.Error ? App.Error | string | undefined : App.Error;
+	body: App.Error;
 }
 
 /**
@@ -766,7 +766,7 @@ export function redirect(
 /**
  * The object returned by the `redirect` function
  */
-export interface Redirect extends UniqueInterface {
+export interface Redirect {
 	/** The HTTP status code */
 	status: 300 | 301 | 302 | 303 | 304 | 305 | 306 | 307 | 308;
 	/** The location to redirect to */

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml