Skip to content

Commit fd13f36

Browse files
authored
chore: fix node ID types (#13535)
1 parent 30b87c0 commit fd13f36

File tree

4 files changed

+15
-18
lines changed

4 files changed

+15
-18
lines changed

packages/kit/src/exports/vite/dev/index.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,17 +177,18 @@ export async function dev(vite, vite_config, svelte_config) {
177177
return async () => {
178178
/** @type {import('types').SSRNode} */
179179
const result = {};
180-
181-
/** @type {import('vite').ModuleNode[]} */
182-
const module_nodes = [];
183-
184180
result.index = index;
181+
result.universal_id = node.universal;
182+
result.server_id = node.server;
185183

186-
// these are unused in dev, it's easier to include them
184+
// these are unused in dev, but it's easier to include them
187185
result.imports = [];
188186
result.stylesheets = [];
189187
result.fonts = [];
190188

189+
/** @type {import('vite').ModuleNode[]} */
190+
const module_nodes = [];
191+
191192
if (node.component) {
192193
result.component = async () => {
193194
const { module_node, module } = await resolve(
@@ -202,17 +203,13 @@ export async function dev(vite, vite_config, svelte_config) {
202203

203204
if (node.universal) {
204205
const { module, module_node } = await resolve(node.universal);
205-
206206
module_nodes.push(module_node);
207-
208207
result.universal = module;
209-
result.universal_id = node.universal;
210208
}
211209

212210
if (node.server) {
213211
const { module } = await resolve(node.server);
214212
result.server = module;
215-
result.server_id = node.server;
216213
}
217214

218215
// in dev we inline all styles to avoid FOUC. this gets populated lazily so that

packages/kit/src/runtime/server/page/load_data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export async function load_server_data({ event, state, node, parent }) {
7878
const { href } = new URL(dep, event.url);
7979

8080
if (DEV) {
81-
validate_depends(node.server_id, dep);
81+
validate_depends(node.server_id || 'missing route ID', dep);
8282

8383
if (done && !uses.dependencies.has(href)) {
8484
console.warn(

packages/kit/src/types/internal.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ export interface BuildData {
7979
* An entry is undefined if the layout/page has no component or universal file (i.e. only has a `.server.js` file).
8080
* Only set in case of `router.resolution === 'server'`.
8181
*/
82-
nodes?: (string | undefined)[];
82+
nodes?: Array<string | undefined>;
8383
/**
8484
* CSS files referenced in the entry points of the layouts/pages.
8585
* An entry is undefined if the layout/page has no component or universal file (i.e. only has a `.server.js` file) or if has no CSS.
8686
* Only set in case of `router.resolution === 'server'`.
8787
*/
88-
css?: (string[] | undefined)[];
88+
css?: Array<string[] | undefined>;
8989
/**
9090
* Contains the client route manifest in a form suitable for the server which is used for server side route resolution.
9191
* Notably, it contains all routes, regardless of whether they are prerendered or not (those are missing in the optimized server route manifest).
@@ -396,8 +396,8 @@ export interface SSRNode {
396396
entries?: PrerenderEntryGenerator;
397397
};
398398

399-
universal_id: string;
400-
server_id: string;
399+
universal_id?: string;
400+
server_id?: string;
401401
}
402402

403403
export type SSRNodeLoader = () => Promise<SSRNode>;

packages/kit/types/index.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1726,13 +1726,13 @@ declare module '@sveltejs/kit' {
17261726
* An entry is undefined if the layout/page has no component or universal file (i.e. only has a `.server.js` file).
17271727
* Only set in case of `router.resolution === 'server'`.
17281728
*/
1729-
nodes?: (string | undefined)[];
1729+
nodes?: Array<string | undefined>;
17301730
/**
17311731
* CSS files referenced in the entry points of the layouts/pages.
17321732
* An entry is undefined if the layout/page has no component or universal file (i.e. only has a `.server.js` file) or if has no CSS.
17331733
* Only set in case of `router.resolution === 'server'`.
17341734
*/
1735-
css?: (string[] | undefined)[];
1735+
css?: Array<string[] | undefined>;
17361736
/**
17371737
* Contains the client route manifest in a form suitable for the server which is used for server side route resolution.
17381738
* Notably, it contains all routes, regardless of whether they are prerendered or not (those are missing in the optimized server route manifest).
@@ -1873,8 +1873,8 @@ declare module '@sveltejs/kit' {
18731873
entries?: PrerenderEntryGenerator;
18741874
};
18751875

1876-
universal_id: string;
1877-
server_id: string;
1876+
universal_id?: string;
1877+
server_id?: string;
18781878
}
18791879

18801880
type SSRNodeLoader = () => Promise<SSRNode>;

0 commit comments

Comments
 (0)