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

package/dist/cjs/cli/index.js

@@ -56,8 +56,6 @@ var __webpack_exports__ = {};
         createTanstackRsbuildRouteSplittingProfile: ()=>external_routeSplitting_js_namespaceObject.createTanstackRsbuildRouteSplittingProfile,
         default: ()=>src_cli,
         generateTanstackRouterTypesSourceForEntry: ()=>external_tanstackTypes_js_namespaceObject.generateTanstackRouterTypesSourceForEntry,
-        isTanstackRouterFrameworkEnabled: ()=>external_tanstackTypes_js_namespaceObject.isTanstackRouterFrameworkEnabled,
-        isTanstackStartRouteModuleSource: ()=>external_routeSplitting_js_namespaceObject.isTanstackStartRouteModuleSource,
         resolveTanstackRouteCodeSplittingEnabled: ()=>external_routeSplitting_js_namespaceObject.resolveTanstackRouteCodeSplittingEnabled,
         tanstackRouterPlugin: ()=>tanstackRouterPlugin,
         writeTanstackRegisterFile: ()=>writeTanstackRegisterFile,
@@ -75,7 +73,7 @@ var __webpack_exports__ = {};
     function getRuntimeRouterCli() {
         if (runtimeRouterCli) return runtimeRouterCli;
         const cli = __webpack_require__("@modern-js/runtime/cli");
-        if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir) {
+        if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner) {
             runtimeRouterCli = cli;
             return runtimeRouterCli;
         }
@@ -122,7 +120,7 @@ ${canonicalRoutesAugmentation}`;
         }));
     }
     async function writeTanstackRouterTypesForEntries(opts) {
-        const { appContext, generatedDirName = DEFAULT_GENERATED_DIR_NAME, routesByEntry } = opts;
+        const { appContext, generatedDirName = DEFAULT_GENERATED_DIR_NAME, routesByEntry, i18nPluginInstalled = false } = opts;
         const entryNames = Object.keys(routesByEntry);
         await Promise.all(entryNames.map(async (entryName)=>{
             const { routerGenTs } = await (0, external_tanstackTypes_js_namespaceObject.generateTanstackRouterTypesSourceForEntry)({
@@ -140,8 +138,10 @@ ${canonicalRoutesAugmentation}`;
             return a.localeCompare(b);
         });
         let canonicalRoutes = null;
-        for (const entryName of registerEntries){
-            const entryCanonicalRoutes = (0, external_tanstackTypes_js_namespaceObject.collectCanonicalRoutesForEntry)(routesByEntry[entryName]);
+        if (i18nPluginInstalled) for (const entryName of registerEntries){
+            const entryCanonicalRoutes = (0, external_tanstackTypes_js_namespaceObject.collectCanonicalRoutesForEntry)(routesByEntry[entryName], {
+                localeParamHeuristic: true
+            });
             if (entryCanonicalRoutes) canonicalRoutes = {
                 ...entryCanonicalRoutes,
                 ...canonicalRoutes ?? {}
@@ -169,16 +169,42 @@ ${canonicalRoutesAugmentation}`;
                     const { getEntrypointRoutesDir } = getRuntimeRouterCli();
                     return getEntrypointRoutesDir(entrypoint) === routesDir;
                 };
+                const isForeignRouteEntrypoint = (entrypoint)=>{
+                    const { getEntrypointRoutesDir, getEntrypointRoutesOwner } = getRuntimeRouterCli();
+                    if (getEntrypointRoutesOwner(entrypoint)) return true;
+                    if (entrypoint.pageRoutesEntry) return true;
+                    return null !== getEntrypointRoutesDir(entrypoint);
+                };
+                const isI18nPluginInstalled = ()=>{
+                    const { plugins } = api.getAppContext();
+                    return Boolean(plugins?.some((plugin)=>plugin?.name === '@modern-js/plugin-i18n'));
+                };
                 api._internalRuntimePlugins(({ entrypoint, plugins })=>{
-                    if (!isTanstackEntrypoint(entrypoint)) return {
+                    const { metaName, serverRoutes } = api.getAppContext();
+                    const serverBase = serverRoutes.filter((route)=>route.entryName === entrypoint.entryName).map((route)=>route.urlPath).sort((a, b)=>a.length - b.length > 0 ? -1 : 1);
+                    if (isTanstackEntrypoint(entrypoint)) {
+                        plugins.push({
+                            name: 'tanstackRouter',
+                            path: `@${metaName}/plugin-tanstack/runtime`,
+                            config: {
+                                serverBase
+                            }
+                        });
+                        return {
+                            entrypoint,
+                            plugins
+                        };
+                    }
+                    if (isForeignRouteEntrypoint(entrypoint)) return {
                         entrypoint,
                         plugins
                     };
-                    const { metaName, serverRoutes } = api.getAppContext();
-                    const serverBase = serverRoutes.filter((route)=>route.entryName === entrypoint.entryName).map((route)=>route.urlPath).sort((a, b)=>a.length - b.length > 0 ? -1 : 1);
-                    plugins.push({
-                        name: 'tanstackRouter',
-                        path: `@${metaName}/plugin-tanstack/runtime`,
+                    const routerWrapperPath = `@${metaName}/plugin-tanstack/runtime/router`;
+                    const existingRouterPlugin = plugins.find((plugin)=>'router' === plugin.name);
+                    if (existingRouterPlugin) existingRouterPlugin.path = routerWrapperPath;
+                    else plugins.push({
+                        name: 'router',
+                        path: routerWrapperPath,
                         config: {
                             serverBase
                         }
@@ -197,7 +223,9 @@ ${canonicalRoutesAugmentation}`;
                         source: {
                             include: [
                                 /[\\/]node_modules[\\/]@tanstack[\\/]react-router[\\/]/,
-                                external_node_path_default().resolve(__dirname, '../runtime').replace('cjs', 'esm')
+                                /[\\/]node_modules[\\/]@tanstack[\\/]router-core[\\/]/,
+                                /[\\/]node_modules[\\/]@tanstack[\\/]react-store[\\/]/,
+                                external_node_path_default().resolve(__dirname, '..', '..')
                             ]
                         }
                     }));
@@ -214,15 +242,13 @@ ${canonicalRoutesAugmentation}`;
                     if (0 === tanstackEntrypoints.length) return;
                     const { handleGeneratorEntryCode } = getRuntimeRouterCli();
                     const routesByEntry = await handleGeneratorEntryCode(api, tanstackEntrypoints, {
-                        entrypointsKey: ENTRYPOINTS_KEY,
-                        generateCodeOptions: {
-                            enableTanstackTypes: false
-                        }
+                        entrypointsKey: ENTRYPOINTS_KEY
                     });
                     await writeTanstackRouterTypesForEntries({
                         appContext: api.getAppContext(),
                         generatedDirName,
-                        routesByEntry
+                        routesByEntry,
+                        i18nPluginInstalled: isI18nPluginInstalled()
                     });
                 });
                 api.onFileChanged(async (event)=>{
@@ -236,15 +262,13 @@ ${canonicalRoutesAugmentation}`;
                         regenerate: async ({ api, entrypoints })=>{
                             const { handleGeneratorEntryCode } = getRuntimeRouterCli();
                             const routesByEntry = await handleGeneratorEntryCode(api, entrypoints, {
-                                entrypointsKey: ENTRYPOINTS_KEY,
-                                generateCodeOptions: {
-                                    enableTanstackTypes: false
-                                }
+                                entrypointsKey: ENTRYPOINTS_KEY
                             });
                             await writeTanstackRouterTypesForEntries({
                                 appContext: api.getAppContext(),
                                 generatedDirName,
-                                routesByEntry
+                                routesByEntry,
+                                i18nPluginInstalled: isI18nPluginInstalled()
                             });
                         }
                     });
@@ -280,8 +304,6 @@ exports.collectCanonicalRoutesForEntry = __webpack_exports__.collectCanonicalRou
 exports.createTanstackRsbuildRouteSplittingProfile = __webpack_exports__.createTanstackRsbuildRouteSplittingProfile;
 exports["default"] = __webpack_exports__["default"];
 exports.generateTanstackRouterTypesSourceForEntry = __webpack_exports__.generateTanstackRouterTypesSourceForEntry;
-exports.isTanstackRouterFrameworkEnabled = __webpack_exports__.isTanstackRouterFrameworkEnabled;
-exports.isTanstackStartRouteModuleSource = __webpack_exports__.isTanstackStartRouteModuleSource;
 exports.resolveTanstackRouteCodeSplittingEnabled = __webpack_exports__.resolveTanstackRouteCodeSplittingEnabled;
 exports.tanstackRouterPlugin = __webpack_exports__.tanstackRouterPlugin;
 exports.writeTanstackRegisterFile = __webpack_exports__.writeTanstackRegisterFile;
@@ -291,8 +313,6 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createTanstackRsbuildRouteSplittingProfile",
     "default",
     "generateTanstackRouterTypesSourceForEntry",
-    "isTanstackRouterFrameworkEnabled",
-    "isTanstackStartRouteModuleSource",
     "resolveTanstackRouteCodeSplittingEnabled",
     "tanstackRouterPlugin",
     "writeTanstackRegisterFile",

package/dist/cjs/cli/routeSplitting.js

@@ -27,15 +27,6 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
-const TANSTACK_START_ROUTE_FACTORY_CALLS = [
-    'createFileRoute',
-    'createRootRoute',
-    'createRootRouteWithContext'
-];
-const TANSTACK_START_ROUTE_FACTORY_REGEX = /\b(createFileRoute|createRootRoute|createRootRouteWithContext)\s*(?:<|\()/;
-function isTanstackStartRouteModuleSource(source) {
-    return TANSTACK_START_ROUTE_FACTORY_REGEX.test(source);
-}
 function resolveTanstackRouteCodeSplittingEnabled(option) {
     if ('boolean' == typeof option) return option;
     return option?.enabled ?? true;
@@ -46,40 +37,17 @@ function createTanstackRsbuildRouteSplittingProfile(opts) {
             output: {
                 splitRouteChunks: resolveTanstackRouteCodeSplittingEnabled(opts.routeCodeSplitting)
             }
-        },
-        modernRouteChunks: {
-            enabled: resolveTanstackRouteCodeSplittingEnabled(opts.routeCodeSplitting),
-            owner: 'modern'
-        },
-        builderChunkSplit: {
-            owner: 'modern-rsbuild',
-            preserved: true
-        },
-        tanstackStartRspackSplitter: {
-            compatible: false,
-            reason: 'TanStack Start Rsbuild route splitting is tied to TanStack file-route factory modules; Modern generates TanStack route trees from Modern route metadata and owns route chunking through output.splitRouteChunks.',
-            clientDeleteNodes: [
-                'ssr',
-                'server',
-                'headers'
-            ],
-            routeFactoryCalls: [
-                ...TANSTACK_START_ROUTE_FACTORY_CALLS
-            ]
         }
     };
 }
 __webpack_require__.d(__webpack_exports__, {
     createTanstackRsbuildRouteSplittingProfile: ()=>createTanstackRsbuildRouteSplittingProfile,
-    isTanstackStartRouteModuleSource: ()=>isTanstackStartRouteModuleSource,
     resolveTanstackRouteCodeSplittingEnabled: ()=>resolveTanstackRouteCodeSplittingEnabled
 });
 exports.createTanstackRsbuildRouteSplittingProfile = __webpack_exports__.createTanstackRsbuildRouteSplittingProfile;
-exports.isTanstackStartRouteModuleSource = __webpack_exports__.isTanstackStartRouteModuleSource;
 exports.resolveTanstackRouteCodeSplittingEnabled = __webpack_exports__.resolveTanstackRouteCodeSplittingEnabled;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createTanstackRsbuildRouteSplittingProfile",
-    "isTanstackStartRouteModuleSource",
     "resolveTanstackRouteCodeSplittingEnabled"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/cli/tanstackTypes.js

@@ -38,24 +38,12 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     collectCanonicalRoutesForEntry: ()=>collectCanonicalRoutesForEntry,
-    generateTanstackRouterTypesSourceForEntry: ()=>generateTanstackRouterTypesSourceForEntry,
-    isTanstackRouterFrameworkEnabled: ()=>isTanstackRouterFrameworkEnabled
+    generateTanstackRouterTypesSourceForEntry: ()=>generateTanstackRouterTypesSourceForEntry
 });
+const cli_namespaceObject = require("@modern-js/runtime/cli");
 const utils_namespaceObject = require("@modern-js/utils");
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
-const reservedWords = 'break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield enum await implements package protected static interface private public';
-const builtins = 'arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl';
-const forbidList = new Set(`${reservedWords} ${builtins}`.split(' '));
-function makeLegalIdentifier(str) {
-    const identifier = str.replace(/-(\w)/g, (_, letter)=>letter.toUpperCase()).replace(/[^$_a-zA-Z0-9]/g, '_');
-    if (/\d/.test(identifier[0]) || forbidList.has(identifier)) return `_${identifier}`;
-    return identifier || '_';
-}
-function getPathWithoutExt(filename) {
-    const extname = external_path_default().extname(filename);
-    return extname ? filename.slice(0, -extname.length) : filename;
-}
 const JS_OR_TS_EXTS = [
     '.js',
     '.jsx',
@@ -80,7 +68,7 @@ function toTanstackPath(pathname) {
 }
 async function resolveFileNoExt(inputNoExtPath) {
     const file = (0, utils_namespaceObject.findExists)(JS_OR_TS_EXTS.map((ext)=>`${inputNoExtPath}${ext}`));
-    return file ? getPathWithoutExt(file) : null;
+    return file ? (0, cli_namespaceObject.getPathWithoutExt)(file) : null;
 }
 function quote(str) {
     return JSON.stringify(str);
@@ -152,7 +140,8 @@ function paramsTypeForCanonicalPath(canonicalPath) {
     }
     return fields.length > 0 ? `{ ${fields.join('; ')} }` : 'Record<string, never>';
 }
-function collectCanonicalRoutesForEntry(routes) {
+function collectCanonicalRoutesForEntry(routes, options = {}) {
+    const { localeParamHeuristic = true } = options;
     const canonicalParams = new Map();
     let hasI18nSurface = false;
     const normalizeJoined = (joined)=>{
@@ -172,7 +161,7 @@ function collectCanonicalRoutesForEntry(routes) {
             currentPath = normalizeJoined(route.modernCanonicalPath);
         } else if ('string' == typeof route.path && route.path.length > 0) {
             const segments = route.path.replace(/\[(.+?)\]/g, ':$1').split('/').filter(Boolean);
-            if ('' === parentPath && LOCALE_PARAM_SEGMENTS.has(segments[0])) {
+            if (localeParamHeuristic && '' === parentPath && LOCALE_PARAM_SEGMENTS.has(segments[0])) {
                 hasI18nSurface = true;
                 segments.shift();
             }
@@ -193,17 +182,6 @@ function collectCanonicalRoutesForEntry(routes) {
         ...canonicalParams.entries()
     ].sort(([a], [b])=>a.localeCompare(b)));
 }
-async function isTanstackRouterFrameworkEnabled(appContext) {
-    const runtimeConfigBase = external_path_default().join(appContext.srcDirectory, appContext.runtimeConfigFile);
-    const runtimeConfigFile = (0, utils_namespaceObject.findExists)(JS_OR_TS_EXTS.map((ext)=>`${runtimeConfigBase}${ext}`));
-    if (!runtimeConfigFile) return false;
-    try {
-        const content = await utils_namespaceObject.fs.readFile(runtimeConfigFile, 'utf-8');
-        return /framework\s*:\s*['"]tanstack['"]/.test(content);
-    } catch  {
-        return false;
-    }
-}
 async function generateTanstackRouterTypesSourceForEntry(opts) {
     const { appContext, entryName, generatedDirName = 'modern-tanstack', routes } = opts;
     const outDir = external_path_default().join(appContext.srcDirectory, generatedDirName, entryName);
@@ -212,12 +190,30 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
     const imports = [];
     const statements = [];
     const loaderImportMap = new Map();
+    const componentImportMap = new Map();
     const searchContractImportMap = new Map();
     const usedRouteVarNames = new Set();
     let loaderIndex = 0;
+    let componentIndex = 0;
     let validateSearchIndex = 0;
     let loaderDepsIndex = 0;
     let routeIndex = 0;
+    const getImportNameForComponent = (componentPath)=>{
+        if ('string' != typeof componentPath || 0 === componentPath.length) return Promise.resolve(null);
+        let pendingImportName = componentImportMap.get(componentPath);
+        if (!pendingImportName) {
+            pendingImportName = (async ()=>{
+                const resolvedNoExt = await resolveRouteModuleNoExt(componentPath);
+                if (!resolvedNoExt) return null;
+                const relImport = normalizeRelativeImport(external_path_default().relative(outDir, resolvedNoExt));
+                const componentName = `component_${componentIndex++}`;
+                imports.push(`import ${componentName} from ${quote(relImport)};`);
+                return componentName;
+            })();
+            componentImportMap.set(componentPath, pendingImportName);
+        }
+        return pendingImportName;
+    };
     const resolveRouteModuleNoExt = async (aliasedNoExtPath)=>{
         const prefix = `${appContext.internalSrcAlias}/`;
         let absNoExt;
@@ -273,7 +269,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
     };
     const createRouteVarName = (route)=>{
         const id = route.id;
-        const base = id ? makeLegalIdentifier(id) : `r_${routeIndex++}`;
+        const base = id ? (0, cli_namespaceObject.makeLegalIdentifier)(id) : `r_${routeIndex++}`;
         return reserveRouteVarName(`route_${base}`);
     };
     const buildRoute = async (opts)=>{
@@ -292,6 +288,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         const routeOpts = [
             `getParentRoute: () => ${parentVar},`
         ];
+        const componentName = await getImportNameForComponent(route._component);
+        if (componentName) routeOpts.push(`component: ${componentName},`);
         if (isPathlessLayout(route)) {
             const id = route.id;
             routeOpts.push(`id: ${quote(id || 'pathless')},`);
@@ -334,6 +332,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             route
         })));
     const rootOpts = [];
+    const rootComponentName = await getImportNameForComponent(rootModern?._component);
+    if (rootComponentName) rootOpts.push(`component: ${rootComponentName},`);
     if (rootLoaderName) rootOpts.push(`loader: modernLoaderToTanstack({ hasSplat: false }, ${rootLoaderName}),`);
     if (rootValidateSearchName) rootOpts.push(`validateSearch: ${rootValidateSearchName},`);
     if (rootLoaderDepsName) rootOpts.push(`loaderDeps: ${rootLoaderDepsName},`);
@@ -342,178 +342,15 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
 
 import {
   createMemoryHistory,
-  modernTanstackRouterFastDefaults,
   createRootRouteWithContext,
   createRoute,
   createRouter,
-  notFound,
-  redirect,
+  createRouteStaticData,
+  type ModernRouterContext,
+  modernLoaderToTanstack,
+  modernTanstackRouterFastDefaults,
 } from '@modern-js/plugin-tanstack/runtime';
 
-type ModernRouterContext = {
-  request?: Request;
-  requestContext?: unknown;
-};
-
-function isResponse(value: unknown): value is Response {
-  return (
-    value != null &&
-    typeof value === 'object' &&
-    typeof (value as any).status === 'number' &&
-    typeof (value as any).headers === 'object'
-  );
-}
-
-const redirectStatusCodes = new Set([301, 302, 303, 307, 308]);
-function isRedirectResponse(res: Response) {
-  return redirectStatusCodes.has(res.status);
-}
-
-function throwTanstackRedirect(location: string) {
-  const target = location.length > 0 ? location : '/';
-  try {
-    void new URL(target);
-    throw redirect({ href: target });
-  } catch {
-    throw redirect({ to: target });
-  }
-}
-
-function mapParamsForModernLoader(params: Record<string, string>, hasSplat: boolean) {
-  if (!hasSplat) {
-    return params;
-  }
-
-  const { _splat, ...rest } = params as any;
-  if (typeof _splat !== 'undefined') {
-    return { ...rest, '*': _splat };
-  }
-  return rest;
-}
-
-function createRouteStaticData(opts: {
-  modernRouteId?: string;
-  modernRouteAction?: unknown;
-  modernRouteLoader?: unknown;
-}) {
-  const staticData: {
-    modernRouteId?: string;
-    modernRouteAction?: unknown;
-    modernRouteLoader?: unknown;
-  } = {};
-
-  if (typeof opts.modernRouteId === 'string' && opts.modernRouteId.length > 0) {
-    staticData.modernRouteId = opts.modernRouteId;
-  }
-
-  if (typeof opts.modernRouteLoader !== 'undefined') {
-    staticData.modernRouteLoader = opts.modernRouteLoader;
-  }
-
-  if (typeof opts.modernRouteAction !== 'undefined') {
-    staticData.modernRouteAction = opts.modernRouteAction;
-  }
-
-  return staticData;
-}
-
-function getLoaderSignal(ctx: any): AbortSignal {
-  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: any): string {
-  if (typeof ctx?.location === 'string') {
-    return ctx.location;
-  }
-
-  const publicHref = ctx?.location?.publicHref;
-  if (typeof publicHref === 'string') {
-    return publicHref;
-  }
-
-  const href = ctx?.location?.href;
-  if (typeof href === 'string') {
-    return href;
-  }
-
-  const urlHref = ctx?.location?.url?.href;
-  return typeof urlHref === 'string' ? urlHref : '';
-}
-
-function getLoaderParams(ctx: any): Record<string, string> {
-  return typeof ctx?.params === 'object' && ctx.params !== null ? ctx.params : {};
-}
-
-function handleModernLoaderResult<LoaderResult>(result: LoaderResult): LoaderResult {
-  if (isResponse(result)) {
-    if (isRedirectResponse(result)) {
-      const location = result.headers.get('Location') ?? '/';
-      throwTanstackRedirect(location);
-    }
-    if (result.status === 404) {
-      throw notFound();
-    }
-  }
-
-  return result;
-}
-
-function handleModernLoaderError(err: unknown): never {
-  if (isResponse(err)) {
-    if (isRedirectResponse(err)) {
-      const location = err.headers.get('Location') ?? '/';
-      throwTanstackRedirect(location);
-    }
-    if (err.status === 404) {
-      throw notFound();
-    }
-  }
-
-  throw err;
-}
-
-function modernLoaderToTanstack<TLoader extends (args: any) => any>(
-  opts: { hasSplat: boolean },
-  modernLoader: TLoader,
-) {
-  type LoaderResult = Awaited<ReturnType<TLoader>>;
-
-  return (ctx: any): Promise<LoaderResult> => {
-    try {
-      const signal = getLoaderSignal(ctx);
-      const baseRequest: Request | undefined =
-        ctx?.context?.request instanceof Request ? ctx.context.request : undefined;
-
-      const href = getLoaderHref(ctx);
-
-      const request = baseRequest !== undefined
-        ? new Request(baseRequest, { signal })
-        : new Request(href, { signal });
-
-      const params = mapParamsForModernLoader(getLoaderParams(ctx), opts.hasSplat);
-
-      return Promise.resolve(
-        (modernLoader as any)({
-          request,
-          params,
-          context: ctx?.context?.requestContext,
-        }),
-      )
-        .then((result: LoaderResult) => handleModernLoaderResult(result))
-        .catch(handleModernLoaderError);
-    } catch (err) {
-      handleModernLoaderError(err);
-    }
-  };
-}
-
 ${imports.join('\n')}
 
 export const rootRoute = createRootRouteWithContext<ModernRouterContext>()({
@@ -544,11 +381,9 @@ export const router = createRouter({
 }
 exports.collectCanonicalRoutesForEntry = __webpack_exports__.collectCanonicalRoutesForEntry;
 exports.generateTanstackRouterTypesSourceForEntry = __webpack_exports__.generateTanstackRouterTypesSourceForEntry;
-exports.isTanstackRouterFrameworkEnabled = __webpack_exports__.isTanstackRouterFrameworkEnabled;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "collectCanonicalRoutesForEntry",
-    "generateTanstackRouterTypesSourceForEntry",
-    "isTanstackRouterFrameworkEnabled"
+    "generateTanstackRouterTypesSourceForEntry"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/runtime/hooks.js

@@ -28,33 +28,30 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    modifyRoutes: ()=>modifyRoutes,
-    onAfterCreateRouter: ()=>onAfterCreateRouter,
-    onAfterHydrateRouter: ()=>onAfterHydrateRouter,
-    onBeforeCreateRouter: ()=>onBeforeCreateRouter,
-    onBeforeCreateRoutes: ()=>onBeforeCreateRoutes,
-    onBeforeHydrateRouter: ()=>onBeforeHydrateRouter
+    modifyRoutes: ()=>context_namespaceObject.modifyRoutes,
+    onAfterCreateRouter: ()=>context_namespaceObject.onAfterCreateRouter,
+    onAfterHydrateRouter: ()=>context_namespaceObject.onAfterHydrateRouter,
+    onBeforeCreateRouter: ()=>context_namespaceObject.onBeforeCreateRouter,
+    onBeforeCreateRoutes: ()=>context_namespaceObject.onBeforeCreateRoutes,
+    onBeforeHydrateRouter: ()=>context_namespaceObject.onBeforeHydrateRouter,
+    routerProviderRegistryHooks: ()=>context_namespaceObject.routerProviderRegistryHooks
 });
-const plugin_namespaceObject = require("@modern-js/plugin");
-const modifyRoutes = (0, plugin_namespaceObject.createSyncHook)();
-const onBeforeCreateRoutes = (0, plugin_namespaceObject.createSyncHook)();
-const onBeforeCreateRouter = (0, plugin_namespaceObject.createSyncHook)();
-const onAfterCreateRouter = (0, plugin_namespaceObject.createSyncHook)();
-const onBeforeHydrateRouter = (0, plugin_namespaceObject.createSyncHook)();
-const onAfterHydrateRouter = (0, plugin_namespaceObject.createSyncHook)();
+const context_namespaceObject = require("@modern-js/runtime/context");
 exports.modifyRoutes = __webpack_exports__.modifyRoutes;
 exports.onAfterCreateRouter = __webpack_exports__.onAfterCreateRouter;
 exports.onAfterHydrateRouter = __webpack_exports__.onAfterHydrateRouter;
 exports.onBeforeCreateRouter = __webpack_exports__.onBeforeCreateRouter;
 exports.onBeforeCreateRoutes = __webpack_exports__.onBeforeCreateRoutes;
 exports.onBeforeHydrateRouter = __webpack_exports__.onBeforeHydrateRouter;
+exports.routerProviderRegistryHooks = __webpack_exports__.routerProviderRegistryHooks;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "modifyRoutes",
     "onAfterCreateRouter",
     "onAfterHydrateRouter",
     "onBeforeCreateRouter",
     "onBeforeCreateRoutes",
-    "onBeforeHydrateRouter"
+    "onBeforeHydrateRouter",
+    "routerProviderRegistryHooks"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true