@tanstack/solid-router 1.112.11 → 1.112.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Match.cjs.map +1 -1
- package/dist/cjs/Matches.cjs.map +1 -1
- package/dist/cjs/Matches.d.cts +1 -8
- package/dist/cjs/RouterProvider.cjs.map +1 -1
- package/dist/cjs/RouterProvider.d.cts +4 -4
- package/dist/cjs/Transitioner.cjs +1 -1
- package/dist/cjs/Transitioner.cjs.map +1 -1
- package/dist/cjs/fileRoute.cjs.map +1 -1
- package/dist/cjs/fileRoute.d.cts +4 -7
- package/dist/cjs/index.d.cts +3 -5
- package/dist/cjs/link.cjs.map +1 -1
- package/dist/cjs/link.d.cts +1 -2
- package/dist/cjs/not-found.cjs.map +1 -1
- package/dist/cjs/not-found.d.cts +1 -2
- package/dist/cjs/redirects.cjs.map +1 -1
- package/dist/cjs/redirects.d.cts +1 -2
- package/dist/cjs/renderRouteNotFound.cjs.map +1 -1
- package/dist/cjs/renderRouteNotFound.d.cts +1 -2
- package/dist/cjs/route.cjs +15 -23
- package/dist/cjs/route.cjs.map +1 -1
- package/dist/cjs/route.d.cts +19 -50
- package/dist/cjs/router.cjs +18 -20
- package/dist/cjs/router.cjs.map +1 -1
- package/dist/cjs/router.d.cts +84 -454
- package/dist/cjs/routerContext.cjs.map +1 -1
- package/dist/cjs/routerContext.d.cts +2 -2
- package/dist/cjs/scroll-restoration.cjs.map +1 -1
- package/dist/cjs/scroll-restoration.d.cts +1 -2
- package/dist/cjs/typePrimitives.d.cts +1 -2
- package/dist/cjs/useBlocker.cjs.map +1 -1
- package/dist/cjs/useBlocker.d.cts +2 -3
- package/dist/cjs/useLoaderData.cjs.map +1 -1
- package/dist/cjs/useLoaderData.d.cts +1 -3
- package/dist/cjs/useLoaderDeps.cjs.map +1 -1
- package/dist/cjs/useLoaderDeps.d.cts +1 -3
- package/dist/cjs/useLocation.cjs.map +1 -1
- package/dist/cjs/useLocation.d.cts +1 -1
- package/dist/cjs/useMatch.cjs.map +1 -1
- package/dist/cjs/useMatch.d.cts +1 -3
- package/dist/cjs/useNavigate.cjs.map +1 -1
- package/dist/cjs/useNavigate.d.cts +1 -2
- package/dist/cjs/useParams.cjs.map +1 -1
- package/dist/cjs/useParams.d.cts +1 -3
- package/dist/cjs/useRouteContext.cjs.map +1 -1
- package/dist/cjs/useRouteContext.d.cts +1 -2
- package/dist/cjs/useRouter.cjs.map +1 -1
- package/dist/cjs/useRouter.d.cts +1 -1
- package/dist/cjs/useRouterState.cjs.map +1 -1
- package/dist/cjs/useRouterState.d.cts +1 -1
- package/dist/cjs/useSearch.cjs.map +1 -1
- package/dist/cjs/useSearch.d.cts +1 -3
- package/dist/cjs/utils.cjs.map +1 -1
- package/dist/cjs/utils.d.cts +0 -9
- package/dist/esm/Match.js.map +1 -1
- package/dist/esm/Matches.d.ts +1 -8
- package/dist/esm/Matches.js.map +1 -1
- package/dist/esm/RouterProvider.d.ts +4 -4
- package/dist/esm/RouterProvider.js.map +1 -1
- package/dist/esm/Transitioner.js +1 -1
- package/dist/esm/Transitioner.js.map +1 -1
- package/dist/esm/fileRoute.d.ts +4 -7
- package/dist/esm/fileRoute.js.map +1 -1
- package/dist/esm/index.d.ts +3 -5
- package/dist/esm/link.d.ts +1 -2
- package/dist/esm/link.js.map +1 -1
- package/dist/esm/not-found.d.ts +1 -2
- package/dist/esm/not-found.js.map +1 -1
- package/dist/esm/redirects.d.ts +1 -2
- package/dist/esm/redirects.js.map +1 -1
- package/dist/esm/renderRouteNotFound.d.ts +1 -2
- package/dist/esm/renderRouteNotFound.js.map +1 -1
- package/dist/esm/route.d.ts +19 -50
- package/dist/esm/route.js +15 -23
- package/dist/esm/route.js.map +1 -1
- package/dist/esm/router.d.ts +84 -454
- package/dist/esm/router.js +18 -20
- package/dist/esm/router.js.map +1 -1
- package/dist/esm/routerContext.d.ts +2 -2
- package/dist/esm/routerContext.js.map +1 -1
- package/dist/esm/scroll-restoration.d.ts +1 -2
- package/dist/esm/scroll-restoration.js.map +1 -1
- package/dist/esm/typePrimitives.d.ts +1 -2
- package/dist/esm/useBlocker.d.ts +2 -3
- package/dist/esm/useBlocker.js.map +1 -1
- package/dist/esm/useLoaderData.d.ts +1 -3
- package/dist/esm/useLoaderData.js.map +1 -1
- package/dist/esm/useLoaderDeps.d.ts +1 -3
- package/dist/esm/useLoaderDeps.js.map +1 -1
- package/dist/esm/useLocation.d.ts +1 -1
- package/dist/esm/useLocation.js.map +1 -1
- package/dist/esm/useMatch.d.ts +1 -3
- package/dist/esm/useMatch.js.map +1 -1
- package/dist/esm/useNavigate.d.ts +1 -2
- package/dist/esm/useNavigate.js.map +1 -1
- package/dist/esm/useParams.d.ts +1 -3
- package/dist/esm/useParams.js.map +1 -1
- package/dist/esm/useRouteContext.d.ts +1 -2
- package/dist/esm/useRouteContext.js.map +1 -1
- package/dist/esm/useRouter.d.ts +1 -1
- package/dist/esm/useRouter.js.map +1 -1
- package/dist/esm/useRouterState.d.ts +1 -1
- package/dist/esm/useRouterState.js.map +1 -1
- package/dist/esm/useSearch.d.ts +1 -3
- package/dist/esm/useSearch.js.map +1 -1
- package/dist/esm/utils.d.ts +0 -9
- package/dist/esm/utils.js.map +1 -1
- package/dist/source/Matches.d.ts +1 -8
- package/dist/source/Matches.jsx.map +1 -1
- package/dist/source/RouterProvider.d.ts +4 -4
- package/dist/source/RouterProvider.jsx.map +1 -1
- package/dist/source/Transitioner.jsx +1 -1
- package/dist/source/Transitioner.jsx.map +1 -1
- package/dist/source/fileRoute.d.ts +4 -7
- package/dist/source/fileRoute.js.map +1 -1
- package/dist/source/index.d.ts +3 -5
- package/dist/source/index.jsx.map +1 -1
- package/dist/source/link.d.ts +1 -2
- package/dist/source/link.jsx.map +1 -1
- package/dist/source/not-found.d.ts +1 -2
- package/dist/source/not-found.jsx.map +1 -1
- package/dist/source/redirects.d.ts +1 -2
- package/dist/source/renderRouteNotFound.d.ts +1 -2
- package/dist/source/renderRouteNotFound.jsx.map +1 -1
- package/dist/source/route.d.ts +19 -50
- package/dist/source/route.js +15 -23
- package/dist/source/route.js.map +1 -1
- package/dist/source/router.d.ts +83 -454
- package/dist/source/router.js +23 -14
- package/dist/source/router.js.map +1 -1
- package/dist/source/routerContext.d.ts +2 -2
- package/dist/source/routerContext.jsx.map +1 -1
- package/dist/source/scroll-restoration.d.ts +1 -2
- package/dist/source/scroll-restoration.jsx.map +1 -1
- package/dist/source/typePrimitives.d.ts +1 -2
- package/dist/source/useBlocker.d.ts +2 -3
- package/dist/source/useBlocker.jsx.map +1 -1
- package/dist/source/useLoaderData.d.ts +1 -3
- package/dist/source/useLoaderData.jsx.map +1 -1
- package/dist/source/useLoaderDeps.d.ts +1 -3
- package/dist/source/useLoaderDeps.jsx.map +1 -1
- package/dist/source/useLocation.d.ts +1 -1
- package/dist/source/useLocation.jsx.map +1 -1
- package/dist/source/useMatch.d.ts +1 -3
- package/dist/source/useMatch.jsx.map +1 -1
- package/dist/source/useNavigate.d.ts +1 -2
- package/dist/source/useNavigate.jsx.map +1 -1
- package/dist/source/useParams.d.ts +1 -3
- package/dist/source/useParams.jsx.map +1 -1
- package/dist/source/useRouteContext.d.ts +1 -2
- package/dist/source/useRouter.d.ts +1 -1
- package/dist/source/useRouterState.d.ts +1 -1
- package/dist/source/useRouterState.jsx.map +1 -1
- package/dist/source/useSearch.d.ts +1 -3
- package/dist/source/useSearch.jsx.map +1 -1
- package/dist/source/utils.d.ts +1 -10
- package/dist/source/utils.js.map +1 -1
- package/package.json +3 -3
- package/src/Match.tsx +1 -1
- package/src/Matches.tsx +4 -8
- package/src/RouterProvider.tsx +4 -7
- package/src/Transitioner.tsx +1 -1
- package/src/fileRoute.ts +9 -25
- package/src/index.tsx +22 -28
- package/src/link.tsx +2 -1
- package/src/not-found.tsx +1 -2
- package/src/redirects.ts +1 -1
- package/src/renderRouteNotFound.tsx +1 -2
- package/src/route.ts +93 -222
- package/src/router.ts +146 -591
- package/src/routerContext.tsx +3 -3
- package/src/scroll-restoration.tsx +6 -2
- package/src/typePrimitives.ts +2 -1
- package/src/useBlocker.tsx +7 -3
- package/src/useLoaderData.tsx +3 -2
- package/src/useLoaderDeps.tsx +3 -2
- package/src/useLocation.tsx +5 -1
- package/src/useMatch.tsx +3 -2
- package/src/useNavigate.tsx +2 -1
- package/src/useParams.tsx +3 -2
- package/src/useRouteContext.ts +2 -2
- package/src/useRouter.tsx +1 -1
- package/src/useRouterState.tsx +5 -1
- package/src/useSearch.tsx +3 -2
- package/src/utils.ts +0 -16
package/dist/esm/router.js
CHANGED
|
@@ -57,7 +57,7 @@ class Router {
|
|
|
57
57
|
this.subscribers = /* @__PURE__ */ new Set();
|
|
58
58
|
this.isScrollRestoring = false;
|
|
59
59
|
this.isScrollRestorationSetup = false;
|
|
60
|
-
this.
|
|
60
|
+
this.startTransition = (fn) => fn();
|
|
61
61
|
this.update = (newOptions) => {
|
|
62
62
|
var _a;
|
|
63
63
|
if (newOptions.notFoundRoute) {
|
|
@@ -254,6 +254,19 @@ class Router {
|
|
|
254
254
|
});
|
|
255
255
|
return resolvedPath;
|
|
256
256
|
};
|
|
257
|
+
this.matchRoutes = (pathnameOrNext, locationSearchOrOpts, opts) => {
|
|
258
|
+
if (typeof pathnameOrNext === "string") {
|
|
259
|
+
return this.matchRoutesInternal(
|
|
260
|
+
{
|
|
261
|
+
pathname: pathnameOrNext,
|
|
262
|
+
search: locationSearchOrOpts
|
|
263
|
+
},
|
|
264
|
+
opts
|
|
265
|
+
);
|
|
266
|
+
} else {
|
|
267
|
+
return this.matchRoutesInternal(pathnameOrNext, locationSearchOrOpts);
|
|
268
|
+
}
|
|
269
|
+
};
|
|
257
270
|
this.getMatchedRoutes = (next, dest) => {
|
|
258
271
|
let routeParams = {};
|
|
259
272
|
const trimmedPath = trimPathRight(next.pathname);
|
|
@@ -635,7 +648,7 @@ class Router {
|
|
|
635
648
|
let notFound;
|
|
636
649
|
let loadPromise;
|
|
637
650
|
loadPromise = new Promise((resolve) => {
|
|
638
|
-
this.
|
|
651
|
+
this.startTransition(async () => {
|
|
639
652
|
var _a;
|
|
640
653
|
try {
|
|
641
654
|
const next = this.latestLocation;
|
|
@@ -932,11 +945,9 @@ class Router {
|
|
|
932
945
|
const prevLoadPromise = prev.loadPromise;
|
|
933
946
|
return {
|
|
934
947
|
...prev,
|
|
935
|
-
loadPromise: createControlledPromise(
|
|
936
|
-
|
|
937
|
-
|
|
938
|
-
}
|
|
939
|
-
),
|
|
948
|
+
loadPromise: createControlledPromise(() => {
|
|
949
|
+
prevLoadPromise == null ? void 0 : prevLoadPromise.resolve();
|
|
950
|
+
}),
|
|
940
951
|
beforeLoadPromise: createControlledPromise()
|
|
941
952
|
};
|
|
942
953
|
});
|
|
@@ -1432,19 +1443,6 @@ class Router {
|
|
|
1432
1443
|
get looseRoutesById() {
|
|
1433
1444
|
return this.routesById;
|
|
1434
1445
|
}
|
|
1435
|
-
matchRoutes(pathnameOrNext, locationSearchOrOpts, opts) {
|
|
1436
|
-
if (typeof pathnameOrNext === "string") {
|
|
1437
|
-
return this.matchRoutesInternal(
|
|
1438
|
-
{
|
|
1439
|
-
pathname: pathnameOrNext,
|
|
1440
|
-
search: locationSearchOrOpts
|
|
1441
|
-
},
|
|
1442
|
-
opts
|
|
1443
|
-
);
|
|
1444
|
-
} else {
|
|
1445
|
-
return this.matchRoutesInternal(pathnameOrNext, locationSearchOrOpts);
|
|
1446
|
-
}
|
|
1447
|
-
}
|
|
1448
1446
|
matchRoutesInternal(next, opts) {
|
|
1449
1447
|
const { foundRoute, matchedRoutes, routeParams } = this.getMatchedRoutes(
|
|
1450
1448
|
next,
|