vinext 1.0.0-beta.3 → 1.0.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +44 -3
- package/dist/build/client-build-config.d.ts +0 -1
- package/dist/build/css-url-assets.d.ts +0 -1
- package/dist/build/google-fonts/build-url.d.ts +5 -2
- package/dist/build/google-fonts/font-metadata.d.ts +7 -3
- package/dist/build/google-fonts/get-axes.d.ts +0 -1
- package/dist/build/layout-classification.d.ts +7 -4
- package/dist/build/next-client-runtime-manifests.d.ts +0 -1
- package/dist/build/next-client-runtime-manifests.js +2 -19
- package/dist/build/nitro-route-rules.d.ts +0 -1
- package/dist/build/pages-client-assets-module.d.ts +0 -1
- package/dist/build/precompress.d.ts +7 -2
- package/dist/build/precompress.js +42 -8
- package/dist/build/prerender-paths.d.ts +2 -2
- package/dist/build/prerender-server-entry.d.ts +1 -1
- package/dist/build/prerender-server-pool.d.ts +4 -2
- package/dist/build/prerender.d.ts +36 -32
- package/dist/build/prerender.js +18 -3
- package/dist/build/public-dir-conflict.d.ts +14 -0
- package/dist/build/public-dir-conflict.js +25 -0
- package/dist/build/report.d.ts +2 -2
- package/dist/build/route-classification-injector.d.ts +0 -1
- package/dist/build/route-classification-manifest.d.ts +5 -3
- package/dist/build/run-prerender.d.ts +3 -2
- package/dist/build/static-export.d.ts +23 -12
- package/dist/cache/cache-adapters-virtual.d.ts +5 -2
- package/dist/check.js +4 -4
- package/dist/cli-args.d.ts +2 -1
- package/dist/cli-args.js +10 -0
- package/dist/cli-dev-config.d.ts +0 -1
- package/dist/cli.d.ts +1 -1
- package/dist/cli.js +14 -8
- package/dist/client/client-rewrite-matcher.d.ts +12 -0
- package/dist/client/client-rewrite-matcher.js +20 -0
- package/dist/client/client-rewrites.d.ts +31 -0
- package/dist/client/client-rewrites.js +41 -0
- package/dist/client/dev-error-overlay.d.ts +0 -1
- package/dist/client/empty-module.d.ts +1 -1
- package/dist/client/index.d.ts +2 -0
- package/dist/client/index.js +2 -0
- package/dist/client/instrumentation-client-state.d.ts +0 -1
- package/dist/client/navigation-runtime.d.ts +12 -1
- package/dist/client/navigation-runtime.js +6 -2
- package/dist/client/pages-router-link-navigation.d.ts +3 -21
- package/dist/client/react-instance-bootstrap.d.ts +1 -0
- package/dist/client/react-instance-bootstrap.js +7 -0
- package/dist/client/react-instance.d.ts +13 -0
- package/dist/client/react-instance.js +20 -0
- package/dist/client/vinext-next-data.d.ts +11 -6
- package/dist/client/window-next.d.ts +5 -2
- package/dist/config/config-matchers.d.ts +3 -5
- package/dist/config/config-matchers.js +7 -6
- package/dist/config/dotenv.d.ts +4 -9
- package/dist/config/dotenv.js +30 -22
- package/dist/config/next-config.d.ts +113 -52
- package/dist/config/next-config.js +6 -0
- package/dist/config/prerender.d.ts +0 -1
- package/dist/entries/app-browser-entry.d.ts +0 -1
- package/dist/entries/app-browser-entry.js +7 -3
- package/dist/entries/app-rsc-entry.d.ts +30 -16
- package/dist/entries/app-rsc-entry.js +40 -12
- package/dist/entries/app-rsc-manifest.d.ts +0 -1
- package/dist/entries/app-rsc-manifest.js +1 -0
- package/dist/entries/pages-client-entry.d.ts +0 -1
- package/dist/entries/pages-client-entry.js +7 -2
- package/dist/entries/pages-server-entry.d.ts +1 -2
- package/dist/entries/pages-server-entry.js +25 -6
- package/dist/image/image-adapters-virtual.d.ts +4 -2
- package/dist/index.d.ts +0 -1
- package/dist/index.js +257 -75
- package/dist/init-cloudflare.d.ts +0 -1
- package/dist/init-platform.d.ts +0 -1
- package/dist/init.d.ts +40 -20
- package/dist/plugins/ast-scope.d.ts +0 -1
- package/dist/plugins/async-hooks-stub.d.ts +0 -1
- package/dist/plugins/client-reference-dedup.d.ts +0 -1
- package/dist/plugins/client-reference-dedup.js +7 -5
- package/dist/plugins/css-data-url.d.ts +0 -1
- package/dist/plugins/css-module-imports.d.ts +0 -1
- package/dist/plugins/dynamic-preload-metadata.d.ts +0 -1
- package/dist/plugins/extensionless-dynamic-import.d.ts +0 -1
- package/dist/plugins/extensionless-dynamic-import.js +352 -13
- package/dist/plugins/fonts.d.ts +0 -1
- package/dist/plugins/ignore-dynamic-requests.d.ts +0 -1
- package/dist/plugins/ignore-dynamic-requests.js +28 -4
- package/dist/plugins/import-meta-url.d.ts +0 -1
- package/dist/plugins/instrumentation-client.d.ts +0 -1
- package/dist/plugins/middleware-server-only.d.ts +0 -1
- package/dist/plugins/og-asset-ownership.d.ts +0 -1
- package/dist/plugins/og-assets.d.ts +0 -1
- package/dist/plugins/optimize-imports.d.ts +0 -1
- package/dist/plugins/remove-console.d.ts +0 -1
- package/dist/plugins/require-context.d.ts +0 -1
- package/dist/plugins/require-context.js +143 -26
- package/dist/plugins/rsc-client-reference-loaders.d.ts +0 -1
- package/dist/plugins/rsc-reference-validation-normalizer.d.ts +0 -1
- package/dist/plugins/sass.d.ts +30 -2
- package/dist/plugins/sass.js +67 -5
- package/dist/plugins/server-externals-manifest.d.ts +0 -1
- package/dist/plugins/strip-server-exports.d.ts +0 -1
- package/dist/plugins/styled-jsx.d.ts +0 -1
- package/dist/plugins/wasm-module-import.d.ts +0 -1
- package/dist/routing/app-route-graph.d.ts +115 -56
- package/dist/routing/app-route-graph.js +2 -1
- package/dist/routing/app-router.d.ts +0 -1
- package/dist/routing/pages-router.d.ts +9 -5
- package/dist/routing/route-matching.d.ts +0 -1
- package/dist/routing/utils.d.ts +1 -23
- package/dist/routing/utils.js +1 -30
- package/dist/server/accept-encoding.d.ts +0 -1
- package/dist/server/api-handler.d.ts +0 -1
- package/dist/server/api-handler.js +4 -3
- package/dist/server/app-bfcache-identity.d.ts +9 -10
- package/dist/server/app-bfcache-identity.js +27 -102
- package/dist/server/app-browser-action-result.d.ts +0 -1
- package/dist/server/app-browser-client-reuse-manifest.d.ts +0 -1
- package/dist/server/app-browser-entry.d.ts +1 -1
- package/dist/server/app-browser-entry.js +106 -66
- package/dist/server/app-browser-history-controller.d.ts +8 -5
- package/dist/server/app-browser-hydration.d.ts +0 -1
- package/dist/server/app-browser-interception-context.d.ts +0 -1
- package/dist/server/app-browser-mpa-navigation.d.ts +0 -1
- package/dist/server/app-browser-navigation-controller.d.ts +3 -6
- package/dist/server/app-browser-navigation-controller.js +29 -4
- package/dist/server/app-browser-popstate.d.ts +0 -1
- package/dist/server/app-browser-prefetch-response.d.ts +25 -0
- package/dist/server/app-browser-prefetch-response.js +54 -0
- package/dist/server/app-browser-server-action-client.d.ts +1 -1
- package/dist/server/app-browser-server-action-client.js +3 -2
- package/dist/server/app-browser-server-action-navigation.d.ts +0 -1
- package/dist/server/app-browser-state.d.ts +11 -5
- package/dist/server/app-browser-state.js +10 -6
- package/dist/server/app-browser-stream.d.ts +0 -1
- package/dist/server/app-browser-visible-commit.d.ts +1 -1
- package/dist/server/app-browser-visible-commit.js +6 -2
- package/dist/server/app-elements-wire.d.ts +16 -13
- package/dist/server/app-elements-wire.js +37 -10
- package/dist/server/app-elements.d.ts +2 -3
- package/dist/server/app-elements.js +2 -2
- package/dist/server/app-fallback-renderer.d.ts +8 -4
- package/dist/server/app-fallback-renderer.js +2 -1
- package/dist/server/app-history-state.d.ts +2 -2
- package/dist/server/app-history-state.js +1 -1
- package/dist/server/app-hook-warning-suppression.d.ts +0 -1
- package/dist/server/app-layout-param-observation.d.ts +0 -1
- package/dist/server/app-layout-param-observation.js +1 -1
- package/dist/server/app-middleware.d.ts +5 -1
- package/dist/server/app-middleware.js +96 -31
- package/dist/server/app-optimistic-routing.d.ts +1 -0
- package/dist/server/app-page-boundary-render.d.ts +8 -4
- package/dist/server/app-page-cache-finalizer.d.ts +2 -3
- package/dist/server/app-page-cache-finalizer.js +47 -17
- package/dist/server/app-page-cache-render.d.ts +2 -2
- package/dist/server/app-page-cache-render.js +2 -1
- package/dist/server/app-page-cache.d.ts +1 -3
- package/dist/server/app-page-cache.js +22 -11
- package/dist/server/app-page-dispatch.d.ts +12 -6
- package/dist/server/app-page-dispatch.js +14 -6
- package/dist/server/app-page-element-builder.d.ts +63 -20
- package/dist/server/app-page-element-builder.js +114 -43
- package/dist/server/app-page-execution.d.ts +12 -5
- package/dist/server/app-page-execution.js +1 -1
- package/dist/server/app-page-head.d.ts +2 -2
- package/dist/server/app-page-http-access-fallback-metadata.d.ts +2 -2
- package/dist/server/app-page-params.d.ts +0 -1
- package/dist/server/app-page-ppr-runtime.d.ts +0 -1
- package/dist/server/app-page-probe.d.ts +4 -3
- package/dist/server/app-page-probe.js +1 -1
- package/dist/server/app-page-render-identity.d.ts +1 -0
- package/dist/server/app-page-render-observation.d.ts +0 -1
- package/dist/server/app-page-render.d.ts +7 -5
- package/dist/server/app-page-render.js +59 -24
- package/dist/server/app-page-request.d.ts +3 -2
- package/dist/server/app-page-request.js +6 -46
- package/dist/server/app-page-response.d.ts +15 -3
- package/dist/server/app-page-response.js +21 -3
- package/dist/server/app-page-route-wiring.d.ts +30 -7
- package/dist/server/app-page-route-wiring.js +163 -63
- package/dist/server/app-page-search-params-observation.d.ts +0 -1
- package/dist/server/app-page-segment-plan.d.ts +56 -0
- package/dist/server/app-page-segment-plan.js +177 -0
- package/dist/server/app-page-segment-state.d.ts +18 -2
- package/dist/server/app-page-segment-state.js +23 -4
- package/dist/server/app-page-stream.d.ts +19 -10
- package/dist/server/app-pages-bridge.d.ts +2 -2
- package/dist/server/app-pages-bridge.js +14 -2
- package/dist/server/app-post-middleware-context.d.ts +0 -1
- package/dist/server/app-ppr-fallback-shell-render.d.ts +0 -1
- package/dist/server/app-prerender-endpoints.d.ts +0 -1
- package/dist/server/app-prerender-static-params.d.ts +0 -1
- package/dist/server/app-render-dependency.d.ts +11 -4
- package/dist/server/app-render-dependency.js +59 -9
- package/dist/server/app-request-context.d.ts +1 -0
- package/dist/server/app-route-handler-cache.d.ts +2 -2
- package/dist/server/app-route-handler-cache.js +5 -1
- package/dist/server/app-route-handler-dispatch.d.ts +0 -1
- package/dist/server/app-route-handler-execution.d.ts +2 -2
- package/dist/server/app-route-handler-execution.js +5 -1
- package/dist/server/app-route-handler-policy.d.ts +0 -1
- package/dist/server/app-route-handler-response.d.ts +0 -1
- package/dist/server/app-route-handler-runtime.d.ts +0 -1
- package/dist/server/app-route-handler-runtime.js +1 -2
- package/dist/server/app-route-module-loader.d.ts +32 -6
- package/dist/server/app-route-module-loader.js +73 -3
- package/dist/server/app-router-entry.d.ts +0 -1
- package/dist/server/app-router-entry.js +2 -2
- package/dist/server/app-rsc-cache-busting.d.ts +7 -1
- package/dist/server/app-rsc-cache-busting.js +6 -0
- package/dist/server/app-rsc-handler.d.ts +9 -2
- package/dist/server/app-rsc-handler.js +173 -41
- package/dist/server/app-rsc-redirect-flight.d.ts +0 -1
- package/dist/server/app-rsc-render-mode.d.ts +3 -2
- package/dist/server/app-rsc-render-mode.js +4 -1
- package/dist/server/app-rsc-request-normalization.d.ts +19 -10
- package/dist/server/app-rsc-request-normalization.js +65 -4
- package/dist/server/app-rsc-response-finalizer.d.ts +5 -2
- package/dist/server/app-rsc-response-finalizer.js +31 -18
- package/dist/server/app-rsc-route-matching.d.ts +6 -1
- package/dist/server/app-rsc-route-matching.js +47 -2
- package/dist/server/app-segment-config.d.ts +0 -1
- package/dist/server/app-server-action-execution.d.ts +42 -9
- package/dist/server/app-server-action-execution.js +189 -111
- package/dist/server/app-ssr-entry.d.ts +5 -3
- package/dist/server/app-ssr-entry.js +4 -5
- package/dist/server/app-ssr-router-instance.d.ts +0 -1
- package/dist/server/app-ssr-stream.d.ts +7 -1
- package/dist/server/app-ssr-stream.js +2 -1
- package/dist/server/app-static-generation.d.ts +0 -1
- package/dist/server/app-visited-response-cache.d.ts +7 -2
- package/dist/server/app-visited-response-cache.js +49 -1
- package/dist/server/before-interactive-head.d.ts +0 -1
- package/dist/server/before-interactive-head.js +2 -0
- package/dist/server/bfcache-identity.d.ts +45 -0
- package/dist/server/bfcache-identity.js +52 -0
- package/dist/server/cache-control.d.ts +3 -3
- package/dist/server/cache-control.js +3 -2
- package/dist/server/cache-proof.d.ts +0 -1
- package/dist/server/client-reuse-manifest.d.ts +0 -1
- package/dist/server/config-headers.d.ts +2 -2
- package/dist/server/csp.d.ts +0 -1
- package/dist/server/default-global-error-module.d.ts +0 -1
- package/dist/server/default-global-not-found-module.d.ts +0 -1
- package/dist/server/default-not-found-module.d.ts +0 -1
- package/dist/server/dev-lockfile.d.ts +21 -9
- package/dist/server/dev-module-runner.d.ts +0 -1
- package/dist/server/dev-route-files.d.ts +0 -1
- package/dist/server/dev-server.d.ts +4 -8
- package/dist/server/dev-server.js +86 -131
- package/dist/server/dev-stack-sourcemap.d.ts +0 -1
- package/dist/server/document-initial-head.d.ts +12 -2
- package/dist/server/document-initial-head.js +17 -2
- package/dist/server/edge-api-runtime.d.ts +10 -1
- package/dist/server/edge-api-runtime.js +29 -1
- package/dist/server/file-based-metadata.d.ts +0 -1
- package/dist/server/headers.d.ts +17 -2
- package/dist/server/headers.js +17 -1
- package/dist/server/http-conditional.d.ts +22 -0
- package/dist/server/http-conditional.js +117 -0
- package/dist/server/http-date.d.ts +5 -0
- package/dist/server/http-date.js +73 -0
- package/dist/server/http-error-responses.d.ts +2 -1
- package/dist/server/http-error-responses.js +14 -2
- package/dist/server/http-range.d.ts +25 -0
- package/dist/server/http-range.js +67 -0
- package/dist/server/image-optimization.d.ts +14 -6
- package/dist/server/image-optimization.js +0 -1
- package/dist/server/instrumentation.d.ts +7 -4
- package/dist/server/isr-cache.d.ts +28 -6
- package/dist/server/isr-cache.js +19 -13
- package/dist/server/isr-decision.d.ts +6 -4
- package/dist/server/metadata-route-build-data.d.ts +0 -1
- package/dist/server/metadata-route-response.d.ts +0 -1
- package/dist/server/metadata-route-response.js +7 -6
- package/dist/server/metadata-routes.d.ts +34 -16
- package/dist/server/middleware-matcher-pattern.d.ts +0 -1
- package/dist/server/middleware-matcher.d.ts +8 -3
- package/dist/server/middleware-matcher.js +23 -18
- package/dist/server/middleware-runtime.d.ts +6 -1
- package/dist/server/middleware-runtime.js +91 -28
- package/dist/server/middleware.d.ts +0 -1
- package/dist/server/navigation-planner.d.ts +1 -1
- package/dist/server/next-error-digest.d.ts +0 -1
- package/dist/server/pages-api-route.d.ts +2 -1
- package/dist/server/pages-api-route.js +32 -7
- package/dist/server/pages-asset-tags.d.ts +3 -1
- package/dist/server/pages-asset-tags.js +6 -4
- package/dist/server/pages-data-route.d.ts +14 -6
- package/dist/server/pages-data-route.js +19 -10
- package/dist/server/pages-dev-hydration.js +3 -0
- package/dist/server/pages-dev-stylesheets.d.ts +10 -0
- package/dist/server/pages-dev-stylesheets.js +150 -0
- package/dist/server/pages-document-asset-props.d.ts +26 -0
- package/dist/server/pages-document-asset-props.js +69 -0
- package/dist/server/pages-document-initial-props.d.ts +10 -6
- package/dist/server/pages-get-initial-props.d.ts +2 -2
- package/dist/server/pages-i18n.d.ts +1 -7
- package/dist/server/pages-node-compat.d.ts +11 -2
- package/dist/server/pages-node-compat.js +52 -5
- package/dist/server/pages-page-data.d.ts +21 -9
- package/dist/server/pages-page-data.js +109 -30
- package/dist/server/pages-page-handler.d.ts +70 -32
- package/dist/server/pages-page-handler.js +25 -6
- package/dist/server/pages-page-response.d.ts +9 -13
- package/dist/server/pages-page-response.js +25 -26
- package/dist/server/pages-readiness.d.ts +0 -1
- package/dist/server/pages-request-pipeline.d.ts +20 -6
- package/dist/server/pages-request-pipeline.js +40 -20
- package/dist/server/pages-revalidate.d.ts +0 -1
- package/dist/server/pages-revalidate.js +1 -1
- package/dist/server/pages-router-entry.js +14 -10
- package/dist/server/prerender-manifest.d.ts +7 -0
- package/dist/server/prod-server.d.ts +13 -7
- package/dist/server/prod-server.js +276 -83
- package/dist/server/proxy-trust.d.ts +0 -1
- package/dist/server/request-log.d.ts +7 -11
- package/dist/server/request-pipeline.d.ts +13 -4
- package/dist/server/request-pipeline.js +28 -20
- package/dist/server/revalidation-host.d.ts +0 -1
- package/dist/server/revalidation-host.js +1 -1
- package/dist/server/rsc-completion-metadata.d.ts +15 -0
- package/dist/server/rsc-completion-metadata.js +183 -0
- package/dist/server/seed-cache.d.ts +2 -1
- package/dist/server/seed-cache.js +8 -5
- package/dist/server/skip-cache-proof.d.ts +0 -1
- package/dist/server/static-file-cache.d.ts +23 -9
- package/dist/server/static-file-cache.js +47 -23
- package/dist/server/static-layout-client-reuse-proof.d.ts +0 -1
- package/dist/server/worker-revalidation-context.d.ts +0 -1
- package/dist/server/worker-revalidation-context.js +1 -0
- package/dist/server/worker-utils.d.ts +3 -1
- package/dist/server/worker-utils.js +11 -2
- package/dist/shims/app-router-scroll-state.d.ts +2 -1
- package/dist/shims/app-router-scroll-state.js +7 -2
- package/dist/shims/app-router-scroll.d.ts +2 -8
- package/dist/shims/app.d.ts +1 -5
- package/dist/shims/before-interactive-context.d.ts +5 -3
- package/dist/shims/cache-handler.d.ts +6 -1
- package/dist/shims/cache-handler.js +4 -2
- package/dist/shims/cache-request-state.d.ts +12 -1
- package/dist/shims/cache-request-state.js +22 -1
- package/dist/shims/cache-runtime.d.ts +9 -5
- package/dist/shims/cache-runtime.js +16 -6
- package/dist/shims/cache.d.ts +2 -3
- package/dist/shims/cache.js +2 -2
- package/dist/shims/cdn-cache.d.ts +0 -1
- package/dist/shims/client-locale.d.ts +1 -6
- package/dist/shims/client-only.d.ts +1 -1
- package/dist/shims/compat-router.d.ts +0 -1
- package/dist/shims/constants.d.ts +1 -1
- package/dist/shims/default-global-error.d.ts +1 -4
- package/dist/shims/default-not-found.d.ts +0 -1
- package/dist/shims/document.d.ts +0 -1
- package/dist/shims/document.js +17 -3
- package/dist/shims/dynamic-preload-chunks.d.ts +0 -1
- package/dist/shims/dynamic.d.ts +0 -1
- package/dist/shims/error-boundary-navigation.d.ts +0 -1
- package/dist/shims/error-boundary.d.ts +7 -32
- package/dist/shims/error.d.ts +1 -6
- package/dist/shims/fetch-cache.js +112 -63
- package/dist/shims/font-google-base.d.ts +0 -1
- package/dist/shims/font-local.d.ts +0 -1
- package/dist/shims/form.d.ts +5 -3
- package/dist/shims/hash-scroll.d.ts +1 -1
- package/dist/shims/hash-scroll.js +2 -1
- package/dist/shims/head-state.d.ts +0 -1
- package/dist/shims/head.d.ts +1 -4
- package/dist/shims/headers.d.ts +2 -2
- package/dist/shims/headers.js +1 -1
- package/dist/shims/i18n-context.d.ts +0 -1
- package/dist/shims/i18n-state.d.ts +0 -1
- package/dist/shims/image.d.ts +0 -1
- package/dist/shims/image.js +1 -2
- package/dist/shims/internal/als-registry.d.ts +31 -2
- package/dist/shims/internal/als-registry.js +50 -2
- package/dist/shims/internal/app-prefetch-fetch-queue.d.ts +17 -2
- package/dist/shims/internal/app-prefetch-fetch-queue.js +69 -7
- package/dist/shims/internal/app-route-detection.d.ts +0 -1
- package/dist/shims/internal/app-route-prefetch-policy.d.ts +31 -0
- package/dist/shims/internal/app-route-prefetch-policy.js +57 -0
- package/dist/shims/internal/app-router-context.d.ts +0 -1
- package/dist/shims/internal/hybrid-client-route-owner-direct.d.ts +1 -5
- package/dist/shims/internal/hybrid-client-route-owner.d.ts +0 -1
- package/dist/shims/internal/hybrid-client-route-owner.js +6 -8
- package/dist/shims/internal/interpolate-as.d.ts +3 -2
- package/dist/shims/internal/pages-data-target.d.ts +21 -10
- package/dist/shims/internal/pages-data-target.js +1 -1
- package/dist/shims/internal/pages-data-url.d.ts +3 -1
- package/dist/shims/internal/router-context.d.ts +0 -1
- package/dist/shims/internal/work-unit-async-storage.d.ts +4 -3
- package/dist/shims/internal/work-unit-async-storage.js +2 -0
- package/dist/shims/layout-segment-context.d.ts +2 -6
- package/dist/shims/legacy-image.d.ts +0 -1
- package/dist/shims/link.d.ts +29 -21
- package/dist/shims/link.js +52 -97
- package/dist/shims/metadata.d.ts +11 -25
- package/dist/shims/metadata.js +24 -32
- package/dist/shims/navigation-context-state.d.ts +0 -1
- package/dist/shims/navigation-state.d.ts +1 -0
- package/dist/shims/navigation.d.ts +54 -6
- package/dist/shims/navigation.js +325 -73
- package/dist/shims/navigation.react-server.d.ts +1 -0
- package/dist/shims/og.d.ts +0 -1
- package/dist/shims/request-context.d.ts +8 -3
- package/dist/shims/request-state-types.d.ts +1 -0
- package/dist/shims/router.d.ts +44 -23
- package/dist/shims/router.js +8 -7
- package/dist/shims/script-nonce-context.d.ts +0 -1
- package/dist/shims/script.d.ts +25 -13
- package/dist/shims/server-only.d.ts +1 -1
- package/dist/shims/server.d.ts +1 -3
- package/dist/shims/server.js +5 -6
- package/dist/shims/slot.d.ts +23 -11
- package/dist/shims/slot.js +103 -19
- package/dist/shims/streamed-icons.d.ts +7 -0
- package/dist/shims/streamed-icons.js +33 -0
- package/dist/shims/unified-request-context.d.ts +44 -4
- package/dist/shims/unified-request-context.js +56 -2
- package/dist/shims/use-merged-ref.d.ts +0 -1
- package/dist/shims/web-vitals.d.ts +0 -1
- package/dist/typegen.d.ts +1 -2
- package/dist/typegen.js +1 -1
- package/dist/utils/cache-control-metadata.d.ts +13 -1
- package/dist/utils/cache-control-metadata.js +17 -1
- package/dist/utils/client-build-manifest.d.ts +0 -1
- package/dist/utils/domain-locale.d.ts +1 -5
- package/dist/utils/html-limited-bots.js +1 -1
- package/dist/utils/middleware-request-headers.d.ts +17 -5
- package/dist/utils/middleware-request-headers.js +32 -23
- package/dist/utils/precompressed-variant.d.ts +9 -0
- package/dist/utils/precompressed-variant.js +15 -0
- package/dist/utils/project.d.ts +12 -7
- package/dist/utils/public-file-path.d.ts +5 -0
- package/dist/utils/public-file-path.js +12 -0
- package/dist/utils/public-routes.d.ts +1 -1
- package/dist/utils/public-routes.js +6 -5
- package/package.json +7 -3
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { DEFAULT_CLIENT_REUSE_MANIFEST_LIMITS } from "./client-reuse-manifest.js";
|
|
2
2
|
import { AppRouterState } from "./app-browser-state.js";
|
|
3
|
-
|
|
4
3
|
//#region src/server/app-browser-client-reuse-manifest.d.ts
|
|
5
4
|
type ClientReuseManifestLimits = typeof DEFAULT_CLIENT_REUSE_MANIFEST_LIMITS;
|
|
6
5
|
type VisibleAppState = Pick<AppRouterState, "elements" | "visibleCommitVersion">;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export {
|
|
1
|
+
export {}
|
|
@@ -11,30 +11,32 @@ import { clearAppNavigationFailureTarget, installAppNavigationFailureListeners }
|
|
|
11
11
|
import { DevRecoveryBoundary, GlobalErrorBoundary, RedirectBoundary } from "../shims/error-boundary.js";
|
|
12
12
|
import { beginAppRouterScrollIntent, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
|
|
13
13
|
import { AppRouterScrollCommitProvider } from "../shims/app-router-scroll.js";
|
|
14
|
-
import {
|
|
15
|
-
import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, getVinextRscCompatibilityId
|
|
14
|
+
import { BfcacheIdentityMapContext, ElementsContext, Slot } from "../shims/slot.js";
|
|
15
|
+
import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, VINEXT_RSC_CONTENT_TYPE, createRscRequestHeaders, createRscRequestUrl, getVinextRscCompatibilityId } from "./app-rsc-cache-busting.js";
|
|
16
16
|
import { getNavigationRuntime, registerNavigationRuntimeBootstrap, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
|
|
17
17
|
import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
|
|
18
18
|
import "../client/instrumentation-client.js";
|
|
19
|
-
import {
|
|
19
|
+
import { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
|
|
20
|
+
import { createBfcacheSegmentIdentityMap, createInitialBfcacheIdMap } from "./app-bfcache-identity.js";
|
|
20
21
|
import { createDiscardedServerActionRefreshScheduler, createServerActionInitiationSnapshot, resolveServerActionOperationLane } from "./app-browser-action-result.js";
|
|
21
22
|
import { createClientReuseManifestHeaderFromVisibleAppState } from "./app-browser-client-reuse-manifest.js";
|
|
22
23
|
import { resolveManifestNavigationInterceptionContext, resolveMiddlewareRewriteNavigationInterceptionContext } from "./app-browser-interception-context.js";
|
|
23
|
-
import { readHistoryStatePreviousNextUrl } from "./app-history-state.js";
|
|
24
24
|
import { AppBrowserMpaNavigationScheduler } from "./app-browser-mpa-navigation.js";
|
|
25
|
+
import { stripRscCompletionMetadataResponse } from "./rsc-completion-metadata.js";
|
|
25
26
|
import { blockDangerousStreamedRscRedirect } from "./app-browser-rsc-redirect.js";
|
|
26
27
|
import { navigationPlanner } from "./navigation-planner.js";
|
|
27
|
-
import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
|
|
28
|
+
import { DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL, __basePath, appRouterInstance, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, deletePrefetchResponseSnapshot, getClientNavigationRenderContext, getMountedSlotsHeader, getPrefetchCache, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setPendingPathname, useRouter } from "../shims/navigation.js";
|
|
28
29
|
import { chunksToReadableStream, createProgressiveRscStream, getVinextBrowserGlobal } from "./app-browser-stream.js";
|
|
29
30
|
import { COMMITTED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, VISITED_CACHE_APP_NAVIGATION_PAYLOAD_ORIGIN, isCacheRestorableAppPayloadMetadata, isCompleteAppPayloadMetadata, resolveInterceptionContextFromPreviousNextUrl } from "./app-browser-state.js";
|
|
30
31
|
import { clearHardNavigationLoopGuard, createAppBrowserNavigationController, createBasePathStrippedPathAndSearch } from "./app-browser-navigation-controller.js";
|
|
31
32
|
import { consumeInitialFormState, createVinextHydrateRootOptions, hydrateRootInTransition } from "./app-browser-hydration.js";
|
|
32
33
|
import { AppBrowserHistoryController } from "./app-browser-history-controller.js";
|
|
33
|
-
import { createVisitedResponseCacheEntry, isVisitedResponseCacheEntryFresh } from "./app-visited-response-cache.js";
|
|
34
|
+
import { createVisitedResponseCacheEntry, deleteVisitedResponseCacheEntry, findVisitedResponseCacheEntry, isVisitedResponseCacheEntryFresh } from "./app-visited-response-cache.js";
|
|
34
35
|
import { createPopstateRestoreHandler, restoreSynchronousPopstateScrollPosition } from "./app-browser-popstate.js";
|
|
35
36
|
import { createDevOnCaughtError, createOnUncaughtError, createProdOnCaughtError, prodOnRecoverableError } from "./app-browser-error.js";
|
|
36
37
|
import { createHydrationCachePublication } from "./app-hydration-cache-publication.js";
|
|
37
|
-
import {
|
|
38
|
+
import { peekSettledPrefetchResponseForNavigation, prepareConsumedPrefetchResponseForPublication, preserveCommittedPrefetchExpiry, resolvePrefetchNavigationResponseUrl } from "./app-browser-prefetch-response.js";
|
|
39
|
+
import { createOptimisticRouteTemplate, getOptimisticPrefetchSourceKey, getOptimisticRouteTemplateKey, matchOptimisticRouteManifestRoute, resolveOptimisticNavigationPayload } from "./app-optimistic-routing.js";
|
|
38
40
|
import { removeStylesheetLinksCoveredByInlineCss } from "./app-inline-css-client.js";
|
|
39
41
|
import { createElement, startTransition, use, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
|
|
40
42
|
import { flushSync } from "react-dom";
|
|
@@ -126,6 +128,7 @@ let latestClientParams = {};
|
|
|
126
128
|
const visitedResponseCache = /* @__PURE__ */ new Map();
|
|
127
129
|
let clientNavigationCacheGeneration = 0;
|
|
128
130
|
let browserRouterStateHasEverCommitted = false;
|
|
131
|
+
let initialPrefetchRouterState = null;
|
|
129
132
|
const mpaNavigationScheduler = new AppBrowserMpaNavigationScheduler();
|
|
130
133
|
const unresolvedMpaNavigation = new Promise(() => {});
|
|
131
134
|
const RSC_HMR_SETTLE_DELAY_MS = 150;
|
|
@@ -193,21 +196,6 @@ function clearClientNavigationCaches() {
|
|
|
193
196
|
clearPrefetchState();
|
|
194
197
|
historyController.invalidateRestorableClientState();
|
|
195
198
|
}
|
|
196
|
-
function normalizeBrowserRscUrlForReuse(url) {
|
|
197
|
-
if (!url) return null;
|
|
198
|
-
try {
|
|
199
|
-
const parsed = new URL(url, window.location.origin);
|
|
200
|
-
stripRscCacheBustingSearchParam(parsed);
|
|
201
|
-
return `${parsed.pathname}${parsed.search}`;
|
|
202
|
-
} catch {
|
|
203
|
-
return null;
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
|
-
function isAlternatePrefetchResponseUrl(responseUrl, additionalRscUrls) {
|
|
207
|
-
const normalizedResponseUrl = normalizeBrowserRscUrlForReuse(responseUrl);
|
|
208
|
-
if (normalizedResponseUrl === null) return false;
|
|
209
|
-
return additionalRscUrls.some((additionalRscUrl) => normalizeBrowserRscUrlForReuse(additionalRscUrl) === normalizedResponseUrl);
|
|
210
|
-
}
|
|
211
199
|
function isSettledPrefetchCacheEntry(entry) {
|
|
212
200
|
return entry.outcome === "cache-seeded" && entry.pending === void 0 && entry.snapshot !== void 0;
|
|
213
201
|
}
|
|
@@ -347,8 +335,8 @@ function evictVisitedResponseCacheIfNeeded() {
|
|
|
347
335
|
}
|
|
348
336
|
function readVisitedResponseCacheCandidate(rscUrl, interceptionContext, mountedSlotsHeader, navigationKind) {
|
|
349
337
|
const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
|
|
350
|
-
const
|
|
351
|
-
if (!
|
|
338
|
+
const match = findVisitedResponseCacheEntry(visitedResponseCache, rscUrl, interceptionContext);
|
|
339
|
+
if (!match) return {
|
|
352
340
|
cacheKey,
|
|
353
341
|
entry: null,
|
|
354
342
|
facts: {
|
|
@@ -357,15 +345,15 @@ function readVisitedResponseCacheCandidate(rscUrl, interceptionContext, mountedS
|
|
|
357
345
|
}
|
|
358
346
|
};
|
|
359
347
|
return {
|
|
360
|
-
cacheKey,
|
|
361
|
-
entry:
|
|
348
|
+
cacheKey: match.cacheKey,
|
|
349
|
+
entry: match.entry,
|
|
362
350
|
facts: {
|
|
363
351
|
candidate: "present",
|
|
364
|
-
fresh: isVisitedResponseCacheEntryFresh(
|
|
352
|
+
fresh: isVisitedResponseCacheEntryFresh(match.entry, {
|
|
365
353
|
navigationKind,
|
|
366
354
|
now: Date.now()
|
|
367
355
|
}),
|
|
368
|
-
mountedSlotsMatch:
|
|
356
|
+
mountedSlotsMatch: match.entry.elements !== void 0 || match.entry.mountedSlotsHeader === mountedSlotsHeader,
|
|
369
357
|
navigationKind
|
|
370
358
|
}
|
|
371
359
|
};
|
|
@@ -381,9 +369,9 @@ function applyVisitedResponseCacheCandidateDecision(candidate, decision) {
|
|
|
381
369
|
return null;
|
|
382
370
|
}
|
|
383
371
|
function deleteVisitedResponse(rscUrl, interceptionContext) {
|
|
384
|
-
visitedResponseCache
|
|
372
|
+
deleteVisitedResponseCacheEntry(visitedResponseCache, rscUrl, interceptionContext);
|
|
385
373
|
}
|
|
386
|
-
function storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, params, prefetchFallbackTtlMs = DYNAMIC_NAVIGATION_CACHE_TTL, requestMountedSlotsHeader = snapshot.mountedSlotsHeader ?? null, elements) {
|
|
374
|
+
function storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, params, prefetchFallbackTtlMs = DYNAMIC_NAVIGATION_CACHE_TTL, requestMountedSlotsHeader = snapshot.mountedSlotsHeader ?? null, elements, seedPrefetchCache = true, prefetchSnapshot = snapshot) {
|
|
387
375
|
const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
|
|
388
376
|
visitedResponseCache.delete(cacheKey);
|
|
389
377
|
evictVisitedResponseCacheIfNeeded();
|
|
@@ -396,10 +384,10 @@ function storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, par
|
|
|
396
384
|
response: snapshot
|
|
397
385
|
});
|
|
398
386
|
visitedResponseCache.set(cacheKey, entry);
|
|
399
|
-
seedPrefetchResponseSnapshot(rscUrl,
|
|
387
|
+
if (seedPrefetchCache) seedPrefetchResponseSnapshot(rscUrl, prefetchSnapshot, interceptionContext, requestMountedSlotsHeader, prefetchFallbackTtlMs);
|
|
400
388
|
return () => {
|
|
401
389
|
if (visitedResponseCache.get(cacheKey) === entry) visitedResponseCache.delete(cacheKey);
|
|
402
|
-
deletePrefetchResponseSnapshot(rscUrl,
|
|
390
|
+
if (seedPrefetchCache) deletePrefetchResponseSnapshot(rscUrl, prefetchSnapshot, interceptionContext);
|
|
403
391
|
};
|
|
404
392
|
}
|
|
405
393
|
function clientNavigationSnapshotHref(snapshot) {
|
|
@@ -586,12 +574,9 @@ function BrowserRoot({ hydrationCachePublication, initialElements, initialNaviga
|
|
|
586
574
|
treeState.renderId
|
|
587
575
|
]);
|
|
588
576
|
const routeTree = createElement(RedirectBoundary, null, createElement(NavigationCommitSignal, { renderId: treeState.renderId }, createElement(ElementsContext.Provider, { value: treeState.elements }, createElement(Slot, { id: treeState.routeId }))));
|
|
589
|
-
const
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
}), [treeState.elements, treeState.navigationSnapshot.pathname]);
|
|
593
|
-
const stateKeyTree = createElement(BfcacheStateKeyMapContext.Provider, { value: bfcacheStateKeys }, routeTree);
|
|
594
|
-
const redirectedTree = createElement(AppRouterRedirectBridge, null, BfcacheIdMapContext ? createElement(BfcacheIdMapContext.Provider, { value: treeState.bfcacheIds }, stateKeyTree) : stateKeyTree);
|
|
577
|
+
const bfcacheSegmentIdentities = useMemo(() => createBfcacheSegmentIdentityMap({ elements: treeState.elements }), [treeState.elements]);
|
|
578
|
+
const identityMapTree = createElement(BfcacheIdentityMapContext.Provider, { value: bfcacheSegmentIdentities }, routeTree);
|
|
579
|
+
const redirectedTree = createElement(AppRouterRedirectBridge, null, BfcacheIdMapContext ? createElement(BfcacheIdMapContext.Provider, { value: treeState.bfcacheIds }, identityMapTree) : identityMapTree);
|
|
595
580
|
const innerTree = AppRouterContext ? createElement(AppRouterContext.Provider, { value: appRouterInstance }, redirectedTree) : redirectedTree;
|
|
596
581
|
const committedTree = import.meta.env.DEV ? createElement(DevRecoveryBoundary, {
|
|
597
582
|
isImplicitRootErrorBoundary: true,
|
|
@@ -778,6 +763,10 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
778
763
|
Promise.all([root, initialCacheBuffer]).then(async ([elements, buffer]) => {
|
|
779
764
|
if (cacheGeneration !== clientNavigationCacheGeneration) return;
|
|
780
765
|
const metadata = AppElementsWire.readMetadata(elements);
|
|
766
|
+
initialPrefetchRouterState = {
|
|
767
|
+
pathAndSearch: initialPathAndSearch,
|
|
768
|
+
routeId: metadata.routeId
|
|
769
|
+
};
|
|
781
770
|
if (!isCompleteAppPayloadMetadata(metadata)) return;
|
|
782
771
|
const mountedSlotsHeader = getMountedSlotIdsHeader(elements);
|
|
783
772
|
const headers = createRscRequestHeaders({ mountedSlotsHeader });
|
|
@@ -788,6 +777,10 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
788
777
|
buffer,
|
|
789
778
|
contentType: VINEXT_RSC_CONTENT_TYPE,
|
|
790
779
|
...initialRscBootstrap?.dynamicStaleTimeSeconds !== void 0 ? { dynamicStaleTimeSeconds: initialRscBootstrap.dynamicStaleTimeSeconds } : {},
|
|
780
|
+
...initialRscBootstrap?.staleTimeSeconds === void 0 ? {} : { serverStaleTime: {
|
|
781
|
+
kind: "resolved",
|
|
782
|
+
seconds: initialRscBootstrap.staleTimeSeconds
|
|
783
|
+
} },
|
|
791
784
|
mountedSlotsHeader,
|
|
792
785
|
paramsHeader: encodeURIComponent(JSON.stringify(initialParams)),
|
|
793
786
|
renderedPathAndSearch: null,
|
|
@@ -796,8 +789,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
796
789
|
const fallbackTtlMs = initialRscBootstrap?.initialCacheKind === "static" ? PREFETCH_CACHE_TTL : DYNAMIC_NAVIGATION_CACHE_TTL;
|
|
797
790
|
hydrationCachePublication.publish(() => {
|
|
798
791
|
if (cacheGeneration !== clientNavigationCacheGeneration) return () => {};
|
|
799
|
-
|
|
800
|
-
return storeVisitedResponseSnapshot(rscUrl, metadata.interceptionContext, snapshot, initialParams, fallbackTtlMs, mountedSlotsHeader, elements);
|
|
792
|
+
return storeVisitedResponseSnapshot(rscUrl, metadata.interceptionContext, snapshot, initialParams, fallbackTtlMs, mountedSlotsHeader, elements, false);
|
|
801
793
|
});
|
|
802
794
|
}).catch(() => {});
|
|
803
795
|
historyController.writeBootstrapHistoryMetadata();
|
|
@@ -855,6 +847,26 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
855
847
|
registerNavigationRuntimeFunctions({
|
|
856
848
|
clearNavigationCaches: clearClientNavigationCaches,
|
|
857
849
|
commitHashNavigation: (href, historyUpdateMode, scroll) => historyController.commitHashOnlyNavigation(href, historyUpdateMode, scroll),
|
|
850
|
+
getPrefetchRouterState: () => {
|
|
851
|
+
if (!browserNavigationController.hasBrowserRouterState()) {
|
|
852
|
+
if (initialPrefetchRouterState) return initialPrefetchRouterState;
|
|
853
|
+
const routeManifest = getNavigationRuntime()?.bootstrap.routeManifest ?? null;
|
|
854
|
+
const match = routeManifest ? matchOptimisticRouteManifestRoute({
|
|
855
|
+
basePath: __basePath,
|
|
856
|
+
href: window.location.href,
|
|
857
|
+
routeManifest
|
|
858
|
+
}) : null;
|
|
859
|
+
return match ? {
|
|
860
|
+
pathAndSearch: createBasePathStrippedPathAndSearch(new URL(window.location.href), __basePath),
|
|
861
|
+
routeId: match.route.id
|
|
862
|
+
} : null;
|
|
863
|
+
}
|
|
864
|
+
const state = browserNavigationController.getBrowserRouterState();
|
|
865
|
+
return {
|
|
866
|
+
pathAndSearch: createSnapshotPathAndSearch(state.navigationSnapshot),
|
|
867
|
+
routeId: state.routeId
|
|
868
|
+
};
|
|
869
|
+
},
|
|
858
870
|
navigate: async function navigateRsc(href, redirectDepth = 0, navigationKind = "navigate", historyUpdateMode, previousNextUrlOverride, programmaticTransition = false, traversalIntent, scrollIntent, visibleCommitMode = "transition") {
|
|
859
871
|
abortSupersededNavigation();
|
|
860
872
|
const navigationAbortController = new AbortController();
|
|
@@ -879,8 +891,9 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
879
891
|
const reuseCurrentBfcacheIds = navigationKind !== "traverse" || !historyController.isCacheInvalidationGuarded() && historyController.isCurrentBfcacheVersion(activeTraversalIntent?.historyState ?? window.history.state);
|
|
880
892
|
try {
|
|
881
893
|
const shouldUsePendingRouterState = programmaticTransition;
|
|
882
|
-
if (
|
|
883
|
-
|
|
894
|
+
if (hasBrowserRouterState()) {
|
|
895
|
+
if (shouldUsePendingRouterState) pendingRouterState = beginPendingBrowserRouterState();
|
|
896
|
+
} else {
|
|
884
897
|
await waitForBrowserRouterStateReady();
|
|
885
898
|
if (!browserNavigationController.isCurrentNavigation(navId)) return;
|
|
886
899
|
if (shouldUsePendingRouterState) pendingRouterState = beginPendingBrowserRouterState();
|
|
@@ -903,12 +916,28 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
903
916
|
}) : null;
|
|
904
917
|
const shouldBypassNavigationCache = earlyIntentDecision?.kind === "flightNavigation" && earlyIntentDecision.bypassNavigationCache;
|
|
905
918
|
const requestHeaders = createRscRequestHeaders({
|
|
919
|
+
fetchPriority: "auto",
|
|
906
920
|
interceptionContext: requestInterceptionContext,
|
|
907
921
|
mountedSlotsHeader
|
|
908
922
|
});
|
|
909
|
-
const rscUrl = await createRscRequestUrl(url.pathname + url.search, requestHeaders);
|
|
910
923
|
const rewrittenNavigationHref = navigationKind === "navigate" && HAS_CLIENT_REWRITES ? resolveLoadedHybridClientRewriteHref(currentHref, __basePath) : null;
|
|
911
|
-
const
|
|
924
|
+
const targetPathAndSearch = url.pathname + url.search;
|
|
925
|
+
const additionalPrefetchPathAndSearch = rewrittenNavigationHref && rewrittenNavigationHref !== currentHref ? [rewrittenNavigationHref] : [];
|
|
926
|
+
const settledPrefetchedResponse = peekSettledPrefetchResponseForNavigation({
|
|
927
|
+
additionalRscUrls: additionalPrefetchPathAndSearch,
|
|
928
|
+
bypassNavigationCache: shouldBypassNavigationCache,
|
|
929
|
+
interceptionContext: requestInterceptionContext,
|
|
930
|
+
mountedSlotsHeader,
|
|
931
|
+
navigationKind,
|
|
932
|
+
targetPathAndSearch
|
|
933
|
+
});
|
|
934
|
+
const rscUrl = settledPrefetchedResponse ? resolvePrefetchNavigationResponseUrl({
|
|
935
|
+
additionalRscUrls: additionalPrefetchPathAndSearch,
|
|
936
|
+
origin: window.location.origin,
|
|
937
|
+
responseUrl: settledPrefetchedResponse.url,
|
|
938
|
+
visibleRscUrl: targetPathAndSearch
|
|
939
|
+
}) : await createRscRequestUrl(targetPathAndSearch, requestHeaders);
|
|
940
|
+
const additionalPrefetchRscUrls = settledPrefetchedResponse ? additionalPrefetchPathAndSearch : await Promise.all(additionalPrefetchPathAndSearch.map((href) => createRscRequestUrl(href, requestHeaders)));
|
|
912
941
|
const visitedResponseCandidate = shouldBypassNavigationCache ? {
|
|
913
942
|
cacheKey: AppElementsWire.encodeCacheKey(rscUrl, requestInterceptionContext),
|
|
914
943
|
entry: null,
|
|
@@ -925,7 +954,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
925
954
|
visitedResponse
|
|
926
955
|
});
|
|
927
956
|
let routeManifest = navigationKind === "navigate" ? getBrowserRouteManifest() : null;
|
|
928
|
-
const hasPrefetchCandidate = prefetchProbeDecision.kind === "probe" && hasPrefetchCacheEntryForNavigation(rscUrl, requestInterceptionContext, mountedSlotsHeader, {
|
|
957
|
+
const hasPrefetchCandidate = settledPrefetchedResponse !== null || prefetchProbeDecision.kind === "probe" && hasPrefetchCacheEntryForNavigation(rscUrl, requestInterceptionContext, mountedSlotsHeader, {
|
|
929
958
|
additionalRscUrls: additionalPrefetchRscUrls,
|
|
930
959
|
notifyInvalidation: false
|
|
931
960
|
});
|
|
@@ -1003,17 +1032,27 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
1003
1032
|
let navResponse;
|
|
1004
1033
|
let navResponseExpiresAt;
|
|
1005
1034
|
let navResponseUrl = null;
|
|
1035
|
+
let consumedPrefetchSnapshot;
|
|
1036
|
+
let prefetchedElements;
|
|
1006
1037
|
let fallbackReuseDecision = reuseDecision;
|
|
1007
1038
|
if (reuseDecision.kind === "consumePrefetch") {
|
|
1008
|
-
const prefetchedResponse = await consumePrefetchResponseForNavigation(rscUrl, requestInterceptionContext, mountedSlotsHeader, {
|
|
1039
|
+
const prefetchedResponse = settledPrefetchedResponse ? consumePrefetchResponse(targetPathAndSearch, requestInterceptionContext, mountedSlotsHeader, { additionalRscUrls: additionalPrefetchPathAndSearch }) : await consumePrefetchResponseForNavigation(rscUrl, requestInterceptionContext, mountedSlotsHeader, {
|
|
1009
1040
|
additionalRscUrls: additionalPrefetchRscUrls,
|
|
1010
1041
|
shouldConsume: () => browserNavigationController.isCurrentNavigation(navId)
|
|
1011
1042
|
});
|
|
1012
1043
|
if (!browserNavigationController.isCurrentNavigation(navId)) return;
|
|
1013
1044
|
if (prefetchedResponse) {
|
|
1014
1045
|
navResponse = restoreRscResponse(prefetchedResponse, false);
|
|
1015
|
-
|
|
1016
|
-
|
|
1046
|
+
navResponseUrl = resolvePrefetchNavigationResponseUrl({
|
|
1047
|
+
additionalRscUrls: additionalPrefetchRscUrls,
|
|
1048
|
+
origin: window.location.origin,
|
|
1049
|
+
responseUrl: prefetchedResponse.url,
|
|
1050
|
+
visibleRscUrl: rscUrl
|
|
1051
|
+
});
|
|
1052
|
+
const publication = prepareConsumedPrefetchResponseForPublication(prefetchedResponse, navResponseUrl);
|
|
1053
|
+
consumedPrefetchSnapshot = publication.snapshot;
|
|
1054
|
+
prefetchedElements = publication.preparedElements;
|
|
1055
|
+
navResponseExpiresAt = publication.expiresAt;
|
|
1017
1056
|
}
|
|
1018
1057
|
if (!navResponse) {
|
|
1019
1058
|
routeManifest = navigationKind === "navigate" ? getBrowserRouteManifest() : null;
|
|
@@ -1082,6 +1121,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
1082
1121
|
navResponse = await fetch(rscUrl, {
|
|
1083
1122
|
headers: requestHeaders,
|
|
1084
1123
|
credentials: "include",
|
|
1124
|
+
priority: "auto",
|
|
1085
1125
|
signal: navigationAbortController.signal
|
|
1086
1126
|
});
|
|
1087
1127
|
}
|
|
@@ -1128,14 +1168,15 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
1128
1168
|
const navBody = navResponse.body;
|
|
1129
1169
|
if (!navBody) return;
|
|
1130
1170
|
const [reactBranch, cacheBranch] = navBody.tee();
|
|
1131
|
-
const reactResponse = new Response(reactBranch, {
|
|
1171
|
+
const reactResponse = stripRscCompletionMetadataResponse(new Response(reactBranch, {
|
|
1132
1172
|
status: navResponse.status,
|
|
1133
1173
|
headers: navResponse.headers
|
|
1134
|
-
});
|
|
1174
|
+
}));
|
|
1135
1175
|
const cacheBufferPromise = new Response(cacheBranch).arrayBuffer();
|
|
1136
1176
|
cacheBufferPromise.catch(() => {});
|
|
1137
1177
|
if (!browserNavigationController.isCurrentNavigation(navId)) return;
|
|
1138
|
-
|
|
1178
|
+
if (prefetchedElements) reactResponse.body?.cancel().catch(() => {});
|
|
1179
|
+
const rscPayload = prefetchedElements ? prefetchedElements : decodeAppElementsPromise(createFromFetch(Promise.resolve(reactResponse)));
|
|
1139
1180
|
if (!browserNavigationController.isCurrentNavigation(navId)) return;
|
|
1140
1181
|
let committedState = null;
|
|
1141
1182
|
if (await renderNavigationPayload({
|
|
@@ -1160,29 +1201,30 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
1160
1201
|
scrollIntent,
|
|
1161
1202
|
targetHref: currentHref,
|
|
1162
1203
|
traversalIntent: activeTraversalIntent,
|
|
1163
|
-
visibleCommitMode
|
|
1204
|
+
visibleCommitMode: prefetchedElements ? "synchronous" : visibleCommitMode
|
|
1164
1205
|
}) !== "committed") return;
|
|
1206
|
+
committedState ??= getBrowserRouterState();
|
|
1165
1207
|
try {
|
|
1166
1208
|
const renderedElements = await rscPayload;
|
|
1167
1209
|
if (navigationCacheGeneration !== clientNavigationCacheGeneration) return;
|
|
1168
1210
|
const metadata = AppElementsWire.readMetadata(renderedElements);
|
|
1169
|
-
const cacheBuffer = await cacheBufferPromise;
|
|
1170
1211
|
if (navigationCacheGeneration !== clientNavigationCacheGeneration) return;
|
|
1171
|
-
const responseSnapshot = createCachedRscResponseSnapshot(navResponse,
|
|
1172
|
-
const
|
|
1212
|
+
const responseSnapshot = consumedPrefetchSnapshot ?? createCachedRscResponseSnapshot(navResponse, await cacheBufferPromise, navResponseUrl);
|
|
1213
|
+
const cacheRestorable = !(responseSnapshot.completedDynamicStaleTimeSeconds !== void 0) && isCacheRestorableAppPayloadMetadata(metadata);
|
|
1214
|
+
const { completedDynamicStaleTimeSeconds: _staticCompletedDynamicStaleTime, dynamicStaleTimeSeconds: _staticDynamicStaleTime, ...staticResponseSnapshot } = responseSnapshot;
|
|
1173
1215
|
const snapshot = {
|
|
1174
|
-
...
|
|
1216
|
+
...cacheRestorable ? staticResponseSnapshot : {
|
|
1175
1217
|
...responseSnapshot,
|
|
1176
1218
|
...responseSnapshot.dynamicStaleTimeSeconds === void 0 && metadata.dynamicStaleTimeSeconds !== void 0 ? { dynamicStaleTimeSeconds: metadata.dynamicStaleTimeSeconds } : {}
|
|
1177
1219
|
},
|
|
1178
|
-
...navResponseExpiresAt !== void 0 ? { expiresAt: navResponseExpiresAt } : {},
|
|
1179
1220
|
mountedSlotsHeader: getMountedSlotIdsHeader(renderedElements)
|
|
1180
1221
|
};
|
|
1222
|
+
const prefetchSnapshot = preserveCommittedPrefetchExpiry(snapshot, navResponseExpiresAt);
|
|
1181
1223
|
const interceptionContext = resolveVisitedResponseInterceptionContext(requestInterceptionContext, metadata.interceptionContext);
|
|
1182
|
-
if (
|
|
1224
|
+
if (cacheRestorable) {
|
|
1183
1225
|
if (navigationCacheGeneration !== clientNavigationCacheGeneration) return;
|
|
1184
|
-
storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, navParams, PREFETCH_CACHE_TTL, mountedSlotsHeader);
|
|
1185
|
-
} else
|
|
1226
|
+
storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, navParams, PREFETCH_CACHE_TTL, mountedSlotsHeader, void 0, true, prefetchSnapshot);
|
|
1227
|
+
} else {
|
|
1186
1228
|
const state = committedState;
|
|
1187
1229
|
const committedElements = {
|
|
1188
1230
|
...state.elements,
|
|
@@ -1192,10 +1234,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
1192
1234
|
[AppElementsWire.keys.slotBindings]: state.slotBindings
|
|
1193
1235
|
};
|
|
1194
1236
|
if (navigationCacheGeneration !== clientNavigationCacheGeneration) return;
|
|
1195
|
-
storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, navParams, DYNAMIC_NAVIGATION_CACHE_TTL, mountedSlotsHeader, committedElements);
|
|
1196
|
-
} else {
|
|
1197
|
-
if (navigationCacheGeneration !== clientNavigationCacheGeneration) return;
|
|
1198
|
-
seedPrefetchResponseSnapshot(rscUrl, snapshot, interceptionContext, mountedSlotsHeader, DYNAMIC_NAVIGATION_CACHE_TTL);
|
|
1237
|
+
storeVisitedResponseSnapshot(rscUrl, interceptionContext, snapshot, navParams, DYNAMIC_NAVIGATION_CACHE_TTL, mountedSlotsHeader, committedElements, true, prefetchSnapshot);
|
|
1199
1238
|
}
|
|
1200
1239
|
} catch {}
|
|
1201
1240
|
return;
|
|
@@ -1209,7 +1248,8 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
1209
1248
|
browserNavigationController.finalizeNavigation(navId, pendingRouterState);
|
|
1210
1249
|
discardedServerActionRefreshScheduler.markNavigationSettled();
|
|
1211
1250
|
}
|
|
1212
|
-
}
|
|
1251
|
+
},
|
|
1252
|
+
preparePrefetchResponse: (response) => decodeAppElementsPromise(createFromFetch(Promise.resolve(response)))
|
|
1213
1253
|
});
|
|
1214
1254
|
const handlePopstate = createPopstateRestoreHandler({
|
|
1215
1255
|
getActiveNavigationId: browserNavigationController.getActiveNavigationId.bind(browserNavigationController),
|
|
@@ -1271,7 +1311,7 @@ function bootstrapHydration(rscStream, devErrorOverlay, initialRscBootstrap) {
|
|
|
1271
1311
|
const navigationSnapshot = createClientNavigationRenderSnapshot(window.location.href, latestClientParams);
|
|
1272
1312
|
devErrorOverlay?.dismissOverlay();
|
|
1273
1313
|
const hmrHeaders = createRscRequestHeaders({ mountedSlotsHeader: getMountedSlotIdsHeader(browserNavigationController.getBrowserRouterState().elements) });
|
|
1274
|
-
await browserNavigationController.hmrReplaceTree(decodeAppElementsPromise(createFromFetch(fetch(await createRscRequestUrl(window.location.pathname + window.location.search, hmrHeaders), { headers: hmrHeaders }))), navigationSnapshot);
|
|
1314
|
+
await browserNavigationController.hmrReplaceTree(decodeAppElementsPromise(createFromFetch(fetch(await createRscRequestUrl(window.location.pathname + window.location.search, hmrHeaders), { headers: hmrHeaders }).then(stripRscCompletionMetadataResponse))), navigationSnapshot);
|
|
1275
1315
|
};
|
|
1276
1316
|
const handleRscUpdate = async (updateId) => {
|
|
1277
1317
|
try {
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { BfcacheIdMap, HistoryTraversalIntent } from "./app-history-state.js";
|
|
2
2
|
import { AppRouterState } from "./app-browser-state.js";
|
|
3
3
|
import { HistoryUpdateMode } from "./app-browser-navigation-controller.js";
|
|
4
|
-
|
|
5
4
|
//#region src/server/app-browser-history-controller.d.ts
|
|
6
5
|
/**
|
|
7
6
|
* Visible router-state metadata at the instant a hash-only navigation commits.
|
|
@@ -14,10 +13,14 @@ type VisibleNavigationMetadata = {
|
|
|
14
13
|
};
|
|
15
14
|
type AppBrowserHistoryControllerDeps = {
|
|
16
15
|
initialHistoryState: unknown;
|
|
17
|
-
maxHistoryStateSnapshots: number;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
16
|
+
maxHistoryStateSnapshots: number;
|
|
17
|
+
/** Reads `window.history.state`. Injected so the controller stays unit-testable. */
|
|
18
|
+
readHistoryState: () => unknown;
|
|
19
|
+
/** Reads `window.location.href`. Injected so the controller stays unit-testable. */
|
|
20
|
+
readCurrentHref: () => string;
|
|
21
|
+
/** Wraps `pushHistoryStateWithoutNotify(state, "", href)`. */
|
|
22
|
+
pushHistoryState: (state: unknown, href: string) => void;
|
|
23
|
+
/** Wraps `replaceHistoryStateWithoutNotify(state, "", href)`. */
|
|
21
24
|
replaceHistoryState: (state: unknown, href?: string) => void;
|
|
22
25
|
readVisibleNavigationMetadata: () => VisibleNavigationMetadata | null;
|
|
23
26
|
};
|
|
@@ -2,12 +2,12 @@ import { RouteManifest } from "../routing/app-route-graph.js";
|
|
|
2
2
|
import { AppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
|
|
3
3
|
import { NavigationRuntimeVisibleCommitMode } from "../client/navigation-runtime.js";
|
|
4
4
|
import { AppElements } from "./app-elements-wire.js";
|
|
5
|
+
import "./app-elements.js";
|
|
5
6
|
import { OperationLane } from "./operation-token.js";
|
|
6
7
|
import { ServerActionRevalidationKind } from "./app-browser-action-result.js";
|
|
7
8
|
import { ClientNavigationRenderSnapshot, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
|
|
8
9
|
import { AppNavigationPayloadOrigin, AppRouterState } from "./app-browser-state.js";
|
|
9
10
|
import { Dispatch, ReactNode } from "react";
|
|
10
|
-
|
|
11
11
|
//#region src/server/app-browser-navigation-controller.d.ts
|
|
12
12
|
type HistoryUpdateMode = "push" | "replace";
|
|
13
13
|
type PendingBrowserRouterState = {
|
|
@@ -51,7 +51,7 @@ type BrowserNavigationPayloadOptions = {
|
|
|
51
51
|
navigationInitiationState: AppRouterState;
|
|
52
52
|
navigationSnapshot: ClientNavigationRenderSnapshot;
|
|
53
53
|
navId: number;
|
|
54
|
-
nextElements: Promise<AppElements
|
|
54
|
+
nextElements: Promise<AppElements> | AppElements;
|
|
55
55
|
onCommittedState?: (state: AppRouterState) => void;
|
|
56
56
|
operationLane: OperationLane;
|
|
57
57
|
params: Record<string, string | string[]>;
|
|
@@ -98,10 +98,7 @@ type BrowserNavigationController = {
|
|
|
98
98
|
*/
|
|
99
99
|
drainPrePaintEffects(renderId: number): void;
|
|
100
100
|
clearCommittedNavigationFailureTargets(renderId: number): void;
|
|
101
|
-
NavigationCommitSignal(this: void, {
|
|
102
|
-
renderId,
|
|
103
|
-
children
|
|
104
|
-
}: {
|
|
101
|
+
NavigationCommitSignal(this: void, { renderId, children }: {
|
|
105
102
|
renderId: number;
|
|
106
103
|
children?: ReactNode;
|
|
107
104
|
}): ReactNode;
|
|
@@ -3,7 +3,7 @@ import { clearAppNavigationFailureTarget, getAppNavigationFailureTarget } from "
|
|
|
3
3
|
import { claimAppRouterScrollIntentForCommit, consumeAppRouterScrollIntent } from "../shims/app-router-scroll-state.js";
|
|
4
4
|
import { resolveServerActionOperationLane, shouldScheduleRefreshForDiscardedServerAction } from "./app-browser-action-result.js";
|
|
5
5
|
import { activateNavigationSnapshot, clearPendingPathname, commitClientNavigationState, createSnapshotPathAndSearch } from "../shims/navigation.js";
|
|
6
|
-
import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit } from "./app-browser-state.js";
|
|
6
|
+
import { FRESH_APP_NAVIGATION_PAYLOAD_ORIGIN, createPendingNavigationCommit, createPendingNavigationCommitFromElements } from "./app-browser-state.js";
|
|
7
7
|
import { applyApprovedVisibleCommit, approveHmrVisibleCommit, approvePendingNavigationCommit, resolveAndClassifyNavigationCommit } from "./app-browser-visible-commit.js";
|
|
8
8
|
import { startTransition, useInsertionEffect, useLayoutEffect } from "react";
|
|
9
9
|
import { flushSync } from "react-dom";
|
|
@@ -255,6 +255,9 @@ function createAppBrowserNavigationController(deps = {}) {
|
|
|
255
255
|
pendingRouterState.settled = true;
|
|
256
256
|
pendingRouterState.resolve(committedState);
|
|
257
257
|
if (activePendingBrowserRouterState === pendingRouterState) activePendingBrowserRouterState = null;
|
|
258
|
+
if (visibleCommitMode === "synchronous") flushSync(() => {
|
|
259
|
+
setter(committedState);
|
|
260
|
+
});
|
|
258
261
|
return;
|
|
259
262
|
}
|
|
260
263
|
if (visibleCommitMode === "synchronous") {
|
|
@@ -332,6 +335,22 @@ function createAppBrowserNavigationController(deps = {}) {
|
|
|
332
335
|
if (!shouldScheduleRefreshForDiscardedServerAction(lifecycleOptions?.revalidation ?? "none")) return;
|
|
333
336
|
lifecycleOptions?.onDiscardedRevalidation?.();
|
|
334
337
|
}
|
|
338
|
+
function isSamePathSearchHashCommit(targetHref) {
|
|
339
|
+
if (typeof window === "undefined") return false;
|
|
340
|
+
try {
|
|
341
|
+
const currentUrl = new URL(window.location.href);
|
|
342
|
+
const targetUrl = new URL(targetHref, currentUrl.href);
|
|
343
|
+
return targetUrl.origin === currentUrl.origin && targetUrl.pathname === currentUrl.pathname && targetUrl.search !== currentUrl.search && targetUrl.hash !== "";
|
|
344
|
+
} catch {
|
|
345
|
+
return false;
|
|
346
|
+
}
|
|
347
|
+
}
|
|
348
|
+
function shouldForceSynchronousCommit(options) {
|
|
349
|
+
if (options.actionType === "traverse") return false;
|
|
350
|
+
if (options.historyUpdateMode === void 0) return false;
|
|
351
|
+
if (options.scrollIntent?.hash == null) return false;
|
|
352
|
+
return isSamePathSearchHashCommit(options.targetHref);
|
|
353
|
+
}
|
|
335
354
|
async function renderNavigationPayload(options) {
|
|
336
355
|
if (options.navId === pendingUserNavigationId) pendingUserNavigationLane = options.operationLane;
|
|
337
356
|
const renderId = allocateRenderId();
|
|
@@ -348,11 +367,10 @@ function createAppBrowserNavigationController(deps = {}) {
|
|
|
348
367
|
});
|
|
349
368
|
let snapshotActivated = false;
|
|
350
369
|
try {
|
|
351
|
-
const
|
|
370
|
+
const pendingOptions = {
|
|
352
371
|
currentState: options.navigationInitiationState,
|
|
353
372
|
navigationCommitKind: options.navigationCommitKind,
|
|
354
373
|
navigationId: options.navId,
|
|
355
|
-
nextElements: options.nextElements,
|
|
356
374
|
navigationSnapshot: options.navigationSnapshot,
|
|
357
375
|
operationLane: options.operationLane,
|
|
358
376
|
payloadOrigin: options.payloadOrigin,
|
|
@@ -361,6 +379,13 @@ function createAppBrowserNavigationController(deps = {}) {
|
|
|
361
379
|
restoredBfcacheIds: options.restoredBfcacheIds,
|
|
362
380
|
reuseCurrentBfcacheIds: options.reuseCurrentBfcacheIds,
|
|
363
381
|
type: options.actionType
|
|
382
|
+
};
|
|
383
|
+
const pending = options.nextElements instanceof Promise ? await createPendingNavigationCommit({
|
|
384
|
+
...pendingOptions,
|
|
385
|
+
nextElements: options.nextElements
|
|
386
|
+
}) : createPendingNavigationCommitFromElements({
|
|
387
|
+
...pendingOptions,
|
|
388
|
+
nextElements: options.nextElements
|
|
364
389
|
});
|
|
365
390
|
const approval = approvePendingNavigationCommit({
|
|
366
391
|
activeNavigationId,
|
|
@@ -402,7 +427,7 @@ function createAppBrowserNavigationController(deps = {}) {
|
|
|
402
427
|
claimAppRouterScrollIntentForCommit(options.scrollIntent, renderId);
|
|
403
428
|
activateNavigationSnapshot();
|
|
404
429
|
snapshotActivated = true;
|
|
405
|
-
dispatchApprovedVisibleCommit(renderId, approvedCommit, options.pendingRouterState, options.visibleCommitMode ?? "transition");
|
|
430
|
+
dispatchApprovedVisibleCommit(renderId, approvedCommit, options.pendingRouterState, shouldForceSynchronousCommit(options) ? "synchronous" : options.visibleCommitMode ?? "transition");
|
|
406
431
|
} catch (error) {
|
|
407
432
|
pendingNavigationFailureTargets.delete(renderId);
|
|
408
433
|
pendingNavigationPrePaintEffects.delete(renderId);
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { CachedRscResponse, peekPrefetchResponseForNavigation } from "../shims/navigation.js";
|
|
2
|
+
//#region src/server/app-browser-prefetch-response.d.ts
|
|
3
|
+
declare function peekSettledPrefetchResponseForNavigation(options: {
|
|
4
|
+
additionalRscUrls: readonly string[];
|
|
5
|
+
bypassNavigationCache: boolean;
|
|
6
|
+
interceptionContext: string | null;
|
|
7
|
+
mountedSlotsHeader: string | null;
|
|
8
|
+
navigationKind: "navigate" | "refresh" | "traverse";
|
|
9
|
+
peek?: typeof peekPrefetchResponseForNavigation;
|
|
10
|
+
targetPathAndSearch: string;
|
|
11
|
+
}): CachedRscResponse | null;
|
|
12
|
+
declare function resolvePrefetchNavigationResponseUrl(options: {
|
|
13
|
+
additionalRscUrls: readonly string[];
|
|
14
|
+
origin: string;
|
|
15
|
+
responseUrl: string;
|
|
16
|
+
visibleRscUrl: string;
|
|
17
|
+
}): string;
|
|
18
|
+
declare function prepareConsumedPrefetchResponseForPublication(response: CachedRscResponse, responseUrl: string): {
|
|
19
|
+
expiresAt: number | undefined;
|
|
20
|
+
preparedElements: CachedRscResponse["preparedElements"];
|
|
21
|
+
snapshot: CachedRscResponse;
|
|
22
|
+
};
|
|
23
|
+
declare function preserveCommittedPrefetchExpiry(snapshot: CachedRscResponse, expiresAt: number | undefined): CachedRscResponse;
|
|
24
|
+
//#endregion
|
|
25
|
+
export { peekSettledPrefetchResponseForNavigation, prepareConsumedPrefetchResponseForPublication, preserveCommittedPrefetchExpiry, resolvePrefetchNavigationResponseUrl };
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { stripRscCacheBustingSearchParam } from "./app-rsc-cache-busting.js";
|
|
2
|
+
import { peekPrefetchResponseForNavigation } from "../shims/navigation.js";
|
|
3
|
+
//#region src/server/app-browser-prefetch-response.ts
|
|
4
|
+
function peekSettledPrefetchResponseForNavigation(options) {
|
|
5
|
+
if (options.navigationKind !== "navigate" || options.bypassNavigationCache) return null;
|
|
6
|
+
return (options.peek ?? peekPrefetchResponseForNavigation)(options.targetPathAndSearch, options.interceptionContext, options.mountedSlotsHeader, { additionalRscUrls: options.additionalRscUrls });
|
|
7
|
+
}
|
|
8
|
+
function normalizeBrowserRscUrlForReuse(url, origin) {
|
|
9
|
+
if (!url) return null;
|
|
10
|
+
try {
|
|
11
|
+
const parsed = new URL(url, origin);
|
|
12
|
+
stripRscCacheBustingSearchParam(parsed);
|
|
13
|
+
return `${parsed.pathname}${parsed.search}`;
|
|
14
|
+
} catch {
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
function isSameOriginBrowserRscUrl(url, origin) {
|
|
19
|
+
try {
|
|
20
|
+
return new URL(url, origin).origin === new URL(origin).origin;
|
|
21
|
+
} catch {
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function canonicalizeBrowserRscResponseUrl(responseUrl, origin) {
|
|
26
|
+
try {
|
|
27
|
+
const parsed = new URL(responseUrl, origin);
|
|
28
|
+
if (parsed.origin === new URL(origin).origin) return `${parsed.pathname}${parsed.search}`;
|
|
29
|
+
} catch {}
|
|
30
|
+
return responseUrl;
|
|
31
|
+
}
|
|
32
|
+
function resolvePrefetchNavigationResponseUrl(options) {
|
|
33
|
+
const normalizedResponseUrl = normalizeBrowserRscUrlForReuse(options.responseUrl, options.origin);
|
|
34
|
+
return normalizedResponseUrl !== null && isSameOriginBrowserRscUrl(options.responseUrl, options.origin) && options.additionalRscUrls.some((additionalRscUrl) => normalizeBrowserRscUrlForReuse(additionalRscUrl, options.origin) === normalizedResponseUrl) ? options.visibleRscUrl : canonicalizeBrowserRscResponseUrl(options.responseUrl, options.origin);
|
|
35
|
+
}
|
|
36
|
+
function prepareConsumedPrefetchResponseForPublication(response, responseUrl) {
|
|
37
|
+
const { expiresAt, preparedElements, ...snapshot } = response;
|
|
38
|
+
return {
|
|
39
|
+
expiresAt,
|
|
40
|
+
preparedElements,
|
|
41
|
+
snapshot: {
|
|
42
|
+
...snapshot,
|
|
43
|
+
url: responseUrl
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
function preserveCommittedPrefetchExpiry(snapshot, expiresAt) {
|
|
48
|
+
return expiresAt === void 0 ? snapshot : {
|
|
49
|
+
...snapshot,
|
|
50
|
+
expiresAt
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
//#endregion
|
|
54
|
+
export { peekSettledPrefetchResponseForNavigation, prepareConsumedPrefetchResponseForPublication, preserveCommittedPrefetchExpiry, resolvePrefetchNavigationResponseUrl };
|