From 19414ce9a8658745e9d64d4385a40b5658c05dc6 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Thu, 14 Oct 2021 20:59:26 -0700
Subject: [PATCH] various cleanup

---
 packages/adapter-node/src/env.js   |  2 +-
 packages/adapter-node/src/index.js |  1 +
 packages/adapter-node/src/shims.js | 16 ++++++++--------
 packages/adapter-vercel/index.js   |  8 +++-----
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/adapter-node/src/env.js b/packages/adapter-node/src/env.js
index d353f7a70a95..2c2f1bcd97f8 100644
--- a/packages/adapter-node/src/env.js
+++ b/packages/adapter-node/src/env.js
@@ -1,3 +1,3 @@
-export const path = process.env['PATH'] || false;
+export const path = process.env['SOCKET_PATH'] || false;
 export const host = process.env['HOST'] || '0.0.0.0';
 export const port = process.env['PORT'] || (!path && 3000);
diff --git a/packages/adapter-node/src/index.js b/packages/adapter-node/src/index.js
index 20b8285c6e22..e4bdb4390042 100644
--- a/packages/adapter-node/src/index.js
+++ b/packages/adapter-node/src/index.js
@@ -1,3 +1,4 @@
+import './shims';
 import { path, host, port } from './env';
 import { assetsMiddleware, kitMiddleware, prerenderedMiddleware } from './middlewares';
 import compression from 'compression';
diff --git a/packages/adapter-node/src/shims.js b/packages/adapter-node/src/shims.js
index 839b2dd5b108..08a7f6dc7708 100644
--- a/packages/adapter-node/src/shims.js
+++ b/packages/adapter-node/src/shims.js
@@ -1,9 +1,9 @@
-import { createRequire } from 'module';
-export { fetch, Response, Request, Headers } from '@sveltejs/kit/install-fetch';
+import { fetch, Response, Request, Headers } from '@sveltejs/kit/install-fetch';
 
-// esbuild automatically renames "require"
-// So we still have to use Object.defineProperty here
-Object.defineProperty(globalThis, 'require', {
-	enumerable: true,
-	value: createRequire(import.meta.url)
-});
+// @ts-expect-error
+globalThis.fetch = fetch;
+// @ts-expect-error
+globalThis.Response = Response;
+// @ts-expect-error
+globalThis.Request = Request;
+globalThis.Headers = Headers;
diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/index.js
index d5c53689f143..7f3e01a259ab 100644
--- a/packages/adapter-vercel/index.js
+++ b/packages/adapter-vercel/index.js
@@ -23,11 +23,9 @@ export default function (options) {
 				lambda: join(dir, 'functions/node/render')
 			};
 
-			// TODO ideally we'd have something like utils.tmpdir('vercel')
-			// rather than hardcoding '.svelte-kit/vercel/entry.js', and the
-			// relative import from that file to output/server/app.js
-			// would be controlled. at the moment we're exposing
-			// implementation details that could change
+			// TODO ideally we'd have something like utils.tmpdir('vercel') rather
+			// than hardcoding '.svelte-kit/vercel/entry.js'. At the moment we're
+			// exposing implementation details that could change
 			utils.log.minor('Generating serverless function...');
 			utils.copy(join(files, 'entry.js'), '.svelte-kit/vercel/entry.js');