diff --git a/packages/next/client/components/app-router.tsx b/packages/next/client/components/app-router.tsx index 587d7829e57e..15b1420fa5c9 100644 --- a/packages/next/client/components/app-router.tsx +++ b/packages/next/client/components/app-router.tsx @@ -168,7 +168,7 @@ function Router({ // This is safe to do as canonicalUrl can't be rendered, it's only used to control the history updates in the useEffect further down in this file. typeof window !== 'undefined' ? // window.location does not have the same type as URL but has all the fields createHrefFromUrl needs. - createHrefFromUrl(window.location as unknown as URL) + createHrefFromUrl(window.location) : initialCanonicalUrl, } }, [children, initialCanonicalUrl, initialTree]) diff --git a/packages/next/client/components/reducer.ts b/packages/next/client/components/reducer.ts index ac5396b78939..1a3760124e47 100644 --- a/packages/next/client/components/reducer.ts +++ b/packages/next/client/components/reducer.ts @@ -45,7 +45,9 @@ function readRecordValue(thenable: Promise): T { } } -export function createHrefFromUrl(url: URL): string { +export function createHrefFromUrl( + url: Pick +): string { return url.pathname + url.search + url.hash } diff --git a/packages/next/client/request-idle-callback.ts b/packages/next/client/request-idle-callback.ts index 7ce28455b27a..f30937892301 100644 --- a/packages/next/client/request-idle-callback.ts +++ b/packages/next/client/request-idle-callback.ts @@ -4,14 +4,14 @@ export const requestIdleCallback = self.requestIdleCallback.bind(window)) || function (cb: IdleRequestCallback): number { let start = Date.now() - return setTimeout(function () { + return self.setTimeout(function () { cb({ didTimeout: false, timeRemaining: function () { return Math.max(0, 50 - (Date.now() - start)) }, }) - }, 1) as unknown as number + }, 1) } export const cancelIdleCallback =