From 6ee673095cbddc97a56bae7a512a5271d4a977a2 Mon Sep 17 00:00:00 2001
From: Jack Hanford <jackhanford@gmail.com>
Date: Mon, 15 Nov 2021 15:45:37 -0800
Subject: continue fixing typescript errors

---
 packages/bun-framework-next/page-loader.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'packages/bun-framework-next/page-loader.ts')

diff --git a/packages/bun-framework-next/page-loader.ts b/packages/bun-framework-next/page-loader.ts
index 2a8b402ad..3b31387d8 100644
--- a/packages/bun-framework-next/page-loader.ts
+++ b/packages/bun-framework-next/page-loader.ts
@@ -1,4 +1,6 @@
-import NextPageLoader from "next/dist/client/page-loader";
+import NextPageLoader, {
+  GoodPageCache as NextGoodPageCache,
+} from "next/dist/client/page-loader";
 import getAssetPathFromRoute from "next/dist/shared/lib/router/utils/get-asset-path-from-route";
 
 export function insertStyleSheet(url: string) {
@@ -10,8 +12,9 @@ export function insertStyleSheet(url: string) {
     const link = document.createElement("link");
     link.rel = "stylesheet";
 
-    link.onload = () => resolve();
-    link.onerror = () => reject();
+    // marking this resolve as void seems to break other things
+    link.onload = resolve;
+    link.onerror = reject;
 
     link.href = url;
 
@@ -19,6 +22,11 @@ export function insertStyleSheet(url: string) {
   });
 }
 
+interface GoodPageCache extends NextGoodPageCache {
+  __N_SSG: boolean;
+  __N_SSP: boolean;
+}
+
 export default class PageLoader extends NextPageLoader {
   constructor(_, __, pages) {
     super(_, __);
@@ -70,7 +78,7 @@ export default class PageLoader extends NextPageLoader {
   };
 
   prefetch() {
-    return Promise.resolve({});
+    return Promise.resolve();
   }
 
   async loadPage(route: string): Promise<GoodPageCache> {
-- 
cgit v1.2.3