@tanstack/react-router 1.34.2 → 1.34.5

package/src/awaited.tsx

@@ -116,8 +116,7 @@ function AwaitInner<T>(
   if (window.__TSR__ROUTER__) {
     let deferred = window.__TSR__ROUTER__.getDeferred('${state.uid}');
     if (deferred) deferred.resolve(window.__TSR__DEFERRED__${state.uid});
-  }
-  document.querySelectorAll('.tsr-script-once').forEach((el) => el.parentElement.removeChild(el));`}
+  }`}
         />
       ) : null}
       {props.children(data)}
@@ -125,7 +124,7 @@ function AwaitInner<T>(
   )
 }
 
-function ScriptOnce({
+export function ScriptOnce({
   className,
   children,
   ...rest
@@ -135,7 +134,10 @@ function ScriptOnce({
       {...rest}
       className={`tsr-script-once ${className || ''}`}
       dangerouslySetInnerHTML={{
-        __html: children,
+        __html: [
+          children,
+          `document.querySelectorAll('.tsr-script-once').forEach((el) => el.parentElement.removeChild(el));`,
+        ].join('\n'),
       }}
     />
   )

package/src/index.tsx

@@ -12,7 +12,7 @@ export {
 } from '@tanstack/history'
 export { default as invariant } from 'tiny-invariant'
 export { default as warning } from 'tiny-warning'
-export { useAwaited, Await, type AwaitOptions } from './awaited'
+export { useAwaited, Await, type AwaitOptions, ScriptOnce } from './awaited'
 export {
   defer,
   isDehydratedDeferred,

package/src/router.ts

@@ -7,7 +7,6 @@ import { defaultParseSearch, defaultStringifySearch } from './searchParams'
 import {
   createControlledPromise,
   deepEqual,
-  escapeJSON,
   functionalUpdate,
   last,
   pick,
@@ -421,6 +420,12 @@ export const componentTypes = [
 ] as const
 
 export type RouterEvents = {
+  onBeforeNavigate: {
+    type: 'onBeforeNavigate'
+    fromLocation: ParsedLocation
+    toLocation: ParsedLocation
+    pathChanged: boolean
+  }
   onBeforeLoad: {
     type: 'onBeforeLoad'
     fromLocation: ParsedLocation
@@ -1374,7 +1379,7 @@ export class Router<
     })
   }
 
-  navigate: NavigateFn = ({ from, to, ...rest }) => {
+  navigate: NavigateFn = ({ from, to, __isRedirect, ...rest }) => {
     // If this link simply reloads the current route,
     // make sure it has a new key so it will trigger a data refresh
 
@@ -1423,13 +1428,6 @@ export class Router<
         // Cancel any pending matches
         this.cancelMatches()
 
-        this.emit({
-          type: 'onBeforeLoad',
-          fromLocation: prevLocation,
-          toLocation: next,
-          pathChanged: pathDidChange,
-        })
-
         let pendingMatches!: Array<AnyRouteMatch>
 
         this.__store.batch(() => {
@@ -1454,6 +1452,22 @@ export class Router<
           }))
         })
 
+        if (!this.state.redirect) {
+          this.emit({
+            type: 'onBeforeNavigate',
+            fromLocation: prevLocation,
+            toLocation: next,
+            pathChanged: pathDidChange,
+          })
+        }
+
+        this.emit({
+          type: 'onBeforeLoad',
+          fromLocation: prevLocation,
+          toLocation: next,
+          pathChanged: pathDidChange,
+        })
+
         await this.loadMatches({
           matches: pendingMatches,
           location: next,
@@ -1516,7 +1530,7 @@ export class Router<
         if (isResolvedRedirect(err)) {
           redirect = err
           if (!this.isServer) {
-            this.navigate({ ...err, replace: true })
+            this.navigate({ ...err, replace: true, __isRedirect: true })
             this.load()
           }
         } else if (isNotFound(err)) {
@@ -2231,11 +2245,6 @@ export class Router<
     return match
   }
 
-  /**
-   * @deprecated Injecting HTML directly is no longer supported. Use the new <ScriptOnce /> component instead.
-   */
-  injectHtml = async (html: string | (() => Promise<string> | string)) => {}
-
   // We use a token -> weak map to keep track of deferred promises
   // that are registered on the server and need to be resolved
   registeredDeferredsIds = new Map<string, {}>()