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

preload errors

Browse Source
This commit is contained in:
Rich Harris
2018-03-04 18:26:58 -05:00
parent 7e2f5f8fb6
commit 50ecc5c130
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime/index.ts
View File

@@ -271,7 +271,12 @@ export function preloadRoutes(pathnames: string[]) {
return routes return routes
.filter(route => { .filter(route => {
return !pathnames || pathnames.some(pathname => route.pattern.test(pathname)); if (!pathnames) return true;
return pathnames.some(pathname => {
return route.error
? route.error === pathname
: route.pattern.test(pathname)
});
}) })
.reduce((promise: Promise<any>, route) => { .reduce((promise: Promise<any>, route) => {
return promise.then(route.load); return promise.then(route.load);

3
src/runtime/interfaces.ts
View File

@@ -13,8 +13,9 @@ export interface Component {
export type Route = { export type Route = {
pattern: RegExp; pattern: RegExp;
params: (match: RegExpExecArray) => Record<string, string>;
load: () => Promise<{ default: ComponentConstructor }>; load: () => Promise<{ default: ComponentConstructor }>;
error?: string;
params?: (match: RegExpExecArray) => Record<string, string>;
ignore?: boolean; ignore?: boolean;
}; };