Skip to content

Commit 6013524

Browse files
committed
address code review comment
1 parent 95e456d commit 6013524

File tree

3 files changed

+8
-26
lines changed

3 files changed

+8
-26
lines changed

packages/kit/src/runtime/server/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,9 @@ export async function respond(request, options, state = {}) {
190190
});
191191
}
192192

193-
return new Response(undefined, { status: 404 });
193+
// we can't load the endpoint from our own manifest,
194+
// so we need to make an actual HTTP request
195+
return await fetch(request);
194196
},
195197

196198
// TODO remove for 1.0

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

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -159,20 +159,11 @@ export async function load_node({
159159
}
160160
);
161161

162-
if (rendered) {
163-
if (state.prerender) {
164-
state.prerender.dependencies.set(relative, rendered);
165-
}
166-
167-
response = rendered;
168-
} else {
169-
// we can't load the endpoint from our own manifest,
170-
// so we need to make an actual HTTP request
171-
response = await fetch(new URL(requested, event.url).href, {
172-
method: opts.method || 'GET',
173-
headers: opts.headers
174-
});
162+
if (state.prerender) {
163+
state.prerender.dependencies.set(relative, rendered);
175164
}
165+
166+
response = rendered;
176167
} else {
177168
// external
178169
if (resolved.startsWith('//')) {
@@ -204,7 +195,6 @@ export async function load_node({
204195
response = await options.hooks.externalFetch.call(null, external_request);
205196
}
206197

207-
if (response) {
208198
const proxy = new Proxy(response, {
209199
get(response, key, _receiver) {
210200
async function text() {
@@ -249,14 +239,6 @@ export async function load_node({
249239
});
250240

251241
return proxy;
252-
}
253-
254-
return (
255-
response ||
256-
new Response('Not found', {
257-
status: 404
258-
})
259-
);
260242
},
261243
stuff: { ...stuff }
262244
};

packages/kit/types/internal.d.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,5 @@ export interface MethodOverride {
228228
}
229229

230230
export interface Respond {
231-
(request: Request, options: SSRRenderOptions, state?: SSRRenderState): Promise<
232-
Response | undefined
233-
>;
231+
(request: Request, options: SSRRenderOptions, state?: SSRRenderState): Promise<Response>;
234232
}

0 commit comments

Comments
 (0)