Skip to content

Commit 9bea757

Browse files
authored
fix: correctly include ambient types from vercel/node adapter (#12088)
closes #12433
1 parent 6774ebc commit 9bea757

File tree

13 files changed

+43
-33
lines changed

13 files changed

+43
-33
lines changed

.changeset/shaggy-walls-wave.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@sveltejs/adapter-vercel": patch
3+
"@sveltejs/adapter-node": patch
4+
---
5+
6+
fix: include ambient type declarations

packages/adapter-cloudflare-workers/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
"@sveltejs/kit": ["../kit/types/index"]
1414
}
1515
},
16-
"include": ["**/*.js", "placeholders.d.ts"]
16+
"include": ["**/*.js", "internal.d.ts"]
1717
}

packages/adapter-cloudflare/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
"@sveltejs/kit": ["../kit/types/index"]
1313
}
1414
},
15-
"include": ["index.js", "placeholders.d.ts", "src/worker.js"]
15+
"include": ["index.js", "internal.d.ts", "src/worker.js"]
1616
}

packages/adapter-netlify/index.d.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
import { Adapter } from '@sveltejs/kit';
2-
import './ambient.js';
32

43
export default function plugin(opts?: { split?: boolean; edge?: boolean }): Adapter;

packages/adapter-netlify/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
"@sveltejs/kit": ["../kit/types/index"]
1616
}
1717
},
18-
"include": ["*.js", "src/**/*.js", "ambient.d.ts"]
18+
"include": ["*.js", "src/**/*.js", "internal.d.ts"]
1919
}

packages/adapter-node/ambient.d.ts

+10-26
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,12 @@
1-
declare module 'ENV' {
2-
export function env(key: string, fallback?: any): string;
3-
}
4-
5-
declare module 'HANDLER' {
6-
export const handler: import('polka').Middleware;
7-
}
8-
9-
declare module 'MANIFEST' {
10-
import { SSRManifest } from '@sveltejs/kit';
11-
12-
export const base: string;
13-
export const manifest: SSRManifest;
14-
export const prerendered: Set<string>;
15-
}
16-
17-
declare module 'SERVER' {
18-
export { Server } from '@sveltejs/kit';
19-
}
20-
21-
declare namespace App {
22-
export interface Platform {
23-
/**
24-
* The original Node request object (https://nodejs.org/api/http.html#class-httpincomingmessage)
25-
*/
26-
req: import('http').IncomingMessage;
1+
import http from 'node:http';
2+
3+
declare global {
4+
namespace App {
5+
export interface Platform {
6+
/**
7+
* The original Node request object (https://nodejs.org/api/http.html#class-httpincomingmessage)
8+
*/
9+
req: http.IncomingMessage;
10+
}
2711
}
2812
}

packages/adapter-node/internal.d.ts

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
declare module 'ENV' {
2+
export function env(key: string, fallback?: any): string;
3+
}
4+
5+
declare module 'HANDLER' {
6+
export const handler: import('polka').Middleware;
7+
}
8+
9+
declare module 'MANIFEST' {
10+
import { SSRManifest } from '@sveltejs/kit';
11+
12+
export const base: string;
13+
export const manifest: SSRManifest;
14+
export const prerendered: Set<string>;
15+
}
16+
17+
declare module 'SERVER' {
18+
export { Server } from '@sveltejs/kit';
19+
}

packages/adapter-node/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
"files": [
3030
"files",
3131
"index.js",
32-
"index.d.ts"
32+
"index.d.ts",
33+
"ambient.d.ts"
3334
],
3435
"scripts": {
3536
"dev": "node -e \"fs.rmSync('files', { force: true, recursive: true })\" && rollup -cw",

packages/adapter-node/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
"@sveltejs/kit": ["../kit/types/index"]
1414
}
1515
},
16-
"include": ["index.js", "src/**/*.js", "ambient.d.ts"]
16+
"include": ["index.js", "src/**/*.js", "internal.d.ts"]
1717
}

packages/adapter-vercel/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
"files",
3131
"index.js",
3232
"utils.js",
33-
"index.d.ts"
33+
"index.d.ts",
34+
"ambient.d.ts"
3435
],
3536
"scripts": {
3637
"lint": "prettier --check .",

0 commit comments

Comments
 (0)