fix: polyfill fetch before running any app code (#3400)

sveltejs · Jan 19, 2022 · 49114b9 · 49114b9
1 parent 02a12af
commit 49114b9
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 11 deletions.
diff --git a/.changeset/strong-owls-jam.md b/.changeset/strong-owls-jam.md
@@ -0,0 +1,7 @@
+---
+'@sveltejs/adapter-netlify': patch
+'@sveltejs/adapter-node': patch
+'@sveltejs/adapter-vercel': patch
+---
+
+Polyfill fetch before running any app code
diff --git a/packages/adapter-netlify/rollup.config.js b/packages/adapter-netlify/rollup.config.js
@@ -5,7 +5,8 @@ import json from '@rollup/plugin-json';
 export default [
 	{
 		input: {
-			handler: 'src/handler.js'
+			handler: 'src/handler.js',
+			shims: 'src/shims.js'
 		},
 		output: [
 			{

diff --git a/packages/adapter-netlify/src/handler.js b/packages/adapter-netlify/src/handler.js
@@ -1,8 +1,6 @@
-import { __fetch_polyfill } from '@sveltejs/kit/install-fetch';
+import './shims';
 import { App } from './server/app.js';
 
-__fetch_polyfill();
-
 /**
  *
  * @param {import('@sveltejs/kit').SSRManifest} manifest

diff --git a/packages/adapter-netlify/src/shims.js b/packages/adapter-netlify/src/shims.js
@@ -0,0 +1,2 @@
+import { __fetch_polyfill } from '@sveltejs/kit/install-fetch';
+__fetch_polyfill();
diff --git a/packages/adapter-node/rollup.config.js b/packages/adapter-node/rollup.config.js
@@ -6,7 +6,8 @@ export default [
 	{
 		input: {
 			index: 'src/index.js',
-			handler: 'src/handler.js'
+			handler: 'src/handler.js',
+			shims: 'src/shims.js'
 		},
 		output: {
 			dir: 'files',

diff --git a/packages/adapter-node/src/handler.js b/packages/adapter-node/src/handler.js
@@ -1,16 +1,14 @@
+import './shims';
 import fs from 'fs';
 import path from 'path';
 import sirv from 'sirv';
 import { fileURLToPath } from 'url';
 import { getRawBody } from '@sveltejs/kit/node';
-import { __fetch_polyfill } from '@sveltejs/kit/install-fetch';
 
 // @ts-ignore
 import { App } from 'APP';
 import { manifest } from 'MANIFEST';
 
-__fetch_polyfill();
-
 const app = new App(manifest);
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));

diff --git a/packages/adapter-node/src/shims.js b/packages/adapter-node/src/shims.js
@@ -0,0 +1,2 @@
+import { __fetch_polyfill } from '@sveltejs/kit/install-fetch';
+__fetch_polyfill();
diff --git a/packages/adapter-vercel/files/entry.js b/packages/adapter-vercel/files/entry.js
@@ -1,10 +1,8 @@
-import { __fetch_polyfill } from '@sveltejs/kit/install-fetch';
+import './shims';
 import { getRawBody } from '@sveltejs/kit/node';
 import { App } from 'APP';
 import { manifest } from 'MANIFEST';
 
-__fetch_polyfill();
-
 const app = new App(manifest);
 
 export default async (req, res) => {

diff --git a/packages/adapter-vercel/files/shims.js b/packages/adapter-vercel/files/shims.js
@@ -0,0 +1,2 @@
+import { __fetch_polyfill } from '@sveltejs/kit/install-fetch';
+__fetch_polyfill();