@bleedingdev/modern-js-plugin-tanstack 3.2.0-ultramodern.120 → 3.2.0-ultramodern.122

package/dist/cjs/runtime/loaderBridge.js

@@ -0,0 +1,173 @@
+"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__, {
+    createRouteStaticData: ()=>createRouteStaticData,
+    isAbsoluteUrl: ()=>isAbsoluteUrl,
+    isRedirectResponse: ()=>isRedirectResponse,
+    isResponse: ()=>isResponse,
+    isTanstackRedirect: ()=>isTanstackRedirect,
+    mapSplatParamsForModernLoader: ()=>mapSplatParamsForModernLoader,
+    modernLoaderToTanstack: ()=>modernLoaderToTanstack,
+    throwTanstackRedirect: ()=>throwTanstackRedirect
+});
+const react_router_namespaceObject = require("@tanstack/react-router");
+function isResponse(value) {
+    const record = value;
+    return null != record && 'object' == typeof record && 'number' == typeof record.status && 'object' == typeof record.headers;
+}
+const redirectStatusCodes = new Set([
+    301,
+    302,
+    303,
+    307,
+    308
+]);
+function isRedirectResponse(res) {
+    return redirectStatusCodes.has(res.status);
+}
+function isTanstackRedirect(value) {
+    return isResponse(value) && 'object' == typeof value.options;
+}
+function isAbsoluteUrl(value) {
+    try {
+        new URL(value);
+        return true;
+    } catch  {
+        return false;
+    }
+}
+function throwTanstackRedirect(location) {
+    const target = location || '/';
+    if (isAbsoluteUrl(target)) throw (0, react_router_namespaceObject.redirect)({
+        href: target
+    });
+    throw (0, react_router_namespaceObject.redirect)({
+        to: target
+    });
+}
+function mapSplatParamsForModernLoader(params, hasSplat) {
+    if (!hasSplat) return params;
+    const { _splat, ...rest } = params;
+    if (void 0 !== _splat) return {
+        ...rest,
+        '*': _splat
+    };
+    return rest;
+}
+function createRouteStaticData(opts) {
+    const staticData = {};
+    if ('string' == typeof opts.modernRouteId && opts.modernRouteId.length > 0) staticData.modernRouteId = opts.modernRouteId;
+    if (void 0 !== opts.modernRouteLoader) staticData.modernRouteLoader = opts.modernRouteLoader;
+    if (void 0 !== opts.modernRouteAction) staticData.modernRouteAction = opts.modernRouteAction;
+    return staticData;
+}
+function getLoaderSignal(ctx) {
+    const abortSignal = ctx?.abortController?.signal;
+    if (abortSignal instanceof AbortSignal) return abortSignal;
+    if (ctx?.signal instanceof AbortSignal) return ctx.signal;
+    return new AbortController().signal;
+}
+function getLoaderHref(ctx) {
+    if ('string' == typeof ctx?.location) return ctx.location;
+    const publicHref = ctx?.location?.publicHref;
+    if ('string' == typeof publicHref) return publicHref;
+    const href = ctx?.location?.href;
+    if ('string' == typeof href) return href;
+    const urlHref = ctx?.location?.url?.href;
+    return 'string' == typeof urlHref ? urlHref : '';
+}
+function getLoaderParams(ctx) {
+    return 'object' == typeof ctx?.params && null !== ctx.params ? ctx.params : {};
+}
+function handleModernLoaderResult(result) {
+    if (isResponse(result)) {
+        if (isRedirectResponse(result)) {
+            const location = result.headers.get('Location') ?? '/';
+            throwTanstackRedirect(location);
+        }
+        if (404 === result.status) throw (0, react_router_namespaceObject.notFound)();
+    }
+    return result;
+}
+function handleModernLoaderError(err) {
+    if (isResponse(err)) {
+        if (isTanstackRedirect(err)) throw err;
+        if (isRedirectResponse(err)) {
+            const location = err.headers.get('Location') ?? '/';
+            throwTanstackRedirect(location);
+        }
+        if (404 === err.status) throw (0, react_router_namespaceObject.notFound)();
+    }
+    throw err;
+}
+function modernLoaderToTanstack(opts, modernLoader) {
+    return (rawCtx)=>{
+        const ctx = rawCtx;
+        try {
+            const signal = getLoaderSignal(ctx);
+            const baseRequest = ctx?.context?.request instanceof Request ? ctx.context.request : void 0;
+            const href = getLoaderHref(ctx);
+            const request = void 0 !== baseRequest ? new Request(baseRequest, {
+                signal
+            }) : new Request(href, {
+                signal
+            });
+            const params = mapSplatParamsForModernLoader(getLoaderParams(ctx), opts.hasSplat);
+            return Promise.resolve(modernLoader({
+                request,
+                params,
+                context: ctx?.context?.requestContext
+            })).then((result)=>handleModernLoaderResult(result)).catch(handleModernLoaderError);
+        } catch (err) {
+            handleModernLoaderError(err);
+        }
+    };
+}
+exports.createRouteStaticData = __webpack_exports__.createRouteStaticData;
+exports.isAbsoluteUrl = __webpack_exports__.isAbsoluteUrl;
+exports.isRedirectResponse = __webpack_exports__.isRedirectResponse;
+exports.isResponse = __webpack_exports__.isResponse;
+exports.isTanstackRedirect = __webpack_exports__.isTanstackRedirect;
+exports.mapSplatParamsForModernLoader = __webpack_exports__.mapSplatParamsForModernLoader;
+exports.modernLoaderToTanstack = __webpack_exports__.modernLoaderToTanstack;
+exports.throwTanstackRedirect = __webpack_exports__.throwTanstackRedirect;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "createRouteStaticData",
+    "isAbsoluteUrl",
+    "isRedirectResponse",
+    "isResponse",
+    "isTanstackRedirect",
+    "mapSplatParamsForModernLoader",
+    "modernLoaderToTanstack",
+    "throwTanstackRedirect"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/runtime/plugin.js

@@ -33,7 +33,6 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const context_namespaceObject = require("@modern-js/runtime/context");
-const merge_namespaceObject = require("@modern-js/runtime-utils/merge");
 const url_namespaceObject = require("@modern-js/runtime-utils/url");
 const react_router_namespaceObject = require("@tanstack/react-router");
 const client_namespaceObject = require("@tanstack/react-router/ssr/client");
@@ -43,6 +42,7 @@ const external_hooks_js_namespaceObject = require("./hooks.js");
 const external_hydrationBoundary_js_namespaceObject = require("./hydrationBoundary.js");
 const external_lifecycle_js_namespaceObject = require("./lifecycle.js");
 const external_outlet_js_namespaceObject = require("./outlet.js");
+const external_pluginCore_js_namespaceObject = require("./pluginCore.js");
 const external_prefetchLink_js_namespaceObject = require("./prefetchLink.js");
 const external_routeTree_js_namespaceObject = require("./routeTree.js");
 const client_js_namespaceObject = require("./rsc/client.js");
@@ -151,50 +151,26 @@ function ModernRouterClient({ router }) {
         router: router
     });
 }
-function stripSyntheticNotFoundRoute(routes) {
-    return routes.filter((route)=>!('*' === route.path && !route.id && !route.loader)).map((route)=>{
-        if (!route.children?.length) return route;
-        return {
-            ...route,
-            children: stripSyntheticNotFoundRoute(route.children)
-        };
-    });
-}
 const tanstackRouterPlugin = (userConfig = {})=>{
     const plugin = {
         name: '@modern-js/plugin-router-tanstack',
-        registryHooks: {
-            modifyRoutes: external_hooks_js_namespaceObject.modifyRoutes,
-            onAfterCreateRouter: external_hooks_js_namespaceObject.onAfterCreateRouter,
-            onAfterHydrateRouter: external_hooks_js_namespaceObject.onAfterHydrateRouter,
-            onBeforeCreateRouter: external_hooks_js_namespaceObject.onBeforeCreateRouter,
-            onBeforeCreateRoutes: external_hooks_js_namespaceObject.onBeforeCreateRoutes,
-            onBeforeHydrateRouter: external_hooks_js_namespaceObject.onBeforeHydrateRouter
-        },
+        registryHooks: external_hooks_js_namespaceObject.routerProviderRegistryHooks,
         setup: (api)=>{
             const hooks = api.getHooks();
             let cachedRouteObjects;
             let cachedRouteTree = null;
             let cachedRouter = null;
             let cachedRouterBasepath = null;
-            const getMergedConfig = ()=>{
-                const pluginConfig = api.getRuntimeConfig();
-                return (0, merge_namespaceObject.merge)(pluginConfig.router || {}, userConfig);
-            };
+            const getMergedConfig = ()=>(0, external_pluginCore_js_namespaceObject.getMergedRouterConfig)(api, userConfig);
             const getRouteObjects = ()=>{
                 if (void 0 !== cachedRouteObjects) return cachedRouteObjects;
                 const mergedConfig = getMergedConfig();
-                const { routesConfig, createRoutes } = mergedConfig;
-                const finalRouteConfig = {
-                    routes: (0, context_namespaceObject.getGlobalRoutes)(),
-                    globalApp: (0, context_namespaceObject.getGlobalLayoutApp)(),
-                    ...routesConfig
-                };
+                const { createRoutes } = mergedConfig;
+                const finalRouteConfig = (0, external_pluginCore_js_namespaceObject.getFinalRouteConfig)(mergedConfig);
                 const routeObjects = createRoutes ? createRoutes() : (0, external_utils_js_namespaceObject.createRouteObjectsFromConfig)({
                     routesConfig: finalRouteConfig
                 }) || [];
-                const normalizedRouteObjects = createRoutes ? routeObjects : stripSyntheticNotFoundRoute(routeObjects);
-                cachedRouteObjects = hooks.modifyRoutes.call(normalizedRouteObjects);
+                cachedRouteObjects = hooks.modifyRoutes.call(routeObjects);
                 return cachedRouteObjects;
             };
             const getRouteTree = ()=>{

package/dist/cjs/runtime/plugin.node.js

@@ -33,7 +33,6 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const context_namespaceObject = require("@modern-js/runtime/context");
-const merge_namespaceObject = require("@modern-js/runtime-utils/merge");
 const node_namespaceObject = require("@modern-js/runtime-utils/node");
 const time_namespaceObject = require("@modern-js/runtime-utils/time");
 const constants_namespaceObject = require("@modern-js/utils/universal/constants");
@@ -44,6 +43,7 @@ const external_basepathRewrite_js_namespaceObject = require("./basepathRewrite.j
 const external_hooks_js_namespaceObject = require("./hooks.js");
 const external_hydrationBoundary_js_namespaceObject = require("./hydrationBoundary.js");
 const external_lifecycle_js_namespaceObject = require("./lifecycle.js");
+const external_pluginCore_js_namespaceObject = require("./pluginCore.js");
 const external_routeTree_js_namespaceObject = require("./routeTree.js");
 const payloadRouter_js_namespaceObject = require("./rsc/payloadRouter.js");
 const external_types_js_namespaceObject = require("./types.js");
@@ -128,15 +128,6 @@ function createGetSsrHref(request) {
     const url = new URL(request.url);
     return `${url.pathname}${url.search}${url.hash}`;
 }
-function stripSyntheticNotFoundRoute(routes) {
-    return routes.filter((route)=>!('*' === route.path && !route.id && !route.loader)).map((route)=>{
-        if (!route.children?.length) return route;
-        return {
-            ...route,
-            children: stripSyntheticNotFoundRoute(route.children)
-        };
-    });
-}
 function collectRouterErrors(tanstackRouter) {
     const state = tanstackRouter.state;
     const matches = Array.isArray(state.matches) ? state.matches : [];
@@ -151,26 +142,14 @@ function collectRouterErrors(tanstackRouter) {
 const tanstackRouterPlugin = (userConfig = {})=>{
     const plugin = {
         name: '@modern-js/plugin-router-tanstack',
-        registryHooks: {
-            modifyRoutes: external_hooks_js_namespaceObject.modifyRoutes,
-            onAfterCreateRouter: external_hooks_js_namespaceObject.onAfterCreateRouter,
-            onAfterHydrateRouter: external_hooks_js_namespaceObject.onAfterHydrateRouter,
-            onBeforeCreateRouter: external_hooks_js_namespaceObject.onBeforeCreateRouter,
-            onBeforeCreateRoutes: external_hooks_js_namespaceObject.onBeforeCreateRoutes,
-            onBeforeHydrateRouter: external_hooks_js_namespaceObject.onBeforeHydrateRouter
-        },
+        registryHooks: external_hooks_js_namespaceObject.routerProviderRegistryHooks,
         setup: (api)=>{
             api.onBeforeRender(async (context, interrupt)=>{
-                const pluginConfig = api.getRuntimeConfig();
-                const mergedConfig = (0, merge_namespaceObject.merge)(pluginConfig.router || {}, userConfig);
+                const mergedConfig = (0, external_pluginCore_js_namespaceObject.getMergedRouterConfig)(api, userConfig);
                 const serializationAdapters = (0, context_namespaceObject.getGlobalEnableRsc)() ? (await import("./rsc/server.js")).getTanstackRscSerializationAdapters() : void 0;
                 const enableRsc = (0, context_namespaceObject.getGlobalEnableRsc)();
-                const { basename = '', routesConfig, createRoutes } = mergedConfig;
-                const finalRouteConfig = {
-                    routes: (0, context_namespaceObject.getGlobalRoutes)(),
-                    globalApp: (0, context_namespaceObject.getGlobalLayoutApp)(),
-                    ...routesConfig
-                };
+                const { basename = '', createRoutes } = mergedConfig;
+                const finalRouteConfig = (0, external_pluginCore_js_namespaceObject.getFinalRouteConfig)(mergedConfig);
                 if (!finalRouteConfig.routes && !createRoutes) return;
                 const hooks = api.getHooks();
                 await hooks.onBeforeCreateRoutes.call(context);
@@ -178,8 +157,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
                     routesConfig: finalRouteConfig,
                     ssrMode: context.ssrContext?.mode
                 }) || [];
-                const normalizedRouteObjects = createRoutes ? routeObjects : stripSyntheticNotFoundRoute(routeObjects);
-                const modifiedRouteObjects = hooks.modifyRoutes.call(normalizedRouteObjects);
+                const modifiedRouteObjects = hooks.modifyRoutes.call(routeObjects);
                 if (!modifiedRouteObjects.length) return;
                 const { request, nonce, baseUrl, loaderFailureMode = 'errorBoundary' } = context.ssrContext;
                 const _basename = '/' === baseUrl ? (0, external_utils_js_namespaceObject.urlJoin)(baseUrl, basename || '') : baseUrl;
@@ -297,7 +275,7 @@ const tanstackRouterPlugin = (userConfig = {})=>{
             api.wrapRoot((App)=>{
                 const getRouteApp = ()=>(props)=>{
                         const context = (0, external_react_namespaceObject.useContext)(context_namespaceObject.InternalRuntimeContext);
-                        const router = context.routerInstance ?? context.routerRuntime?.instance;
+                        const router = (0, external_lifecycle_js_namespaceObject.getRouterRuntimeState)(context)?.instance;
                         if (!router) return App ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(App, {
                             ...props
                         }) : null;

package/dist/cjs/runtime/pluginCore.js

@@ -0,0 +1,55 @@
+"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__, {
+    getFinalRouteConfig: ()=>getFinalRouteConfig,
+    getMergedRouterConfig: ()=>getMergedRouterConfig
+});
+const context_namespaceObject = require("@modern-js/runtime/context");
+const merge_namespaceObject = require("@modern-js/runtime-utils/merge");
+function getMergedRouterConfig(api, userConfig) {
+    const pluginConfig = api.getRuntimeConfig();
+    return (0, merge_namespaceObject.merge)(pluginConfig.router || {}, userConfig);
+}
+function getFinalRouteConfig(mergedConfig) {
+    return {
+        routes: (0, context_namespaceObject.getGlobalRoutes)(),
+        globalApp: (0, context_namespaceObject.getGlobalLayoutApp)(),
+        ...mergedConfig.routesConfig
+    };
+}
+exports.getFinalRouteConfig = __webpack_exports__.getFinalRouteConfig;
+exports.getMergedRouterConfig = __webpack_exports__.getMergedRouterConfig;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "getFinalRouteConfig",
+    "getMergedRouterConfig"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/runtime/register.js

@@ -0,0 +1,56 @@
+"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__, {
+    tanstackRouterCompatBindings: ()=>tanstackRouterCompatBindings
+});
+const context_namespaceObject = require("@modern-js/runtime/context");
+const external_dataMutation_js_namespaceObject = require("./dataMutation.js");
+const external_outlet_js_namespaceObject = require("./outlet.js");
+const external_plugin_js_namespaceObject = require("./plugin.js");
+const external_prefetchLink_js_namespaceObject = require("./prefetchLink.js");
+const tanstackRouterProviderFactory = (userConfig)=>(0, external_plugin_js_namespaceObject.tanstackRouterPlugin)(userConfig);
+(0, context_namespaceObject.registerRouterProvider)('tanstack', tanstackRouterProviderFactory);
+const COMPAT_BINDINGS_SLOT = Symbol.for('@modern-js/plugin-tanstack:runtime-compat-bindings');
+const tanstackRouterCompatBindings = {
+    Form: external_dataMutation_js_namespaceObject.Form,
+    Link: external_prefetchLink_js_namespaceObject.Link,
+    NavLink: external_prefetchLink_js_namespaceObject.NavLink,
+    Outlet: external_outlet_js_namespaceObject.Outlet,
+    RouteActionResponseError: external_dataMutation_js_namespaceObject.RouteActionResponseError,
+    useFetcher: external_dataMutation_js_namespaceObject.useFetcher
+};
+globalThis[COMPAT_BINDINGS_SLOT] ??= tanstackRouterCompatBindings;
+exports.tanstackRouterCompatBindings = __webpack_exports__.tanstackRouterCompatBindings;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "tanstackRouterCompatBindings"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});