react-router 0.0.0-experimental-a65d6f5 → 0.0.0-experimental-c19b79d

package/dist/development/{chunk-CWSJ6RYI.mjs → chunk-AGOH44BE.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-a65d6f5
+ * react-router v0.0.0-experimental-c19b79d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -38,7 +38,6 @@ import {
   getManifestPath,
   getSingleFetchDataStrategyImpl,
   getStaticContextFromError,
-  instrumentHandler,
   invariant,
   isDataWithResponseInit,
   isMutationMethod,
@@ -61,7 +60,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-47MIYFLC.mjs";
+} from "./chunk-IMKEG5CI.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -518,8 +517,7 @@ async function callRouteHandler(handler, args) {
   let result = await handler({
     request: stripRoutesParam(stripIndexParam2(args.request)),
     params: args.params,
-    context: args.context,
-    unstable_pattern: args.unstable_pattern
+    context: args.context
   });
   if (isDataWithResponseInit(result) && result.init && result.init.status && isRedirectStatusCode(result.init.status)) {
     throw new Response(null, result.init);
@@ -1012,8 +1010,7 @@ function derive(build, mode) {
   let dataRoutes = createStaticHandlerDataRoutes(build.routes, build.future);
   let serverMode = isServerMode(mode) ? mode : "production" /* Production */;
   let staticHandler = createStaticHandler(dataRoutes, {
-    basename: build.basename,
-    unstable_instrumentations: build.entry.module.unstable_instrumentations
+    basename: build.basename
   });
   let errorHandler = build.entry.module.handleError || ((error, { request }) => {
     if (serverMode !== "test" /* Test */ && !request.signal.aborted) {
@@ -1023,7 +1020,35 @@ function derive(build, mode) {
       );
     }
   });
-  let requestHandler = async (request, initialContext) => {
+  return {
+    routes,
+    dataRoutes,
+    serverMode,
+    staticHandler,
+    errorHandler
+  };
+}
+var createRequestHandler = (build, mode) => {
+  let _build;
+  let routes;
+  let serverMode;
+  let staticHandler;
+  let errorHandler;
+  return async function requestHandler(request, initialContext) {
+    _build = typeof build === "function" ? await build() : build;
+    if (typeof build === "function") {
+      let derived = derive(_build, mode);
+      routes = derived.routes;
+      serverMode = derived.serverMode;
+      staticHandler = derived.staticHandler;
+      errorHandler = derived.errorHandler;
+    } else if (!routes || !serverMode || !staticHandler || !errorHandler) {
+      let derived = derive(_build, mode);
+      routes = derived.routes;
+      serverMode = derived.serverMode;
+      staticHandler = derived.staticHandler;
+      errorHandler = derived.errorHandler;
+    }
     let params = {};
     let loadContext;
     let handleError = (error) => {
@@ -1036,7 +1061,7 @@ function derive(build, mode) {
         request
       });
     };
-    if (build.future.v8_middleware) {
+    if (_build.future.v8_middleware) {
       if (initialContext && !(initialContext instanceof RouterContextProvider)) {
         let error = new Error(
           "Invalid `context` value provided to `handleRequest`. When middleware is enabled you must return an instance of `RouterContextProvider` from your `getLoadContext` function."
@@ -1049,7 +1074,7 @@ function derive(build, mode) {
       loadContext = initialContext || {};
     }
     let url = new URL(request.url);
-    let normalizedBasename = build.basename || "/";
+    let normalizedBasename = _build.basename || "/";
     let normalizedPath = url.pathname;
     if (stripBasename(normalizedPath, normalizedBasename) === "/_root.data") {
       normalizedPath = normalizedBasename;
@@ -1060,7 +1085,7 @@ function derive(build, mode) {
       normalizedPath = normalizedPath.slice(0, -1);
     }
     let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
-    if (!build.ssr) {
+    if (!_build.ssr) {
       let decodedPath = decodeURI(normalizedPath);
       if (normalizedBasename !== "/") {
         let strippedPath = stripBasename(decodedPath, normalizedBasename);
@@ -1084,9 +1109,9 @@ function derive(build, mode) {
         }
         decodedPath = strippedPath;
       }
-      if (build.prerender.length === 0) {
+      if (_build.prerender.length === 0) {
         isSpaMode = true;
-      } else if (!build.prerender.includes(decodedPath) && !build.prerender.includes(decodedPath + "/")) {
+      } else if (!_build.prerender.includes(decodedPath) && !_build.prerender.includes(decodedPath + "/")) {
         if (url.pathname.endsWith(".data")) {
           errorHandler(
             new ErrorResponseImpl(
@@ -1110,19 +1135,19 @@ function derive(build, mode) {
       }
     }
     let manifestUrl = getManifestPath(
-      build.routeDiscovery.manifestPath,
+      _build.routeDiscovery.manifestPath,
       normalizedBasename
     );
     if (url.pathname === manifestUrl) {
       try {
-        let res = await handleManifestRequest(build, routes, url);
+        let res = await handleManifestRequest(_build, routes, url);
         return res;
       } catch (e) {
         handleError(e);
         return new Response("Unknown Server Error", { status: 500 });
       }
     }
-    let matches = matchServerRoutes(routes, normalizedPath, build.basename);
+    let matches = matchServerRoutes(routes, normalizedPath, _build.basename);
     if (matches && matches.length > 0) {
       Object.assign(params, matches[0].params);
     }
@@ -1133,11 +1158,11 @@ function derive(build, mode) {
       let singleFetchMatches = matchServerRoutes(
         routes,
         handlerUrl.pathname,
-        build.basename
+        _build.basename
       );
       response = await handleSingleFetchRequest(
         serverMode,
-        build,
+        _build,
         staticHandler,
         request,
         handlerUrl,
@@ -1148,12 +1173,12 @@ function derive(build, mode) {
         response = generateSingleFetchRedirectResponse(
           response,
           request,
-          build,
+          _build,
           serverMode
         );
       }
-      if (build.entry.module.handleDataRequest) {
-        response = await build.entry.module.handleDataRequest(response, {
+      if (_build.entry.module.handleDataRequest) {
+        response = await _build.entry.module.handleDataRequest(response, {
           context: loadContext,
           params: singleFetchMatches ? singleFetchMatches[0].params : {},
           request
@@ -1162,7 +1187,7 @@ function derive(build, mode) {
           response = generateSingleFetchRedirectResponse(
             response,
             request,
-            build,
+            _build,
             serverMode
           );
         }
@@ -1170,7 +1195,7 @@ function derive(build, mode) {
     } else if (!isSpaMode && matches && matches[matches.length - 1].route.module.default == null && matches[matches.length - 1].route.module.ErrorBoundary == null) {
       response = await handleResourceRequest(
         serverMode,
-        build,
+        _build,
         staticHandler,
         matches.slice(-1)[0].route.id,
         request,
@@ -1180,14 +1205,14 @@ function derive(build, mode) {
     } else {
       let { pathname } = url;
       let criticalCss = void 0;
-      if (build.unstable_getCriticalCss) {
-        criticalCss = await build.unstable_getCriticalCss({ pathname });
+      if (_build.unstable_getCriticalCss) {
+        criticalCss = await _build.unstable_getCriticalCss({ pathname });
       } else if (mode === "development" /* Development */ && getDevServerHooks()?.getCriticalCss) {
         criticalCss = await getDevServerHooks()?.getCriticalCss?.(pathname);
       }
       response = await handleDocumentRequest(
         serverMode,
-        build,
+        _build,
         staticHandler,
         request,
         loadContext,
@@ -1205,47 +1230,6 @@ function derive(build, mode) {
     }
     return response;
   };
-  if (build.entry.module.unstable_instrumentations) {
-    requestHandler = instrumentHandler(
-      requestHandler,
-      build.entry.module.unstable_instrumentations.map((i) => i.handler).filter(Boolean)
-    );
-  }
-  return {
-    routes,
-    dataRoutes,
-    serverMode,
-    staticHandler,
-    errorHandler,
-    requestHandler
-  };
-}
-var createRequestHandler = (build, mode) => {
-  let _build;
-  let routes;
-  let serverMode;
-  let staticHandler;
-  let errorHandler;
-  let _requestHandler;
-  return async function requestHandler(request, initialContext) {
-    _build = typeof build === "function" ? await build() : build;
-    if (typeof build === "function") {
-      let derived = derive(_build, mode);
-      routes = derived.routes;
-      serverMode = derived.serverMode;
-      staticHandler = derived.staticHandler;
-      errorHandler = derived.errorHandler;
-      _requestHandler = derived.requestHandler;
-    } else if (!routes || !serverMode || !staticHandler || !errorHandler || !_requestHandler) {
-      let derived = derive(_build, mode);
-      routes = derived.routes;
-      serverMode = derived.serverMode;
-      staticHandler = derived.staticHandler;
-      errorHandler = derived.errorHandler;
-      _requestHandler = derived.requestHandler;
-    }
-    return _requestHandler(request, initialContext);
-  };
 };
 async function handleManifestRequest(build, routes, url) {
   if (build.assets.version !== url.searchParams.get("version")) {