@bleedingdev/modern-js-plugin-tanstack 3.4.0-ultramodern.2 → 3.4.0-ultramodern.20

package/dist/cjs/cli/index.js

@@ -73,7 +73,7 @@ var __webpack_exports__ = {};
     function getRuntimeRouterCli() {
         if (runtimeRouterCli) return runtimeRouterCli;
         const cli = __webpack_require__("@modern-js/runtime/cli");
-        if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner) {
+        if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner && cli.updateNestedRoutesSpec) {
             runtimeRouterCli = cli;
             return runtimeRouterCli;
         }
@@ -284,11 +284,8 @@ ${canonicalRoutesAugmentation}`;
                     if (isTanstackEntrypoint(entrypoint)) {
                         const { distDirectory } = api.getAppContext();
                         const nestedRoutesSpecPath = external_node_path_default().resolve(distDirectory, utils_namespaceObject.NESTED_ROUTE_SPEC_FILE);
-                        const existingNestedRoutes = await utils_namespaceObject.fs.pathExists(nestedRoutesSpecPath) ? await utils_namespaceObject.fs.readJSON(nestedRoutesSpecPath) : {};
-                        await utils_namespaceObject.fs.outputJSON(nestedRoutesSpecPath, {
-                            ...existingNestedRoutes,
-                            ...nestedRoutesForServer
-                        });
+                        const { updateNestedRoutesSpec } = getRuntimeRouterCli();
+                        await updateNestedRoutesSpec(nestedRoutesSpecPath, nestedRoutesForServer);
                     }
                     return {
                         entrypoint,

package/dist/cjs/runtime/index.js

@@ -18,6 +18,9 @@ var __webpack_modules__ = {
     "./register" (module) {
         module.exports = require("./register.js");
     },
+    "./routeHooks" (module) {
+        module.exports = require("./routeHooks.js");
+    },
     "./state" (module) {
         module.exports = require("./state.js");
     },
@@ -80,17 +83,22 @@ var __webpack_exports__ = {};
     var __rspack_reexport = {};
     for(const __rspack_import_key in _tanstack_react_router__rspack_import_1)if ([
         "throwTanstackRedirect",
+        "useParentMatches",
         "useFetcher",
         "modernLoaderToTanstack",
         "createRouteStaticData",
+        "useMatches",
+        "useRouterState",
         "Form",
         "Link",
         "default",
         "isAbsoluteUrl",
         "NavLink",
         "getModernTanstackRouterFastDefaults",
-        "modernTanstackRouterFastDefaults",
+        "useChildMatches",
         "tanstackRouterPlugin",
+        "useMatch",
+        "modernTanstackRouterFastDefaults",
         "RouteActionResponseError",
         "Outlet",
         "getTanstackRouterState"
@@ -101,8 +109,9 @@ var __webpack_exports__ = {};
     var _outlet__rspack_import_4 = __webpack_require__("./outlet");
     var _plugin__rspack_import_5 = __webpack_require__("./plugin");
     var _prefetchLink__rspack_import_6 = __webpack_require__("./prefetchLink");
-    var _state__rspack_import_7 = __webpack_require__("./state");
-    var _types__rspack_import_8 = __webpack_require__("./types");
+    var _routeHooks__rspack_import_7 = __webpack_require__("./routeHooks");
+    var _state__rspack_import_8 = __webpack_require__("./state");
+    var _types__rspack_import_9 = __webpack_require__("./types");
     __webpack_require__.d(__webpack_exports__, {
         Form: ()=>_dataMutation__rspack_import_2.Form,
         Link: ()=>_prefetchLink__rspack_import_6.Link,
@@ -111,14 +120,19 @@ var __webpack_exports__ = {};
         RouteActionResponseError: ()=>_dataMutation__rspack_import_2.RouteActionResponseError,
         createRouteStaticData: ()=>_loaderBridge__rspack_import_3.createRouteStaticData,
         default: ()=>_plugin__rspack_import_5.tanstackRouterPlugin,
-        getModernTanstackRouterFastDefaults: ()=>_types__rspack_import_8.getModernTanstackRouterFastDefaults,
-        getTanstackRouterState: ()=>_state__rspack_import_7.getTanstackRouterState,
+        getModernTanstackRouterFastDefaults: ()=>_types__rspack_import_9.getModernTanstackRouterFastDefaults,
+        getTanstackRouterState: ()=>_state__rspack_import_8.getTanstackRouterState,
         isAbsoluteUrl: ()=>_loaderBridge__rspack_import_3.isAbsoluteUrl,
         modernLoaderToTanstack: ()=>_loaderBridge__rspack_import_3.modernLoaderToTanstack,
-        modernTanstackRouterFastDefaults: ()=>_types__rspack_import_8.modernTanstackRouterFastDefaults,
+        modernTanstackRouterFastDefaults: ()=>_types__rspack_import_9.modernTanstackRouterFastDefaults,
         tanstackRouterPlugin: ()=>_plugin__rspack_import_5.tanstackRouterPlugin,
         throwTanstackRedirect: ()=>_loaderBridge__rspack_import_3.throwTanstackRedirect,
-        useFetcher: ()=>_dataMutation__rspack_import_2.useFetcher
+        useChildMatches: ()=>_routeHooks__rspack_import_7.useChildMatches,
+        useFetcher: ()=>_dataMutation__rspack_import_2.useFetcher,
+        useMatch: ()=>_routeHooks__rspack_import_7.useMatch,
+        useMatches: ()=>_routeHooks__rspack_import_7.useMatches,
+        useParentMatches: ()=>_routeHooks__rspack_import_7.useParentMatches,
+        useRouterState: ()=>_routeHooks__rspack_import_7.useRouterState
     });
 })();
 exports.Form = __webpack_exports__.Form;
@@ -135,7 +149,12 @@ exports.modernLoaderToTanstack = __webpack_exports__.modernLoaderToTanstack;
 exports.modernTanstackRouterFastDefaults = __webpack_exports__.modernTanstackRouterFastDefaults;
 exports.tanstackRouterPlugin = __webpack_exports__.tanstackRouterPlugin;
 exports.throwTanstackRedirect = __webpack_exports__.throwTanstackRedirect;
+exports.useChildMatches = __webpack_exports__.useChildMatches;
 exports.useFetcher = __webpack_exports__.useFetcher;
+exports.useMatch = __webpack_exports__.useMatch;
+exports.useMatches = __webpack_exports__.useMatches;
+exports.useParentMatches = __webpack_exports__.useParentMatches;
+exports.useRouterState = __webpack_exports__.useRouterState;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "Form",
     "Link",
@@ -151,7 +170,12 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "modernTanstackRouterFastDefaults",
     "tanstackRouterPlugin",
     "throwTanstackRedirect",
-    "useFetcher"
+    "useChildMatches",
+    "useFetcher",
+    "useMatch",
+    "useMatches",
+    "useParentMatches",
+    "useRouterState"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/runtime/plugin.js

@@ -43,6 +43,7 @@ const external_lifecycle_js_namespaceObject = require("./lifecycle.js");
 const external_outlet_js_namespaceObject = require("./outlet.js");
 const external_pluginCore_js_namespaceObject = require("./pluginCore.js");
 const external_prefetchLink_js_namespaceObject = require("./prefetchLink.js");
+const external_routeHooks_js_namespaceObject = require("./routeHooks.js");
 const external_routeTree_js_namespaceObject = require("./routeTree.js");
 const client_js_namespaceObject = require("./rsc/client.js");
 const external_types_js_namespaceObject = require("./types.js");
@@ -253,7 +254,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                 }
                 context.router = {
                     Link: external_prefetchLink_js_namespaceObject.Link,
-                    useMatches: react_router_namespaceObject.useMatches,
+                    useMatches: external_routeHooks_js_namespaceObject.useMatches,
                     useLocation: react_router_namespaceObject.useLocation,
                     useNavigate: react_router_namespaceObject.useNavigate,
                     useRouter: react_router_namespaceObject.useRouter

package/dist/cjs/runtime/routeHooks.js

@@ -0,0 +1,72 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    useChildMatches: ()=>useChildMatches,
+    useMatch: ()=>useMatch,
+    useMatches: ()=>useMatches,
+    useParentMatches: ()=>useParentMatches,
+    useRouterState: ()=>useRouterState
+});
+const react_router_namespaceObject = require("@tanstack/react-router");
+const withWholeObjectStructuralSharingGuard = (options)=>{
+    if (void 0 !== options && (void 0 !== options.select || void 0 !== options.structuralSharing)) return options;
+    if (void 0 === options) return {
+        structuralSharing: false
+    };
+    return {
+        ...options,
+        structuralSharing: false
+    };
+};
+const useMatchWithWholeObjectGuard = (options)=>(0, react_router_namespaceObject.useMatch)(withWholeObjectStructuralSharingGuard(options));
+const useMatchesWithWholeObjectGuard = (options)=>(0, react_router_namespaceObject.useMatches)(withWholeObjectStructuralSharingGuard(options));
+const useParentMatchesWithWholeObjectGuard = (options)=>(0, react_router_namespaceObject.useParentMatches)(withWholeObjectStructuralSharingGuard(options));
+const useChildMatchesWithWholeObjectGuard = (options)=>(0, react_router_namespaceObject.useChildMatches)(withWholeObjectStructuralSharingGuard(options));
+const useRouterStateWithWholeObjectGuard = (options)=>(0, react_router_namespaceObject.useRouterState)(withWholeObjectStructuralSharingGuard(options));
+const useMatch = useMatchWithWholeObjectGuard;
+const useMatches = useMatchesWithWholeObjectGuard;
+const useParentMatches = useParentMatchesWithWholeObjectGuard;
+const useChildMatches = useChildMatchesWithWholeObjectGuard;
+const useRouterState = useRouterStateWithWholeObjectGuard;
+exports.useChildMatches = __webpack_exports__.useChildMatches;
+exports.useMatch = __webpack_exports__.useMatch;
+exports.useMatches = __webpack_exports__.useMatches;
+exports.useParentMatches = __webpack_exports__.useParentMatches;
+exports.useRouterState = __webpack_exports__.useRouterState;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "useChildMatches",
+    "useMatch",
+    "useMatches",
+    "useParentMatches",
+    "useRouterState"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/esm/cli/index.mjs

@@ -16,7 +16,7 @@ let runtimeRouterCli;
 function getRuntimeRouterCli() {
     if (runtimeRouterCli) return runtimeRouterCli;
     const cli = __webpack_require__(2320);
-    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner) {
+    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner && cli.updateNestedRoutesSpec) {
         runtimeRouterCli = cli;
         return runtimeRouterCli;
     }
@@ -227,11 +227,8 @@ function tanstackRouterPlugin(options = {}) {
                 if (isTanstackEntrypoint(entrypoint)) {
                     const { distDirectory } = api.getAppContext();
                     const nestedRoutesSpecPath = node_path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE);
-                    const existingNestedRoutes = await fs.pathExists(nestedRoutesSpecPath) ? await fs.readJSON(nestedRoutesSpecPath) : {};
-                    await fs.outputJSON(nestedRoutesSpecPath, {
-                        ...existingNestedRoutes,
-                        ...nestedRoutesForServer
-                    });
+                    const { updateNestedRoutesSpec } = getRuntimeRouterCli();
+                    await updateNestedRoutesSpec(nestedRoutesSpecPath, nestedRoutesForServer);
                 }
                 return {
                     entrypoint,

package/dist/esm/runtime/index.mjs

@@ -5,5 +5,6 @@ export { createRouteStaticData, isAbsoluteUrl, modernLoaderToTanstack, throwTans
 export { Outlet } from "./outlet.mjs";
 export { tanstackRouterPlugin as default, tanstackRouterPlugin } from "./plugin.mjs";
 export { Link, NavLink } from "./prefetchLink.mjs";
+export { useChildMatches, useMatch, useMatches, useParentMatches, useRouterState } from "./routeHooks.mjs";
 export { getTanstackRouterState } from "./state.mjs";
 export { getModernTanstackRouterFastDefaults, modernTanstackRouterFastDefaults } from "./types.mjs";

package/dist/esm/runtime/plugin.mjs

@@ -1,7 +1,7 @@
 import { jsx } from "react/jsx-runtime";
 import { InternalRuntimeContext, getGlobalEnableRsc } from "@modern-js/runtime/context";
 import { normalizePathname } from "@modern-js/runtime-utils/url";
-import { RouterProvider, createBrowserHistory, createHashHistory, createRouter, useLocation, useMatches, useNavigate, useRouter } from "@tanstack/react-router";
+import { RouterProvider, createBrowserHistory, createHashHistory, createRouter, useLocation, useNavigate, useRouter } from "@tanstack/react-router";
 import { useContext, useMemo } from "react";
 import { createModernBasepathRewrite } from "./basepathRewrite.mjs";
 import { routerProviderRegistryHooks } from "./hooks.mjs";
@@ -10,6 +10,7 @@ import { applyRouterRuntimeState } from "./lifecycle.mjs";
 import { withModernRouteMatchContext } from "./outlet.mjs";
 import { getFinalRouteConfig, getMergedRouterConfig } from "./pluginCore.mjs";
 import { Link } from "./prefetchLink.mjs";
+import { useMatches } from "./routeHooks.mjs";
 import { createRouteTreeFromRouteObjects } from "./routeTree.mjs";
 import { getTanstackRscSerializationAdapters } from "./rsc/client.mjs";
 import { getModernTanstackRouterFastDefaults } from "./types.mjs";

package/dist/esm/runtime/routeHooks.mjs

@@ -0,0 +1,22 @@
+import { useChildMatches, useMatch, useMatches, useParentMatches, useRouterState } from "@tanstack/react-router";
+const withWholeObjectStructuralSharingGuard = (options)=>{
+    if (void 0 !== options && (void 0 !== options.select || void 0 !== options.structuralSharing)) return options;
+    if (void 0 === options) return {
+        structuralSharing: false
+    };
+    return {
+        ...options,
+        structuralSharing: false
+    };
+};
+const useMatchWithWholeObjectGuard = (options)=>useMatch(withWholeObjectStructuralSharingGuard(options));
+const useMatchesWithWholeObjectGuard = (options)=>useMatches(withWholeObjectStructuralSharingGuard(options));
+const useParentMatchesWithWholeObjectGuard = (options)=>useParentMatches(withWholeObjectStructuralSharingGuard(options));
+const useChildMatchesWithWholeObjectGuard = (options)=>useChildMatches(withWholeObjectStructuralSharingGuard(options));
+const useRouterStateWithWholeObjectGuard = (options)=>useRouterState(withWholeObjectStructuralSharingGuard(options));
+const routeHooks_useMatch = useMatchWithWholeObjectGuard;
+const routeHooks_useMatches = useMatchesWithWholeObjectGuard;
+const routeHooks_useParentMatches = useParentMatchesWithWholeObjectGuard;
+const routeHooks_useChildMatches = useChildMatchesWithWholeObjectGuard;
+const routeHooks_useRouterState = useRouterStateWithWholeObjectGuard;
+export { routeHooks_useChildMatches as useChildMatches, routeHooks_useMatch as useMatch, routeHooks_useMatches as useMatches, routeHooks_useParentMatches as useParentMatches, routeHooks_useRouterState as useRouterState };

package/dist/esm-node/cli/index.mjs

@@ -20,7 +20,7 @@ let runtimeRouterCli;
 function getRuntimeRouterCli() {
     if (runtimeRouterCli) return runtimeRouterCli;
     const cli = __webpack_require__("@modern-js/runtime/cli?9b14");
-    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner) {
+    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner && cli.updateNestedRoutesSpec) {
         runtimeRouterCli = cli;
         return runtimeRouterCli;
     }
@@ -231,11 +231,8 @@ function tanstackRouterPlugin(options = {}) {
                 if (isTanstackEntrypoint(entrypoint)) {
                     const { distDirectory } = api.getAppContext();
                     const nestedRoutesSpecPath = node_path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE);
-                    const existingNestedRoutes = await fs.pathExists(nestedRoutesSpecPath) ? await fs.readJSON(nestedRoutesSpecPath) : {};
-                    await fs.outputJSON(nestedRoutesSpecPath, {
-                        ...existingNestedRoutes,
-                        ...nestedRoutesForServer
-                    });
+                    const { updateNestedRoutesSpec } = getRuntimeRouterCli();
+                    await updateNestedRoutesSpec(nestedRoutesSpecPath, nestedRoutesForServer);
                 }
                 return {
                     entrypoint,

package/dist/esm-node/runtime/index.mjs

@@ -6,5 +6,6 @@ export { createRouteStaticData, isAbsoluteUrl, modernLoaderToTanstack, throwTans
 export { Outlet } from "./outlet.mjs";
 export { tanstackRouterPlugin as default, tanstackRouterPlugin } from "./plugin.mjs";
 export { Link, NavLink } from "./prefetchLink.mjs";
+export { useChildMatches, useMatch, useMatches, useParentMatches, useRouterState } from "./routeHooks.mjs";
 export { getTanstackRouterState } from "./state.mjs";
 export { getModernTanstackRouterFastDefaults, modernTanstackRouterFastDefaults } from "./types.mjs";

package/dist/esm-node/runtime/plugin.mjs

@@ -2,7 +2,7 @@ import "node:module";
 import { jsx } from "react/jsx-runtime";
 import { InternalRuntimeContext, getGlobalEnableRsc } from "@modern-js/runtime/context";
 import { normalizePathname } from "@modern-js/runtime-utils/url";
-import { RouterProvider, createBrowserHistory, createHashHistory, createRouter, useLocation, useMatches, useNavigate, useRouter } from "@tanstack/react-router";
+import { RouterProvider, createBrowserHistory, createHashHistory, createRouter, useLocation, useNavigate, useRouter } from "@tanstack/react-router";
 import { useContext, useMemo } from "react";
 import { createModernBasepathRewrite } from "./basepathRewrite.mjs";
 import { routerProviderRegistryHooks } from "./hooks.mjs";
@@ -11,6 +11,7 @@ import { applyRouterRuntimeState } from "./lifecycle.mjs";
 import { withModernRouteMatchContext } from "./outlet.mjs";
 import { getFinalRouteConfig, getMergedRouterConfig } from "./pluginCore.mjs";
 import { Link } from "./prefetchLink.mjs";
+import { useMatches } from "./routeHooks.mjs";
 import { createRouteTreeFromRouteObjects } from "./routeTree.mjs";
 import { getTanstackRscSerializationAdapters } from "./rsc/client.mjs";
 import { getModernTanstackRouterFastDefaults } from "./types.mjs";

package/dist/esm-node/runtime/routeHooks.mjs

@@ -0,0 +1,23 @@
+import "node:module";
+import { useChildMatches, useMatch, useMatches, useParentMatches, useRouterState } from "@tanstack/react-router";
+const withWholeObjectStructuralSharingGuard = (options)=>{
+    if (void 0 !== options && (void 0 !== options.select || void 0 !== options.structuralSharing)) return options;
+    if (void 0 === options) return {
+        structuralSharing: false
+    };
+    return {
+        ...options,
+        structuralSharing: false
+    };
+};
+const useMatchWithWholeObjectGuard = (options)=>useMatch(withWholeObjectStructuralSharingGuard(options));
+const useMatchesWithWholeObjectGuard = (options)=>useMatches(withWholeObjectStructuralSharingGuard(options));
+const useParentMatchesWithWholeObjectGuard = (options)=>useParentMatches(withWholeObjectStructuralSharingGuard(options));
+const useChildMatchesWithWholeObjectGuard = (options)=>useChildMatches(withWholeObjectStructuralSharingGuard(options));
+const useRouterStateWithWholeObjectGuard = (options)=>useRouterState(withWholeObjectStructuralSharingGuard(options));
+const routeHooks_useMatch = useMatchWithWholeObjectGuard;
+const routeHooks_useMatches = useMatchesWithWholeObjectGuard;
+const routeHooks_useParentMatches = useParentMatchesWithWholeObjectGuard;
+const routeHooks_useChildMatches = useChildMatchesWithWholeObjectGuard;
+const routeHooks_useRouterState = useRouterStateWithWholeObjectGuard;
+export { routeHooks_useChildMatches as useChildMatches, routeHooks_useMatch as useMatch, routeHooks_useMatches as useMatches, routeHooks_useParentMatches as useParentMatches, routeHooks_useRouterState as useRouterState };

package/dist/types/runtime/index.d.ts

@@ -8,6 +8,7 @@ export { Outlet } from './outlet';
 export { tanstackRouterPlugin, tanstackRouterPlugin as default, } from './plugin';
 export type { LinkProps, NavLinkProps, PrefetchBehavior, } from './prefetchLink';
 export { Link, NavLink } from './prefetchLink';
+export { useChildMatches, useMatch, useMatches, useParentMatches, useRouterState, } from './routeHooks';
 export type { TanstackRouterState } from './state';
 export { getTanstackRouterState } from './state';
 export type { RouterConfig } from './types';

package/dist/types/runtime/routeHooks.d.ts

@@ -0,0 +1,6 @@
+import { useChildMatches as useTanstackChildMatches, useMatch as useTanstackMatch, useMatches as useTanstackMatches, useParentMatches as useTanstackParentMatches, useRouterState as useTanstackRouterState } from '@tanstack/react-router';
+export declare const useMatch: typeof useTanstackMatch;
+export declare const useMatches: typeof useTanstackMatches;
+export declare const useParentMatches: typeof useTanstackParentMatches;
+export declare const useChildMatches: typeof useTanstackChildMatches;
+export declare const useRouterState: typeof useTanstackRouterState;

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.4.0-ultramodern.2",
+  "version": "3.4.0-ultramodern.20",
   "engines": {
     "node": ">=20"
   },
@@ -77,13 +77,13 @@
     "@swc/helpers": "^0.5.23",
     "@tanstack/react-router": "1.170.16",
     "@tanstack/router-core": "1.171.13",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.4.0-ultramodern.2",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.4.0-ultramodern.2",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.2",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.4.0-ultramodern.2"
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.4.0-ultramodern.20",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.20",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.4.0-ultramodern.20",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.4.0-ultramodern.20"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.4.0-ultramodern.2",
+    "@modern-js/runtime": "3.4.0-ultramodern.20",
     "react": "^19.2.7",
     "react-dom": "^19.2.7"
   },
@@ -98,9 +98,9 @@
     "@typescript/native-preview": "7.0.0-dev.20260624.1",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.4.0-ultramodern.2",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.4.0-ultramodern.2",
-    "@scripts/rstest-config": "2.66.0"
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.4.0-ultramodern.20",
+    "@scripts/rstest-config": "2.66.0",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.4.0-ultramodern.20"
   },
   "sideEffects": [
     "./src/runtime/register.ts",

package/rstest.config.mts

@@ -28,7 +28,9 @@ export default {
         'tests/router/hooks.test.ts',
         'tests/router/loaderBridge.test.ts',
         'tests/router/packageSurface.test.ts',
+        'tests/router/preloadRedirect.test.ts',
         'tests/router/register.test.ts',
+        'tests/router/routeHooks.test.ts',
         'tests/router/rsc.test.tsx',
         'tests/router/tanstackTypes.test.ts',
         'tests/router/routeTree.test.ts',

package/src/cli/index.ts

@@ -83,6 +83,10 @@ type RuntimeRouterCliHelpers = {
     },
   ) => Promise<Entrypoint[]>;
   isRouteEntry: (dir: string, routesDir?: string) => string | false;
+  updateNestedRoutesSpec: (
+    specPath: string,
+    nextRoutes: Record<string, unknown>,
+  ) => Promise<void>;
 };
 
 let runtimeRouterCli: RuntimeRouterCliHelpers | undefined;
@@ -97,7 +101,8 @@ function getRuntimeRouterCli(): RuntimeRouterCliHelpers {
   if (
     cli.handleGeneratorEntryCode &&
     cli.getEntrypointRoutesDir &&
-    cli.getEntrypointRoutesOwner
+    cli.getEntrypointRoutesOwner &&
+    cli.updateNestedRoutesSpec
   ) {
     runtimeRouterCli = cli as RuntimeRouterCliHelpers;
     return runtimeRouterCli;
@@ -497,19 +502,11 @@ export function tanstackRouterPlugin(
             distDirectory,
             NESTED_ROUTE_SPEC_FILE,
           );
-          const existingNestedRoutes = (await fs.pathExists(
+          const { updateNestedRoutesSpec } = getRuntimeRouterCli();
+          await updateNestedRoutesSpec(
             nestedRoutesSpecPath,
-          ))
-            ? ((await fs.readJSON(nestedRoutesSpecPath)) as Record<
-                string,
-                unknown
-              >)
-            : {};
-
-          await fs.outputJSON(nestedRoutesSpecPath, {
-            ...existingNestedRoutes,
-            ...nestedRoutesForServer,
-          });
+            nestedRoutesForServer,
+          );
         }
 
         return {

package/src/runtime/index.tsx

@@ -31,6 +31,13 @@ export type {
   PrefetchBehavior,
 } from './prefetchLink';
 export { Link, NavLink } from './prefetchLink';
+export {
+  useChildMatches,
+  useMatch,
+  useMatches,
+  useParentMatches,
+  useRouterState,
+} from './routeHooks';
 export type { TanstackRouterState } from './state';
 export { getTanstackRouterState } from './state';
 export type { RouterConfig } from './types';

package/src/runtime/plugin.tsx

@@ -15,7 +15,6 @@ import {
   createRouter,
   RouterProvider,
   useLocation,
-  useMatches,
   useNavigate,
   useRouter,
 } from '@tanstack/react-router';
@@ -35,6 +34,7 @@ import {
   type TanstackRouterRuntimePlugin,
 } from './pluginCore';
 import { Link } from './prefetchLink';
+import { useMatches } from './routeHooks';
 import { createRouteTreeFromRouteObjects } from './routeTree';
 import { getTanstackRscSerializationAdapters } from './rsc/client';
 import {

package/src/runtime/routeHooks.ts

@@ -0,0 +1,92 @@
+import {
+  useChildMatches as useTanstackChildMatches,
+  useMatch as useTanstackMatch,
+  useMatches as useTanstackMatches,
+  useParentMatches as useTanstackParentMatches,
+  useRouterState as useTanstackRouterState,
+} from '@tanstack/react-router';
+
+type WholeObjectStructuralSharingOptions = {
+  readonly select?: unknown;
+  readonly structuralSharing?: boolean;
+};
+
+const withWholeObjectStructuralSharingGuard = <
+  TOptions extends WholeObjectStructuralSharingOptions | undefined,
+>(
+  options: TOptions,
+): TOptions | WholeObjectStructuralSharingOptions => {
+  if (
+    options !== undefined &&
+    (options.select !== undefined || options.structuralSharing !== undefined)
+  ) {
+    return options;
+  }
+
+  if (options === undefined) {
+    return { structuralSharing: false };
+  }
+
+  return {
+    ...options,
+    structuralSharing: false,
+  };
+};
+
+type UseMatchOptions = Parameters<typeof useTanstackMatch>[0];
+type UseMatchResult = ReturnType<typeof useTanstackMatch>;
+type UseMatchesOptions = Parameters<typeof useTanstackMatches>[0];
+type UseMatchesResult = ReturnType<typeof useTanstackMatches>;
+type UseParentMatchesOptions = Parameters<typeof useTanstackParentMatches>[0];
+type UseParentMatchesResult = ReturnType<typeof useTanstackParentMatches>;
+type UseChildMatchesOptions = Parameters<typeof useTanstackChildMatches>[0];
+type UseChildMatchesResult = ReturnType<typeof useTanstackChildMatches>;
+type UseRouterStateOptions = Parameters<typeof useTanstackRouterState>[0];
+type UseRouterStateResult = ReturnType<typeof useTanstackRouterState>;
+
+const useMatchWithWholeObjectGuard = (
+  options: UseMatchOptions,
+): UseMatchResult =>
+  useTanstackMatch(
+    withWholeObjectStructuralSharingGuard(
+      options as WholeObjectStructuralSharingOptions,
+    ) as UseMatchOptions,
+  );
+
+const useMatchesWithWholeObjectGuard = (
+  options?: UseMatchesOptions,
+): UseMatchesResult =>
+  useTanstackMatches(
+    withWholeObjectStructuralSharingGuard(options) as UseMatchesOptions,
+  );
+
+const useParentMatchesWithWholeObjectGuard = (
+  options?: UseParentMatchesOptions,
+): UseParentMatchesResult =>
+  useTanstackParentMatches(
+    withWholeObjectStructuralSharingGuard(options) as UseParentMatchesOptions,
+  );
+
+const useChildMatchesWithWholeObjectGuard = (
+  options?: UseChildMatchesOptions,
+): UseChildMatchesResult =>
+  useTanstackChildMatches(
+    withWholeObjectStructuralSharingGuard(options) as UseChildMatchesOptions,
+  );
+
+const useRouterStateWithWholeObjectGuard = (
+  options?: UseRouterStateOptions,
+): UseRouterStateResult =>
+  useTanstackRouterState(
+    withWholeObjectStructuralSharingGuard(options) as UseRouterStateOptions,
+  );
+
+export const useMatch = useMatchWithWholeObjectGuard as typeof useTanstackMatch;
+export const useMatches =
+  useMatchesWithWholeObjectGuard as typeof useTanstackMatches;
+export const useParentMatches =
+  useParentMatchesWithWholeObjectGuard as typeof useTanstackParentMatches;
+export const useChildMatches =
+  useChildMatchesWithWholeObjectGuard as typeof useTanstackChildMatches;
+export const useRouterState =
+  useRouterStateWithWholeObjectGuard as typeof useTanstackRouterState;

package/tests/router/cli.test.ts

@@ -57,6 +57,18 @@ rstest.mock('@modern-js/runtime/cli', () => {
       const routesEntry = path.join(dir, routesDir);
       return fs.existsSync(routesEntry) ? routesEntry : false;
     },
+    updateNestedRoutesSpec: async (
+      specPath: string,
+      nextRoutes: Record<string, unknown>,
+    ) => {
+      const existingRoutes = fs.existsSync(specPath)
+        ? await fs.readJSON(specPath)
+        : {};
+      await fs.outputJSON(specPath, {
+        ...existingRoutes,
+        ...nextRoutes,
+      });
+    },
   };
 });
 

package/tests/router/fastDefaults.test.ts

@@ -14,6 +14,13 @@ describe('tanstack router fast defaults', () => {
   });
 
   test('allows explicit structural sharing override', () => {
+    expect(
+      getModernTanstackRouterFastDefaults({
+        defaultStructuralSharing: true,
+      }),
+    ).toEqual({
+      defaultStructuralSharing: true,
+    });
     expect(
       getModernTanstackRouterFastDefaults({
         defaultStructuralSharing: false,

package/tests/router/preloadRedirect.test.ts

@@ -0,0 +1,69 @@
+import { createMemoryHistory } from '@tanstack/history';
+import {
+  createRootRoute,
+  createRoute,
+  createRouter,
+  redirect,
+} from '@tanstack/react-router';
+
+describe('tanstack router-core preload redirects', () => {
+  afterEach(() => {
+    rstest.restoreAllMocks();
+  });
+
+  test('keeps concurrent cached preload redirects from reading deleted matches', async () => {
+    const consoleErrorSpy = rstest
+      .spyOn(console, 'error')
+      .mockImplementation(() => {});
+    const rootRoute = createRootRoute();
+    const indexRoute = createRoute({
+      getParentRoute: () => rootRoute,
+      path: '/',
+      component: () => null,
+    });
+    let redirectLoaderCalls = 0;
+    const redirectRoute = createRoute({
+      getParentRoute: () => rootRoute,
+      path: '/redirect',
+      loader: async () => {
+        redirectLoaderCalls += 1;
+        await Promise.resolve();
+        throw redirect({ to: '/target' });
+      },
+      component: () => null,
+    });
+    const targetLoader = rstest.fn(async () => 'target');
+    const targetRoute = createRoute({
+      getParentRoute: () => rootRoute,
+      path: '/target',
+      loader: targetLoader,
+      component: () => null,
+    });
+    const router = createRouter({
+      routeTree: rootRoute.addChildren([
+        indexRoute,
+        redirectRoute,
+        targetRoute,
+      ]),
+      history: createMemoryHistory({
+        initialEntries: ['/'],
+      }),
+      defaultStructuralSharing: true,
+    });
+
+    await Promise.all([
+      router.preloadRoute({ to: '/redirect' }),
+      router.preloadRoute({ to: '/redirect' }),
+    ]);
+
+    expect(consoleErrorSpy).not.toHaveBeenCalled();
+    expect(router.options.defaultStructuralSharing).toBe(true);
+    expect(redirectLoaderCalls).toBeGreaterThan(0);
+    expect(targetLoader).toHaveBeenCalled();
+    expect(
+      router.stores.cachedMatches
+        .get()
+        .some(match => match.status === 'redirected'),
+    ).toBe(false);
+  });
+});

package/tests/router/routeHooks.test.ts

@@ -0,0 +1,113 @@
+const calls: Record<string, unknown[]> = {
+  useChildMatches: [],
+  useMatch: [],
+  useMatches: [],
+  useParentMatches: [],
+  useRouterState: [],
+};
+
+rstest.mock('@tanstack/react-router', () => ({
+  useChildMatches: (options: unknown) => {
+    calls.useChildMatches.push(options);
+    return options;
+  },
+  useMatch: (options: unknown) => {
+    calls.useMatch.push(options);
+    return options;
+  },
+  useMatches: (options: unknown) => {
+    calls.useMatches.push(options);
+    return options;
+  },
+  useParentMatches: (options: unknown) => {
+    calls.useParentMatches.push(options);
+    return options;
+  },
+  useRouterState: (options: unknown) => {
+    calls.useRouterState.push(options);
+    return options;
+  },
+}));
+
+import {
+  useChildMatches,
+  useMatch,
+  useMatches,
+  useParentMatches,
+  useRouterState,
+} from '../../src/runtime/routeHooks';
+
+const getLastCall = (hookName: keyof typeof calls) => {
+  const callList = calls[hookName];
+  return callList[callList.length - 1];
+};
+
+describe('tanstack route hook structural sharing guards', () => {
+  beforeEach(() => {
+    for (const hookName of Object.keys(calls)) {
+      calls[hookName] = [];
+    }
+  });
+
+  test('disables structural sharing for full internal router objects', () => {
+    useMatch({ from: '/' } as never);
+    useMatches();
+    useParentMatches();
+    useChildMatches();
+    useRouterState();
+
+    expect(getLastCall('useMatch')).toEqual({
+      from: '/',
+      structuralSharing: false,
+    });
+    expect(getLastCall('useMatches')).toEqual({
+      structuralSharing: false,
+    });
+    expect(getLastCall('useParentMatches')).toEqual({
+      structuralSharing: false,
+    });
+    expect(getLastCall('useChildMatches')).toEqual({
+      structuralSharing: false,
+    });
+    expect(getLastCall('useRouterState')).toEqual({
+      structuralSharing: false,
+    });
+  });
+
+  test('keeps selected data on the router default', () => {
+    const select = (value: unknown) => value;
+    const matchOptions = { from: '/', select };
+    const matchesOptions = { select };
+    const stateOptions = { select };
+
+    useMatch(matchOptions as never);
+    useMatches(matchesOptions as never);
+    useParentMatches(matchesOptions as never);
+    useChildMatches(matchesOptions as never);
+    useRouterState(stateOptions as never);
+
+    expect(getLastCall('useMatch')).toBe(matchOptions);
+    expect(getLastCall('useMatches')).toBe(matchesOptions);
+    expect(getLastCall('useParentMatches')).toBe(matchesOptions);
+    expect(getLastCall('useChildMatches')).toBe(matchesOptions);
+    expect(getLastCall('useRouterState')).toBe(stateOptions);
+  });
+
+  test('honors explicit structural sharing choices', () => {
+    const enabled = { structuralSharing: true };
+    const disabled = { structuralSharing: false };
+    const matchEnabled = { from: '/', structuralSharing: true };
+
+    useMatch(matchEnabled as never);
+    useMatches(enabled as never);
+    useParentMatches(disabled as never);
+    useChildMatches(enabled as never);
+    useRouterState(disabled as never);
+
+    expect(getLastCall('useMatch')).toBe(matchEnabled);
+    expect(getLastCall('useMatches')).toBe(enabled);
+    expect(getLastCall('useParentMatches')).toBe(disabled);
+    expect(getLastCall('useChildMatches')).toBe(enabled);
+    expect(getLastCall('useRouterState')).toBe(disabled);
+  });
+});

package/tests/router/tanstackTypes.test.ts

@@ -279,9 +279,14 @@ describe('tanstack router type generation', () => {
     );
 
     await expect(
-      execFileAsync('tsgo', ['--noEmit', '-p', 'tsconfig.json'], {
-        cwd: tempDir,
-      }),
+      execFileAsync(
+        process.platform === 'win32' ? 'tsgo.cmd' : 'tsgo',
+        ['--noEmit', '-p', 'tsconfig.json'],
+        {
+          cwd: tempDir,
+          shell: process.platform === 'win32',
+        },
+      ),
     ).resolves.toBeDefined();
   });