adapter node sync

sveltejs · ignatiusmb · Aug 25, 2021 · Aug 25, 2021 · Aug 25, 2021 · Aug 25, 2021
commit 11b99fc37a21bd4e9c9a38f5d86aecaa15183360
diff --git a/packages/adapter-node/index.js b/packages/adapter-node/index.js
@@ -45,7 +45,7 @@ export default function ({
 			const files = fileURLToPath(new URL('./files', import.meta.url));
 			utils.copy(files, '.svelte-kit/node');
 			writeFileSync(
-				'.svelte-kit/node/env.js',
+				'.svelte-kit/node/env.js', // types pointed in src/env.d.ts
 				`export const path = process.env[${JSON.stringify(
 					path_env
 				)}] || false;\nexport const host = process.env[${JSON.stringify(

diff --git a/packages/adapter-node/src/env.d.ts b/packages/adapter-node/src/env.d.ts
@@ -0,0 +1,3 @@
+export const host: string;
+export const path: string;
+export const port: number;
diff --git a/packages/adapter-node/src/index.js b/packages/adapter-node/src/index.js
@@ -1,8 +1,5 @@
-// TODO hardcoding the relative location makes this brittle
-// @ts-ignore
-import { init, render } from '../output/server/app.js';
-// @ts-ignore
-import { path, host, port } from './env.js';
+import { init, render } from '@sveltejs/kit/adapter';
+import { host, path, port } from './env.js';
 import { createServer } from './server';
 
 init();

diff --git a/packages/adapter-node/src/server.js b/packages/adapter-node/src/server.js
@@ -16,8 +16,7 @@ const paths = {
 	prerendered: join(__dirname, '/prerendered')
 };
 
-// TODO: type render function from @sveltejs/kit/adapter
-// @ts-ignore
+/** @param {{ render: import('@sveltejs/kit').App['render'] }} app */
 export function createServer({ render }) {
 	const prerendered_handler = fs.existsSync(paths.prerendered)
 		? sirv(paths.prerendered, {