react-router 0.0.0-experimental-795b50c5b → 0.0.0-experimental-4cf5bd08c

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # `react-router`
 
+## 7.9.1
+
+### Patch Changes
+
+- Fix internal `Future` interface naming from `middleware` -> `v8_middleware` ([#14327](https://github.com/remix-run/react-router/pull/14327))
+
+## 7.9.0
+
+### Minor Changes
+
+- Stabilize middleware and context APIs. ([#14215](https://github.com/remix-run/react-router/pull/14215))
+
+  We have removed the `unstable_` prefix from the following APIs and they are now considered stable and ready for production use:
+  - [`RouterContextProvider`](https://reactrouter.com/api/utils/RouterContextProvider)
+  - [`createContext`](https://reactrouter.com/api/utils/createContext)
+  - `createBrowserRouter` [`getContext`](https://reactrouter.com/api/data-routers/createBrowserRouter#optsgetcontext) option
+  - `<HydratedRouter>` [`getContext`](https://reactrouter.com/api/framework-routers/HydratedRouter#getcontext) prop
+
+  Please see the [Middleware Docs](https://reactrouter.com/how-to/middleware), the [Middleware RFC](https://github.com/remix-run/remix/discussions/7642), and the [Client-side Context RFC](https://github.com/remix-run/react-router/discussions/9856) for more information.
+
+### Patch Changes
+
+- Escape HTML in `meta()` JSON-LD content ([#14316](https://github.com/remix-run/react-router/pull/14316))
+- Add react-server Await component implementation ([#14261](https://github.com/remix-run/react-router/pull/14261))
+- In RSC Data Mode when using a custom basename, fix hydration errors for routes that only have client loaders ([#14264](https://github.com/remix-run/react-router/pull/14264))
+- Make `href` function available in a react-server context ([#14262](https://github.com/remix-run/react-router/pull/14262))
+- decode each time `getPayload()` is called to allow for "in-context" decoding and hoisting of contextual assets ([#14248](https://github.com/remix-run/react-router/pull/14248))
+- `href()` now correctly processes routes that have an extension after the parameter or are a single optional parameter. ([#13797](https://github.com/remix-run/react-router/pull/13797))
+
 ## 7.8.2
 
 ### Patch Changes

package/dist/development/{chunk-7T5JZQAV.mjs → chunk-JGV7YEW2.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-795b50c5b
+ * react-router v0.0.0-experimental-4cf5bd08c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2437,6 +2437,10 @@ function createRouter(init) {
     }
     return state.fetchers.get(key) || IDLE_FETCHER;
   }
+  function resetFetcher(key, opts) {
+    abortFetcher(key, opts?.reason);
+    updateFetcherState(key, getDoneFetcher(null));
+  }
   function deleteFetcher(key) {
     let fetcher = state.fetchers.get(key);
     if (fetchControllers.has(key) && !(fetcher && fetcher.state === "loading" && fetchReloadIds.has(key))) {
@@ -2459,10 +2463,10 @@ function createRouter(init) {
     }
     updateState({ fetchers: new Map(state.fetchers) });
   }
-  function abortFetcher(key) {
+  function abortFetcher(key, reason) {
     let controller = fetchControllers.get(key);
     if (controller) {
-      controller.abort();
+      controller.abort(reason);
       fetchControllers.delete(key);
     }
   }
@@ -2726,6 +2730,7 @@ function createRouter(init) {
     createHref: (to) => init.history.createHref(to),
     encodeLocation: (to) => init.history.encodeLocation(to),
     getFetcher,
+    resetFetcher,
     deleteFetcher: queueFetcherForDeletion,
     dispose,
     getBlocker,
@@ -2835,7 +2840,7 @@ function createStaticHandler(routes, opts) {
                   dataStrategy || null,
                   skipLoaderErrorBubbling === true,
                   null,
-                  "filterMatchesToLoad" in opts2 ? opts2.filterMatchesToLoad ?? null : null,
+                  "filterMatchesToLoad" in opts2 ? opts2.filterMatchesToLoad ?? null : filterMatchesToLoad ?? null,
                   skipRevalidation === true
                 );
                 if (isResponse(result2)) {
@@ -5143,13 +5148,23 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
         params: Object.assign({}, parentParams, match.params),
         pathname: joinPaths([
           parentPathnameBase,
-          // Re-encode pathnames that were decoded inside matchRoutes
-          navigator.encodeLocation ? navigator.encodeLocation(match.pathname).pathname : match.pathname
+          // Re-encode pathnames that were decoded inside matchRoutes.
+          // Pre-encode `?` and `#` ahead of `encodeLocation` because it uses
+          // `new URL()` internally and we need to prevent it from treating
+          // them as separators
+          navigator.encodeLocation ? navigator.encodeLocation(
+            match.pathname.replace(/\?/g, "%3F").replace(/#/g, "%23")
+          ).pathname : match.pathname
         ]),
         pathnameBase: match.pathnameBase === "/" ? parentPathnameBase : joinPaths([
           parentPathnameBase,
           // Re-encode pathnames that were decoded inside matchRoutes
-          navigator.encodeLocation ? navigator.encodeLocation(match.pathnameBase).pathname : match.pathnameBase
+          // Pre-encode `?` and `#` ahead of `encodeLocation` because it uses
+          // `new URL()` internally and we need to prevent it from treating
+          // them as separators
+          navigator.encodeLocation ? navigator.encodeLocation(
+            match.pathnameBase.replace(/\?/g, "%3F").replace(/#/g, "%23")
+          ).pathname : match.pathnameBase
         ])
       })
     ),
@@ -6998,9 +7013,6 @@ var ESCAPE_REGEX = /[&><\u2028\u2029]/g;
 function escapeHtml(html) {
   return html.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
 }
-function createHtml(html) {
-  return { __html: html };
-}
 
 // lib/dom/ssr/invariant.ts
 function invariant2(value, message) {
@@ -8676,7 +8688,7 @@ function Meta() {
           {
             key: `script:ld+json:${json}`,
             type: "application/ld+json",
-            dangerouslySetInnerHTML: { __html: json }
+            dangerouslySetInnerHTML: { __html: escapeHtml(json) }
           }
         );
       } catch (err) {
@@ -8781,7 +8793,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
       {
         ...scriptProps,
         suppressHydrationWarning: true,
-        dangerouslySetInnerHTML: createHtml(contextScript),
+        dangerouslySetInnerHTML: { __html: contextScript },
         type: void 0
       }
     ), /* @__PURE__ */ React8.createElement(
@@ -8789,7 +8801,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
       {
         ...scriptProps,
         suppressHydrationWarning: true,
-        dangerouslySetInnerHTML: createHtml(routeModulesScript),
+        dangerouslySetInnerHTML: { __html: routeModulesScript },
         type: "module",
         async: true
       }
@@ -8967,7 +8979,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "0.0.0-experimental-795b50c5b";
+    "0.0.0-experimental-4cf5bd08c";
   }
 } catch (e) {
 }
@@ -9581,6 +9593,7 @@ function useFetcher({
     },
     [fetcherKey, submitImpl]
   );
+  let unstable_reset = React10.useCallback((opts) => router.resetFetcher(fetcherKey, opts), [router, fetcherKey]);
   let FetcherForm = React10.useMemo(() => {
     let FetcherForm2 = React10.forwardRef(
       (props, ref) => {
@@ -9597,10 +9610,11 @@ function useFetcher({
       Form: FetcherForm,
       submit,
       load,
+      unstable_reset,
       ...fetcher,
       data: data2
     }),
-    [FetcherForm, submit, load, fetcher, data2]
+    [FetcherForm, submit, load, unstable_reset, fetcher, data2]
   );
   return fetcherWithComponents;
 }
@@ -10011,6 +10025,9 @@ function createStaticRouter(routes, context, opts = {}) {
     deleteFetcher() {
       throw msg("deleteFetcher");
     },
+    resetFetcher() {
+      throw msg("resetFetcher");
+    },
     dispose() {
       throw msg("dispose");
     },
@@ -10142,6 +10159,7 @@ export {
   WithErrorBoundaryProps,
   withErrorBoundaryProps,
   createSearchParams,
+  escapeHtml,
   encode,
   createRequestInit,
   SingleFetchRedirectSymbol,

package/dist/development/{chunk-KHKNSFUT.mjs → chunk-LRHWL6QF.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-795b50c5b
+ * react-router v0.0.0-experimental-4cf5bd08c
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -33,6 +33,7 @@ import {
   createStaticRouter,
   decodeViaTurboStream,
   encode,
+  escapeHtml,
   getManifestPath,
   getSingleFetchDataStrategyImpl,
   getStaticContextFromError,
@@ -58,7 +59,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-7T5JZQAV.mjs";
+} from "./chunk-JGV7YEW2.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -677,19 +678,6 @@ function createStaticHandlerDataRoutes(manifest, future, parentId = "", routesBy
   });
 }
 
-// lib/server-runtime/markup.ts
-var ESCAPE_LOOKUP = {
-  "&": "\\u0026",
-  ">": "\\u003e",
-  "<": "\\u003c",
-  "\u2028": "\\u2028",
-  "\u2029": "\\u2029"
-};
-var ESCAPE_REGEX = /[&><\u2028\u2029]/g;
-function escapeHtml(html) {
-  return html.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
-}
-
 // lib/server-runtime/serverHandoff.ts
 function createServerHandoffString(serverHandoff) {
   return escapeHtml(JSON.stringify(serverHandoff));
@@ -1686,7 +1674,14 @@ import * as React4 from "react";
 import * as ReactDOM from "react-dom";
 
 // lib/dom/ssr/hydration.tsx
-function getHydrationData(state, routes, getRouteInfo, location2, basename, isSpaMode) {
+function getHydrationData({
+  state,
+  routes,
+  getRouteInfo,
+  location: location2,
+  basename,
+  isSpaMode
+}) {
   let hydrationData = {
     ...state,
     loaderData: { ...state.loaderData }
@@ -1979,14 +1974,14 @@ function createRouterFromPayload({
     getContext,
     basename: payload.basename,
     history: createBrowserHistory(),
-    hydrationData: getHydrationData(
-      {
+    hydrationData: getHydrationData({
+      state: {
         loaderData: payload.loaderData,
         actionData: payload.actionData,
         errors: payload.errors
       },
       routes,
-      (routeId) => {
+      getRouteInfo: (routeId) => {
         let match = payload.matches.find((m) => m.id === routeId);
         invariant(match, "Route not found in payload");
         return {
@@ -1995,10 +1990,10 @@ function createRouterFromPayload({
           hasHydrateFallback: match.hydrateFallbackElement != null
         };
       },
-      payload.location,
-      void 0,
-      false
-    ),
+      location: payload.location,
+      basename: payload.basename,
+      isSpaMode: false
+    }),
     async patchRoutesOnNavigation({ path, signal }) {
       if (discoveredPaths.has(path)) {
         return;