@reckona/mreact-router 0.0.207 → 0.0.209

package/dist/render.js

@@ -15,7 +15,7 @@ import { appFileConventionContentType } from "./file-conventions.js";
 import { dispatchServerActionRequest, prepareRouteServerActionPlaceholders, prepareRouteServerActions, } from "./actions.js";
 import { serverActionCookie } from "./csrf.js";
 import { activeRouteCacheContext, withRouteCacheContext, cachedRouteResponse, cacheRouteResponse, routeCacheKey, routeCachePolicyFromSource, } from "./cache.js";
-import { trackRequestHeaderReads, withTrackedRequest, } from "./request-header-tracking.js";
+import { trackRequestHeaderReads, routeLocationFromRequest, routeLocationForHydration, routeLocationFromUrl, withTrackedRouteLocation, withTrackedRequest, } from "./request-header-tracking.js";
 import { configuredHstsHeader, hasInvalidConfiguredHsts } from "./security-headers.js";
 import { resolveRouterCacheLimit } from "./cache-config.js";
 import { protectNonceBearingResponse } from "./prerender-entry.js";
@@ -638,7 +638,7 @@ async function renderAppRequestInternal(options) {
                 clientRoute,
                 props: {
                     params: matched.params,
-                    request: { url: url.pathname },
+                    request: routeLocationForHydration(url),
                 },
                 routePath: matched.route.path,
                 script: clientScript,
@@ -696,11 +696,11 @@ async function renderAppRequestInternal(options) {
                             headers: { "content-type": "text/plain; charset=utf-8" },
                         });
                     }
-                    const renderedPage = await runWithQueryClient(queryClient, () => runServerModuleWithSlots(stringOutput.code, withTrackedRequest({
+                    const renderedPage = await runWithQueryClient(queryClient, () => runServerModuleWithSlots(stringOutput.code, withTrackedRouteLocation({
                         data,
                         params: matched.params,
                         queryClient,
-                    }, appRequest, trackedRequest), matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, undefined, options.importPolicy, options.devServerModuleCacheVersion));
+                    }, appRequest, trackedRequest, routeLocationFromUrl(url)), matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, undefined, options.importPolicy, options.devServerModuleCacheVersion));
                     const pageHtml = renderedPage.html;
                     const pageHtmlForLayout = clientRoute
                         ? withHydrationMarkers({
@@ -711,7 +711,7 @@ async function renderAppRequestInternal(options) {
                             script: clientScript,
                             props: {
                                 params: matched.params,
-                                request: { url: url.pathname },
+                                request: routeLocationForHydration(url),
                                 data,
                             },
                         })
@@ -720,11 +720,11 @@ async function renderAppRequestInternal(options) {
                         appDir: options.appDir,
                         pageFile: matched.route.file,
                         html: pageHtmlForLayout,
-                        props: withTrackedRequest({
+                        props: withTrackedRouteLocation({
                             data,
                             params: matched.params,
                             queryClient,
-                        }, appRequest, trackedRequest),
+                        }, appRequest, trackedRequest, routeLocationFromUrl(url)),
                         slots: renderedPage.slots,
                         serverModules: options.serverModules,
                         serverModuleCacheVersion: options.serverModuleCacheVersion,
@@ -834,7 +834,7 @@ async function renderAppRequestInternal(options) {
                         params: matched.params,
                         queryClient,
                         request: appRequest,
-                        requestUrl: url.pathname,
+                        requestUrl: url.href,
                         trackedRequest,
                         routePath: matched.route.path,
                         routeScripts: options.clientScripts,
@@ -860,11 +860,11 @@ async function renderAppRequestInternal(options) {
                     return response;
                 }
                 const data = streamData;
-                const props = withTrackedRequest({
+                const props = withTrackedRouteLocation({
                     data,
                     params: matched.params,
                     queryClient,
-                }, appRequest, trackedRequest);
+                }, appRequest, trackedRequest, routeLocationFromUrl(url));
                 phaseStartedAt = renderTimingPhaseStartedAt(timing);
                 const stream = runServerStreamModule(output.code, {
                     appDir: options.appDir,
@@ -873,7 +873,7 @@ async function renderAppRequestInternal(options) {
                     markerRequest: options.request,
                     prerenderVariantCapture: options.prerenderVariantCapture,
                     props,
-                    requestUrl: url.pathname,
+                    requestUrl: url.href,
                     routePath: matched.route.path,
                     routeScripts: options.clientScripts,
                     serverModules: options.serverModules,
@@ -933,11 +933,11 @@ async function renderAppRequestInternal(options) {
                 });
             }
             phaseStartedAt = renderTimingPhaseStartedAt(timing);
-            const renderedPage = await runWithQueryClient(queryClient, () => runServerModuleWithSlots(output.code, withTrackedRequest({
+            const renderedPage = await runWithQueryClient(queryClient, () => runServerModuleWithSlots(output.code, withTrackedRouteLocation({
                 data,
                 params: matched.params,
                 queryClient,
-            }, appRequest, trackedRequest), matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, timing, options.importPolicy, options.devServerModuleCacheVersion));
+            }, appRequest, trackedRequest, routeLocationFromUrl(url)), matched.route.file, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, timing, options.importPolicy, options.devServerModuleCacheVersion));
             finishRenderTimingPhase(timing, phaseStartedAt, "pageRenderMs");
             const pageHtml = renderedPage.html;
             // Wrap the page (not the full document) with the hydration marker so
@@ -954,7 +954,7 @@ async function renderAppRequestInternal(options) {
                     script: clientScript,
                     props: {
                         params: matched.params,
-                        request: { url: url.pathname },
+                        request: routeLocationForHydration(url),
                         data,
                     },
                 })
@@ -964,11 +964,11 @@ async function renderAppRequestInternal(options) {
                 appDir: options.appDir,
                 pageFile: matched.route.file,
                 html: pageHtmlForLayout,
-                props: withTrackedRequest({
+                props: withTrackedRouteLocation({
                     data,
                     params: matched.params,
                     queryClient,
-                }, appRequest, trackedRequest),
+                }, appRequest, trackedRequest, routeLocationFromUrl(url)),
                 slots: renderedPage.slots,
                 serverModules: options.serverModules,
                 serverModuleCacheVersion: options.serverModuleCacheVersion,
@@ -1432,7 +1432,7 @@ function errorBoundaryProps(error, request, routePath) {
         error: normalizeErrorForProps(error),
         params: {},
         queryClient: createQueryClient(),
-        request,
+        request: routeLocationFromRequest(request),
         requestId: requestIdForErrorContext(request),
         routeId: routeIdForPath(routePath ?? new URL(request.url).pathname),
         traceId: traceContextFromRequest(request)?.traceId,
@@ -2193,7 +2193,7 @@ function runServerStreamModule(code, options) {
                 script: options.script,
                 props: {
                     params: options.props.params,
-                    request: { url: options.requestUrl },
+                    request: routeLocationForHydration(new URL(options.requestUrl, options.markerRequest.url)),
                     data: options.props.data,
                 },
             })
@@ -2311,11 +2311,11 @@ function localServerSourceImportCandidates(base) {
     return candidates;
 }
 async function runServerStreamModuleWithLoading(code, options) {
-    const loadingProps = withTrackedRequest({
+    const loadingProps = withTrackedRouteLocation({
         data: undefined,
         params: options.params,
         queryClient: options.queryClient,
-    }, options.request, options.trackedRequest);
+    }, options.request, options.trackedRequest, routeLocationFromUrl(new URL(options.requestUrl)));
     const layoutShells = await layoutShellsForPage(options.appDir, options.pageFile, loadingProps, {}, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.clientRouteInferenceCache, options.define, options.vitePlugins, options.importPolicy);
     const loadingHtml = await renderServerFileToHtml(options.loadingFile, loadingProps, options.serverModules, options.serverModuleCacheVersion, options.serverSourceFiles, options.define, options.vitePlugins);
     const marker = options.clientRoute
@@ -2326,7 +2326,7 @@ async function runServerStreamModuleWithLoading(code, options) {
             script: options.script,
             props: {
                 params: options.params,
-                request: { url: options.requestUrl },
+                request: routeLocationForHydration(new URL(options.requestUrl)),
             },
         })
         : serverOnlyRouteMarkerParts(options.routePath, options.markerRequest, options.prerenderVariantCapture === true);
@@ -2349,11 +2349,11 @@ async function runServerStreamModuleWithLoading(code, options) {
         }
         sink.append(marker?.prefix ?? "");
         renderOutOfOrderBoundary(sink, "mreact-route", options.data, async (boundarySink, data) => {
-            await appendServerStreamModule(code, boundarySink, withTrackedRequest({
+            await appendServerStreamModule(code, boundarySink, withTrackedRouteLocation({
                 data,
                 params: options.params,
                 queryClient: options.queryClient,
-            }, options.request, options.trackedRequest), options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, options.importPolicy);
+            }, options.request, options.trackedRequest, routeLocationFromUrl(new URL(options.requestUrl))), options.pageFile, options.serverModules, options.serverModuleCacheVersion, options.define, options.vitePlugins, options.importPolicy);
         }, {
             async catch(boundarySink, error) {
                 try {