From aeb9d249203197eb3e2e45759100be81c6f9f157 Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Tue, 20 Dec 2022 13:15:53 +1000 Subject: [PATCH 1/6] fallback platform to empty object --- .changeset/shy-monkeys-raise.md | 5 +++++ packages/kit/src/runtime/server/index.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/shy-monkeys-raise.md diff --git a/.changeset/shy-monkeys-raise.md b/.changeset/shy-monkeys-raise.md new file mode 100644 index 000000000000..93dc65103529 --- /dev/null +++ b/.changeset/shy-monkeys-raise.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': minor +--- + +event.platform falls back to empty object when not defined diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js index ae64b865d16b..f9388359a8dd 100644 --- a/packages/kit/src/runtime/server/index.js +++ b/packages/kit/src/runtime/server/index.js @@ -124,7 +124,7 @@ export async function respond(request, options, state) { }), locals: {}, params, - platform: state.platform, + platform: state.platform ?? {}, request, route: { id: route?.id ?? null }, setHeaders: (new_headers) => { From 5ac3152772e3bccf364d514088f7d9071b343508 Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Tue, 20 Dec 2022 10:27:47 +0100 Subject: [PATCH 2/6] Update .changeset/shy-monkeys-raise.md --- .changeset/shy-monkeys-raise.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/shy-monkeys-raise.md b/.changeset/shy-monkeys-raise.md index 93dc65103529..09d2d6d67cbf 100644 --- a/.changeset/shy-monkeys-raise.md +++ b/.changeset/shy-monkeys-raise.md @@ -1,5 +1,5 @@ --- -'@sveltejs/kit': minor +'@sveltejs/kit': patch --- event.platform falls back to empty object when not defined From fd4871b9b95256a7e3f85676d654197473febe39 Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Wed, 28 Dec 2022 07:27:06 +1000 Subject: [PATCH 3/6] mark platform type as possibly undefined instead --- .changeset/shy-monkeys-raise.md | 2 +- packages/kit/src/runtime/server/index.js | 2 +- packages/kit/types/index.d.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.changeset/shy-monkeys-raise.md b/.changeset/shy-monkeys-raise.md index 09d2d6d67cbf..210db542ad1a 100644 --- a/.changeset/shy-monkeys-raise.md +++ b/.changeset/shy-monkeys-raise.md @@ -2,4 +2,4 @@ '@sveltejs/kit': patch --- -event.platform falls back to empty object when not defined +Update typings of event.platform to be possibly undefined diff --git a/packages/kit/src/runtime/server/index.js b/packages/kit/src/runtime/server/index.js index f9388359a8dd..ae64b865d16b 100644 --- a/packages/kit/src/runtime/server/index.js +++ b/packages/kit/src/runtime/server/index.js @@ -124,7 +124,7 @@ export async function respond(request, options, state) { }), locals: {}, params, - platform: state.platform ?? {}, + platform: state.platform, request, route: { id: route?.id ?? null }, setHeaders: (new_headers) => { diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts index d41d2050298d..2944b989c348 100644 --- a/packages/kit/types/index.d.ts +++ b/packages/kit/types/index.d.ts @@ -865,7 +865,7 @@ export interface RequestEvent< /** * Additional data made available through the adapter. */ - platform: Readonly; + platform: Readonly | undefined; /** * The original request object */ From a5ab7847b1f69a012d60e39366429c1a0c8c304d Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Thu, 5 Jan 2023 11:14:55 -0500 Subject: [PATCH 4/6] Update packages/kit/types/index.d.ts --- packages/kit/types/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts index 2944b989c348..b5bb81c9ae76 100644 --- a/packages/kit/types/index.d.ts +++ b/packages/kit/types/index.d.ts @@ -865,7 +865,7 @@ export interface RequestEvent< /** * Additional data made available through the adapter. */ - platform: Readonly | undefined; + platform: Readonly | void; /** * The original request object */ From 8ef902bbf280b8a390e3c3825df13d86cc71c86d Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Thu, 5 Jan 2023 11:20:56 -0500 Subject: [PATCH 5/6] Update .changeset/shy-monkeys-raise.md Co-authored-by: Conduitry --- .changeset/shy-monkeys-raise.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/shy-monkeys-raise.md b/.changeset/shy-monkeys-raise.md index 210db542ad1a..e19249fb0032 100644 --- a/.changeset/shy-monkeys-raise.md +++ b/.changeset/shy-monkeys-raise.md @@ -2,4 +2,4 @@ '@sveltejs/kit': patch --- -Update typings of event.platform to be possibly undefined +Update typings of `event.platform` to be possibly undefined From b3f172cd930b6a0d5666ed5d804535777be21751 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Thu, 5 Jan 2023 17:44:52 -0500 Subject: [PATCH 6/6] Update packages/kit/types/index.d.ts --- packages/kit/types/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts index b5bb81c9ae76..2944b989c348 100644 --- a/packages/kit/types/index.d.ts +++ b/packages/kit/types/index.d.ts @@ -865,7 +865,7 @@ export interface RequestEvent< /** * Additional data made available through the adapter. */ - platform: Readonly | void; + platform: Readonly | undefined; /** * The original request object */