Move history functions

Author: benmccann

runtime/src/app/app.ts

@@ -13,7 +13,6 @@ import {
 import {
 	HydratedTarget,
 	Target,
-	ScrollPosition,
 	Redirect,
 	Page
 } from './types';
@@ -71,15 +70,6 @@ export function set_target(element) {
 	target = element;
 }
 
-const _history = typeof history !== 'undefined' ? history : {
-	pushState: (state: any, title: string, href: string) => {},
-	replaceState: (state: any, title: string, href: string) => {},
-	scrollRestoration: ''
-};
-export { _history as history };
-
-export const scroll_history: Record<string, ScrollPosition> = {};
-
 export function extract_query(search: string) {
 	const query = Object.create(null);
 	if (search.length > 0) {
@@ -152,13 +142,6 @@ export function handle_error(url: URL) {
 	render([], props, { host, path: pathname, query, params: {} });
 }
 
-export function scroll_state() {
-	return {
-		x: pageXOffset,
-		y: pageYOffset
-	};
-}
-
 export async function handle_target(dest: Target) {
 	if (root_component) stores.preloading.set(true);
 

runtime/src/app/goto/index.ts

@@ -1,4 +1,5 @@
-import { history, select_target } from '../app';
+import { history } from '../start';
+import { select_target } from '../app';
 import { navigate, cid } from '../start';
 
 export default function goto(

runtime/src/app/start/index.ts

@@ -1,14 +1,12 @@
 import {
 	handle_target,
-	history,
 	initial_data,
-	scroll_history,
-	scroll_state,
 	select_target,
 	handle_error,
 	set_target
 } from '../app';
 import {
+	ScrollPosition,
 	Target
 } from '../types';
 import prefetch from '../prefetch/index';
@@ -23,24 +21,33 @@ export function set_cid(n: number) {
 	cid = n;
 }
 
+const _history = typeof history !== 'undefined' ? history : {
+	pushState: (state: any, title: string, href: string) => {},
+	replaceState: (state: any, title: string, href: string) => {},
+	scrollRestoration: ''
+};
+export { _history as history };
+
+export const scroll_history: Record<string, ScrollPosition> = {};
+
 export default function start(opts: {
 	target: Node
 }): Promise<void> {
-	if ('scrollRestoration' in history) {
-		history.scrollRestoration = 'manual';
+	if ('scrollRestoration' in _history) {
+		_history.scrollRestoration = 'manual';
 	}
 
 	// Adopted from Nuxt.js
 	// Reset scrollRestoration to auto when leaving page, allowing page reload
 	// and back-navigation from other pages to use the browser to restore the
 	// scrolling position.
 	addEventListener('beforeunload', () => {
-		history.scrollRestoration = 'auto';
+		_history.scrollRestoration = 'auto';
 	});
 
 	// Setting scrollRestoration to manual again when returning to this page.
 	addEventListener('load', () => {
-		history.scrollRestoration = 'manual';
+		_history.scrollRestoration = 'manual';
 	});
 
 	set_target(opts.target);
@@ -55,7 +62,7 @@ export default function start(opts: {
 	return Promise.resolve().then(() => {
 		const { hash, href } = location;
 
-		history.replaceState({ id: uid }, '', href);
+		_history.replaceState({ id: uid }, '', href);
 
 		const url = new URL(location.href);
 
@@ -122,7 +129,7 @@ function handle_click(event: MouseEvent) {
 		const noscroll = a.hasAttribute('sapper:noscroll');
 		navigate(target, null, noscroll, url.hash);
 		event.preventDefault();
-		history.pushState({ id: cid }, '', url.href);
+		_history.pushState({ id: cid }, '', url.href);
 	}
 }
 
@@ -135,6 +142,13 @@ function find_anchor(node: Node) {
 	return node;
 }
 
+function scroll_state() {
+	return {
+		x: pageXOffset,
+		y: pageYOffset
+	};
+}
+
 function handle_popstate(event: PopStateEvent) {
 	scroll_history[cid] = scroll_state();
 
@@ -151,7 +165,7 @@ function handle_popstate(event: PopStateEvent) {
 		// hashchange
 		set_uid(uid + 1);
 		set_cid(uid);
-		history.replaceState({ id: cid }, '', location.href);
+		_history.replaceState({ id: cid }, '', location.href);
 	}
 }