vinext 0.1.2 → 0.1.3

package/dist/shims/ppr-fallback-shell.js

@@ -43,12 +43,15 @@ function scheduleCacheReadyIfSettled(state) {
 	});
 }
 function scheduleAbortIfReady(state) {
-	if (state.phase !== "final" || !state.hasDynamicBoundary || state.pendingCacheTasks > 0 || state.pendingCacheReadyCleanup !== null || state.isAbortScheduled) return;
+	if (state.phase !== "final" || !state.isFinalRenderStarted || !state.hasDynamicBoundary || state.pendingCacheTasks > 0 || state.pendingCacheReadyCleanup !== null || state.isAbortScheduled) return;
 	state.isAbortScheduled = true;
 	state.pendingAbortCleanup = scheduleAfterTask(() => {
 		state.pendingAbortCleanup = null;
 		state.isAbortScheduled = false;
-		if (state.phase === "final" && state.hasDynamicBoundary && state.pendingCacheTasks === 0 && state.pendingCacheReadyCleanup === null && !state.abortController.signal.aborted) state.abortController.abort();
+		if (state.phase === "final" && state.hasDynamicBoundary && state.pendingCacheTasks === 0 && state.pendingCacheReadyCleanup === null && !state.reactAbortController.signal.aborted) {
+			state.reactAbortController.abort();
+			state.abortController.abort();
+		}
 	});
 }
 function completeCacheTask(state, task) {
@@ -64,12 +67,15 @@ function ignoreCacheTask(state, task) {
 	completeCacheTask(state, task);
 }
 function createPprFallbackShellState(options) {
+	const abortController = new AbortController();
 	return {
-		abortController: new AbortController(),
+		abortController,
+		reactAbortController: abortController,
 		cacheEpoch: 0,
 		cacheReadyResolvers: [],
 		fallbackParamNames: new Set(options.fallbackParamNames),
 		hasDynamicBoundary: false,
+		isFinalRenderStarted: false,
 		isAbortScheduled: false,
 		pendingAbortCleanup: null,
 		pendingCacheReadyCleanup: null,
@@ -107,14 +113,22 @@ function trackPprFallbackShellCacheTask(fn, cacheVariant) {
 	});
 }
 function createPprFallbackShellSuspensePromiseForState(state, expression) {
-	state.hasDynamicBoundary = true;
-	for (const task of pprFallbackShellCacheTaskStackAls.getStore() ?? []) ignoreCacheTask(state, task);
-	scheduleCacheReadyIfSettled(state);
+	markPprFallbackShellDynamicBoundaryForState(state);
 	if (state.phase === "final") scheduleAbortIfReady(state);
 	const promise = makeHangingPromise(state.abortController.signal, state.routePattern, expression);
 	promise.catch(noop);
 	return promise;
 }
+function markPprFallbackShellDynamicBoundaryForState(state) {
+	state.hasDynamicBoundary = true;
+	for (const task of pprFallbackShellCacheTaskStackAls.getStore() ?? []) ignoreCacheTask(state, task);
+	scheduleCacheReadyIfSettled(state);
+}
+function markPprFallbackShellDynamicBoundary() {
+	const state = getPprFallbackShellState();
+	if (state === null || state.fallbackParamNames.size === 0) return;
+	markPprFallbackShellDynamicBoundaryForState(state);
+}
 function createPprFallbackShellSuspensePromise(expression) {
 	const state = getPprFallbackShellState();
 	if (state === null) return null;
@@ -134,16 +148,23 @@ function preparePprFallbackShellFinalRender(state) {
 		state.pendingAbortCleanup = null;
 	}
 	state.abortController = new AbortController();
+	state.reactAbortController = new AbortController();
 	state.cacheEpoch++;
 	state.cacheReadyResolvers.length = 0;
 	state.hasDynamicBoundary = false;
+	state.isFinalRenderStarted = false;
 	state.isAbortScheduled = false;
 	state.pendingCacheTasks = 0;
 	state.phase = "final";
 }
+function beginPprFallbackShellFinalRender(state) {
+	if (state.phase !== "final") return;
+	state.isFinalRenderStarted = true;
+	scheduleAbortIfReady(state);
+}
 function isPprFallbackShellAbortError(error) {
 	if (typeof DOMException !== "undefined" && error instanceof DOMException && error.name === "AbortError") return true;
 	return error instanceof Error && error.name === "HangingPromiseRejectionError";
 }
 //#endregion
-export { createPprFallbackShellState, createPprFallbackShellSuspensePromise, createPprFallbackShellSuspensePromiseForState, getPprFallbackShellState, isPprFallbackShellAbortError, preparePprFallbackShellFinalRender, runWithPprFallbackShellState, trackPprFallbackShellCacheTask, waitForPprFallbackShellCacheReady };
+export { beginPprFallbackShellFinalRender, createPprFallbackShellState, createPprFallbackShellSuspensePromise, createPprFallbackShellSuspensePromiseForState, getPprFallbackShellState, isPprFallbackShellAbortError, markPprFallbackShellDynamicBoundary, preparePprFallbackShellFinalRender, runWithPprFallbackShellState, trackPprFallbackShellCacheTask, waitForPprFallbackShellCacheReady };

package/dist/shims/router.d.ts

@@ -36,6 +36,7 @@ type UrlObject = {
   query?: UrlQuery;
 };
 type TransitionOptions = {
+  _h?: 1;
   shallow?: boolean;
   scroll?: boolean;
   locale?: string | false;
@@ -108,6 +109,7 @@ type PagesNavigationContextShape = {
  */
 declare function getPagesNavigationContext(): PagesNavigationContextShape | null;
 declare function getPagesNavigationIsReadyFromSerializedState(routePattern: string | undefined, searchString: string, nextData?: VinextNextData): boolean;
+declare function markPagesRouterReady(): boolean;
 /**
  * useRouter hook - Pages Router compatible.
  *
@@ -122,8 +124,17 @@ declare function useRouter(): NextRouter;
  * The provider owns the reactive Pages Router snapshot so next/router and
  * next/compat/router consumers share one context value instead of each hook
  * installing its own global URL-change listener.
+ *
+ * The PagesRouterCommitBoundary exists for client navigations: its layout
+ * callback runs scroll restoration at commit time and resolves the navigation
+ * at the same root-commit boundary Next.js awaits before routeChangeComplete.
+ * Its onError rejection drives the hard-navigation fallback in runNavigateClient.
+ * The same boundary intentionally also wraps SSR and initial hydration, where
+ * callbacks default to noopCommit: a hydration-time render error is caught
+ * here (React still console.error's it) instead of propagating, matching the
+ * navigation-path containment.
  */
-declare function wrapWithRouterContext(element: ReactElement): ReactElement;
+declare function wrapWithRouterContext(element: ReactElement, onCommit?: () => void, onError?: (error: Error) => void): ReactElement;
 /**
  * Props injected by `withRouter` into the wrapped component.
  *
@@ -176,4 +187,4 @@ declare const RouterMethods: {
 };
 declare const Router: typeof RouterMethods & Omit<NextRouter, keyof typeof RouterMethods>;
 //#endregion
-export { ExcludeRouterProps, NextRouter, WithRouterProps, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { ExcludeRouterProps, NextRouter, WithRouterProps, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };