@bleedingdev/modern-js-plugin-tanstack 3.5.0-ultramodern.9 → 3.5.0-ultramodern.91

package/dist/cjs/runtime/rsc/payloadErrors.js

@@ -0,0 +1,99 @@
+"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__, {
+    isSerializedNotFound: ()=>isSerializedNotFound,
+    serializePayloadError: ()=>serializePayloadError,
+    shouldRedactServerError: ()=>shouldRedactServerError,
+    toRouteErrors: ()=>toRouteErrors,
+    toRouteLoaderData: ()=>toRouteLoaderData
+});
+const router_namespaceObject = require("@modern-js/runtime-utils/router");
+function shouldRedactServerError(status = 500) {
+    return status >= 500 && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV;
+}
+function serializePayloadError(error) {
+    if ((0, router_namespaceObject.isRouteErrorResponse)(error)) {
+        if (shouldRedactServerError(error.status)) return {
+            status: error.status,
+            statusText: 'Internal Server Error',
+            data: 'Unexpected Server Error',
+            __type: 'RouteErrorResponse'
+        };
+        return {
+            ...error,
+            __type: 'RouteErrorResponse'
+        };
+    }
+    if (error instanceof Error) {
+        if (shouldRedactServerError()) return {
+            message: 'Unexpected Server Error',
+            stack: void 0,
+            __type: 'Error'
+        };
+        return {
+            message: error.message,
+            stack: error.stack,
+            __type: 'Error',
+            ...'Error' !== error.name ? {
+                __subType: error.name
+            } : {}
+        };
+    }
+    if (shouldRedactServerError()) return {
+        message: 'Unexpected Server Error',
+        stack: void 0,
+        __type: 'Error'
+    };
+    return error;
+}
+function isSerializedNotFound(value) {
+    return Boolean(value) && 'object' == typeof value && true === value.isNotFound;
+}
+function toRouteErrors(payload) {
+    return payload.errors && 'object' == typeof payload.errors ? payload.errors : {};
+}
+function toRouteLoaderData(payload) {
+    return payload.loaderData && 'object' == typeof payload.loaderData ? payload.loaderData : {};
+}
+exports.isSerializedNotFound = __webpack_exports__.isSerializedNotFound;
+exports.serializePayloadError = __webpack_exports__.serializePayloadError;
+exports.shouldRedactServerError = __webpack_exports__.shouldRedactServerError;
+exports.toRouteErrors = __webpack_exports__.toRouteErrors;
+exports.toRouteLoaderData = __webpack_exports__.toRouteLoaderData;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "isSerializedNotFound",
+    "serializePayloadError",
+    "shouldRedactServerError",
+    "toRouteErrors",
+    "toRouteLoaderData"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/runtime/rsc/payloadFetch.js

@@ -0,0 +1,105 @@
+"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__, {
+    __setTanstackRscPayloadDecoderForTests: ()=>__setTanstackRscPayloadDecoderForTests,
+    createPayloadFetchKey: ()=>createPayloadFetchKey,
+    fetchTanstackRscPayload: ()=>fetchTanstackRscPayload,
+    isAbsoluteUrl: ()=>isAbsoluteUrl_js_namespaceObject.isAbsoluteUrl,
+    payloadFetchCache: ()=>payloadFetchCache
+});
+const react_router_namespaceObject = require("@tanstack/react-router");
+const isAbsoluteUrl_js_namespaceObject = require("../shared/isAbsoluteUrl.js");
+const external_flightSerialization_js_namespaceObject = require("./flightSerialization.js");
+const payloadFetchCache = new Map();
+let payloadDecoder;
+async function decodePayload(stream) {
+    if (payloadDecoder) return (0, external_flightSerialization_js_namespaceObject.reviveTanstackRscFlightValues)(await payloadDecoder(stream));
+    const runtime = await import("@modern-js/runtime/rsc/client");
+    return (0, external_flightSerialization_js_namespaceObject.reviveTanstackRscFlightValues)(await runtime.createFromReadableStream(stream));
+}
+function isServerPayload(value) {
+    return Boolean(value) && 'object' == typeof value && 'render' === value.type && Array.isArray(value.routes);
+}
+function createPayloadFetchKey(request) {
+    return JSON.stringify([
+        request.url,
+        request.method,
+        [
+            ...request.headers.entries()
+        ].sort(([left], [right])=>left.localeCompare(right))
+    ]);
+}
+async function fetchTanstackRscPayload(request) {
+    const headers = new Headers(request.headers);
+    headers.set('x-rsc-tree', 'true');
+    const response = await fetch(request.url, {
+        credentials: 'same-origin',
+        headers,
+        method: 'GET',
+        signal: request.signal
+    });
+    const redirectLocation = response.headers.get('X-Modernjs-Redirect');
+    if (redirectLocation) {
+        if ((0, isAbsoluteUrl_js_namespaceObject.isAbsoluteUrl)(redirectLocation)) throw (0, react_router_namespaceObject.redirect)({
+            headers: response.headers,
+            href: redirectLocation,
+            statusCode: response.status
+        });
+        throw (0, react_router_namespaceObject.redirect)({
+            headers: response.headers,
+            statusCode: response.status,
+            to: redirectLocation || '/'
+        });
+    }
+    if (404 === response.status && !response.body) throw (0, react_router_namespaceObject.notFound)();
+    if (!response.body) throw new Error('TanStack RSC payload response body is null.');
+    const payload = await decodePayload(response.body);
+    if (!isServerPayload(payload)) throw new Error('Unexpected TanStack RSC payload type.');
+    return payload;
+}
+function __setTanstackRscPayloadDecoderForTests(decoder) {
+    payloadDecoder = decoder;
+    payloadFetchCache.clear();
+}
+exports.__setTanstackRscPayloadDecoderForTests = __webpack_exports__.__setTanstackRscPayloadDecoderForTests;
+exports.createPayloadFetchKey = __webpack_exports__.createPayloadFetchKey;
+exports.fetchTanstackRscPayload = __webpack_exports__.fetchTanstackRscPayload;
+exports.isAbsoluteUrl = __webpack_exports__.isAbsoluteUrl;
+exports.payloadFetchCache = __webpack_exports__.payloadFetchCache;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "__setTanstackRscPayloadDecoderForTests",
+    "createPayloadFetchKey",
+    "fetchTanstackRscPayload",
+    "isAbsoluteUrl",
+    "payloadFetchCache"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/runtime/rsc/payloadRouter.js

@@ -28,97 +28,29 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    __setTanstackRscPayloadDecoderForTests: ()=>__setTanstackRscPayloadDecoderForTests,
+    __setTanstackRscPayloadDecoderForTests: ()=>external_payloadFetch_js_namespaceObject.__setTanstackRscPayloadDecoderForTests,
     createTanstackRscServerPayload: ()=>createTanstackRscServerPayload,
     handleTanstackRscRedirect: ()=>handleTanstackRscRedirect,
     isTanstackRscPayloadNavigationEnabled: ()=>isTanstackRscPayloadNavigationEnabled,
     loadTanstackRscPayload: ()=>loadTanstackRscPayload,
     loadTanstackRscRouteData: ()=>loadTanstackRscRouteData
 });
-const router_namespaceObject = require("@modern-js/runtime-utils/router");
 const react_router_namespaceObject = require("@tanstack/react-router");
-const payloadFetchCache = new Map();
-let payloadDecoder;
-function getRouteId(match) {
-    const routeId = match.routeId ?? match.route?.id ?? match.id;
-    return 'string' == typeof routeId ? routeId : void 0;
-}
-function getRouteStaticData(match) {
-    return match.route?.options?.staticData || {};
-}
-function getRouteParentId(match) {
-    const parentId = match.route?.parentRoute?.id;
-    return 'string' == typeof parentId ? parentId : void 0;
-}
-function toRoutePath(match) {
-    const path = match.route?.options?.path;
-    return 'string' == typeof path ? path : void 0;
-}
-function toPayloadRoute(match) {
-    const routeId = getRouteId(match);
-    if (!routeId) return;
-    const staticData = getRouteStaticData(match);
-    const params = match.params && 'object' == typeof match.params ? match.params : {};
-    const pathname = 'string' == typeof match.pathname ? match.pathname : '';
-    return {
-        handle: staticData.modernRouteHandle,
-        hasAction: Boolean(staticData.modernRouteHasAction || staticData.modernRouteAction),
-        hasErrorBoundary: false,
-        hasLoader: Boolean(staticData.modernRouteHasLoader),
-        hasClientLoader: Boolean(staticData.modernRouteHasClientLoader),
-        id: routeId,
-        index: Boolean(match.route?.options?.index) || void 0,
-        params,
-        parentId: getRouteParentId(match),
-        path: toRoutePath(match),
-        pathname,
-        pathnameBase: 'string' == typeof match.pathnameBase ? match.pathnameBase : pathname
-    };
-}
-function shouldRedactServerError(status = 500) {
-    return status >= 500 && 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV;
-}
-function serializePayloadError(error) {
-    if ((0, router_namespaceObject.isRouteErrorResponse)(error)) {
-        if (shouldRedactServerError(error.status)) return {
-            status: error.status,
-            statusText: 'Internal Server Error',
-            data: 'Unexpected Server Error',
-            __type: 'RouteErrorResponse'
-        };
-        return {
-            ...error,
-            __type: 'RouteErrorResponse'
-        };
-    }
-    if (error instanceof Error) {
-        if (shouldRedactServerError()) return {
-            message: 'Unexpected Server Error',
-            stack: void 0,
-            __type: 'Error'
-        };
-        return {
-            message: error.message,
-            stack: error.stack,
-            __type: 'Error',
-            ...'Error' !== error.name ? {
-                __subType: error.name
-            } : {}
-        };
-    }
-    return error;
-}
+const external_flightSerialization_js_namespaceObject = require("./flightSerialization.js");
+const external_payloadErrors_js_namespaceObject = require("./payloadErrors.js");
+const external_payloadFetch_js_namespaceObject = require("./payloadFetch.js");
+const external_payloadRoutes_js_namespaceObject = require("./payloadRoutes.js");
 function createTanstackRscServerPayload(router, options = {}) {
     const matches = Array.isArray(router.state?.matches) ? router.state.matches : [];
     const routes = [];
     const loaderData = {};
     const errors = {};
     for (const match of matches){
-        const payloadRoute = toPayloadRoute(match);
+        const payloadRoute = (0, external_payloadRoutes_js_namespaceObject.toPayloadRoute)(match);
         if (payloadRoute) {
             routes.push(payloadRoute);
-            if ('loaderData' in match && void 0 !== match.loaderData && !(options.omitClientLoaderData && payloadRoute.hasClientLoader)) loaderData[payloadRoute.id] = match.loaderData;
-            if (void 0 !== match.error) errors[payloadRoute.id] = serializePayloadError(match.error);
+            if ('loaderData' in match && void 0 !== match.loaderData && !(options.omitClientLoaderData && payloadRoute.hasClientLoader)) loaderData[payloadRoute.id] = (0, external_flightSerialization_js_namespaceObject.serializeTanstackRscFlightValues)(match.loaderData);
+            if (void 0 !== match.error) errors[payloadRoute.id] = (0, external_payloadErrors_js_namespaceObject.serializePayloadError)(match.error);
         }
     }
     return {
@@ -126,14 +58,17 @@ function createTanstackRscServerPayload(router, options = {}) {
         actionData: null,
         errors: Object.keys(errors).length > 0 ? errors : null,
         loaderData,
-        location: router.state?.location,
+        location: (0, external_payloadRoutes_js_namespaceObject.toPlainLocation)(router.state?.location),
         routes
     };
 }
 function handleTanstackRscRedirect(headers, basename, status) {
     const newHeaders = new Headers(headers);
     let redirectUrl = headers.get('Location') || '/';
-    if ('/' !== basename) redirectUrl = redirectUrl.replace(basename, '') || '/';
+    if ('/' !== basename) {
+        if (redirectUrl === basename) redirectUrl = '/';
+        else if (redirectUrl.startsWith(`${basename}/`)) redirectUrl = redirectUrl.slice(basename.length);
+    }
     newHeaders.set('X-Modernjs-Redirect', redirectUrl);
     newHeaders.set('X-Modernjs-BaseUrl', basename);
     newHeaders.delete('Location');
@@ -145,91 +80,35 @@ function handleTanstackRscRedirect(headers, basename, status) {
 function isTanstackRscPayloadNavigationEnabled() {
     return "u" > typeof window;
 }
-async function decodePayload(stream) {
-    if (payloadDecoder) return payloadDecoder(stream);
-    const runtime = await import("@modern-js/runtime/rsc/client");
-    return runtime.createFromReadableStream(stream);
-}
-function isServerPayload(value) {
-    return Boolean(value) && 'object' == typeof value && 'render' === value.type && Array.isArray(value.routes);
-}
-function createPayloadFetchKey(request) {
-    return request.url;
-}
-function isAbsoluteUrl(value) {
-    try {
-        new URL(value);
-        return true;
-    } catch  {
-        return false;
-    }
-}
-async function fetchTanstackRscPayload(request) {
-    const headers = new Headers(request.headers);
-    headers.set('x-rsc-tree', 'true');
-    const response = await fetch(request.url, {
-        credentials: 'same-origin',
-        headers,
-        method: 'GET',
-        signal: request.signal
-    });
-    const redirectLocation = response.headers.get('X-Modernjs-Redirect');
-    if (redirectLocation) {
-        if (isAbsoluteUrl(redirectLocation)) throw (0, react_router_namespaceObject.redirect)({
-            href: redirectLocation
-        });
-        throw (0, react_router_namespaceObject.redirect)({
-            to: redirectLocation || '/'
-        });
-    }
-    if (404 === response.status && !response.body) throw (0, react_router_namespaceObject.notFound)();
-    if (!response.body) throw new Error('TanStack RSC payload response body is null.');
-    const payload = await decodePayload(response.body);
-    if (!isServerPayload(payload)) throw new Error('Unexpected TanStack RSC payload type.');
-    return payload;
-}
 function loadTanstackRscPayload(request) {
-    const key = createPayloadFetchKey(request);
-    let payloadPromise = payloadFetchCache.get(key);
+    const key = (0, external_payloadFetch_js_namespaceObject.createPayloadFetchKey)(request);
+    let payloadPromise = external_payloadFetch_js_namespaceObject.payloadFetchCache.get(key);
     if (!payloadPromise) {
-        payloadPromise = fetchTanstackRscPayload(request).finally(()=>{
-            payloadFetchCache.delete(key);
+        payloadPromise = (0, external_payloadFetch_js_namespaceObject.fetchTanstackRscPayload)(request).finally(()=>{
+            external_payloadFetch_js_namespaceObject.payloadFetchCache["delete"](key);
         });
-        payloadFetchCache.set(key, payloadPromise);
+        external_payloadFetch_js_namespaceObject.payloadFetchCache.set(key, payloadPromise);
     }
     return payloadPromise;
 }
-function isSerializedNotFound(value) {
-    return Boolean(value) && 'object' == typeof value && true === value.isNotFound;
-}
-function toRouteErrors(payload) {
-    return payload.errors && 'object' == typeof payload.errors ? payload.errors : {};
-}
-function toRouteLoaderData(payload) {
-    return payload.loaderData && 'object' == typeof payload.loaderData ? payload.loaderData : {};
-}
 async function loadTanstackRscRouteData({ hasClientLoader, loadClientData, request, routeId }) {
     if (hasClientLoader) return loadClientData();
     if (!routeId) return loadClientData();
     const payload = await loadTanstackRscPayload(request);
-    const errors = toRouteErrors(payload);
+    const errors = (0, external_payloadErrors_js_namespaceObject.toRouteErrors)(payload);
     const routeError = errors[routeId];
     if (void 0 !== routeError) {
-        if (isSerializedNotFound(routeError)) throw (0, react_router_namespaceObject.notFound)({
+        if ((0, external_payloadErrors_js_namespaceObject.isSerializedNotFound)(routeError)) throw (0, react_router_namespaceObject.notFound)({
             ...routeError,
             routeId
         });
         throw routeError;
     }
-    const loaderData = toRouteLoaderData(payload);
+    const loaderData = (0, external_payloadErrors_js_namespaceObject.toRouteLoaderData)(payload);
     if (routeId in loaderData) return loaderData[routeId];
     const payloadRoute = payload.routes.find((route)=>route.id === routeId);
     if (payloadRoute && payloadRoute.hasClientLoader) return loadClientData();
 }
-function __setTanstackRscPayloadDecoderForTests(decoder) {
-    payloadDecoder = decoder;
-    payloadFetchCache.clear();
-}
 exports.__setTanstackRscPayloadDecoderForTests = __webpack_exports__.__setTanstackRscPayloadDecoderForTests;
 exports.createTanstackRscServerPayload = __webpack_exports__.createTanstackRscServerPayload;
 exports.handleTanstackRscRedirect = __webpack_exports__.handleTanstackRscRedirect;

package/dist/cjs/runtime/rsc/payloadRoutes.js

@@ -0,0 +1,94 @@
+"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__);
+function toPlainRecord(value) {
+    if (!value || 'object' != typeof value) return {};
+    return Object.fromEntries(Object.entries(value));
+}
+function toPlainLocation(location) {
+    if (!location || 'object' != typeof location) return location;
+    const plainLocation = toPlainRecord(location);
+    for (const key of [
+        'search',
+        'state'
+    ])if (plainLocation[key] && 'object' == typeof plainLocation[key] && !Array.isArray(plainLocation[key])) plainLocation[key] = toPlainRecord(plainLocation[key]);
+    return plainLocation;
+}
+function getRouteId(match) {
+    const routeId = match.routeId ?? match.route?.id ?? match.id;
+    return 'string' == typeof routeId ? routeId : void 0;
+}
+function getRouteStaticData(match) {
+    return match.route?.options?.staticData || {};
+}
+function getRouteParentId(match) {
+    const parentId = match.route?.parentRoute?.id;
+    return 'string' == typeof parentId ? parentId : void 0;
+}
+function toRoutePath(match) {
+    const path = match.route?.options?.path;
+    return 'string' == typeof path ? path : void 0;
+}
+function toPayloadRoute(match) {
+    const routeId = getRouteId(match);
+    if (!routeId) return;
+    const staticData = getRouteStaticData(match);
+    const params = match.params && 'object' == typeof match.params ? toPlainRecord(match.params) : {};
+    const pathname = 'string' == typeof match.pathname ? match.pathname : '';
+    return {
+        handle: staticData.modernRouteHandle,
+        hasAction: Boolean(staticData.modernRouteHasAction || staticData.modernRouteAction),
+        hasErrorBoundary: false,
+        hasLoader: Boolean(staticData.modernRouteHasLoader),
+        hasClientLoader: Boolean(staticData.modernRouteHasClientLoader),
+        id: routeId,
+        index: Boolean(match.route?.options?.index) || void 0,
+        params,
+        parentId: getRouteParentId(match),
+        path: toRoutePath(match),
+        pathname,
+        pathnameBase: 'string' == typeof match.pathnameBase ? match.pathnameBase : pathname
+    };
+}
+__webpack_require__.d(__webpack_exports__, {
+    getRouteId: ()=>getRouteId,
+    toPayloadRoute: ()=>toPayloadRoute,
+    toPlainLocation: ()=>toPlainLocation
+});
+exports.getRouteId = __webpack_exports__.getRouteId;
+exports.toPayloadRoute = __webpack_exports__.toPayloadRoute;
+exports.toPlainLocation = __webpack_exports__.toPlainLocation;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "getRouteId",
+    "toPayloadRoute",
+    "toPlainLocation"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/runtime/rsc/payloadStorage.js

@@ -0,0 +1,58 @@
+"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__, {
+    getTanstackRscRouter: ()=>getTanstackRscRouter,
+    setTanstackRscRouter: ()=>setTanstackRscRouter,
+    setTanstackRscServerPayload: ()=>setTanstackRscServerPayload
+});
+const node_namespaceObject = require("@modern-js/runtime-utils/node");
+const setTanstackRscServerPayload = (payload)=>{
+    const storageContext = node_namespaceObject.storage.useContext?.();
+    if (storageContext) storageContext.serverPayload = payload;
+};
+const setTanstackRscRouter = (router)=>{
+    const storageContext = node_namespaceObject.storage.useContext?.();
+    if (storageContext) storageContext.tanstackRscRouter = router;
+};
+const getTanstackRscRouter = ()=>{
+    const storageContext = node_namespaceObject.storage.useContext?.();
+    return storageContext?.tanstackRscRouter;
+};
+exports.getTanstackRscRouter = __webpack_exports__.getTanstackRscRouter;
+exports.setTanstackRscRouter = __webpack_exports__.setTanstackRscRouter;
+exports.setTanstackRscServerPayload = __webpack_exports__.setTanstackRscServerPayload;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "getTanstackRscRouter",
+    "setTanstackRscRouter",
+    "setTanstackRscServerPayload"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/runtime/rsc/server.js

@@ -36,28 +36,13 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const server_namespaceObject = require("@modern-js/runtime/rsc/server");
-const react_router_namespaceObject = require("@tanstack/react-router");
 const router_core_namespaceObject = require("@tanstack/router-core");
 const external_react_namespaceObject = require("react");
 const external_ClientSlot_js_namespaceObject = require("./ClientSlot.js");
-const external_createRscProxy_js_namespaceObject = require("./createRscProxy.js");
 const external_ReplayableStream_js_namespaceObject = require("./ReplayableStream.js");
 const external_slotUsageSanitizer_js_namespaceObject = require("./slotUsageSanitizer.js");
 const external_symbols_js_namespaceObject = require("./symbols.js");
 const external_CompositeComponent_js_namespaceObject = require("./CompositeComponent.js");
-function createTreeGetter(stream) {
-    let ready = false;
-    let tree;
-    const treePromise = Promise.resolve((0, server_namespaceObject.createFromReadableStream)(stream.createReplayStream())).then((value)=>{
-        tree = value;
-        ready = true;
-        return value;
-    });
-    return ()=>{
-        if (ready) return tree;
-        return (0, external_react_namespaceObject.use)(treePromise);
-    };
-}
 function createSlotProxy(options) {
     const cache = new Map();
     return new Proxy({}, {
@@ -81,6 +66,17 @@ function createSlotProxy(options) {
         }
     });
 }
+function createServerRscValue(options) {
+    return {
+        [external_symbols_js_namespaceObject.SERVER_COMPONENT_STREAM]: options.stream,
+        ...options.renderable ? {
+            [external_symbols_js_namespaceObject.RENDERABLE_RSC]: true
+        } : {},
+        ...options.slotUsagesStream ? {
+            [external_symbols_js_namespaceObject.RSC_SLOT_USAGES_STREAM]: options.slotUsagesStream
+        } : {}
+    };
+}
 function toReplayableFlightStream(node, handlers) {
     const flightStream = (0, server_namespaceObject.renderRsc)({
         element: node
@@ -94,7 +90,7 @@ async function renderServerComponent(node) {
     const streamWrapper = {
         createReplayStream: ()=>stream.createReplayStream()
     };
-    return (0, external_createRscProxy_js_namespaceObject.createRscProxy)(createTreeGetter(streamWrapper), {
+    return createServerRscValue({
         renderable: true,
         stream: streamWrapper
     });
@@ -123,13 +119,13 @@ async function createCompositeComponent(component) {
     const streamWrapper = {
         createReplayStream: ()=>flightStream.createReplayStream()
     };
-    return (0, external_createRscProxy_js_namespaceObject.createRscProxy)(createTreeGetter(streamWrapper), {
+    return createServerRscValue({
         renderable: false,
         slotUsagesStream: slotUsagesEmitter?.stream,
         stream: streamWrapper
     });
 }
-const adapter = (0, react_router_namespaceObject.createSerializationAdapter)({
+const adapter = (0, router_core_namespaceObject.createSerializationAdapter)({
     key: '$MODERN_TANSTACK_RSC',
     test: external_symbols_js_namespaceObject.isServerComponent,
     toSerializable: (component)=>{