@tanstack/vue-router 1.141.4 → 1.141.7
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/README.md +1 -1
- package/dist/esm/ClientOnly.js +33 -0
- package/dist/esm/ClientOnly.js.map +1 -0
- package/dist/esm/Match.js +66 -39
- package/dist/esm/Match.js.map +1 -1
- package/dist/esm/Transitioner.js +14 -5
- package/dist/esm/Transitioner.js.map +1 -1
- package/dist/esm/index.d.ts +2 -1
- package/dist/esm/index.js +2 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lazyRouteComponent.d.ts +0 -6
- package/dist/esm/lazyRouteComponent.js +5 -24
- package/dist/esm/lazyRouteComponent.js.map +1 -1
- package/dist/esm/link.d.ts +20 -22
- package/dist/esm/link.js +3 -2
- package/dist/esm/link.js.map +1 -1
- package/dist/esm/route.d.ts +6 -1
- package/dist/esm/route.js +25 -0
- package/dist/esm/route.js.map +1 -1
- package/dist/esm/ssr/renderRouterToStream.js +1 -1
- package/dist/esm/ssr/renderRouterToStream.js.map +1 -1
- package/dist/source/Match.jsx +90 -63
- package/dist/source/Match.jsx.map +1 -1
- package/dist/source/Transitioner.jsx +12 -5
- package/dist/source/Transitioner.jsx.map +1 -1
- package/dist/source/index.d.ts +2 -1
- package/dist/source/index.jsx +1 -0
- package/dist/source/index.jsx.map +1 -1
- package/dist/source/lazyRouteComponent.d.ts +0 -6
- package/dist/source/lazyRouteComponent.jsx +3 -23
- package/dist/source/lazyRouteComponent.jsx.map +1 -1
- package/dist/source/link.d.ts +20 -22
- package/dist/source/link.jsx +3 -2
- package/dist/source/link.jsx.map +1 -1
- package/dist/source/route.d.ts +6 -1
- package/dist/source/route.js +13 -0
- package/dist/source/route.js.map +1 -1
- package/dist/source/ssr/renderRouterToStream.jsx +1 -1
- package/dist/source/ssr/renderRouterToStream.jsx.map +1 -1
- package/package.json +3 -2
- package/src/Match.tsx +115 -73
- package/src/Transitioner.tsx +15 -6
- package/src/index.tsx +2 -0
- package/src/lazyRouteComponent.tsx +10 -32
- package/src/link.tsx +87 -59
- package/src/route.ts +33 -1
- package/src/ssr/renderRouterToStream.tsx +1 -1
package/dist/source/Match.jsx
CHANGED
|
@@ -3,6 +3,7 @@ import invariant from 'tiny-invariant';
|
|
|
3
3
|
import warning from 'tiny-warning';
|
|
4
4
|
import { createControlledPromise, getLocationChangeInfo, isNotFound, isRedirect, rootRouteId, } from '@tanstack/router-core';
|
|
5
5
|
import { CatchBoundary, ErrorComponent } from './CatchBoundary';
|
|
6
|
+
import { ClientOnly } from './ClientOnly';
|
|
6
7
|
import { useRouterState } from './useRouterState';
|
|
7
8
|
import { useRouter } from './useRouter';
|
|
8
9
|
import { CatchNotFound } from './not-found';
|
|
@@ -52,6 +53,8 @@ export const Match = Vue.defineComponent({
|
|
|
52
53
|
routeId,
|
|
53
54
|
parentRouteId,
|
|
54
55
|
loadedAt: s.loadedAt,
|
|
56
|
+
ssr: match.ssr,
|
|
57
|
+
_displayPending: match._displayPending,
|
|
55
58
|
};
|
|
56
59
|
},
|
|
57
60
|
});
|
|
@@ -59,6 +62,7 @@ export const Match = Vue.defineComponent({
|
|
|
59
62
|
const route = Vue.computed(() => matchData.value ? router.routesById[matchData.value.routeId] : null);
|
|
60
63
|
const PendingComponent = Vue.computed(() => route.value?.options?.pendingComponent ??
|
|
61
64
|
router?.options?.defaultPendingComponent);
|
|
65
|
+
const pendingElement = Vue.computed(() => PendingComponent.value ? Vue.h(PendingComponent.value) : undefined);
|
|
62
66
|
const routeErrorComponent = Vue.computed(() => route.value?.options?.errorComponent ??
|
|
63
67
|
router?.options?.defaultErrorComponent);
|
|
64
68
|
const routeOnCatch = Vue.computed(() => route.value?.options?.onCatch ?? router?.options?.defaultOnCatch);
|
|
@@ -67,6 +71,14 @@ export const Match = Vue.defineComponent({
|
|
|
67
71
|
(route.value?.options?.notFoundComponent ??
|
|
68
72
|
router?.options?.notFoundRoute?.options?.component)
|
|
69
73
|
: route.value?.options?.notFoundComponent);
|
|
74
|
+
const hasShellComponent = Vue.computed(() => {
|
|
75
|
+
if (!route.value?.isRoot)
|
|
76
|
+
return false;
|
|
77
|
+
return !!route.value.options.shellComponent;
|
|
78
|
+
});
|
|
79
|
+
const ShellComponent = Vue.computed(() => hasShellComponent.value
|
|
80
|
+
? route.value.options.shellComponent
|
|
81
|
+
: null);
|
|
70
82
|
// Create a ref for the current matchId that we provide to child components
|
|
71
83
|
// This ref is updated to the ACTUAL matchId found (which may differ from props during transitions)
|
|
72
84
|
const matchIdRef = Vue.ref(matchData.value?.matchId ?? props.matchId);
|
|
@@ -82,69 +94,72 @@ export const Match = Vue.defineComponent({
|
|
|
82
94
|
return () => {
|
|
83
95
|
// Use the actual matchId from matchData, not props (which may be stale)
|
|
84
96
|
const actualMatchId = matchData.value?.matchId ?? props.matchId;
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
content =
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
97
|
+
const resolvedNoSsr = matchData.value?.ssr === false || matchData.value?.ssr === 'data-only';
|
|
98
|
+
const shouldClientOnly = resolvedNoSsr || !!matchData.value?._displayPending;
|
|
99
|
+
const renderMatchContent = () => {
|
|
100
|
+
const matchInner = Vue.h(MatchInner, { matchId: actualMatchId });
|
|
101
|
+
let content = shouldClientOnly
|
|
102
|
+
? Vue.h(ClientOnly, {
|
|
103
|
+
fallback: pendingElement.value,
|
|
104
|
+
}, {
|
|
105
|
+
default: () => matchInner,
|
|
106
|
+
})
|
|
107
|
+
: matchInner;
|
|
108
|
+
// Wrap in NotFound boundary if needed
|
|
109
|
+
if (routeNotFoundComponent.value) {
|
|
110
|
+
content = Vue.h(CatchNotFound, {
|
|
111
|
+
fallback: (error) => {
|
|
112
|
+
// If the current not found handler doesn't exist or it has a
|
|
113
|
+
// route ID which doesn't match the current route, rethrow the error
|
|
114
|
+
if (!routeNotFoundComponent.value ||
|
|
115
|
+
(error.routeId && error.routeId !== matchData.value?.routeId) ||
|
|
116
|
+
(!error.routeId && route.value && !route.value.isRoot))
|
|
117
|
+
throw error;
|
|
118
|
+
return Vue.h(routeNotFoundComponent.value, error);
|
|
119
|
+
},
|
|
120
|
+
children: content,
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
// Wrap in error boundary if needed
|
|
124
|
+
if (routeErrorComponent.value) {
|
|
125
|
+
content = CatchBoundary({
|
|
126
|
+
getResetKey: () => matchData.value?.loadedAt ?? 0,
|
|
127
|
+
errorComponent: routeErrorComponent.value || ErrorComponent,
|
|
128
|
+
onCatch: (error) => {
|
|
129
|
+
// Forward not found errors (we don't want to show the error component for these)
|
|
130
|
+
if (isNotFound(error))
|
|
131
|
+
throw error;
|
|
132
|
+
warning(false, `Error in route match: ${actualMatchId}`);
|
|
133
|
+
routeOnCatch.value?.(error);
|
|
134
|
+
},
|
|
135
|
+
children: content,
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
// Add scroll restoration if needed
|
|
139
|
+
const withScrollRestoration = [
|
|
140
|
+
content,
|
|
141
|
+
matchData.value?.parentRouteId === rootRouteId &&
|
|
142
|
+
router.options.scrollRestoration
|
|
143
|
+
? Vue.h(Vue.Fragment, null, [
|
|
144
|
+
Vue.h(OnRendered),
|
|
145
|
+
Vue.h(ScrollRestoration),
|
|
146
|
+
])
|
|
127
147
|
: null,
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
? Vue.h(Vue.Fragment, null, [
|
|
138
|
-
Vue.h(OnRendered),
|
|
139
|
-
Vue.h(ScrollRestoration),
|
|
140
|
-
])
|
|
141
|
-
: null,
|
|
142
|
-
].filter(Boolean);
|
|
143
|
-
// Return single child directly to avoid Fragment wrapper that causes hydration mismatch
|
|
144
|
-
if (withScrollRestoration.length === 1) {
|
|
145
|
-
return withScrollRestoration[0];
|
|
148
|
+
].filter(Boolean);
|
|
149
|
+
// Return single child directly to avoid Fragment wrapper that causes hydration mismatch
|
|
150
|
+
if (withScrollRestoration.length === 1) {
|
|
151
|
+
return withScrollRestoration[0];
|
|
152
|
+
}
|
|
153
|
+
return Vue.h(Vue.Fragment, null, withScrollRestoration);
|
|
154
|
+
};
|
|
155
|
+
if (!hasShellComponent.value) {
|
|
156
|
+
return renderMatchContent();
|
|
146
157
|
}
|
|
147
|
-
return Vue.h(
|
|
158
|
+
return Vue.h(ShellComponent.value, null, {
|
|
159
|
+
// Important: return a fresh VNode on each slot invocation so that shell
|
|
160
|
+
// components can re-render without reusing a cached VNode instance.
|
|
161
|
+
default: () => renderMatchContent(),
|
|
162
|
+
});
|
|
148
163
|
};
|
|
149
164
|
},
|
|
150
165
|
});
|
|
@@ -231,6 +246,9 @@ export const MatchInner = Vue.defineComponent({
|
|
|
231
246
|
id: match.id,
|
|
232
247
|
status: match.status,
|
|
233
248
|
error: match.error,
|
|
249
|
+
ssr: match.ssr,
|
|
250
|
+
_forcePending: match._forcePending,
|
|
251
|
+
_displayPending: match._displayPending,
|
|
234
252
|
},
|
|
235
253
|
remountKey,
|
|
236
254
|
};
|
|
@@ -245,10 +263,19 @@ export const MatchInner = Vue.defineComponent({
|
|
|
245
263
|
const remountKey = Vue.computed(() => combinedState.value?.remountKey);
|
|
246
264
|
return () => {
|
|
247
265
|
// If match doesn't exist, return null (component is being unmounted or not ready)
|
|
248
|
-
if (!combinedState.value || !match.value || !route.value)
|
|
266
|
+
if (!combinedState.value || !match.value || !route.value)
|
|
249
267
|
return null;
|
|
250
|
-
}
|
|
251
268
|
// Handle different match statuses
|
|
269
|
+
if (match.value._displayPending) {
|
|
270
|
+
const PendingComponent = route.value.options.pendingComponent ??
|
|
271
|
+
router.options.defaultPendingComponent;
|
|
272
|
+
return PendingComponent ? Vue.h(PendingComponent) : null;
|
|
273
|
+
}
|
|
274
|
+
if (match.value._forcePending) {
|
|
275
|
+
const PendingComponent = route.value.options.pendingComponent ??
|
|
276
|
+
router.options.defaultPendingComponent;
|
|
277
|
+
return PendingComponent ? Vue.h(PendingComponent) : null;
|
|
278
|
+
}
|
|
252
279
|
if (match.value.status === 'notFound') {
|
|
253
280
|
invariant(isNotFound(match.value.error), 'Expected a notFound error');
|
|
254
281
|
return renderRouteNotFound(router, route.value, match.value.error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Match.jsx","sourceRoot":"","sources":["../../src/Match.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Match.jsx","sourceRoot":"","sources":["../../src/Match.tsx"],"names":[],"mappings":"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"}
|
|
@@ -103,6 +103,11 @@ export function useTransitionerSetup() {
|
|
|
103
103
|
const isMounted = Vue.ref(false);
|
|
104
104
|
Vue.onMounted(() => {
|
|
105
105
|
isMounted.value = true;
|
|
106
|
+
if (!isAnyPending.value) {
|
|
107
|
+
router.__store.setState((s) => s.status === 'pending'
|
|
108
|
+
? { ...s, status: 'idle', resolvedLocation: s.location }
|
|
109
|
+
: s);
|
|
110
|
+
}
|
|
106
111
|
});
|
|
107
112
|
Vue.onUnmounted(() => {
|
|
108
113
|
isMounted.value = false;
|
|
@@ -164,6 +169,13 @@ export function useTransitionerSetup() {
|
|
|
164
169
|
if (!isMounted.value)
|
|
165
170
|
return;
|
|
166
171
|
try {
|
|
172
|
+
if (!newValue && router.__store.state.status === 'pending') {
|
|
173
|
+
router.__store.setState((s) => ({
|
|
174
|
+
...s,
|
|
175
|
+
status: 'idle',
|
|
176
|
+
resolvedLocation: s.location,
|
|
177
|
+
}));
|
|
178
|
+
}
|
|
167
179
|
// The router was pending and now it's not
|
|
168
180
|
if (previousIsAnyPending.value.previous && !newValue) {
|
|
169
181
|
const changeInfo = getLocationChangeInfo(router.state);
|
|
@@ -171,11 +183,6 @@ export function useTransitionerSetup() {
|
|
|
171
183
|
type: 'onResolved',
|
|
172
184
|
...changeInfo,
|
|
173
185
|
});
|
|
174
|
-
router.__store.setState((s) => ({
|
|
175
|
-
...s,
|
|
176
|
-
status: 'idle',
|
|
177
|
-
resolvedLocation: s.location,
|
|
178
|
-
}));
|
|
179
186
|
if (changeInfo.hrefChanged) {
|
|
180
187
|
handleHashScroll(router);
|
|
181
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transitioner.jsx","sourceRoot":"","sources":["../../src/Transitioner.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,GACd,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAErC,uDAAuD;AACvD,IAAI,kBAAkB,GAAG,EAAE,MAAM,EAAE,IAAW,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;AAEhE;;;;;;;;;GASG;AACH,MAAM,UAAU,oBAAoB;IAClC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAE1B,yCAAyC;IACzC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,OAAM;IACR,CAAC;IAED,MAAM,SAAS,GAAG,cAAc,CAAC;QAC/B,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS;KACrC,CAAC,CAAA;IAEF,0EAA0E;IAC1E,MAAM,eAAe,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAEtC,8BAA8B;IAC9B,MAAM,iBAAiB,GAAG,cAAc,CAAC;QACvC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC;KAC7D,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IAE5D,MAAM,YAAY,GAAG,GAAG,CAAC,QAAQ,CAC/B,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,IAAI,eAAe,CAAC,KAAK,IAAI,iBAAiB,CAAC,KAAK,CAC1E,CAAA;IACD,MAAM,oBAAoB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAElE,MAAM,aAAa,GAAG,GAAG,CAAC,QAAQ,CAChC,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,IAAI,iBAAiB,CAAC,KAAK,CACjD,CAAA;IACD,MAAM,qBAAqB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;IAEpE,mDAAmD;IACnD,2EAA2E;IAC3E,kFAAkF;IAClF,MAAM,CAAC,eAAe,GAAG,CAAC,EAA8B,EAAE,EAAE;QAC1D,eAAe,CAAC,KAAK,GAAG,IAAI,CAAA;QAC5B,qEAAqE;QACrE,IAAI,CAAC;YACH,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;QACnE,CAAC;QAAC,MAAM,CAAC;YACP,0CAA0C;QAC5C,CAAC;QAED,+BAA+B;QAC/B,MAAM,aAAa,GAAG,GAAG,EAAE;YACzB,gEAAgE;YAChE,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE;gBAChB,IAAI,CAAC;oBACH,eAAe,CAAC,KAAK,GAAG,KAAK,CAAA;oBAC7B,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;gBACpE,CAAC;gBAAC,MAAM,CAAC;oBACP,0CAA0C;gBAC5C,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA;QAED,qCAAqC;QACrC,kFAAkF;QAClF,0EAA0E;QAC1E,sEAAsE;QACtE,EAAE,EAAE,CAAA;QAEJ,2EAA2E;QAC3E,aAAa,EAAE,CAAA;IACjB,CAAC,CAAA;IAED,mFAAmF;IACnF,0EAA0E;IAC1E,6EAA6E;IAC7E,MAAM,2BAA2B,GAG9B,MAAc,CAAC,gCAAgC;QAChD,MAAM,CAAC,mBAAmB,CAE3B;IAAC,MAAc,CAAC,gCAAgC;QAC/C,2BAA2B,CAAA;IAE7B,MAAM,CAAC,mBAAmB,GAAG,CAAC,EAAuB,EAAE,EAAE;QACvD,OAAO,2BAA2B,EAAE,CAAC,KAAK,IAAI,EAAE;YAC9C,MAAM,EAAE,EAAE,CAAA;YACV,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAA;QACtB,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,gCAAgC;IAChC,mCAAmC;IACnC,IAAI,WAAqC,CAAA;IAEzC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAEnD,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC;YACxC,EAAE,EAAE,MAAM,CAAC,cAAc,CAAC,QAAQ;YAClC,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,IAAI;YACX,sBAAsB,EAAE,IAAI;SAC7B,CAAC,CAAA;QAEF,IACE,aAAa,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC;YACzC,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC,EAChC,CAAC;YACD,MAAM,CAAC,cAAc,CAAC,EAAE,GAAG,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,iEAAiE;IACjE,MAAM,SAAS,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAEhC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,SAAS,CAAC,KAAK,GAAG,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"Transitioner.jsx","sourceRoot":"","sources":["../../src/Transitioner.tsx"],"names":[],"mappings":"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"}
|
package/dist/source/index.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ export * from './history';
|
|
|
10
10
|
export { lazyRouteComponent } from './lazyRouteComponent';
|
|
11
11
|
export { useLinkProps, createLink, Link, linkOptions } from './link';
|
|
12
12
|
export type { InferDescendantToPaths, RelativeToPath, RelativeToParentPath, RelativeToCurrentPath, AbsoluteToPath, RelativeToPathAutoComplete, NavigateOptions, ToOptions, ToMaskOptions, ToSubOptions, ResolveRoute, SearchParamOptions, PathParamOptions, ToPathOption, LinkOptions, MakeOptionalPathParams, FileRouteTypes, RouteContextParameter, BeforeLoadContextParameter, ResolveAllContext, ResolveAllParamsFromParent, ResolveFullSearchSchema, ResolveFullSearchSchemaInput, RouteIds, NavigateFn, BuildLocationFn, FullSearchSchemaOption, MakeRemountDepsOptionsUnion, RemountDepsOptions, ResolveFullPath, AnyRouteWithContext, AnyRouterWithContext, CommitLocationOptions, MatchLocation, UseNavigateResult, AnyRedirect, Redirect, RedirectOptions, ResolvedRedirect, MakeRouteMatch, MakeRouteMatchUnion, RouteMatch, AnyRouteMatch, RouteContextFn, RouteContextOptions, BeforeLoadContextOptions, ContextOptions, RouteOptions, FileBaseRouteOptions, BaseRouteOptions, UpdatableRouteOptions, RouteLoaderFn, LoaderFnContext, LazyRouteOptions, AnyRouter, RegisteredRouter, RouterContextOptions, ControllablePromise, InjectedHtmlEntry, RouterOptions, RouterState, ListenerFn, BuildNextOptions, RouterConstructorOptions, RouterEvents, RouterEvent, RouterListener, RouteConstraints, RouteMask, MatchRouteOptions, CreateLazyFileRoute, } from '@tanstack/router-core';
|
|
13
|
-
export type { UseLinkPropsOptions, ActiveLinkOptions, LinkProps, LinkComponent, LinkComponentProps, CreateLinkProps, } from './link';
|
|
13
|
+
export type { UseLinkPropsOptions, ActiveLinkOptions, LinkProps, LinkComponent, LinkComponentRoute, LinkComponentProps, CreateLinkProps, } from './link';
|
|
14
14
|
export { Matches, useMatchRoute, MatchRoute, useMatches, useParentMatches, useChildMatches, } from './Matches';
|
|
15
15
|
export type { UseMatchRouteOptions, MakeMatchRouteOptions } from './Matches';
|
|
16
16
|
export { matchContext } from './matchContext';
|
|
@@ -51,3 +51,4 @@ export { Body } from './Body';
|
|
|
51
51
|
export { Html } from './Html';
|
|
52
52
|
export { composeRewrites } from '@tanstack/router-core';
|
|
53
53
|
export type { LocationRewrite, LocationRewriteFunction, } from '@tanstack/router-core';
|
|
54
|
+
export { ClientOnly } from './ClientOnly';
|
package/dist/source/index.jsx
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.jsx","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EACL,oBAAoB,EACpB,OAAO,EACP,SAAS,EACT,SAAS,EACT,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,WAAW,EACX,eAAe,EACf,WAAW,EACX,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,eAAe,EACf,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,SAAS,EACT,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,0BAA0B,GAC3B,MAAM,uBAAuB,CAAA;AAmF9B,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,mBAAmB,CAAA;AAU1B,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AAG7C,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAE/D,OAAO,EACL,SAAS,EACT,eAAe,EACf,eAAe,EACf,SAAS,EACT,eAAe,EACf,mBAAmB,GACpB,MAAM,aAAa,CAAA;AAEpB,cAAc,WAAW,CAAA;AAEzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"index.jsx","sourceRoot":"","sources":["../../src/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,2 @@
|
|
|
1
|
-
import * as Vue from 'vue';
|
|
2
1
|
import type { AsyncRouteComponent } from './route';
|
|
3
|
-
export declare function ClientOnly(props: {
|
|
4
|
-
children?: any;
|
|
5
|
-
fallback?: Vue.VNode;
|
|
6
|
-
}): () => any;
|
|
7
|
-
export declare function useHydrated(): Vue.Ref<boolean, boolean> | Vue.ComputedRef<boolean>;
|
|
8
2
|
export declare function lazyRouteComponent<T extends Record<string, any>, TKey extends keyof T = 'default'>(importer: () => Promise<T>, exportName?: TKey, ssr?: () => boolean): T[TKey] extends (props: infer TProps) => any ? AsyncRouteComponent<TProps> : never;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as Vue from 'vue';
|
|
2
2
|
import { Outlet } from './Match';
|
|
3
|
+
import { ClientOnly } from './ClientOnly';
|
|
3
4
|
// If the load fails due to module not found, it may mean a new version of
|
|
4
5
|
// the build was deployed and the user's browser is still using an old version.
|
|
5
6
|
// If this happens, the old version in the user's browser would have an outdated
|
|
@@ -15,28 +16,6 @@ function isModuleNotFoundError(error) {
|
|
|
15
16
|
error.message.startsWith('error loading dynamically imported module') ||
|
|
16
17
|
error.message.startsWith('Importing a module script failed'));
|
|
17
18
|
}
|
|
18
|
-
export function ClientOnly(props) {
|
|
19
|
-
const hydrated = useHydrated();
|
|
20
|
-
return () => {
|
|
21
|
-
if (hydrated.value) {
|
|
22
|
-
return props.children;
|
|
23
|
-
}
|
|
24
|
-
return props.fallback || null;
|
|
25
|
-
};
|
|
26
|
-
}
|
|
27
|
-
export function useHydrated() {
|
|
28
|
-
// Only hydrate on client-side, never on server
|
|
29
|
-
const hydrated = Vue.ref(false);
|
|
30
|
-
// If on server, return false
|
|
31
|
-
if (typeof window === 'undefined') {
|
|
32
|
-
return Vue.computed(() => false);
|
|
33
|
-
}
|
|
34
|
-
// On client, set to true once mounted
|
|
35
|
-
Vue.onMounted(() => {
|
|
36
|
-
hydrated.value = true;
|
|
37
|
-
});
|
|
38
|
-
return hydrated;
|
|
39
|
-
}
|
|
40
19
|
export function lazyRouteComponent(importer, exportName, ssr) {
|
|
41
20
|
let loadPromise;
|
|
42
21
|
let comp = null;
|
|
@@ -123,7 +102,8 @@ export function lazyRouteComponent(importer, exportName, ssr) {
|
|
|
123
102
|
if (ssr?.() === false) {
|
|
124
103
|
return Vue.h(ClientOnly, {
|
|
125
104
|
fallback: Vue.h(Outlet),
|
|
126
|
-
|
|
105
|
+
}, {
|
|
106
|
+
default: () => Vue.h(component.value, props),
|
|
127
107
|
});
|
|
128
108
|
}
|
|
129
109
|
// Regular render with the loaded component
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lazyRouteComponent.jsx","sourceRoot":"","sources":["../../src/lazyRouteComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"lazyRouteComponent.jsx","sourceRoot":"","sources":["../../src/lazyRouteComponent.tsx"],"names":[],"mappings":"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"}
|
package/dist/source/link.d.ts
CHANGED
|
@@ -1,28 +1,24 @@
|
|
|
1
1
|
import * as Vue from 'vue';
|
|
2
2
|
import type { AnyRouter, Constrain, LinkOptions, RegisteredRouter, RoutePaths } from '@tanstack/router-core';
|
|
3
|
+
import type { AnchorHTMLAttributes, ReservedProps } from '@vue/runtime-dom';
|
|
3
4
|
import type { ValidateLinkOptions, ValidateLinkOptionsArray } from './typePrimitives';
|
|
4
5
|
type EventHandler<TEvent = Event> = (e: TEvent) => void;
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
onFocus?: EventHandler<FocusEvent>;
|
|
10
|
-
onMouseenter?: EventHandler<MouseEvent>;
|
|
11
|
-
onMouseleave?: EventHandler<MouseEvent>;
|
|
12
|
-
onMouseover?: EventHandler<MouseEvent>;
|
|
13
|
-
onMouseout?: EventHandler<MouseEvent>;
|
|
14
|
-
onTouchstart?: EventHandler<TouchEvent>;
|
|
6
|
+
type DataAttributes = {
|
|
7
|
+
[K in `data-${string}`]?: unknown;
|
|
8
|
+
};
|
|
9
|
+
type LinkHTMLAttributes = AnchorHTMLAttributes & ReservedProps & DataAttributes & {
|
|
15
10
|
onMouseEnter?: EventHandler<MouseEvent>;
|
|
16
11
|
onMouseLeave?: EventHandler<MouseEvent>;
|
|
17
12
|
onMouseOver?: EventHandler<MouseEvent>;
|
|
18
13
|
onMouseOut?: EventHandler<MouseEvent>;
|
|
19
14
|
onTouchStart?: EventHandler<TouchEvent>;
|
|
20
|
-
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
export
|
|
15
|
+
disabled?: boolean;
|
|
16
|
+
};
|
|
17
|
+
type PropsOfComponent<TComp> = TComp extends (props: infer P, ...args: Array<unknown>) => any ? P : TComp extends Vue.Component<infer P> ? P : Record<string, unknown>;
|
|
18
|
+
export declare function useLinkProps<TRouter extends AnyRouter = RegisteredRouter, TFrom extends RoutePaths<TRouter['routeTree']> | string = string, TTo extends string = '', TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom, TMaskTo extends string = ''>(options: UseLinkPropsOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): LinkHTMLAttributes;
|
|
19
|
+
export type UseLinkPropsOptions<TRouter extends AnyRouter = RegisteredRouter, TFrom extends RoutePaths<TRouter['routeTree']> | string = string, TTo extends string | undefined = '.', TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom, TMaskTo extends string = '.'> = ActiveLinkOptions<'a', TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & LinkHTMLAttributes;
|
|
24
20
|
export type ActiveLinkOptions<TComp = 'a', TRouter extends AnyRouter = RegisteredRouter, TFrom extends string = string, TTo extends string | undefined = '.', TMaskFrom extends string = TFrom, TMaskTo extends string = '.'> = LinkOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & ActiveLinkOptionProps<TComp>;
|
|
25
|
-
type ActiveLinkProps<TComp> = Partial<
|
|
21
|
+
type ActiveLinkProps<TComp> = Partial<(TComp extends keyof HTMLElementTagNameMap ? LinkHTMLAttributes : PropsOfComponent<TComp>) & {
|
|
26
22
|
[key: `data-${string}`]: unknown;
|
|
27
23
|
}>;
|
|
28
24
|
export interface ActiveLinkOptionProps<TComp = 'a'> {
|
|
@@ -39,22 +35,24 @@ export interface ActiveLinkOptionProps<TComp = 'a'> {
|
|
|
39
35
|
}
|
|
40
36
|
export type LinkProps<TComp = 'a', TRouter extends AnyRouter = RegisteredRouter, TFrom extends string = string, TTo extends string | undefined = '.', TMaskFrom extends string = TFrom, TMaskTo extends string = '.'> = ActiveLinkOptions<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & LinkPropsChildren;
|
|
41
37
|
export interface LinkPropsChildren {
|
|
42
|
-
children?: Vue.
|
|
38
|
+
children?: Vue.VNodeChild | ((state: {
|
|
43
39
|
isActive: boolean;
|
|
44
40
|
isTransitioning: boolean;
|
|
45
|
-
}) => Vue.
|
|
41
|
+
}) => Vue.VNodeChild);
|
|
46
42
|
}
|
|
47
|
-
type LinkComponentVueProps<TComp> = TComp extends keyof HTMLElementTagNameMap ? Omit<
|
|
43
|
+
type LinkComponentVueProps<TComp> = TComp extends keyof HTMLElementTagNameMap ? Omit<LinkHTMLAttributes, keyof CreateLinkProps> : Omit<PropsOfComponent<TComp>, keyof CreateLinkProps>;
|
|
48
44
|
export type LinkComponentProps<TComp = 'a', TRouter extends AnyRouter = RegisteredRouter, TFrom extends string = string, TTo extends string | undefined = '.', TMaskFrom extends string = TFrom, TMaskTo extends string = '.'> = LinkComponentVueProps<TComp> & LinkProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>;
|
|
49
45
|
export type CreateLinkProps = LinkProps<any, any, string, string, string, string>;
|
|
50
|
-
export type LinkComponent<TComp> = <TRouter extends AnyRouter = RegisteredRouter, const TFrom extends string =
|
|
46
|
+
export type LinkComponent<in out TComp, in out TDefaultFrom extends string = string> = <TRouter extends AnyRouter = RegisteredRouter, const TFrom extends string = TDefaultFrom, const TTo extends string | undefined = undefined, const TMaskFrom extends string = TFrom, const TMaskTo extends string = ''>(props: LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>) => Vue.VNode;
|
|
47
|
+
export interface LinkComponentRoute<in out TDefaultFrom extends string = string> {
|
|
48
|
+
defaultFrom: TDefaultFrom;
|
|
49
|
+
<TRouter extends AnyRouter = RegisteredRouter, const TTo extends string | undefined = undefined, const TMaskTo extends string = ''>(props: LinkComponentProps<'a', TRouter, this['defaultFrom'], TTo, this['defaultFrom'], TMaskTo>): Vue.VNode;
|
|
50
|
+
}
|
|
51
51
|
export declare function createLink<const TComp>(Comp: Constrain<TComp, any, (props: CreateLinkProps) => Vue.VNode>): LinkComponent<TComp>;
|
|
52
52
|
/**
|
|
53
53
|
* Link component with proper TypeScript generics support
|
|
54
54
|
*/
|
|
55
|
-
export declare const Link:
|
|
56
|
-
<TRouter extends AnyRouter = RegisteredRouter, TFrom extends RoutePaths<TRouter["routeTree"]> | string = string, TTo extends string | undefined = ".", TMaskFrom extends RoutePaths<TRouter["routeTree"]> | string = TFrom, TMaskTo extends string = ".">(props: LinkComponentProps<"a", TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): Vue.VNode;
|
|
57
|
-
};
|
|
55
|
+
export declare const Link: Vue.Component<unknown> & Vue.Component<CreateLinkProps> & LinkComponent<"a">;
|
|
58
56
|
export type LinkOptionsFnOptions<TOptions, TComp, TRouter extends AnyRouter = RegisteredRouter> = TOptions extends ReadonlyArray<any> ? ValidateLinkOptionsArray<TRouter, TOptions, string, TComp> : ValidateLinkOptions<TRouter, TOptions, string, TComp>;
|
|
59
57
|
export type LinkOptionsFn<TComp> = <const TOptions, TRouter extends AnyRouter = RegisteredRouter>(options: LinkOptionsFnOptions<TOptions, TComp, TRouter>) => TOptions;
|
|
60
58
|
export declare const linkOptions: LinkOptionsFn<'a'>;
|
package/dist/source/link.jsx
CHANGED
|
@@ -101,6 +101,7 @@ export function useLinkProps(options) {
|
|
|
101
101
|
// Create safe props that can be spread
|
|
102
102
|
const getPropsSafeToSpread = () => {
|
|
103
103
|
const result = {};
|
|
104
|
+
const optionRecord = options;
|
|
104
105
|
for (const key in options) {
|
|
105
106
|
if (![
|
|
106
107
|
'activeProps',
|
|
@@ -137,7 +138,7 @@ export function useLinkProps(options) {
|
|
|
137
138
|
'from',
|
|
138
139
|
'additionalProps',
|
|
139
140
|
].includes(key)) {
|
|
140
|
-
result[key] =
|
|
141
|
+
result[key] = optionRecord[key];
|
|
141
142
|
}
|
|
142
143
|
}
|
|
143
144
|
return result;
|
|
@@ -401,7 +402,7 @@ export function createLink(Comp) {
|
|
|
401
402
|
name: 'CreatedLink',
|
|
402
403
|
inheritAttrs: false,
|
|
403
404
|
setup(_, { attrs, slots }) {
|
|
404
|
-
return () => Vue.h(
|
|
405
|
+
return () => Vue.h(LinkImpl, { ...attrs, _asChild: Comp }, slots);
|
|
405
406
|
},
|
|
406
407
|
});
|
|
407
408
|
}
|