@bleedingdev/modern-js-plugin-tanstack 3.2.0-ultramodern.98 → 3.4.0-ultramodern.0
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/cli/index.js +80 -34
- package/dist/cjs/cli/routeSplitting.js +13 -41
- package/dist/cjs/cli/tanstackTypes.js +114 -200
- package/dist/cjs/cli.js +12 -8
- package/dist/cjs/runtime/basepathRewrite.js +12 -8
- package/dist/cjs/runtime/dataMutation.js +9 -5
- package/dist/cjs/runtime/hooks.js +20 -19
- package/dist/cjs/runtime/hydrationBoundary.js +12 -7
- package/dist/cjs/runtime/index.js +66 -54
- package/dist/cjs/runtime/lifecycle.js +21 -91
- package/dist/cjs/runtime/loaderBridge.js +173 -0
- package/dist/cjs/runtime/outlet.js +58 -0
- package/dist/cjs/runtime/plugin.js +190 -110
- package/dist/cjs/runtime/plugin.node.js +25 -40
- package/dist/cjs/runtime/plugin.worker.js +9 -5
- package/dist/cjs/runtime/pluginCore.js +55 -0
- package/dist/cjs/runtime/prefetchLink.js +10 -6
- package/dist/cjs/runtime/register.js +56 -0
- package/dist/cjs/runtime/routeTree.js +30 -212
- package/dist/cjs/runtime/router.js +41 -0
- package/dist/cjs/runtime/rsc/ClientSlot.js +9 -5
- package/dist/cjs/runtime/rsc/CompositeComponent.js +9 -5
- package/dist/cjs/runtime/rsc/ReplayableStream.js +14 -9
- package/dist/cjs/runtime/rsc/RscNodeRenderer.js +9 -5
- package/dist/cjs/runtime/rsc/SlotContext.js +9 -5
- package/dist/cjs/runtime/rsc/client.js +9 -5
- package/dist/cjs/runtime/rsc/createRscProxy.js +9 -5
- package/dist/cjs/runtime/rsc/index.js +9 -5
- package/dist/cjs/runtime/rsc/payloadRouter.js +44 -6
- package/dist/cjs/runtime/rsc/server.js +9 -5
- package/dist/cjs/runtime/rsc/slotUsageSanitizer.js +9 -5
- package/dist/cjs/runtime/rsc/symbols.js +20 -15
- package/dist/cjs/runtime/state.js +45 -0
- package/dist/cjs/runtime/types.js +13 -9
- package/dist/cjs/runtime/utils.js +9 -11
- package/dist/cjs/runtime.js +9 -5
- package/dist/esm/cli/index.mjs +73 -28
- package/dist/esm/cli/routeSplitting.mjs +1 -30
- package/dist/esm/cli/tanstackTypes.mjs +100 -190
- package/dist/esm/runtime/hooks.mjs +1 -8
- package/dist/esm/runtime/hydrationBoundary.mjs +3 -2
- package/dist/esm/runtime/index.mjs +4 -2
- package/dist/esm/runtime/lifecycle.mjs +1 -82
- package/dist/esm/runtime/loaderBridge.mjs +114 -0
- package/dist/esm/runtime/outlet.mjs +17 -0
- package/dist/esm/runtime/plugin.mjs +183 -107
- package/dist/esm/runtime/plugin.node.mjs +19 -38
- package/dist/esm/runtime/pluginCore.mjs +14 -0
- package/dist/esm/runtime/prefetchLink.mjs +1 -1
- package/dist/esm/runtime/register.mjs +18 -0
- package/dist/esm/runtime/routeTree.mjs +15 -198
- package/dist/esm/runtime/router.mjs +2 -0
- package/dist/esm/runtime/rsc/payloadRouter.mjs +35 -1
- package/dist/esm/runtime/state.mjs +7 -0
- package/dist/esm/runtime/utils.mjs +0 -6
- package/dist/esm-node/cli/index.mjs +73 -28
- package/dist/esm-node/cli/routeSplitting.mjs +1 -30
- package/dist/esm-node/cli/tanstackTypes.mjs +100 -190
- package/dist/esm-node/runtime/hooks.mjs +1 -8
- package/dist/esm-node/runtime/hydrationBoundary.mjs +3 -2
- package/dist/esm-node/runtime/index.mjs +4 -2
- package/dist/esm-node/runtime/lifecycle.mjs +1 -82
- package/dist/esm-node/runtime/loaderBridge.mjs +115 -0
- package/dist/esm-node/runtime/outlet.mjs +18 -0
- package/dist/esm-node/runtime/plugin.mjs +183 -107
- package/dist/esm-node/runtime/plugin.node.mjs +19 -38
- package/dist/esm-node/runtime/pluginCore.mjs +15 -0
- package/dist/esm-node/runtime/prefetchLink.mjs +1 -1
- package/dist/esm-node/runtime/register.mjs +19 -0
- package/dist/esm-node/runtime/routeTree.mjs +15 -198
- package/dist/esm-node/runtime/router.mjs +3 -0
- package/dist/esm-node/runtime/rsc/payloadRouter.mjs +35 -1
- package/dist/esm-node/runtime/state.mjs +8 -0
- package/dist/esm-node/runtime/utils.mjs +0 -6
- package/dist/types/cli/index.d.ts +11 -2
- package/dist/types/cli/routeSplitting.d.ts +6 -15
- package/dist/types/cli/tanstackTypes.d.ts +21 -1
- package/dist/types/runtime/hooks.d.ts +8 -33
- package/dist/types/runtime/index.d.ts +6 -3
- package/dist/types/runtime/lifecycle.d.ts +7 -22
- package/dist/types/runtime/loaderBridge.d.ts +48 -0
- package/dist/types/runtime/outlet.d.ts +2 -0
- package/dist/types/runtime/plugin.d.ts +1 -14
- package/dist/types/runtime/plugin.node.d.ts +1 -14
- package/dist/types/runtime/pluginCore.d.ts +21 -0
- package/dist/types/runtime/register.d.ts +9 -0
- package/dist/types/runtime/routeTree.d.ts +0 -2
- package/dist/types/runtime/router.d.ts +14 -0
- package/dist/types/runtime/state.d.ts +16 -0
- package/dist/types/runtime/types.d.ts +7 -53
- package/package.json +40 -38
- package/rstest.config.mts +6 -0
- package/src/cli/index.ts +146 -24
- package/src/cli/routeSplitting.ts +6 -44
- package/src/cli/tanstackTypes.ts +203 -208
- package/src/runtime/hooks.ts +10 -27
- package/src/runtime/hydrationBoundary.tsx +5 -5
- package/src/runtime/index.tsx +12 -14
- package/src/runtime/lifecycle.ts +16 -151
- package/src/runtime/loaderBridge.ts +257 -0
- package/src/runtime/outlet.tsx +48 -0
- package/src/runtime/plugin.node.tsx +28 -83
- package/src/runtime/plugin.tsx +350 -202
- package/src/runtime/pluginCore.ts +48 -0
- package/src/runtime/prefetchLink.tsx +1 -1
- package/src/runtime/register.ts +58 -0
- package/src/runtime/routeTree.ts +41 -365
- package/src/runtime/router.ts +15 -0
- package/src/runtime/rsc/payloadRouter.ts +45 -2
- package/src/runtime/ssr-shim.d.ts +1 -3
- package/src/runtime/state.ts +29 -0
- package/src/runtime/types.ts +20 -67
- package/src/runtime/utils.tsx +3 -7
- package/tests/router/cli.test.ts +373 -31
- package/tests/router/hooks.test.ts +26 -0
- package/tests/router/loaderBridge.test.ts +211 -0
- package/tests/router/packageSurface.test.ts +24 -0
- package/tests/router/prefetchLink.test.tsx +43 -7
- package/tests/router/register.test.ts +46 -0
- package/tests/router/routeTree.test.ts +176 -139
- package/tests/router/rsc.test.tsx +70 -0
- package/tests/router/tanstackTypes.test.ts +395 -7
- package/dist/cjs/runtime/DefaultNotFound.js +0 -47
- package/dist/esm/runtime/DefaultNotFound.mjs +0 -13
- package/dist/esm-node/runtime/DefaultNotFound.mjs +0 -14
- package/dist/types/runtime/DefaultNotFound.d.ts +0 -2
- package/src/runtime/DefaultNotFound.tsx +0 -15
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __webpack_require__ = {};
|
|
3
|
+
(()=>{
|
|
4
|
+
__webpack_require__.d = (exports1, getters, values)=>{
|
|
5
|
+
var define = (defs, kind)=>{
|
|
6
|
+
for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
[kind]: defs[key]
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
define(getters, "get");
|
|
12
|
+
define(values, "value");
|
|
13
|
+
};
|
|
14
|
+
})();
|
|
15
|
+
(()=>{
|
|
16
|
+
__webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
|
|
17
|
+
})();
|
|
18
|
+
(()=>{
|
|
19
|
+
__webpack_require__.r = (exports1)=>{
|
|
20
|
+
if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
|
|
21
|
+
value: 'Module'
|
|
22
|
+
});
|
|
23
|
+
Object.defineProperty(exports1, '__esModule', {
|
|
24
|
+
value: true
|
|
25
|
+
});
|
|
26
|
+
};
|
|
27
|
+
})();
|
|
28
|
+
var __webpack_exports__ = {};
|
|
29
|
+
__webpack_require__.r(__webpack_exports__);
|
|
30
|
+
__webpack_require__.d(__webpack_exports__, {
|
|
31
|
+
tanstackRouterCompatBindings: ()=>tanstackRouterCompatBindings
|
|
32
|
+
});
|
|
33
|
+
const context_namespaceObject = require("@modern-js/runtime/context");
|
|
34
|
+
const external_dataMutation_js_namespaceObject = require("./dataMutation.js");
|
|
35
|
+
const external_outlet_js_namespaceObject = require("./outlet.js");
|
|
36
|
+
const external_plugin_js_namespaceObject = require("./plugin.js");
|
|
37
|
+
const external_prefetchLink_js_namespaceObject = require("./prefetchLink.js");
|
|
38
|
+
const tanstackRouterProviderFactory = (userConfig)=>(0, external_plugin_js_namespaceObject.tanstackRouterPlugin)(userConfig);
|
|
39
|
+
(0, context_namespaceObject.registerRouterProvider)('tanstack', tanstackRouterProviderFactory);
|
|
40
|
+
const COMPAT_BINDINGS_SLOT = Symbol.for('@modern-js/plugin-tanstack:runtime-compat-bindings');
|
|
41
|
+
const tanstackRouterCompatBindings = {
|
|
42
|
+
Form: external_dataMutation_js_namespaceObject.Form,
|
|
43
|
+
Link: external_prefetchLink_js_namespaceObject.Link,
|
|
44
|
+
NavLink: external_prefetchLink_js_namespaceObject.NavLink,
|
|
45
|
+
Outlet: external_outlet_js_namespaceObject.Outlet,
|
|
46
|
+
RouteActionResponseError: external_dataMutation_js_namespaceObject.RouteActionResponseError,
|
|
47
|
+
useFetcher: external_dataMutation_js_namespaceObject.useFetcher
|
|
48
|
+
};
|
|
49
|
+
globalThis[COMPAT_BINDINGS_SLOT] ??= tanstackRouterCompatBindings;
|
|
50
|
+
exports.tanstackRouterCompatBindings = __webpack_exports__.tanstackRouterCompatBindings;
|
|
51
|
+
for(var __rspack_i in __webpack_exports__)if (-1 === [
|
|
52
|
+
"tanstackRouterCompatBindings"
|
|
53
|
+
].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
|
|
54
|
+
Object.defineProperty(exports, '__esModule', {
|
|
55
|
+
value: true
|
|
56
|
+
});
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __webpack_require__ = {};
|
|
3
3
|
(()=>{
|
|
4
|
-
__webpack_require__.d = (exports1,
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
__webpack_require__.d = (exports1, getters, values)=>{
|
|
5
|
+
var define = (defs, kind)=>{
|
|
6
|
+
for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
[kind]: defs[key]
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
define(getters, "get");
|
|
12
|
+
define(values, "value");
|
|
9
13
|
};
|
|
10
14
|
})();
|
|
11
15
|
(()=>{
|
|
@@ -24,13 +28,14 @@ var __webpack_require__ = {};
|
|
|
24
28
|
var __webpack_exports__ = {};
|
|
25
29
|
__webpack_require__.r(__webpack_exports__);
|
|
26
30
|
__webpack_require__.d(__webpack_exports__, {
|
|
27
|
-
createRouteTreeFromModernRoutes: ()=>createRouteTreeFromModernRoutes,
|
|
28
31
|
createRouteTreeFromRouteObjects: ()=>createRouteTreeFromRouteObjects,
|
|
29
32
|
getModernRouteIdsFromMatches: ()=>getModernRouteIdsFromMatches
|
|
30
33
|
});
|
|
34
|
+
const context_namespaceObject = require("@modern-js/runtime/context");
|
|
31
35
|
const react_router_namespaceObject = require("@tanstack/react-router");
|
|
32
36
|
const external_react_namespaceObject = require("react");
|
|
33
|
-
const
|
|
37
|
+
const external_loaderBridge_js_namespaceObject = require("./loaderBridge.js");
|
|
38
|
+
const external_outlet_js_namespaceObject = require("./outlet.js");
|
|
34
39
|
const payloadRouter_js_namespaceObject = require("./rsc/payloadRouter.js");
|
|
35
40
|
function createTanstackRoute(options) {
|
|
36
41
|
return (0, react_router_namespaceObject.createRoute)(options);
|
|
@@ -38,6 +43,10 @@ function createTanstackRoute(options) {
|
|
|
38
43
|
function createTanstackRootRoute(options) {
|
|
39
44
|
return (0, react_router_namespaceObject.createRootRoute)(options);
|
|
40
45
|
}
|
|
46
|
+
function wrapRouteComponentWithModernContext(route, component, routeId) {
|
|
47
|
+
const routeMatchId = routeId || route.id;
|
|
48
|
+
if (component && routeMatchId) route.options.component = (0, external_outlet_js_namespaceObject.withModernRouteMatchContext)(component, routeMatchId);
|
|
49
|
+
}
|
|
41
50
|
function toTanstackPath(pathname) {
|
|
42
51
|
return pathname.split('/').map((segment)=>{
|
|
43
52
|
if (!segment) return segment;
|
|
@@ -50,23 +59,6 @@ function toTanstackPath(pathname) {
|
|
|
50
59
|
return segment;
|
|
51
60
|
}).join('/');
|
|
52
61
|
}
|
|
53
|
-
function isResponse(value) {
|
|
54
|
-
const record = value;
|
|
55
|
-
return null != record && 'object' == typeof record && 'number' == typeof record.status && 'object' == typeof record.headers;
|
|
56
|
-
}
|
|
57
|
-
function isTanstackRedirect(value) {
|
|
58
|
-
return isResponse(value) && 'object' == typeof value.options;
|
|
59
|
-
}
|
|
60
|
-
const redirectStatusCodes = new Set([
|
|
61
|
-
301,
|
|
62
|
-
302,
|
|
63
|
-
303,
|
|
64
|
-
307,
|
|
65
|
-
308
|
|
66
|
-
]);
|
|
67
|
-
function isRedirectResponse(res) {
|
|
68
|
-
return redirectStatusCodes.has(res.status);
|
|
69
|
-
}
|
|
70
62
|
function isModernDeferredData(value) {
|
|
71
63
|
if (!value || 'object' != typeof value) return false;
|
|
72
64
|
const deferred = value;
|
|
@@ -76,10 +68,10 @@ function normalizeModernLoaderResult(result) {
|
|
|
76
68
|
return isModernDeferredData(result) ? result.data : result;
|
|
77
69
|
}
|
|
78
70
|
function normalizeModernLoaderResponse(result) {
|
|
79
|
-
if (isResponse(result)) {
|
|
80
|
-
if (isRedirectResponse(result)) {
|
|
71
|
+
if ((0, external_loaderBridge_js_namespaceObject.isResponse)(result)) {
|
|
72
|
+
if ((0, external_loaderBridge_js_namespaceObject.isRedirectResponse)(result)) {
|
|
81
73
|
const location = result.headers.get('Location') || '/';
|
|
82
|
-
throwTanstackRedirect(location);
|
|
74
|
+
(0, external_loaderBridge_js_namespaceObject.throwTanstackRedirect)(location);
|
|
83
75
|
}
|
|
84
76
|
if (404 === result.status) throw (0, react_router_namespaceObject.notFound)();
|
|
85
77
|
}
|
|
@@ -119,34 +111,6 @@ function createServerLazyImportComponent(lazyImport, fallbackComponent) {
|
|
|
119
111
|
Component.preload = load;
|
|
120
112
|
return Component;
|
|
121
113
|
}
|
|
122
|
-
function isAbsoluteUrl(value) {
|
|
123
|
-
try {
|
|
124
|
-
new URL(value);
|
|
125
|
-
return true;
|
|
126
|
-
} catch {
|
|
127
|
-
return false;
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
function throwTanstackRedirect(location) {
|
|
131
|
-
const target = location || '/';
|
|
132
|
-
if (isAbsoluteUrl(target)) throw (0, react_router_namespaceObject.redirect)({
|
|
133
|
-
href: target
|
|
134
|
-
});
|
|
135
|
-
throw (0, react_router_namespaceObject.redirect)({
|
|
136
|
-
to: target
|
|
137
|
-
});
|
|
138
|
-
}
|
|
139
|
-
function mapParamsForModernLoader({ modernRoute, params }) {
|
|
140
|
-
if ('nested' === modernRoute.type && modernRoute.path?.includes('*')) {
|
|
141
|
-
const { _splat, ...rest } = params;
|
|
142
|
-
if (void 0 !== _splat) return {
|
|
143
|
-
...rest,
|
|
144
|
-
'*': _splat
|
|
145
|
-
};
|
|
146
|
-
return rest;
|
|
147
|
-
}
|
|
148
|
-
return params;
|
|
149
|
-
}
|
|
150
114
|
function createModernRequest(input, signal) {
|
|
151
115
|
return new Request(input, {
|
|
152
116
|
signal
|
|
@@ -180,52 +144,6 @@ function createModernShouldReload(shouldRevalidate, state) {
|
|
|
180
144
|
return 'boolean' == typeof result ? result : void 0;
|
|
181
145
|
};
|
|
182
146
|
}
|
|
183
|
-
function wrapModernLoader(modernRoute, modernLoader, revalidationState, options = {}) {
|
|
184
|
-
const route = modernRoute;
|
|
185
|
-
return async (ctx)=>{
|
|
186
|
-
try {
|
|
187
|
-
if (revalidationState) rememberRouteLocation(revalidationState, ctx);
|
|
188
|
-
if ('function' == typeof route.lazyImport) try {
|
|
189
|
-
await route.lazyImport();
|
|
190
|
-
} catch {}
|
|
191
|
-
const signal = ctx?.abortController?.signal || ctx?.signal || new AbortController().signal;
|
|
192
|
-
const baseRequest = ctx?.context?.request instanceof Request ? ctx.context.request : void 0;
|
|
193
|
-
const href = 'string' == typeof ctx?.location ? ctx.location : ctx?.location?.publicHref || ctx?.location?.href || ctx?.location?.url?.href || '';
|
|
194
|
-
const request = void 0 !== baseRequest ? new Request(baseRequest, {
|
|
195
|
-
signal
|
|
196
|
-
}) : createModernRequest(href, signal);
|
|
197
|
-
const params = mapParamsForModernLoader({
|
|
198
|
-
modernRoute,
|
|
199
|
-
params: ctx.params || {}
|
|
200
|
-
});
|
|
201
|
-
const loadModernData = async ()=>{
|
|
202
|
-
const result = modernLoader ? await modernLoader({
|
|
203
|
-
request,
|
|
204
|
-
params,
|
|
205
|
-
context: ctx?.context?.requestContext
|
|
206
|
-
}) : null;
|
|
207
|
-
return normalizeModernLoaderResponse(result);
|
|
208
|
-
};
|
|
209
|
-
if (options.rscPayloadRouter && (0, payloadRouter_js_namespaceObject.isTanstackRscPayloadNavigationEnabled)()) return (0, payloadRouter_js_namespaceObject.loadTanstackRscRouteData)({
|
|
210
|
-
hasClientLoader: route.hasClientLoader || void 0 !== route.clientData,
|
|
211
|
-
loadClientData: loadModernData,
|
|
212
|
-
request,
|
|
213
|
-
routeId: ctx.route?.id
|
|
214
|
-
});
|
|
215
|
-
return loadModernData();
|
|
216
|
-
} catch (err) {
|
|
217
|
-
if (isResponse(err)) {
|
|
218
|
-
if (isTanstackRedirect(err)) throw err;
|
|
219
|
-
if (isRedirectResponse(err)) {
|
|
220
|
-
const location = err.headers.get('Location') || '/';
|
|
221
|
-
throwTanstackRedirect(location);
|
|
222
|
-
}
|
|
223
|
-
if (404 === err.status) throw (0, react_router_namespaceObject.notFound)();
|
|
224
|
-
}
|
|
225
|
-
throw err;
|
|
226
|
-
}
|
|
227
|
-
};
|
|
228
|
-
}
|
|
229
147
|
function isRouteObjectPathlessLayout(route) {
|
|
230
148
|
return !route.path && !route.index;
|
|
231
149
|
}
|
|
@@ -279,11 +197,11 @@ function wrapRouteObjectLoader(route, revalidationState, options = {}) {
|
|
|
279
197
|
});
|
|
280
198
|
return loadModernData();
|
|
281
199
|
} catch (err) {
|
|
282
|
-
if (isResponse(err)) {
|
|
283
|
-
if (isTanstackRedirect(err)) throw err;
|
|
284
|
-
if (isRedirectResponse(err)) {
|
|
200
|
+
if ((0, external_loaderBridge_js_namespaceObject.isResponse)(err)) {
|
|
201
|
+
if ((0, external_loaderBridge_js_namespaceObject.isTanstackRedirect)(err)) throw err;
|
|
202
|
+
if ((0, external_loaderBridge_js_namespaceObject.isRedirectResponse)(err)) {
|
|
285
203
|
const location = err.headers.get('Location') || '/';
|
|
286
|
-
throwTanstackRedirect(location);
|
|
204
|
+
(0, external_loaderBridge_js_namespaceObject.throwTanstackRedirect)(location);
|
|
287
205
|
}
|
|
288
206
|
if (404 === err.status) throw (0, react_router_namespaceObject.notFound)();
|
|
289
207
|
}
|
|
@@ -300,11 +218,6 @@ function toRouteComponent(routeObject) {
|
|
|
300
218
|
const element = route.element;
|
|
301
219
|
if (element) return ()=>element;
|
|
302
220
|
}
|
|
303
|
-
function toModernRouteComponent(route) {
|
|
304
|
-
const component = route.component || void 0;
|
|
305
|
-
if ('function' == typeof route.lazyImport && component) return createServerLazyImportComponent(route.lazyImport, component);
|
|
306
|
-
return component;
|
|
307
|
-
}
|
|
308
221
|
function toErrorComponent(routeObject) {
|
|
309
222
|
const route = routeObject;
|
|
310
223
|
if (route.ErrorBoundary) return route.ErrorBoundary;
|
|
@@ -342,9 +255,10 @@ function createRouteFromRouteObject(opts) {
|
|
|
342
255
|
const shouldRevalidate = modernRouteObject.shouldRevalidate;
|
|
343
256
|
const shouldReload = createModernShouldReload(shouldRevalidate, revalidationState);
|
|
344
257
|
const stableFallbackId = routeObject.id || modernRouteObject.file || routeObject.path || 'pathless';
|
|
258
|
+
const component = toRouteComponent(routeObject);
|
|
345
259
|
const base = {
|
|
346
260
|
getParentRoute: ()=>parent,
|
|
347
|
-
component
|
|
261
|
+
component,
|
|
348
262
|
pendingComponent: toPendingComponent(routeObject),
|
|
349
263
|
errorComponent: toErrorComponent(routeObject),
|
|
350
264
|
validateSearch: modernRouteObject.validateSearch,
|
|
@@ -367,6 +281,7 @@ function createRouteFromRouteObject(opts) {
|
|
|
367
281
|
if (isRouteObjectPathlessLayout(routeObject)) base.id = stableFallbackId;
|
|
368
282
|
else base.path = routeObject.index ? '/' : toTanstackPath(routeObject.path || '');
|
|
369
283
|
const route = createTanstackRoute(base);
|
|
284
|
+
wrapRouteComponentWithModernContext(route, component, routeObject.id);
|
|
370
285
|
const children = routeObject.children;
|
|
371
286
|
if (children && children.length > 0) {
|
|
372
287
|
const childRoutes = children.map((child)=>createRouteFromRouteObject({
|
|
@@ -378,103 +293,6 @@ function createRouteFromRouteObject(opts) {
|
|
|
378
293
|
}
|
|
379
294
|
return route;
|
|
380
295
|
}
|
|
381
|
-
function createRouteFromModernRoute(opts) {
|
|
382
|
-
const { options = {}, parent, modernRoute } = opts;
|
|
383
|
-
const route = modernRoute;
|
|
384
|
-
const revalidationState = {};
|
|
385
|
-
const modernId = route.id;
|
|
386
|
-
const stableFallbackId = modernId || route._component || route.filename || route.data || ('function' == typeof route.loader ? route.id : void 0);
|
|
387
|
-
const pendingComponent = route.loading || route.pendingComponent;
|
|
388
|
-
const errorComponent = route.error || route.errorComponent;
|
|
389
|
-
const component = toModernRouteComponent(route);
|
|
390
|
-
const modernLoader = route.loader;
|
|
391
|
-
const modernAction = route.action;
|
|
392
|
-
const modernShouldRevalidate = route.shouldRevalidate;
|
|
393
|
-
const shouldReload = createModernShouldReload(modernShouldRevalidate, revalidationState);
|
|
394
|
-
const isPathlessLayout = 'nested' === route.type && 'boolean' != typeof route.index && void 0 === route.path;
|
|
395
|
-
const isIndexRoute = 'nested' === route.type && Boolean(route.index);
|
|
396
|
-
const base = {
|
|
397
|
-
getParentRoute: ()=>parent,
|
|
398
|
-
component: component || void 0,
|
|
399
|
-
pendingComponent: pendingComponent || void 0,
|
|
400
|
-
errorComponent: errorComponent || void 0,
|
|
401
|
-
validateSearch: route.validateSearch,
|
|
402
|
-
loaderDeps: route.loaderDeps,
|
|
403
|
-
staticData: createRouteStaticData({
|
|
404
|
-
modernRouteId: modernId,
|
|
405
|
-
modernRouteAction: modernAction,
|
|
406
|
-
modernRouteHandle: mergeModernRouteHandle(route),
|
|
407
|
-
modernRouteHasAction: route.hasAction || Boolean(modernAction),
|
|
408
|
-
modernRouteHasClientLoader: route.hasClientLoader || void 0 !== route.clientData,
|
|
409
|
-
modernRouteHasLoader: route.hasLoader || 'function' == typeof modernLoader,
|
|
410
|
-
modernRouteIsClientComponent: route.isClientComponent,
|
|
411
|
-
modernRouteLoader: modernLoader,
|
|
412
|
-
modernRouteShouldRevalidate: modernShouldRevalidate
|
|
413
|
-
}),
|
|
414
|
-
loader: wrapModernLoader(modernRoute, modernLoader, revalidationState, options)
|
|
415
|
-
};
|
|
416
|
-
if (route.inValidSSRRoute) base.ssr = false;
|
|
417
|
-
if (shouldReload) base.shouldReload = shouldReload;
|
|
418
|
-
if (isPathlessLayout) base.id = stableFallbackId || 'pathless';
|
|
419
|
-
else {
|
|
420
|
-
const rawPath = route.path;
|
|
421
|
-
base.path = isIndexRoute ? '/' : toTanstackPath(rawPath || '');
|
|
422
|
-
}
|
|
423
|
-
const tanstackRoute = createTanstackRoute(base);
|
|
424
|
-
const children = route.children;
|
|
425
|
-
if (children && children.length > 0) {
|
|
426
|
-
const childRoutes = children.map((child)=>createRouteFromModernRoute({
|
|
427
|
-
options,
|
|
428
|
-
parent: tanstackRoute,
|
|
429
|
-
modernRoute: child
|
|
430
|
-
}));
|
|
431
|
-
tanstackRoute.addChildren(childRoutes);
|
|
432
|
-
}
|
|
433
|
-
return tanstackRoute;
|
|
434
|
-
}
|
|
435
|
-
function createRouteTreeFromModernRoutes(routes, options = {}) {
|
|
436
|
-
const rootModern = routes.find((r)=>r && 'nested' === r.type && r.isRoot);
|
|
437
|
-
const rootComponent = rootModern ? toModernRouteComponent(rootModern) : void 0;
|
|
438
|
-
const pendingComponent = rootModern?.loading;
|
|
439
|
-
const errorComponent = rootModern?.error;
|
|
440
|
-
const rootLoader = rootModern?.loader;
|
|
441
|
-
const rootAction = rootModern?.action;
|
|
442
|
-
const rootModernId = rootModern?.id;
|
|
443
|
-
const rootShouldRevalidate = rootModern?.shouldRevalidate;
|
|
444
|
-
const rootRevalidationState = {};
|
|
445
|
-
const rootShouldReload = createModernShouldReload(rootShouldRevalidate, rootRevalidationState);
|
|
446
|
-
const rootRouteOptions = {
|
|
447
|
-
component: rootComponent || void 0,
|
|
448
|
-
pendingComponent: pendingComponent || void 0,
|
|
449
|
-
errorComponent: errorComponent || void 0,
|
|
450
|
-
validateSearch: rootModern?.validateSearch,
|
|
451
|
-
loaderDeps: rootModern?.loaderDeps,
|
|
452
|
-
notFoundComponent: external_DefaultNotFound_js_namespaceObject.DefaultNotFound,
|
|
453
|
-
staticData: createRouteStaticData({
|
|
454
|
-
modernRouteId: rootModernId,
|
|
455
|
-
modernRouteAction: rootAction,
|
|
456
|
-
modernRouteHandle: rootModern ? mergeModernRouteHandle(rootModern) : void 0,
|
|
457
|
-
modernRouteHasAction: rootModern?.hasAction || Boolean(rootAction),
|
|
458
|
-
modernRouteHasClientLoader: rootModern?.hasClientLoader || void 0 !== rootModern?.clientData,
|
|
459
|
-
modernRouteHasLoader: rootModern?.hasLoader || 'function' == typeof rootLoader,
|
|
460
|
-
modernRouteIsClientComponent: rootModern?.isClientComponent,
|
|
461
|
-
modernRouteLoader: rootLoader,
|
|
462
|
-
modernRouteShouldRevalidate: rootShouldRevalidate
|
|
463
|
-
}),
|
|
464
|
-
loader: rootModern ? wrapModernLoader(rootModern, rootLoader, rootRevalidationState, options) : void 0
|
|
465
|
-
};
|
|
466
|
-
if (rootShouldReload) rootRouteOptions.shouldReload = rootShouldReload;
|
|
467
|
-
if (rootModern?.inValidSSRRoute) rootRouteOptions.ssr = false;
|
|
468
|
-
const rootRoute = createTanstackRootRoute(rootRouteOptions);
|
|
469
|
-
const topLevel = rootModern ? rootModern.children || [] : routes;
|
|
470
|
-
const childRoutes = topLevel.map((child)=>createRouteFromModernRoute({
|
|
471
|
-
options,
|
|
472
|
-
parent: rootRoute,
|
|
473
|
-
modernRoute: child
|
|
474
|
-
}));
|
|
475
|
-
rootRoute.addChildren(childRoutes);
|
|
476
|
-
return rootRoute;
|
|
477
|
-
}
|
|
478
296
|
function getRootLikeRouteObject(routes) {
|
|
479
297
|
return routes.find((route)=>'/' === route.path && !route.index);
|
|
480
298
|
}
|
|
@@ -483,13 +301,14 @@ function createRouteTreeFromRouteObjects(routes, options = {}) {
|
|
|
483
301
|
const rootRevalidationState = {};
|
|
484
302
|
const rootShouldRevalidate = rootLikeRoute?.shouldRevalidate;
|
|
485
303
|
const rootShouldReload = createModernShouldReload(rootShouldRevalidate, rootRevalidationState);
|
|
304
|
+
const rootComponent = rootLikeRoute ? toRouteComponent(rootLikeRoute) : void 0;
|
|
486
305
|
const rootRouteOptions = {
|
|
487
|
-
component:
|
|
306
|
+
component: rootComponent,
|
|
488
307
|
pendingComponent: rootLikeRoute ? toPendingComponent(rootLikeRoute) : void 0,
|
|
489
308
|
errorComponent: rootLikeRoute ? toErrorComponent(rootLikeRoute) : void 0,
|
|
490
309
|
validateSearch: rootLikeRoute?.validateSearch,
|
|
491
310
|
loaderDeps: rootLikeRoute?.loaderDeps,
|
|
492
|
-
notFoundComponent:
|
|
311
|
+
notFoundComponent: context_namespaceObject.DefaultNotFound,
|
|
493
312
|
staticData: createRouteStaticData({
|
|
494
313
|
modernRouteId: rootLikeRoute?.id,
|
|
495
314
|
modernRouteAction: rootLikeRoute?.action,
|
|
@@ -506,6 +325,7 @@ function createRouteTreeFromRouteObjects(routes, options = {}) {
|
|
|
506
325
|
if (rootShouldReload) rootRouteOptions.shouldReload = rootShouldReload;
|
|
507
326
|
if (rootLikeRoute?.inValidSSRRoute) rootRouteOptions.ssr = false;
|
|
508
327
|
const rootRoute = createTanstackRootRoute(rootRouteOptions);
|
|
328
|
+
if (rootComponent) rootRoute.options.component = (0, external_outlet_js_namespaceObject.withModernRouteMatchContext)(rootComponent, react_router_namespaceObject.rootRouteId);
|
|
509
329
|
const topLevel = rootLikeRoute ? [
|
|
510
330
|
...rootLikeRoute.children || [],
|
|
511
331
|
...routes.filter((route)=>route !== rootLikeRoute)
|
|
@@ -528,11 +348,9 @@ function getModernRouteIdsFromMatches(router) {
|
|
|
528
348
|
}).filter((id)=>'string' == typeof id);
|
|
529
349
|
return Array.from(new Set(ids));
|
|
530
350
|
}
|
|
531
|
-
exports.createRouteTreeFromModernRoutes = __webpack_exports__.createRouteTreeFromModernRoutes;
|
|
532
351
|
exports.createRouteTreeFromRouteObjects = __webpack_exports__.createRouteTreeFromRouteObjects;
|
|
533
352
|
exports.getModernRouteIdsFromMatches = __webpack_exports__.getModernRouteIdsFromMatches;
|
|
534
353
|
for(var __rspack_i in __webpack_exports__)if (-1 === [
|
|
535
|
-
"createRouteTreeFromModernRoutes",
|
|
536
354
|
"createRouteTreeFromRouteObjects",
|
|
537
355
|
"getModernRouteIdsFromMatches"
|
|
538
356
|
].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __webpack_require__ = {};
|
|
3
|
+
(()=>{
|
|
4
|
+
__webpack_require__.d = (exports1, getters, values)=>{
|
|
5
|
+
var define = (defs, kind)=>{
|
|
6
|
+
for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
[kind]: defs[key]
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
define(getters, "get");
|
|
12
|
+
define(values, "value");
|
|
13
|
+
};
|
|
14
|
+
})();
|
|
15
|
+
(()=>{
|
|
16
|
+
__webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
|
|
17
|
+
})();
|
|
18
|
+
(()=>{
|
|
19
|
+
__webpack_require__.r = (exports1)=>{
|
|
20
|
+
if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
|
|
21
|
+
value: 'Module'
|
|
22
|
+
});
|
|
23
|
+
Object.defineProperty(exports1, '__esModule', {
|
|
24
|
+
value: true
|
|
25
|
+
});
|
|
26
|
+
};
|
|
27
|
+
})();
|
|
28
|
+
var __webpack_exports__ = {};
|
|
29
|
+
__webpack_require__.r(__webpack_exports__);
|
|
30
|
+
__webpack_require__.d(__webpack_exports__, {
|
|
31
|
+
routerPlugin: ()=>internal_namespaceObject.routerPlugin
|
|
32
|
+
});
|
|
33
|
+
require("./register.js");
|
|
34
|
+
const internal_namespaceObject = require("@modern-js/runtime/router/internal");
|
|
35
|
+
exports.routerPlugin = __webpack_exports__.routerPlugin;
|
|
36
|
+
for(var __rspack_i in __webpack_exports__)if (-1 === [
|
|
37
|
+
"routerPlugin"
|
|
38
|
+
].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
|
|
39
|
+
Object.defineProperty(exports, '__esModule', {
|
|
40
|
+
value: true
|
|
41
|
+
});
|
|
@@ -2,11 +2,15 @@
|
|
|
2
2
|
"use client";
|
|
3
3
|
var __webpack_require__ = {};
|
|
4
4
|
(()=>{
|
|
5
|
-
__webpack_require__.d = (exports1,
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
__webpack_require__.d = (exports1, getters, values)=>{
|
|
6
|
+
var define = (defs, kind)=>{
|
|
7
|
+
for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
[kind]: defs[key]
|
|
10
|
+
});
|
|
11
|
+
};
|
|
12
|
+
define(getters, "get");
|
|
13
|
+
define(values, "value");
|
|
10
14
|
};
|
|
11
15
|
})();
|
|
12
16
|
(()=>{
|
|
@@ -2,11 +2,15 @@
|
|
|
2
2
|
"use client";
|
|
3
3
|
var __webpack_require__ = {};
|
|
4
4
|
(()=>{
|
|
5
|
-
__webpack_require__.d = (exports1,
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
__webpack_require__.d = (exports1, getters, values)=>{
|
|
6
|
+
var define = (defs, kind)=>{
|
|
7
|
+
for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
[kind]: defs[key]
|
|
10
|
+
});
|
|
11
|
+
};
|
|
12
|
+
define(getters, "get");
|
|
13
|
+
define(values, "value");
|
|
10
14
|
};
|
|
11
15
|
})();
|
|
12
16
|
(()=>{
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __webpack_require__ = {};
|
|
3
3
|
(()=>{
|
|
4
|
-
__webpack_require__.d = (exports1,
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
__webpack_require__.d = (exports1, getters, values)=>{
|
|
5
|
+
var define = (defs, kind)=>{
|
|
6
|
+
for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
[kind]: defs[key]
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
define(getters, "get");
|
|
12
|
+
define(values, "value");
|
|
9
13
|
};
|
|
10
14
|
})();
|
|
11
15
|
(()=>{
|
|
@@ -23,10 +27,6 @@ var __webpack_require__ = {};
|
|
|
23
27
|
})();
|
|
24
28
|
var __webpack_exports__ = {};
|
|
25
29
|
__webpack_require__.r(__webpack_exports__);
|
|
26
|
-
__webpack_require__.d(__webpack_exports__, {
|
|
27
|
-
REPLAYABLE_STREAM_MARKER: ()=>REPLAYABLE_STREAM_MARKER,
|
|
28
|
-
ReplayableStream: ()=>ReplayableStream
|
|
29
|
-
});
|
|
30
30
|
const REPLAYABLE_STREAM_MARKER = Symbol.for('modern.tanstack.rsc.ReplayableStream');
|
|
31
31
|
class ReplayableStream {
|
|
32
32
|
start() {
|
|
@@ -130,6 +130,11 @@ class ReplayableStream {
|
|
|
130
130
|
}
|
|
131
131
|
_REPLAYABLE_STREAM_MARKER = REPLAYABLE_STREAM_MARKER;
|
|
132
132
|
var _REPLAYABLE_STREAM_MARKER;
|
|
133
|
+
__webpack_require__.d(__webpack_exports__, {
|
|
134
|
+
ReplayableStream: ()=>ReplayableStream
|
|
135
|
+
}, {
|
|
136
|
+
REPLAYABLE_STREAM_MARKER: REPLAYABLE_STREAM_MARKER
|
|
137
|
+
});
|
|
133
138
|
exports.REPLAYABLE_STREAM_MARKER = __webpack_exports__.REPLAYABLE_STREAM_MARKER;
|
|
134
139
|
exports.ReplayableStream = __webpack_exports__.ReplayableStream;
|
|
135
140
|
for(var __rspack_i in __webpack_exports__)if (-1 === [
|
|
@@ -2,11 +2,15 @@
|
|
|
2
2
|
"use client";
|
|
3
3
|
var __webpack_require__ = {};
|
|
4
4
|
(()=>{
|
|
5
|
-
__webpack_require__.d = (exports1,
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
__webpack_require__.d = (exports1, getters, values)=>{
|
|
6
|
+
var define = (defs, kind)=>{
|
|
7
|
+
for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
[kind]: defs[key]
|
|
10
|
+
});
|
|
11
|
+
};
|
|
12
|
+
define(getters, "get");
|
|
13
|
+
define(values, "value");
|
|
10
14
|
};
|
|
11
15
|
})();
|
|
12
16
|
(()=>{
|
|
@@ -2,11 +2,15 @@
|
|
|
2
2
|
"use client";
|
|
3
3
|
var __webpack_require__ = {};
|
|
4
4
|
(()=>{
|
|
5
|
-
__webpack_require__.d = (exports1,
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
__webpack_require__.d = (exports1, getters, values)=>{
|
|
6
|
+
var define = (defs, kind)=>{
|
|
7
|
+
for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
[kind]: defs[key]
|
|
10
|
+
});
|
|
11
|
+
};
|
|
12
|
+
define(getters, "get");
|
|
13
|
+
define(values, "value");
|
|
10
14
|
};
|
|
11
15
|
})();
|
|
12
16
|
(()=>{
|
|
@@ -2,11 +2,15 @@
|
|
|
2
2
|
"use client";
|
|
3
3
|
var __webpack_require__ = {};
|
|
4
4
|
(()=>{
|
|
5
|
-
__webpack_require__.d = (exports1,
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
__webpack_require__.d = (exports1, getters, values)=>{
|
|
6
|
+
var define = (defs, kind)=>{
|
|
7
|
+
for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
[kind]: defs[key]
|
|
10
|
+
});
|
|
11
|
+
};
|
|
12
|
+
define(getters, "get");
|
|
13
|
+
define(values, "value");
|
|
10
14
|
};
|
|
11
15
|
})();
|
|
12
16
|
(()=>{
|
|
@@ -2,11 +2,15 @@
|
|
|
2
2
|
"use client";
|
|
3
3
|
var __webpack_require__ = {};
|
|
4
4
|
(()=>{
|
|
5
|
-
__webpack_require__.d = (exports1,
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
__webpack_require__.d = (exports1, getters, values)=>{
|
|
6
|
+
var define = (defs, kind)=>{
|
|
7
|
+
for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
[kind]: defs[key]
|
|
10
|
+
});
|
|
11
|
+
};
|
|
12
|
+
define(getters, "get");
|
|
13
|
+
define(values, "value");
|
|
10
14
|
};
|
|
11
15
|
})();
|
|
12
16
|
(()=>{
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __webpack_require__ = {};
|
|
3
3
|
(()=>{
|
|
4
|
-
__webpack_require__.d = (exports1,
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
__webpack_require__.d = (exports1, getters, values)=>{
|
|
5
|
+
var define = (defs, kind)=>{
|
|
6
|
+
for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
[kind]: defs[key]
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
define(getters, "get");
|
|
12
|
+
define(values, "value");
|
|
9
13
|
};
|
|
10
14
|
})();
|
|
11
15
|
(()=>{
|