@bleedingdev/modern-js-plugin-tanstack 3.2.0-ultramodern.93 → 3.2.0-ultramodern.94
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.
|
@@ -349,7 +349,6 @@ function createRouteFromRouteObject(opts) {
|
|
|
349
349
|
errorComponent: toErrorComponent(routeObject),
|
|
350
350
|
validateSearch: modernRouteObject.validateSearch,
|
|
351
351
|
loaderDeps: modernRouteObject.loaderDeps,
|
|
352
|
-
wrapInSuspense: true,
|
|
353
352
|
staticData: createRouteStaticData({
|
|
354
353
|
modernRouteId: routeObject.id,
|
|
355
354
|
modernRouteAction: modernRouteObject.action,
|
|
@@ -401,7 +400,6 @@ function createRouteFromModernRoute(opts) {
|
|
|
401
400
|
errorComponent: errorComponent || void 0,
|
|
402
401
|
validateSearch: route.validateSearch,
|
|
403
402
|
loaderDeps: route.loaderDeps,
|
|
404
|
-
wrapInSuspense: true,
|
|
405
403
|
staticData: createRouteStaticData({
|
|
406
404
|
modernRouteId: modernId,
|
|
407
405
|
modernRouteAction: modernAction,
|
|
@@ -451,7 +449,6 @@ function createRouteTreeFromModernRoutes(routes, options = {}) {
|
|
|
451
449
|
errorComponent: errorComponent || void 0,
|
|
452
450
|
validateSearch: rootModern?.validateSearch,
|
|
453
451
|
loaderDeps: rootModern?.loaderDeps,
|
|
454
|
-
wrapInSuspense: true,
|
|
455
452
|
notFoundComponent: external_DefaultNotFound_js_namespaceObject.DefaultNotFound,
|
|
456
453
|
staticData: createRouteStaticData({
|
|
457
454
|
modernRouteId: rootModernId,
|
|
@@ -492,7 +489,6 @@ function createRouteTreeFromRouteObjects(routes, options = {}) {
|
|
|
492
489
|
errorComponent: rootLikeRoute ? toErrorComponent(rootLikeRoute) : void 0,
|
|
493
490
|
validateSearch: rootLikeRoute?.validateSearch,
|
|
494
491
|
loaderDeps: rootLikeRoute?.loaderDeps,
|
|
495
|
-
wrapInSuspense: true,
|
|
496
492
|
notFoundComponent: external_DefaultNotFound_js_namespaceObject.DefaultNotFound,
|
|
497
493
|
staticData: createRouteStaticData({
|
|
498
494
|
modernRouteId: rootLikeRoute?.id,
|
|
@@ -319,7 +319,6 @@ function createRouteFromRouteObject(opts) {
|
|
|
319
319
|
errorComponent: toErrorComponent(routeObject),
|
|
320
320
|
validateSearch: modernRouteObject.validateSearch,
|
|
321
321
|
loaderDeps: modernRouteObject.loaderDeps,
|
|
322
|
-
wrapInSuspense: true,
|
|
323
322
|
staticData: createRouteStaticData({
|
|
324
323
|
modernRouteId: routeObject.id,
|
|
325
324
|
modernRouteAction: modernRouteObject.action,
|
|
@@ -371,7 +370,6 @@ function createRouteFromModernRoute(opts) {
|
|
|
371
370
|
errorComponent: errorComponent || void 0,
|
|
372
371
|
validateSearch: route.validateSearch,
|
|
373
372
|
loaderDeps: route.loaderDeps,
|
|
374
|
-
wrapInSuspense: true,
|
|
375
373
|
staticData: createRouteStaticData({
|
|
376
374
|
modernRouteId: modernId,
|
|
377
375
|
modernRouteAction: modernAction,
|
|
@@ -421,7 +419,6 @@ function createRouteTreeFromModernRoutes(routes, options = {}) {
|
|
|
421
419
|
errorComponent: errorComponent || void 0,
|
|
422
420
|
validateSearch: rootModern?.validateSearch,
|
|
423
421
|
loaderDeps: rootModern?.loaderDeps,
|
|
424
|
-
wrapInSuspense: true,
|
|
425
422
|
notFoundComponent: DefaultNotFound,
|
|
426
423
|
staticData: createRouteStaticData({
|
|
427
424
|
modernRouteId: rootModernId,
|
|
@@ -462,7 +459,6 @@ function createRouteTreeFromRouteObjects(routes, options = {}) {
|
|
|
462
459
|
errorComponent: rootLikeRoute ? toErrorComponent(rootLikeRoute) : void 0,
|
|
463
460
|
validateSearch: rootLikeRoute?.validateSearch,
|
|
464
461
|
loaderDeps: rootLikeRoute?.loaderDeps,
|
|
465
|
-
wrapInSuspense: true,
|
|
466
462
|
notFoundComponent: DefaultNotFound,
|
|
467
463
|
staticData: createRouteStaticData({
|
|
468
464
|
modernRouteId: rootLikeRoute?.id,
|
|
@@ -320,7 +320,6 @@ function createRouteFromRouteObject(opts) {
|
|
|
320
320
|
errorComponent: toErrorComponent(routeObject),
|
|
321
321
|
validateSearch: modernRouteObject.validateSearch,
|
|
322
322
|
loaderDeps: modernRouteObject.loaderDeps,
|
|
323
|
-
wrapInSuspense: true,
|
|
324
323
|
staticData: createRouteStaticData({
|
|
325
324
|
modernRouteId: routeObject.id,
|
|
326
325
|
modernRouteAction: modernRouteObject.action,
|
|
@@ -372,7 +371,6 @@ function createRouteFromModernRoute(opts) {
|
|
|
372
371
|
errorComponent: errorComponent || void 0,
|
|
373
372
|
validateSearch: route.validateSearch,
|
|
374
373
|
loaderDeps: route.loaderDeps,
|
|
375
|
-
wrapInSuspense: true,
|
|
376
374
|
staticData: createRouteStaticData({
|
|
377
375
|
modernRouteId: modernId,
|
|
378
376
|
modernRouteAction: modernAction,
|
|
@@ -422,7 +420,6 @@ function createRouteTreeFromModernRoutes(routes, options = {}) {
|
|
|
422
420
|
errorComponent: errorComponent || void 0,
|
|
423
421
|
validateSearch: rootModern?.validateSearch,
|
|
424
422
|
loaderDeps: rootModern?.loaderDeps,
|
|
425
|
-
wrapInSuspense: true,
|
|
426
423
|
notFoundComponent: DefaultNotFound,
|
|
427
424
|
staticData: createRouteStaticData({
|
|
428
425
|
modernRouteId: rootModernId,
|
|
@@ -463,7 +460,6 @@ function createRouteTreeFromRouteObjects(routes, options = {}) {
|
|
|
463
460
|
errorComponent: rootLikeRoute ? toErrorComponent(rootLikeRoute) : void 0,
|
|
464
461
|
validateSearch: rootLikeRoute?.validateSearch,
|
|
465
462
|
loaderDeps: rootLikeRoute?.loaderDeps,
|
|
466
|
-
wrapInSuspense: true,
|
|
467
463
|
notFoundComponent: DefaultNotFound,
|
|
468
464
|
staticData: createRouteStaticData({
|
|
469
465
|
modernRouteId: rootLikeRoute?.id,
|
package/package.json
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"modern.js",
|
|
19
19
|
"tanstack-router"
|
|
20
20
|
],
|
|
21
|
-
"version": "3.2.0-ultramodern.
|
|
21
|
+
"version": "3.2.0-ultramodern.94",
|
|
22
22
|
"engines": {
|
|
23
23
|
"node": ">=20"
|
|
24
24
|
},
|
|
@@ -88,13 +88,13 @@
|
|
|
88
88
|
"@swc/helpers": "^0.5.23",
|
|
89
89
|
"@tanstack/react-router": "1.170.11",
|
|
90
90
|
"@tanstack/router-core": "1.171.9",
|
|
91
|
-
"@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.
|
|
92
|
-
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.
|
|
93
|
-
"@modern-js/
|
|
94
|
-
"@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.
|
|
91
|
+
"@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.94",
|
|
92
|
+
"@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.94",
|
|
93
|
+
"@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.94",
|
|
94
|
+
"@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.94"
|
|
95
95
|
},
|
|
96
96
|
"peerDependencies": {
|
|
97
|
-
"@modern-js/runtime": "3.2.0-ultramodern.
|
|
97
|
+
"@modern-js/runtime": "3.2.0-ultramodern.94",
|
|
98
98
|
"react": "^19.2.6",
|
|
99
99
|
"react-dom": "^19.2.6"
|
|
100
100
|
},
|
|
@@ -109,9 +109,9 @@
|
|
|
109
109
|
"@typescript/native-preview": "7.0.0-dev.20260527.2",
|
|
110
110
|
"react": "^19.2.6",
|
|
111
111
|
"react-dom": "^19.2.6",
|
|
112
|
-
"@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.
|
|
112
|
+
"@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.94",
|
|
113
113
|
"@scripts/rstest-config": "2.66.0",
|
|
114
|
-
"@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.2.0-ultramodern.
|
|
114
|
+
"@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.2.0-ultramodern.94"
|
|
115
115
|
},
|
|
116
116
|
"sideEffects": false,
|
|
117
117
|
"publishConfig": {
|
package/src/runtime/routeTree.ts
CHANGED
|
@@ -741,7 +741,6 @@ function createRouteFromRouteObject(opts: {
|
|
|
741
741
|
errorComponent: toErrorComponent(routeObject),
|
|
742
742
|
validateSearch: modernRouteObject.validateSearch,
|
|
743
743
|
loaderDeps: modernRouteObject.loaderDeps,
|
|
744
|
-
wrapInSuspense: true,
|
|
745
744
|
staticData: createRouteStaticData({
|
|
746
745
|
modernRouteId: routeObject.id,
|
|
747
746
|
modernRouteAction: modernRouteObject.action,
|
|
@@ -835,7 +834,6 @@ function createRouteFromModernRoute(opts: {
|
|
|
835
834
|
errorComponent: errorComponent || undefined,
|
|
836
835
|
validateSearch: route.validateSearch,
|
|
837
836
|
loaderDeps: route.loaderDeps,
|
|
838
|
-
wrapInSuspense: true,
|
|
839
837
|
staticData: createRouteStaticData({
|
|
840
838
|
modernRouteId: modernId,
|
|
841
839
|
modernRouteAction: modernAction,
|
|
@@ -920,7 +918,6 @@ export function createRouteTreeFromModernRoutes(
|
|
|
920
918
|
errorComponent: errorComponent || undefined,
|
|
921
919
|
validateSearch: rootModern?.validateSearch,
|
|
922
920
|
loaderDeps: rootModern?.loaderDeps,
|
|
923
|
-
wrapInSuspense: true,
|
|
924
921
|
notFoundComponent: DefaultNotFound,
|
|
925
922
|
staticData: createRouteStaticData({
|
|
926
923
|
modernRouteId: rootModernId,
|
|
@@ -993,7 +990,6 @@ export function createRouteTreeFromRouteObjects(
|
|
|
993
990
|
errorComponent: rootLikeRoute ? toErrorComponent(rootLikeRoute) : undefined,
|
|
994
991
|
validateSearch: rootLikeRoute?.validateSearch,
|
|
995
992
|
loaderDeps: rootLikeRoute?.loaderDeps,
|
|
996
|
-
wrapInSuspense: true,
|
|
997
993
|
notFoundComponent: DefaultNotFound,
|
|
998
994
|
staticData: createRouteStaticData({
|
|
999
995
|
modernRouteId: rootLikeRoute?.id,
|
|
@@ -61,6 +61,7 @@ type TestRoute = {
|
|
|
61
61
|
staticData: Record<string, unknown>;
|
|
62
62
|
loaderDeps?: unknown;
|
|
63
63
|
validateSearch?: unknown;
|
|
64
|
+
wrapInSuspense?: unknown;
|
|
64
65
|
};
|
|
65
66
|
};
|
|
66
67
|
|
|
@@ -155,6 +156,31 @@ describe('tanstack route tree from RouteObject[]', () => {
|
|
|
155
156
|
expect(userMatch?.loaderData).toEqual({ id: '123' });
|
|
156
157
|
});
|
|
157
158
|
|
|
159
|
+
test('does not force Suspense wrappers for ordinary generated routes', async () => {
|
|
160
|
+
const routes: RouteObject[] = [
|
|
161
|
+
{
|
|
162
|
+
id: 'root',
|
|
163
|
+
path: '/',
|
|
164
|
+
Component: () => createElement(Outlet),
|
|
165
|
+
children: [
|
|
166
|
+
{
|
|
167
|
+
id: 'plain',
|
|
168
|
+
path: 'plain',
|
|
169
|
+
Component: () => null,
|
|
170
|
+
},
|
|
171
|
+
],
|
|
172
|
+
},
|
|
173
|
+
];
|
|
174
|
+
|
|
175
|
+
const routeTree = createRouteTreeFromRouteObjects(routes);
|
|
176
|
+
const router = await loadRouteTree(routeTree, '/plain');
|
|
177
|
+
|
|
178
|
+
expect(routeTree.options.wrapInSuspense).toBeUndefined();
|
|
179
|
+
expect(
|
|
180
|
+
getLooseRoute(router, '/plain').options.wrapInSuspense,
|
|
181
|
+
).toBeUndefined();
|
|
182
|
+
});
|
|
183
|
+
|
|
158
184
|
test('preserves TanStack search contracts from RouteObject routes', () => {
|
|
159
185
|
const rootValidateSearch = (search: unknown) => ({ root: search });
|
|
160
186
|
const rootLoaderDeps = ({ search }: { search: unknown }) => ({ search });
|
|
@@ -609,6 +635,34 @@ describe('tanstack route tree from RouteObject[]', () => {
|
|
|
609
635
|
expect(searchRoute.options.loaderDeps).toBe(childLoaderDeps);
|
|
610
636
|
});
|
|
611
637
|
|
|
638
|
+
test('does not force Suspense wrappers for ordinary Modern routes', async () => {
|
|
639
|
+
const modernRoutes: TestNestedRoute[] = [
|
|
640
|
+
{
|
|
641
|
+
type: 'nested',
|
|
642
|
+
origin: 'config',
|
|
643
|
+
id: 'root',
|
|
644
|
+
isRoot: true,
|
|
645
|
+
component: () => createElement(Outlet),
|
|
646
|
+
children: [
|
|
647
|
+
{
|
|
648
|
+
type: 'nested',
|
|
649
|
+
origin: 'config',
|
|
650
|
+
id: 'plain',
|
|
651
|
+
path: 'plain',
|
|
652
|
+
component: () => null,
|
|
653
|
+
},
|
|
654
|
+
],
|
|
655
|
+
},
|
|
656
|
+
];
|
|
657
|
+
|
|
658
|
+
const routeTree = createRouteTreeFromModernRoutes(modernRoutes);
|
|
659
|
+
const router = await loadRouteTree(routeTree, '/plain');
|
|
660
|
+
const plain = getLooseRouteByModernRouteId(router, 'plain');
|
|
661
|
+
|
|
662
|
+
expect(routeTree.options.wrapInSuspense).toBeUndefined();
|
|
663
|
+
expect(plain.options.wrapInSuspense).toBeUndefined();
|
|
664
|
+
});
|
|
665
|
+
|
|
612
666
|
test('preserves Modern generated client route metadata', () => {
|
|
613
667
|
const modernRoutes: TestNestedRoute[] = [
|
|
614
668
|
{
|