totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-16 04:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle unknown preload errors

Browse Source
This commit is contained in:
Rich Harris
2018-08-16 12:25:23 -04:00
parent 99e5a9601c
commit deef1bbfcf
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/middleware.ts
View File

@@ -299,13 +299,10 @@ function get_page_handler(
parts: [ parts: [
{ name: null, component: error_route } { name: null, component: error_route }
] ]
}, req, res, statusCode, error); }, req, res, statusCode, error || new Error('Unknown error in preload function'));
} }
function handle_page(page: Page, req: Req, res: ServerResponse, status = 200, error: Error | string = null) { function handle_page(page: Page, req: Req, res: ServerResponse, status = 200, error: Error | string = null) {
const get_params = page.parts[page.parts.length - 1].params || (() => ({}));
const match = error ? null : page.pattern.exec(req.path);
const chunks: Record<string, string | string[]> = get_chunks(); const chunks: Record<string, string | string[]> = get_chunks();
res.setHeader('Content-Type', 'text/html'); res.setHeader('Content-Type', 'text/html');
@@ -391,6 +388,8 @@ function get_page_handler(
}) })
: {}; : {};
const match = error ? null : page.pattern.exec(req.path);
Promise.all([root_preloaded].concat(page.parts.map(part => { Promise.all([root_preloaded].concat(page.parts.map(part => {
if (!part) return null; if (!part) return null;