From 748e77ce176026220d027c2e7b1064cc498dd359 Mon Sep 17 00:00:00 2001 From: Sam Greening <2552620+SG60@users.noreply.github.com> Date: Fri, 26 Aug 2022 22:11:33 +0100 Subject: [PATCH 1/7] Run server.init() for edge functions on Vercel. Required since #6179. Closes #6308. --- packages/adapter-vercel/files/edge.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/adapter-vercel/files/edge.js b/packages/adapter-vercel/files/edge.js index cc8cb64370b1..c1427c287825 100644 --- a/packages/adapter-vercel/files/edge.js +++ b/packages/adapter-vercel/files/edge.js @@ -6,7 +6,11 @@ const server = new Server(manifest); /** * @param {Request} request */ -export default (request) => { +export default async (request) => { + await server.init({ + env: process.env + }); + return server.respond(request, { getClientAddress() { return request.headers.get('x-forwarded-for'); From 29d9e32fa11fe113c92214e52485261c8134f73a Mon Sep 17 00:00:00 2001 From: Sam Greening <2552620+SG60@users.noreply.github.com> Date: Fri, 26 Aug 2022 22:16:15 +0100 Subject: [PATCH 2/7] changeset --- .changeset/strong-kangaroos-work.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/strong-kangaroos-work.md diff --git a/.changeset/strong-kangaroos-work.md b/.changeset/strong-kangaroos-work.md new file mode 100644 index 000000000000..09415471f55a --- /dev/null +++ b/.changeset/strong-kangaroos-work.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/adapter-vercel': minor +--- + +Run server.init() for edge functions. Closes #6308. From 040451e0e7cbd95fbd8ebca2507854588003af4e Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 26 Aug 2022 17:19:37 -0400 Subject: [PATCH 3/7] changes --- .changeset/strong-kangaroos-work.md | 2 +- packages/adapter-vercel/files/edge.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.changeset/strong-kangaroos-work.md b/.changeset/strong-kangaroos-work.md index 09415471f55a..c8289f60e252 100644 --- a/.changeset/strong-kangaroos-work.md +++ b/.changeset/strong-kangaroos-work.md @@ -2,4 +2,4 @@ '@sveltejs/adapter-vercel': minor --- -Run server.init() for edge functions. Closes #6308. +Run `server.init()` for edge functions diff --git a/packages/adapter-vercel/files/edge.js b/packages/adapter-vercel/files/edge.js index c1427c287825..dff2be906d58 100644 --- a/packages/adapter-vercel/files/edge.js +++ b/packages/adapter-vercel/files/edge.js @@ -3,14 +3,14 @@ import { manifest } from 'MANIFEST'; const server = new Server(manifest); +await server.init({ + env: process.env +}); + /** * @param {Request} request */ export default async (request) => { - await server.init({ - env: process.env - }); - return server.respond(request, { getClientAddress() { return request.headers.get('x-forwarded-for'); From efa25a24399f1207cc791974ce9a57bd927e638a Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 26 Aug 2022 17:20:05 -0400 Subject: [PATCH 4/7] remove async keyword --- packages/adapter-vercel/files/edge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/adapter-vercel/files/edge.js b/packages/adapter-vercel/files/edge.js index dff2be906d58..652f56cc7908 100644 --- a/packages/adapter-vercel/files/edge.js +++ b/packages/adapter-vercel/files/edge.js @@ -10,7 +10,7 @@ await server.init({ /** * @param {Request} request */ -export default async (request) => { +export default (request) => { return server.respond(request, { getClientAddress() { return request.headers.get('x-forwarded-for'); From be6a257165344af1c49522b05cae0272cb9005e7 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 26 Aug 2022 17:20:47 -0400 Subject: [PATCH 5/7] Update .changeset/strong-kangaroos-work.md --- .changeset/strong-kangaroos-work.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/strong-kangaroos-work.md b/.changeset/strong-kangaroos-work.md index c8289f60e252..97e0ba1a3859 100644 --- a/.changeset/strong-kangaroos-work.md +++ b/.changeset/strong-kangaroos-work.md @@ -1,5 +1,5 @@ --- -'@sveltejs/adapter-vercel': minor +'@sveltejs/adapter-vercel': patch --- Run `server.init()` for edge functions From 5ad9f8dbffcb598aff7652be889da855337395f3 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 26 Aug 2022 22:33:58 -0400 Subject: [PATCH 6/7] netlify edge functions --- packages/adapter-netlify/src/edge.js | 5 +++++ packages/adapter-netlify/tsconfig.json | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/adapter-netlify/src/edge.js b/packages/adapter-netlify/src/edge.js index 44692e5fd49c..0acf8a593251 100644 --- a/packages/adapter-netlify/src/edge.js +++ b/packages/adapter-netlify/src/edge.js @@ -4,6 +4,11 @@ import { manifest, prerendered } from 'MANIFEST'; const server = new Server(manifest); const prefix = `/${manifest.appDir}/`; +await server.init({ + // @ts-ignore + env: Deno.env.toObject() +}); + /** * @param { Request } request * @param { any } context diff --git a/packages/adapter-netlify/tsconfig.json b/packages/adapter-netlify/tsconfig.json index 87bea241ee5c..0a6b886c8407 100644 --- a/packages/adapter-netlify/tsconfig.json +++ b/packages/adapter-netlify/tsconfig.json @@ -4,7 +4,8 @@ "checkJs": true, "noEmit": true, "noImplicitAny": true, - "module": "es2020", + "module": "es2022", + "target": "es2022", "moduleResolution": "node", "allowSyntheticDefaultImports": true, "baseUrl": ".", From 2383041fa50c440ab5613131b1e194f8602f767d Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Sat, 27 Aug 2022 08:47:01 +0200 Subject: [PATCH 7/7] changeset --- .changeset/strong-kangaroos-work.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.changeset/strong-kangaroos-work.md b/.changeset/strong-kangaroos-work.md index 97e0ba1a3859..7708e75fdb13 100644 --- a/.changeset/strong-kangaroos-work.md +++ b/.changeset/strong-kangaroos-work.md @@ -1,5 +1,6 @@ --- '@sveltejs/adapter-vercel': patch +'@sveltejs/adapter-netlify': patch --- Run `server.init()` for edge functions