@wular/pnext 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wular/pnext",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A fast little framework for server-first React apps, fully compatible with Next.js",
   "type": "module",
   "bin": {

package/src/client/router/hub.ts

@@ -14,7 +14,13 @@ import type { EntryModule } from './types'
 // region (install, soft nav, popstate), so it lives on one record: a module-level `let` can only be
 // reassigned inside the module that declares it. State only the runtime touches stays in ./runtime.
 
-export const routerState = {
+export const routerState: {
+  observedLocationKey: string
+  activeRouteKey: string | undefined
+  renderedEntryId: string | undefined
+  /** The navigation that last painted a fallback, and when. */
+  fallbackPaint?: [sequence: number, at: number]
+} = {
   // pathname+search of the URL the router last observed. A popstate that leaves both unchanged is a
   // same-document FRAGMENT traversal - Chrome fires popstate, not just hashchange, for those - and
   // treating one as a history traversal would refetch and swap the body, remounting the live tree

package/src/client/router/runtime.ts

@@ -5217,6 +5217,8 @@ export async function softNavigate(href: string, options: SoftNavigateOptions =
   // A painted loading boundary or stage is a committed navigation state.
   const commitPaint = () => {
     paintedRoute = window.__PNEXT_ROUTE__
+    if (typeof __PNEXT_NEXT_ROUTER__ === 'undefined')
+      routerState.fallbackPaint = [sequence, performance.now()]
     pushOptimisticUrl()
     scheduleNavigationScroll(url, options)
   }
@@ -5416,6 +5418,14 @@ export async function softNavigate(href: string, options: SoftNavigateOptions =
     ])
     if (sequence !== navigationSequence) return abandonFetchedPage(page)
   }
+  // React's FALLBACK_THROTTLE_MS: content replacing a committed fallback reveals no sooner than 300 ms after it.
+  if (typeof __PNEXT_NEXT_ROUTER__ === 'undefined' && routerState.fallbackPaint?.[0] === sequence) {
+    const wait = routerState.fallbackPaint[1] + 300 - performance.now()
+    if (wait > 10) {
+      await new Promise(resolve => setTimeout(resolve, wait))
+      if (sequence !== navigationSequence) return abandonFetchedPage(page)
+    }
+  }
 
   if (!options.pop) {
     const bfcacheId = optimisticBfcacheId ?? nextBfcacheIdForNavigation(targetUrl, previousPathname)