Merge pull request #124 from swup/fix/fetch-page-visit-done

src/index.ts

@@ -7,7 +7,12 @@ import type {
 	PageData,
 	HookDefaultHandler
 } from 'swup';
-import { deviceSupportsHover, networkSupportsPreloading, whenIdle, isAnchorElement } from './util.js';
+import {
+	deviceSupportsHover,
+	networkSupportsPreloading,
+	whenIdle,
+	isAnchorElement
+} from './util.js';
 import createQueue, { Queue } from './queue.js';
 import createObserver, { Observer } from './observer.js';
 
@@ -26,7 +31,7 @@ declare module 'swup' {
 	}
 	export interface HookDefinitions {
 		'link:hover': { el: HTMLAnchorElement | SVGAElement; event: DelegateEvent };
-		'page:preload': { url: string, page?: PageData };
+		'page:preload': { url: string; page?: PageData };
 	}
 	export interface HookReturnValues {
 		'page:preload': Promise<PageData>;
@@ -133,7 +138,6 @@ export default class SwupPreloadPlugin extends Plugin {
 		swup.hooks.create('page:preload');
 		swup.hooks.create('link:hover');
 
-		// @ts-ignore: non-matching signatures (TODO: fix properly)
 		swup.preload = this.preload;
 		swup.preloadLinks = this.preloadLinks;
 
@@ -414,10 +418,16 @@ export default class SwupPreloadPlugin extends Plugin {
 		// @ts-expect-error: createVisit is currently private, need to make this semi-public somehow
 		const visit = this.swup.createVisit({ to: url });
 
-		const page = await this.swup.hooks.call('page:preload', visit, { url }, async (visit, args) => {
-			args.page = await this.swup.fetchPage(href);
-			return args.page;
-		});
+		const page = await this.swup.hooks.call(
+			'page:preload',
+			visit,
+			{ url },
+			async (visit, args) => {
+				// @ts-expect-error FetchOptions.visit is currently marked as internal
+				args.page = await this.swup.fetchPage(href, { visit });
+				return args.page;
+			}
+		);
 		return page;
 	}
 }