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

merge master -> svelte-3, fix various typescript and webpack oddities

Browse Source
This commit is contained in:
Richard Harris
2019-02-01 08:21:45 -05:00
parent f587161d7d 83c8d7f855
commit 4940c5d5be
36 changed files with 794 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
templates/src/app/app.ts
View File

@@ -38,7 +38,7 @@ const root_props: RootProps = {
export let prefetching: {
href: string;
promise: Promise<{ redirect?: Redirect, data?: any, nullable_depth?: number }>;
promise: Promise<{ redirect?: Redirect, data?: any, nullable_depth?: number, new_segments?: any }>;
} = null;
export function set_prefetching(href, promise) {
prefetching = { href, promise };
@@ -141,10 +141,13 @@ export function navigate(target: Target, id: number, noscroll?: boolean, hash?:
const token = current_token = {};
return loaded.then(({ redirect, data, nullable_depth }) => {
return loaded.then(({ redirect, data, nullable_depth, new_segments }) => {
if (redirect) {
return goto(redirect.location, { replaceState: true });
}
if (new_segments) {
segments = new_segments;
}
render(data, nullable_depth, scroll_history[id], noscroll, hash, token);
if (document.activeElement) document.activeElement.blur();
});
@@ -231,6 +234,10 @@ export function prepare_page(target: Target): Promise<{
segments[changed_from] === new_segments[changed_from]
) changed_from += 1;
if (changed_from === new_segments.length) {
changed_from -= 1;
}
let redirect: Redirect = null;
let error: { statusCode: number, message: Error | string } = null;
@@ -297,11 +304,9 @@ export function prepare_page(target: Target): Promise<{
}
}).then(results => {
if (redirect) {
return { redirect };
return { redirect, new_segments };
}
segments = new_segments;
const get_params = page.parts[page.parts.length - 1].params || (() => ({}));
const params = get_params(target.match);
@@ -316,6 +321,7 @@ export function prepare_page(target: Target): Promise<{
return {
nullable_depth: 0,
new_segments,
data: Object.assign({}, props, {
child: {
component: ErrorComponent,
@@ -329,7 +335,7 @@ export function prepare_page(target: Target): Promise<{
const data = {
path,
child: Object.assign({}, root_props.child, {
segment: segments[0]
segment: new_segments[0]
})
};
if (changed(query, root_props.query)) data.query = query;
@@ -360,10 +366,10 @@ export function prepare_page(target: Target): Promise<{
}
level = level.props.child;
level.segment = segments[i + 1];
level.segment = new_segments[i + 1];
}
return { data, nullable_depth };
return { data, nullable_depth, new_segments };
});
}
@@ -400,4 +406,4 @@ function detach(node: Node) {
function changed(a: Record<string, string | true>, b: Record<string, string | true>) {
return JSON.stringify(a) !== JSON.stringify(b);
}
}