Skip to content

Commit 156a14e

Browse files
committed
fix(@angular/build): correct handling of response/request errors
Prior to this change, request errors were not handled correctly. Closes #29884
1 parent d89c2cb commit 156a14e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

packages/angular/build/src/utils/server-rendering/launch-server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export async function launchServer(): Promise<URL> {
3333
// handle request
3434
if (isSsrNodeRequestHandler(reqHandler)) {
3535
await reqHandler(req, res, (e) => {
36-
throw e;
36+
throw e ?? new Error(`Unable to handle request: '${req.url}'.`);
3737
});
3838
} else {
3939
const webRes = await reqHandler(createWebRequestFromNodeRequest(req));

packages/angular/build/src/utils/server-rendering/prerender.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ export async function prerenderPages(
113113
outputMode,
114114
).catch((err) => {
115115
return {
116-
errors: [`An error occurred while extracting routes.\n\n${err.stack ?? err.message ?? err}`],
116+
errors: [`An error occurred while extracting routes.\n\n${err.message ?? err.stack ?? err}`],
117117
serializedRouteTree: [],
118118
appShellRoute: undefined,
119119
};
@@ -258,7 +258,7 @@ async function renderPages(
258258
})
259259
.catch((err) => {
260260
errors.push(
261-
`An error occurred while prerendering route '${route}'.\n\n${err.stack ?? err.message ?? err.code ?? err}`,
261+
`An error occurred while prerendering route '${route}'.\n\n${err.message ?? err.stack ?? err.code ?? err}`,
262262
);
263263
void renderWorker.destroy();
264264
});
@@ -359,7 +359,7 @@ async function getAllRoutes(
359359

360360
return {
361361
errors: [
362-
`An error occurred while extracting routes.\n\n${err.stack ?? err.message ?? err.code ?? err}`,
362+
`An error occurred while extracting routes.\n\n${err.message ?? err.stack ?? err.code ?? err}`,
363363
],
364364
serializedRouteTree: [],
365365
};

0 commit comments

Comments
 (0)