react-router 0.0.0-experimental-689d76079 → 0.0.0-experimental-34996874d

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # `react-router`
 
+## v7.14.2
+
+### Patch Changes
+
+- Remove the un-documented custom error serialization logic from the internal turbo-stream implementation. React Router only automatically handles serialization of `Error` and it's standard subtypes (`SyntaxError`, `TypeError`, etc.). ([[aabf4a1](https://github.com/remix-run/react-router/commit/aabf4a1))
+
+- Properly handle parent middleware redirects during `fetcher.load` ([[aabf4a1](https://github.com/remix-run/react-router/commit/aabf4a1))
+
+- Remove redundant `Omit<RouterProviderProps, "flushSync">` from `react-router/dom` `RouterProvider` ([[aabf4a1](https://github.com/remix-run/react-router/commit/aabf4a1))
+
+- Improved types for `generatePath`'s `param` arg ([[aabf4a1](https://github.com/remix-run/react-router/commit/aabf4a1))
+
+  Type errors when required params are omitted:
+
+  ```ts
+  // Before
+  // Passes type checks, but throws at runtime 💥
+  generatePath(":required", { required: null });
+
+  // After
+  generatePath(":required", { required: null });
+  //                          ^^^^^^^^ Type 'null' is not assignable to type 'string'.ts(2322)
+  ```
+
+  Allow omission of optional params:
+
+  ```ts
+  // Before
+  generatePath(":optional?", {});
+  //                         ^^ Property 'optional' is missing in type '{}' but required in type '{ optional: string | null | undefined; }'.ts(2741)
+
+  // After
+  generatePath(":optional?", {});
+  ```
+
+  Allows extra keys:
+
+  ```ts
+  // Before
+  generatePath(":a", { a: "1", b: "2" });
+  //                           ^ Object literal may only specify known properties, and 'b' does not exist in type '{ a: string; }'.ts(2353)
+
+  // After
+  generatePath(":a", { a: "1", b: "2" });
+  ```
+
 ## v7.14.1
 
 ### Patch Changes

package/dist/development/{browser-I6n6wVSO.d.mts → browser-DOdQ29qc.d.mts}

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterInit } from './context-DGGUoDIu.mjs';
-import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './routeModules-BW4a8k3I.mjs';
+import { R as RouterInit } from './context-5jDC4-vN.mjs';
+import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './routeModules-TFkxZ8Dg.mjs';
 
 declare function getRequest(): Request;
 type RSCRouteConfigEntryBase = {

package/dist/development/{browser-C-UvoYvi.d.ts → browser-fmM0RC-q.d.ts}

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterInit } from './instrumentation-g0dG8UL0.js';
-import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './routeModules-7rtk67cd.js';
+import { R as RouterInit } from './instrumentation-BvOM_tqB.js';
+import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction } from './routeModules-CwfU3INC.js';
 
 declare function getRequest(): Request;
 type RSCRouteConfigEntryBase = {

package/dist/{production/chunk-UNN6ZJ6W.js → development/chunk-BSV573QI.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }/**
- * react-router v0.0.0-experimental-689d76079
+ * react-router v0.0.0-experimental-34996874d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,7 +14,7 @@
 
 
 
-var _chunkNA4ZUJK5js = require('./chunk-NA4ZUJK5.js');
+var _chunkVP7MBYDEjs = require('./chunk-VP7MBYDE.js');
 
 // lib/dom/ssr/hydration.tsx
 function getHydrationData({
@@ -29,12 +29,12 @@ function getHydrationData({
     ...state,
     loaderData: { ...state.loaderData }
   };
-  let initialMatches = _chunkNA4ZUJK5js.matchRoutes.call(void 0, routes, location, basename);
+  let initialMatches = _chunkVP7MBYDEjs.matchRoutes.call(void 0, routes, location, basename);
   if (initialMatches) {
     for (let match of initialMatches) {
       let routeId = match.route.id;
       let routeInfo = getRouteInfo(routeId);
-      if (_chunkNA4ZUJK5js.shouldHydrateRouteLoader.call(void 0, 
+      if (_chunkVP7MBYDEjs.shouldHydrateRouteLoader.call(void 0, 
         routeId,
         routeInfo.clientLoader,
         routeInfo.hasLoader,
@@ -112,7 +112,7 @@ function RSCDefaultRootErrorBoundaryImpl({
       }
     }
   );
-  if (_chunkNA4ZUJK5js.isRouteErrorResponse.call(void 0, error)) {
+  if (_chunkVP7MBYDEjs.isRouteErrorResponse.call(void 0, error)) {
     return /* @__PURE__ */ _react2.default.createElement(
       ErrorWrapper,
       {
@@ -120,7 +120,7 @@ function RSCDefaultRootErrorBoundaryImpl({
         title: "Unhandled Thrown Response!"
       },
       /* @__PURE__ */ _react2.default.createElement("h1", { style: { fontSize: "24px" } }, error.status, " ", error.statusText),
-      _chunkNA4ZUJK5js.ENABLE_DEV_WARNINGS ? heyDeveloper : null
+      _chunkVP7MBYDEjs.ENABLE_DEV_WARNINGS ? heyDeveloper : null
     );
   }
   let errorInstance;
@@ -146,7 +146,7 @@ function RSCDefaultRootErrorBoundaryImpl({
 function RSCDefaultRootErrorBoundary({
   hasRootLayout
 }) {
-  let error = _chunkNA4ZUJK5js.useRouteError.call(void 0, );
+  let error = _chunkVP7MBYDEjs.useRouteError.call(void 0, );
   if (hasRootLayout === void 0) {
     throw new Error("Missing 'hasRootLayout' prop");
   }

package/dist/development/{chunk-N6IZKBC5.mjs → chunk-OFM6MSVO.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-689d76079
+ * react-router v0.0.0-experimental-34996874d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -22,6 +22,7 @@ import {
   SingleFetchRedirectSymbol,
   StaticRouterProvider,
   StreamTransfer,
+  URL_LIMIT,
   convertRoutesToDataRoutes,
   createMemoryRouter,
   createServerRoutes,
@@ -41,6 +42,7 @@ import {
   isResponse,
   isRouteErrorResponse,
   matchRoutes,
+  matchRoutesImpl,
   redirect,
   redirectDocument,
   replace,
@@ -51,7 +53,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-RPWK4TB6.mjs";
+} from "./chunk-ZRB2HDCJ.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -137,8 +139,7 @@ function createRoutesStub(routes, _context) {
     if (routerRef.current == null) {
       frameworkContextRef.current = {
         future: {
-          unstable_passThroughRequests: future?.unstable_passThroughRequests === true,
-          unstable_subResourceIntegrity: future?.unstable_subResourceIntegrity === true,
+          v8_passThroughRequests: future?.v8_passThroughRequests === true,
           v8_middleware: future?.v8_middleware === true,
           unstable_trailingSlashAwareDataRequests: future?.unstable_trailingSlashAwareDataRequests === true
         },
@@ -490,29 +491,48 @@ function serializeErrors(errors, serverMode) {
   return serialized;
 }
 
+// lib/server-runtime/invariant.ts
+function invariant(value, message) {
+  if (value === false || value === null || typeof value === "undefined") {
+    console.error(
+      "The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose"
+    );
+    throw new Error(message);
+  }
+}
+
 // lib/server-runtime/routeMatching.ts
-function matchServerRoutes(routes, pathname, basename) {
-  let matches = matchRoutes(
-    routes,
+function matchServerRoutes(manifest, dataRoutes, branches, pathname, basename) {
+  let matches = matchRoutesImpl(
+    dataRoutes,
     pathname,
-    basename
+    basename ?? "/",
+    false,
+    branches
   );
   if (!matches) return null;
-  return matches.map((match) => ({
-    params: match.params,
-    pathname: match.pathname,
-    route: match.route
-  }));
+  return matches.map((match) => {
+    let route = manifest[match.route.id];
+    invariant(
+      route,
+      `Route with id "${match.route.id}" not found in manifest.`
+    );
+    return {
+      params: match.params,
+      pathname: match.pathname,
+      route
+    };
+  });
 }
 
 // lib/server-runtime/data.ts
 async function callRouteHandler(handler, args, future) {
   let result = await handler({
-    request: future.unstable_passThroughRequests ? args.request : stripRoutesParam(stripIndexParam(args.request)),
-    unstable_url: args.unstable_url,
+    request: future.v8_passThroughRequests ? args.request : stripRoutesParam(stripIndexParam(args.request)),
+    url: args.url,
     params: args.params,
     context: args.context,
-    unstable_pattern: args.unstable_pattern
+    pattern: args.pattern
   });
   if (isDataWithResponseInit(result) && result.init && result.init.status && isRedirectStatusCode(result.init.status)) {
     throw new Response(null, result.init);
@@ -558,16 +578,6 @@ function stripRoutesParam(request) {
   return new Request(url.href, init);
 }
 
-// lib/server-runtime/invariant.ts
-function invariant(value, message) {
-  if (value === false || value === null || typeof value === "undefined") {
-    console.error(
-      "The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose"
-    );
-    throw new Error(message);
-  }
-}
-
 // lib/server-runtime/dev.ts
 var globalDevServerHooksKey = "__reactRouterDevServerHooks";
 function setDevServerHooks(devServerHooks) {
@@ -602,12 +612,6 @@ function groupRoutesByParentId(manifest) {
   });
   return routes;
 }
-function createRoutes(manifest, parentId = "", routesByParentId = groupRoutesByParentId(manifest)) {
-  return (routesByParentId[parentId] || []).map((route) => ({
-    ...route,
-    children: createRoutes(manifest, route.id, routesByParentId)
-  }));
-}
 function createStaticHandlerDataRoutes(manifest, future, parentId = "", routesByParentId = groupRoutesByParentId(manifest)) {
   return (routesByParentId[parentId] || []).map((route) => {
     let commonRoute = {
@@ -894,7 +898,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
     } catch (e) {
       return handleQueryError(new Error("Bad Request"), 400);
     }
-    let handlerRequest = build.future.unstable_passThroughRequests ? request : new Request(handlerUrl, {
+    let handlerRequest = build.future.v8_passThroughRequests ? request : new Request(handlerUrl, {
       method: request.method,
       body: request.body,
       headers: request.headers,
@@ -913,7 +917,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
           return handleQueryError(error);
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryResult(result);
   } catch (error) {
@@ -962,7 +966,7 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
   let routesParam = new URL(request.url).searchParams.get("_routes");
   let loadRouteIds = routesParam ? new Set(routesParam.split(",")) : null;
   try {
-    let handlerRequest = build.future.unstable_passThroughRequests ? request : new Request(handlerUrl, {
+    let handlerRequest = build.future.v8_passThroughRequests ? request : new Request(handlerUrl, {
       headers: request.headers,
       signal: request.signal
     });
@@ -978,7 +982,7 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
           return handleQueryError(error);
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryResult(result);
   } catch (error) {
@@ -1145,12 +1149,12 @@ function encodeViaTurboStream(data2, requestSignal, streamTimeout, serverMode) {
 
 // lib/server-runtime/server.ts
 function derive(build, mode) {
-  let routes = createRoutes(build.routes);
   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
+    instrumentations: build.entry.module.instrumentations,
+    future: build.future
   });
   let errorHandler = build.entry.module.handleError || ((error, { request }) => {
     if (serverMode !== "test" /* Test */ && !request.signal.aborted) {
@@ -1247,24 +1251,30 @@ function derive(build, mode) {
     );
     if (requestUrl.pathname === manifestUrl) {
       try {
-        let res = await handleManifestRequest(build, routes, requestUrl);
+        let res = await handleManifestRequest(
+          build,
+          staticHandler.dataRoutes,
+          staticHandler._internalRouteBranches,
+          requestUrl
+        );
         return res;
       } catch (e) {
         handleError(e);
         return new Response("Unknown Server Error", { status: 500 });
       }
     }
-    let matches = matchServerRoutes(routes, normalizedPathname, build.basename);
+    let matches = matchServerRoutes(
+      build.routes,
+      staticHandler.dataRoutes,
+      staticHandler._internalRouteBranches,
+      normalizedPathname,
+      build.basename
+    );
     if (matches && matches.length > 0) {
       Object.assign(params, matches[0].params);
     }
     let response;
     if (requestUrl.pathname.endsWith(".data")) {
-      let singleFetchMatches = matchServerRoutes(
-        routes,
-        normalizedPathname,
-        build.basename
-      );
       response = await handleSingleFetchRequest(
         serverMode,
         build,
@@ -1285,7 +1295,7 @@ function derive(build, mode) {
       if (build.entry.module.handleDataRequest) {
         response = await build.entry.module.handleDataRequest(response, {
           context: loadContext,
-          params: singleFetchMatches ? singleFetchMatches[0].params : {},
+          params: matches ? matches[0].params : {},
           request
         });
         if (isRedirectResponse(response)) {
@@ -1335,15 +1345,13 @@ function derive(build, mode) {
     }
     return response;
   };
-  if (build.entry.module.unstable_instrumentations) {
+  if (build.entry.module.instrumentations) {
     requestHandler = instrumentHandler(
       requestHandler,
-      build.entry.module.unstable_instrumentations.map((i) => i.handler).filter(Boolean)
+      build.entry.module.instrumentations.map((i) => i.handler).filter(Boolean)
     );
   }
   return {
-    routes,
-    dataRoutes,
     serverMode,
     staticHandler,
     errorHandler,
@@ -1352,7 +1360,6 @@ function derive(build, mode) {
 }
 var createRequestHandler = (build, mode) => {
   let _build;
-  let routes;
   let serverMode;
   let staticHandler;
   let errorHandler;
@@ -1361,14 +1368,12 @@ var createRequestHandler = (build, mode) => {
     _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) {
+    } else if (!serverMode || !staticHandler || !errorHandler || !_requestHandler) {
       let derived = derive(_build, mode);
-      routes = derived.routes;
       serverMode = derived.serverMode;
       staticHandler = derived.staticHandler;
       errorHandler = derived.errorHandler;
@@ -1377,7 +1382,7 @@ var createRequestHandler = (build, mode) => {
     return _requestHandler(request, initialContext);
   };
 };
-async function handleManifestRequest(build, routes, url) {
+async function handleManifestRequest(build, dataRoutes, branches, url) {
   if (build.assets.version !== url.searchParams.get("version")) {
     return new Response(null, {
       status: 204,
@@ -1386,6 +1391,12 @@ async function handleManifestRequest(build, routes, url) {
       }
     });
   }
+  if (url.toString().length > URL_LIMIT) {
+    return new Response(null, {
+      statusText: "Bad Request",
+      status: 400
+    });
+  }
   let patches = {};
   if (url.searchParams.has("paths")) {
     let paths = /* @__PURE__ */ new Set();
@@ -1402,7 +1413,13 @@ async function handleManifestRequest(build, routes, url) {
       });
     });
     for (let path of paths) {
-      let matches = matchServerRoutes(routes, path, build.basename);
+      let matches = matchServerRoutes(
+        build.routes,
+        dataRoutes,
+        branches,
+        path,
+        build.basename
+      );
       if (matches) {
         for (let match of matches) {
           let routeId = match.route.id;
@@ -1470,7 +1487,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
           return new Response(null, { status: 500 });
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     if (!isResponse(result)) {
       result = await renderHtml(result, isSpaMode);
@@ -1603,7 +1620,7 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
           return handleQueryRouteError(error);
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryRouteResult(result);
   } catch (error) {
@@ -2430,10 +2447,9 @@ function RSCStaticRouter({ getPayload }) {
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
       v8_middleware: false,
-      unstable_subResourceIntegrity: false,
       unstable_trailingSlashAwareDataRequests: true,
       // always on for RSC
-      unstable_passThroughRequests: true
+      v8_passThroughRequests: true
       // always on for RSC
     },
     isSpaMode: false,