@bleedingdev/modern-js-plugin-tanstack 3.9.0-ultramodern.2 → 3.9.0-ultramodern.20

package/dist/cjs/cli/artifacts.js

@@ -38,12 +38,14 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     generateTanstackRouteArtifacts: ()=>generateTanstackRouteArtifacts,
+    writeRouteMetadataManifest: ()=>writeRouteMetadataManifest,
     writeTanstackRegisterFile: ()=>writeTanstackRegisterFile,
     writeTanstackRouterTypesForEntries: ()=>writeTanstackRouterTypesForEntries
 });
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const utils_namespaceObject = require("@modern-js/utils");
+const external_routeMetadata_js_namespaceObject = require("./routeMetadata.js");
 const external_tanstackTypes_js_namespaceObject = require("./tanstackTypes.js");
 const DEFAULT_GENERATED_DIR_NAME = 'modern-tanstack';
 async function writeFileIfChanged(filePath, content) {
@@ -121,7 +123,16 @@ async function writeTanstackRouterTypesForEntries(opts) {
         canonicalRoutes
     });
 }
+async function writeRouteMetadataManifest(opts) {
+    const routesDirectory = external_node_path_default().join(opts.appDirectory, 'src', 'routes');
+    const manifestPath = external_node_path_default().join(routesDirectory, external_routeMetadata_js_namespaceObject.ROUTE_METADATA_MANIFEST_FILE_NAME);
+    const manifest = (0, external_routeMetadata_js_namespaceObject.renderRouteMetadataManifest)(await (0, external_routeMetadata_js_namespaceObject.findRouteMetaFiles)(routesDirectory));
+    if (null !== manifest) return void await writeFileIfChanged(manifestPath, manifest);
+    const previous = await utils_namespaceObject.fs.pathExists(manifestPath) ? await utils_namespaceObject.fs.readFile(manifestPath, 'utf-8') : null;
+    if (previous?.startsWith(`${external_routeMetadata_js_namespaceObject.ROUTE_METADATA_MANIFEST_HEADER}\n`)) throw new Error(`[plugin-tanstack] ${manifestPath} is generated from route.meta.ts files, but none remain below ${routesDirectory}. Restore at least one route.meta.ts that exports routeMeta, or delete the manifest together with its imports.`);
+}
 async function generateTanstackRouteArtifacts(opts) {
+    await writeRouteMetadataManifest(opts);
     const [{ createRunOptions }, { cli }, utils] = await Promise.all([
         import("@modern-js/app-tools/cli/run"),
         import("@modern-js/plugin/cli"),
@@ -139,16 +150,19 @@ async function generateTanstackRouteArtifacts(opts) {
         version: opts.version || process.env.MODERN_JS_VERSION || '0.0.0-routes-generate',
         internalPlugins: utils.INTERNAL_RUNTIME_PLUGINS
     });
-    await cli.init({
+    const { appContext } = await cli.init({
         ...runOptions,
         command: 'build'
     });
+    await appContext.hooks.onBeforeExit.call();
 }
 exports.generateTanstackRouteArtifacts = __webpack_exports__.generateTanstackRouteArtifacts;
+exports.writeRouteMetadataManifest = __webpack_exports__.writeRouteMetadataManifest;
 exports.writeTanstackRegisterFile = __webpack_exports__.writeTanstackRegisterFile;
 exports.writeTanstackRouterTypesForEntries = __webpack_exports__.writeTanstackRouterTypesForEntries;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "generateTanstackRouteArtifacts",
+    "writeRouteMetadataManifest",
     "writeTanstackRegisterFile",
     "writeTanstackRouterTypesForEntries"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/cjs/cli/index.js

@@ -59,6 +59,7 @@ var __webpack_exports__ = {};
         generateTanstackRouterTypesSourceForEntry: ()=>external_tanstackTypes_js_namespaceObject.generateTanstackRouterTypesSourceForEntry,
         resolveTanstackRouteCodeSplittingEnabled: ()=>external_routeSplitting_js_namespaceObject.resolveTanstackRouteCodeSplittingEnabled,
         tanstackRouterPlugin: ()=>tanstackRouterPlugin,
+        writeRouteMetadataManifest: ()=>external_artifacts_js_namespaceObject.writeRouteMetadataManifest,
         writeTanstackRegisterFile: ()=>external_artifacts_js_namespaceObject.writeTanstackRegisterFile,
         writeTanstackRouterTypesForEntries: ()=>external_artifacts_js_namespaceObject.writeTanstackRouterTypesForEntries
     });
@@ -91,6 +92,15 @@ var __webpack_exports__ = {};
                 '@modern-js/runtime'
             ],
             setup: (api)=>{
+                const { srcDirectory, serverCompileExcludedFiles = [] } = api.getAppContext();
+                api.updateAppContext({
+                    serverCompileExcludedFiles: [
+                        ...new Set([
+                            ...serverCompileExcludedFiles,
+                            external_node_path_default().join(srcDirectory, generatedDirName, 'register.gen.d.ts')
+                        ])
+                    ]
+                });
                 const nestedRoutesForServer = {};
                 const isTanstackEntrypoint = (entrypoint)=>{
                     const { getEntrypointRoutesDir } = getRuntimeRouterCli();
@@ -239,6 +249,7 @@ exports.generateTanstackRouteArtifacts = __webpack_exports__.generateTanstackRou
 exports.generateTanstackRouterTypesSourceForEntry = __webpack_exports__.generateTanstackRouterTypesSourceForEntry;
 exports.resolveTanstackRouteCodeSplittingEnabled = __webpack_exports__.resolveTanstackRouteCodeSplittingEnabled;
 exports.tanstackRouterPlugin = __webpack_exports__.tanstackRouterPlugin;
+exports.writeRouteMetadataManifest = __webpack_exports__.writeRouteMetadataManifest;
 exports.writeTanstackRegisterFile = __webpack_exports__.writeTanstackRegisterFile;
 exports.writeTanstackRouterTypesForEntries = __webpack_exports__.writeTanstackRouterTypesForEntries;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
@@ -249,6 +260,7 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "generateTanstackRouterTypesSourceForEntry",
     "resolveTanstackRouteCodeSplittingEnabled",
     "tanstackRouterPlugin",
+    "writeRouteMetadataManifest",
     "writeTanstackRegisterFile",
     "writeTanstackRouterTypesForEntries"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/cjs/cli/routeMetadata.js

@@ -0,0 +1,131 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __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__, {
+    ROUTE_METADATA_MANIFEST_FILE_NAME: ()=>ROUTE_METADATA_MANIFEST_FILE_NAME,
+    ROUTE_METADATA_MANIFEST_HEADER: ()=>ROUTE_METADATA_MANIFEST_HEADER,
+    ROUTE_META_FILE_NAME: ()=>ROUTE_META_FILE_NAME,
+    findRouteMetaFiles: ()=>findRouteMetaFiles,
+    renderRouteMetadataManifest: ()=>renderRouteMetadataManifest
+});
+const promises_namespaceObject = require("node:fs/promises");
+const external_node_path_namespaceObject = require("node:path");
+var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
+const ROUTE_META_FILE_NAME = 'route.meta.ts';
+const ROUTE_METADATA_MANIFEST_FILE_NAME = 'ultramodern-route-metadata.ts';
+const ROUTE_METADATA_MANIFEST_HEADER = `// @generated by @modern-js/plugin-tanstack from ${ROUTE_META_FILE_NAME} files. Run routes-generate; do not edit.`;
+const PRINT_WIDTH = 120;
+const MANIFEST_BODY = `export const ultramodernLocalisedUrls = Object.fromEntries(
+  ultramodernRouteMetadata
+    .filter((route) => route.canonicalPath !== '/')
+    .map((route) => [route.canonicalPath, route.localisedPaths]),
+);
+export const ultramodernPublicRoutes = ultramodernRouteMetadata
+  .filter((route) => route.public && route.indexable)
+  .map((route) => ({
+    canonicalPath: route.canonicalPath,
+    descriptionKey: route.descriptionKey,
+    id: route.id,
+    localisedPaths: route.localisedPaths,
+    namespace: route.namespace,
+    ownerAppId: route.ownerAppId,
+    titleKey: route.titleKey,
+    ...('jsonLd' in route ? { jsonLd: route.jsonLd } : {}),
+  }));
+export const ultramodernRouteConfig = {
+  authoring: 'colocated-route-meta',
+  generatedManifest: true,
+  localisedUrls: ultramodernLocalisedUrls,
+  namespace: ultramodernRouteNamespace,
+  publicRoutes: ultramodernPublicRoutes,
+  routes: ultramodernRouteMetadata,
+  source: 'route-owned',
+} as const;
+`;
+const compareCodeUnits = (left, right)=>left < right ? -1 : left > right ? 1 : 0;
+const quoteSpecifier = (specifier)=>specifier.includes("'") ? JSON.stringify(specifier) : `'${specifier}'`;
+function renderRouteMetadataManifest(routeMetaFiles) {
+    const specifiers = routeMetaFiles.map((file)=>`./${file.replaceAll('\\', '/').replace(/\.ts$/u, '')}`).sort(compareCodeUnits);
+    if (0 === specifiers.length) return null;
+    const bindings = specifiers.map((_, index)=>`route${index}`);
+    const imports = specifiers.map((specifier, index)=>`import { routeMeta as ${bindings[index]} } from ${quoteSpecifier(specifier)};`);
+    const inlineRoutes = `export const ultramodernRouteMetadata = [${bindings.join(', ')}] as const;`;
+    const routes = inlineRoutes.length <= PRINT_WIDTH ? inlineRoutes : `export const ultramodernRouteMetadata = [\n${bindings.map((binding)=>`  ${binding},\n`).join('')}] as const;`;
+    return `${ROUTE_METADATA_MANIFEST_HEADER}
+${imports.join('\n')}
+
+export const ultramodernRouteNamespace = route0.namespace;
+${routes}
+${MANIFEST_BODY}`;
+}
+async function findRouteMetaFiles(routesDirectory) {
+    const files = [];
+    const visit = async (relativeDirectory)=>{
+        const entries = await (0, promises_namespaceObject.readdir)(external_node_path_default().join(routesDirectory, relativeDirectory), {
+            withFileTypes: true
+        });
+        for (const entry of entries){
+            const relativePath = external_node_path_default().join(relativeDirectory, entry.name);
+            if (entry.isDirectory()) await visit(relativePath);
+            else if (entry.isFile() && entry.name === ROUTE_META_FILE_NAME) files.push(relativePath);
+        }
+    };
+    try {
+        await visit('');
+    } catch (error) {
+        const { code, path: missingPath } = error;
+        if ('ENOENT' === code && missingPath === routesDirectory) return [];
+        throw error;
+    }
+    return files;
+}
+exports.ROUTE_METADATA_MANIFEST_FILE_NAME = __webpack_exports__.ROUTE_METADATA_MANIFEST_FILE_NAME;
+exports.ROUTE_METADATA_MANIFEST_HEADER = __webpack_exports__.ROUTE_METADATA_MANIFEST_HEADER;
+exports.ROUTE_META_FILE_NAME = __webpack_exports__.ROUTE_META_FILE_NAME;
+exports.findRouteMetaFiles = __webpack_exports__.findRouteMetaFiles;
+exports.renderRouteMetadataManifest = __webpack_exports__.renderRouteMetadataManifest;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "ROUTE_METADATA_MANIFEST_FILE_NAME",
+    "ROUTE_METADATA_MANIFEST_HEADER",
+    "ROUTE_META_FILE_NAME",
+    "findRouteMetaFiles",
+    "renderRouteMetadataManifest"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/cli/tanstackTypes/canonicalRoutes.js

@@ -30,6 +30,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     collectCanonicalRoutesForEntry: ()=>collectCanonicalRoutesForEntry
 });
+const routeDescriptor_js_namespaceObject = require("../../shared/routeDescriptor.js");
 const external_shared_js_namespaceObject = require("./shared.js");
 const LOCALE_PARAM_SEGMENTS = new Set([
     ':lang',
@@ -76,11 +77,13 @@ function collectCanonicalRoutesForEntry(routes, options = {}) {
         const key = (0, external_shared_js_namespaceObject.toTanstackPath)(normalized);
         if (!canonicalParams.has(key)) canonicalParams.set(key, paramsTypeForCanonicalPath(normalized));
     };
-    const visit = (route, parentPath)=>{
+    const visit = (descriptor, parentPath)=>{
+        const { source: route, children } = descriptor;
         let currentPath = parentPath;
-        if ('string' == typeof route.modernCanonicalPath) {
+        const canonicalPath = route.modernLocalisedRoute?.canonicalPath ?? route.modernCanonicalPath;
+        if ('string' == typeof canonicalPath) {
             hasI18nSurface = true;
-            currentPath = normalizeJoined(route.modernCanonicalPath);
+            currentPath = canonicalPath ? normalizeJoined(canonicalPath) : '';
         } else if ('string' == typeof route.path && route.path.length > 0) {
             const segments = route.path.replace(/\[(.+?)\]/g, ':$1').split('/').filter(Boolean);
             if (localeParamHeuristic && '' === parentPath && LOCALE_PARAM_SEGMENTS.has(segments[0])) {
@@ -89,16 +92,13 @@ function collectCanonicalRoutesForEntry(routes, options = {}) {
             }
             currentPath = segments.length ? normalizeJoined(`${parentPath}/${segments.join('/')}`) : parentPath;
         }
-        const children = route.children;
         if (children && children.length > 0) {
             for (const child of children)visit(child, currentPath);
             return;
         }
         record(currentPath || '/');
     };
-    const rootModern = routes.find((route)=>route.isRoot);
-    const topLevel = rootModern ? rootModern.children ?? [] : routes;
-    for (const route of topLevel)visit(route, '');
+    for (const route of (0, routeDescriptor_js_namespaceObject.describeRouteTree)(routes).children)visit(route, '');
     if (!hasI18nSurface || 0 === canonicalParams.size) return null;
     return Object.fromEntries([
         ...canonicalParams.entries()

package/dist/cjs/cli/tanstackTypes/shared.js

@@ -29,8 +29,6 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createRouteStaticDataSnippet: ()=>createRouteStaticDataSnippet,
-    isIndexRoute: ()=>isIndexRoute,
-    isPathlessLayout: ()=>isPathlessLayout,
     normalizeRelativeImport: ()=>normalizeRelativeImport,
     pickModernLoaderModule: ()=>pickModernLoaderModule,
     pickRouteSearchContractModules: ()=>pickRouteSearchContractModules,
@@ -83,14 +81,6 @@ function pickRouteSearchContractModules(route) {
         loaderDepsPath: 'string' == typeof loaderDepsPath ? loaderDepsPath : null
     };
 }
-function isPathlessLayout(route) {
-    const extras = route;
-    return 'nested' === extras.type && 'boolean' != typeof extras.index && void 0 === extras.path;
-}
-function isIndexRoute(route) {
-    const extras = route;
-    return 'nested' === extras.type && Boolean(extras.index);
-}
 function createRouteStaticDataSnippet(opts) {
     const staticData = (0, routeStaticData_js_namespaceObject.createRouteStaticData)({
         modernRouteId: opts.modernRouteId && quote(opts.modernRouteId),
@@ -101,8 +91,6 @@ function createRouteStaticDataSnippet(opts) {
     return entries.length > 0 ? `staticData: createRouteStaticData({\n    ${entries.map(([key, value])=>`${key}: ${value},`).join('\n    ')}\n  }),` : null;
 }
 exports.createRouteStaticDataSnippet = __webpack_exports__.createRouteStaticDataSnippet;
-exports.isIndexRoute = __webpack_exports__.isIndexRoute;
-exports.isPathlessLayout = __webpack_exports__.isPathlessLayout;
 exports.normalizeRelativeImport = __webpack_exports__.normalizeRelativeImport;
 exports.pickModernLoaderModule = __webpack_exports__.pickModernLoaderModule;
 exports.pickRouteSearchContractModules = __webpack_exports__.pickRouteSearchContractModules;
@@ -111,8 +99,6 @@ exports.resolveFileNoExt = __webpack_exports__.resolveFileNoExt;
 exports.toTanstackPath = __webpack_exports__.toTanstackPath;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createRouteStaticDataSnippet",
-    "isIndexRoute",
-    "isPathlessLayout",
     "normalizeRelativeImport",
     "pickModernLoaderModule",
     "pickRouteSearchContractModules",

package/dist/cjs/cli/tanstackTypes/source.js

@@ -32,16 +32,12 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const cli_namespaceObject = require("@modern-js/runtime/cli");
 const utils_namespaceObject = require("@modern-js/utils");
+const routeDescriptor_js_namespaceObject = require("../../shared/routeDescriptor.js");
 const external_shared_js_namespaceObject = require("./shared.js");
 async function generateTanstackRouterTypesSourceForEntry(opts) {
     const { appContext, entryName, generatedDirName = 'modern-tanstack', routes } = opts;
     const outDir = utils_namespaceObject.upath.join(appContext.srcDirectory, generatedDirName, entryName);
-    const rootModern = routes.find((r)=>{
-        const extras = r;
-        return r && 'nested' === extras.type && extras.isRoot;
-    });
-    const rootExtras = rootModern;
-    const topLevel = rootModern ? rootExtras?.children || [] : routes;
+    const { root: rootModern, children: topLevel } = (0, routeDescriptor_js_namespaceObject.describeRouteTree)(routes);
     const imports = [];
     const statements = [];
     const loaderImportMap = new Map();
@@ -58,9 +54,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         let pendingImportName = componentImportMap.get(componentPath);
         if (!pendingImportName) {
             pendingImportName = (async ()=>{
-                const resolvedNoExt = await resolveRouteModuleNoExt(componentPath);
-                if (!resolvedNoExt) return null;
-                const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(utils_namespaceObject.upath.relative(outDir, resolvedNoExt));
+                const relImport = await resolveRouteImport(componentPath);
+                if (!relImport) return null;
                 const componentName = `component_${componentIndex++}`;
                 imports.push(`import ${componentName} from ${(0, external_shared_js_namespaceObject.quote)(relImport)};`);
                 return componentName;
@@ -69,14 +64,15 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         }
         return pendingImportName;
     };
-    const resolveRouteModuleNoExt = async (aliasedNoExtPath)=>{
+    const resolveRouteImport = async (aliasedNoExtPath)=>{
         const prefix = `${appContext.internalSrcAlias}/`;
         let absNoExt;
         if (aliasedNoExtPath.startsWith(prefix)) {
             const rel = aliasedNoExtPath.slice(prefix.length);
             absNoExt = utils_namespaceObject.upath.join(appContext.srcDirectory, rel);
         } else absNoExt = utils_namespaceObject.upath.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : utils_namespaceObject.upath.join(appContext.srcDirectory, aliasedNoExtPath);
-        return (0, external_shared_js_namespaceObject.resolveFileNoExt)(absNoExt);
+        const resolvedNoExt = await (0, external_shared_js_namespaceObject.resolveFileNoExt)(absNoExt);
+        return resolvedNoExt ? (0, external_shared_js_namespaceObject.normalizeRelativeImport)(utils_namespaceObject.upath.relative(outDir, resolvedNoExt)) : null;
     };
     const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
         const key = `${inline ? 'inline' : 'default'}:${hasAction ? 'action' : 'loader'}:${aliasedNoExtPath}`;
@@ -85,9 +81,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             loaderName: existing,
             actionName: hasAction ? existing.replace(/^loader_/, 'action_') : null
         };
-        const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
-        if (!resolvedNoExt) return null;
-        const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(utils_namespaceObject.upath.relative(outDir, resolvedNoExt));
+        const relImport = await resolveRouteImport(aliasedNoExtPath);
+        if (!relImport) return null;
         const importName = `loader_${loaderIndex++}`;
         const actionName = hasAction ? importName.replace(/^loader_/, 'action_') : null;
         if (inline) {
@@ -107,9 +102,8 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         const key = `${exportName}:${aliasedNoExtPath}`;
         const existing = searchContractImportMap.get(key);
         if (existing) return existing;
-        const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
-        if (!resolvedNoExt) return null;
-        const relImport = (0, external_shared_js_namespaceObject.normalizeRelativeImport)(utils_namespaceObject.upath.relative(outDir, resolvedNoExt));
+        const relImport = await resolveRouteImport(aliasedNoExtPath);
+        if (!relImport) return null;
         const importName = 'validateSearch' === exportName ? `validateSearch_${validateSearchIndex++}` : `loaderDeps_${loaderDepsIndex++}`;
         imports.push(`import { ${exportName} as ${importName} } from ${(0, external_shared_js_namespaceObject.quote)(relImport)};`);
         searchContractImportMap.set(key, importName);
@@ -127,9 +121,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         const base = id ? (0, cli_namespaceObject.makeLegalIdentifier)(id) : `r_${routeIndex++}`;
         return reserveRouteVarName(`route_${base}`);
     };
-    const buildRoute = async (opts)=>{
-        const { parentVar, route } = opts;
-        const varName = createRouteVarName(route);
+    const createRouteOptions = async (route, hasSplat)=>{
         const routeExtras = route;
         const loaderInfo = (0, external_shared_js_namespaceObject.pickModernLoaderModule)(route);
         const routeAction = routeExtras.action;
@@ -139,20 +131,9 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         const searchContractInfo = (0, external_shared_js_namespaceObject.pickRouteSearchContractModules)(route);
         const validateSearchName = searchContractInfo.validateSearchPath ? await getImportNameForSearchContract(searchContractInfo.validateSearchPath, 'validateSearch') : null;
         const loaderDepsName = searchContractInfo.loaderDepsPath ? await getImportNameForSearchContract(searchContractInfo.loaderDepsPath, 'loaderDeps') : null;
-        const rawPath = routeExtras.path;
-        const hasSplat = 'string' == typeof rawPath && rawPath.includes('*');
-        const routeOpts = [
-            `getParentRoute: () => ${parentVar},`
-        ];
+        const routeOpts = [];
         const componentName = await getImportNameForComponent(routeExtras._component);
         if (componentName) routeOpts.push(`component: ${componentName},`);
-        if ((0, external_shared_js_namespaceObject.isPathlessLayout)(route)) {
-            const id = routeExtras.id;
-            routeOpts.push(`id: ${(0, external_shared_js_namespaceObject.quote)(id || 'pathless')},`);
-        } else {
-            const p = (0, external_shared_js_namespaceObject.isIndexRoute)(route) ? '/' : (0, external_shared_js_namespaceObject.toTanstackPath)(rawPath || '');
-            routeOpts.push(`path: ${(0, external_shared_js_namespaceObject.quote)(p)},`);
-        }
         if (loaderName) routeOpts.push(`loader: modernLoaderToTanstack({ hasSplat: ${hasSplat} }, ${loaderName}),`);
         if (validateSearchName) routeOpts.push(`validateSearch: ${validateSearchName},`);
         if (loaderDepsName) routeOpts.push(`loaderDeps: ${loaderDepsName},`);
@@ -162,39 +143,29 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             actionName
         });
         if (staticDataSnippet) routeOpts.push(staticDataSnippet);
-        const children = routeExtras.children;
+        return routeOpts;
+    };
+    const buildRoute = async (descriptor, parentVar)=>{
+        const { source: route, location, hasSplat, children } = descriptor;
+        const varName = createRouteVarName(route);
+        const routeOpts = [
+            `getParentRoute: () => ${parentVar},`,
+            ...Object.entries(location).map(([key, value])=>`${key}: ${(0, external_shared_js_namespaceObject.quote)(value)},`),
+            ...await createRouteOptions(route, hasSplat)
+        ];
         const hasChildren = Boolean(children && children.length > 0);
         const routeCtorVarName = hasChildren ? reserveRouteVarName(`${varName}__base`) : varName;
         statements.push(`const ${routeCtorVarName} = createRoute({\n  ${routeOpts.join('\n  ')}\n});`);
         if (children && children.length > 0) {
             const childVars = [];
-            for (const child of children)childVars.push(await buildRoute({
-                parentVar: routeCtorVarName,
-                route: child
-            }));
+            for (const child of children)childVars.push(await buildRoute(child, routeCtorVarName));
             statements.push(`const ${varName} = ${routeCtorVarName}.addChildren([${childVars.join(', ')}]);`);
         }
         return varName;
     };
-    const rootLoaderInfo = rootModern ? (0, external_shared_js_namespaceObject.pickModernLoaderModule)(rootModern) : null;
-    const rootAction = rootExtras?.action;
-    const rootLoaderImports = rootLoaderInfo?.loaderPath ? await getImportNamesForLoader(rootLoaderInfo.loaderPath, rootLoaderInfo.inline, Boolean(rootLoaderInfo.inline && rootAction === rootLoaderInfo.loaderPath)) : null;
-    const rootLoaderName = rootLoaderImports?.loaderName || null;
-    const rootActionName = rootLoaderImports?.actionName || null;
-    const rootSearchContractInfo = rootModern ? (0, external_shared_js_namespaceObject.pickRouteSearchContractModules)(rootModern) : null;
-    const rootValidateSearchName = rootSearchContractInfo?.validateSearchPath ? await getImportNameForSearchContract(rootSearchContractInfo.validateSearchPath, 'validateSearch') : null;
-    const rootLoaderDepsName = rootSearchContractInfo?.loaderDepsPath ? await getImportNameForSearchContract(rootSearchContractInfo.loaderDepsPath, 'loaderDeps') : null;
     const topLevelVars = [];
-    for (const route of topLevel)topLevelVars.push(await buildRoute({
-        parentVar: 'rootRoute',
-        route
-    }));
-    const rootOpts = [];
-    const rootComponentName = await getImportNameForComponent(rootExtras?._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},`);
+    for (const route of topLevel)topLevelVars.push(await buildRoute(route, 'rootRoute'));
+    const rootOpts = rootModern ? await createRouteOptions(rootModern, false) : [];
     const routerGenTs = `// This file is auto-generated by Modern.js. Do not edit manually.
 
 import {
@@ -211,11 +182,7 @@ ${imports.join('\n')}
 
 export const rootRoute = createRootRouteWithContext<ModernRouterContext>()({
   ${rootOpts.join('\n  ')}
-  ${(0, external_shared_js_namespaceObject.createRouteStaticDataSnippet)({
-        modernRouteId: rootExtras?.id,
-        loaderName: rootLoaderName,
-        actionName: rootActionName
-    }) || ''}
+
 });
 
 ${statements.join('\n\n')}

package/dist/cjs/runtime/basepathRewrite.js

@@ -27,19 +27,25 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    createModernBasepathRewrite: ()=>createModernBasepathRewrite
+});
+const i18n_runtime_extensions_namespaceObject = require("@modern-js/i18n-runtime-extensions");
+const react_router_namespaceObject = require("@tanstack/react-router");
 function normalizeBasepath(basepath) {
     if (!basepath) return '/';
     let normalized = basepath.startsWith('/') ? basepath : `/${basepath}`;
     if (normalized.length > 1 && normalized.endsWith('/')) normalized = normalized.slice(0, -1);
     return normalized || '/';
 }
-function createModernBasepathRewrite(basepath, caseSensitive = false) {
+function createModernBasepathRewrite(basepath, caseSensitive = false, routes = []) {
+    const localisedRewrite = (0, i18n_runtime_extensions_namespaceObject.createLocalisedRouteRewrite)(routes);
     const normalizedBasepath = normalizeBasepath(basepath);
-    if ('/' === normalizedBasepath) return;
+    if ('/' === normalizedBasepath) return localisedRewrite;
     const normalizedBasepathWithSlash = `${normalizedBasepath}/`;
     const checkBasepath = caseSensitive ? normalizedBasepath : normalizedBasepath.toLowerCase();
     const checkBasepathWithSlash = caseSensitive ? normalizedBasepathWithSlash : normalizedBasepathWithSlash.toLowerCase();
-    return {
+    const basepathRewrite = {
         input: ({ url })=>{
             const pathname = caseSensitive ? url.pathname : url.pathname.toLowerCase();
             if (pathname === checkBasepath) url.pathname = '/';
@@ -53,10 +59,11 @@ function createModernBasepathRewrite(basepath, caseSensitive = false) {
             return url;
         }
     };
+    return localisedRewrite ? (0, react_router_namespaceObject.composeRewrites)([
+        basepathRewrite,
+        localisedRewrite
+    ]) : basepathRewrite;
 }
-__webpack_require__.d(__webpack_exports__, {
-    createModernBasepathRewrite: ()=>createModernBasepathRewrite
-});
 exports.createModernBasepathRewrite = __webpack_exports__.createModernBasepathRewrite;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createModernBasepathRewrite"

package/dist/cjs/runtime/lifecycle.js

@@ -28,24 +28,21 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    applyRouterRuntimeState: ()=>context_namespaceObject.applyRouterRuntimeState,
-    applyRouterServerPrepareResult: ()=>context_namespaceObject.applyRouterServerPrepareResult,
-    createRouterRuntimeState: ()=>context_namespaceObject.createRouterRuntimeState,
-    createRouterServerSnapshot: ()=>context_namespaceObject.createRouterServerSnapshot,
-    getRouterRuntimeState: ()=>context_namespaceObject.getRouterRuntimeState,
-    getRouterServerSnapshot: ()=>context_namespaceObject.getRouterServerSnapshot
+    applyRouterRuntimeState: ()=>router_state_namespaceObject.applyRouterRuntimeState,
+    applyRouterServerPrepareResult: ()=>router_state_namespaceObject.applyRouterServerPrepareResult,
+    createRouterServerSnapshot: ()=>router_state_namespaceObject.createRouterServerSnapshot,
+    getRouterRuntimeState: ()=>router_state_namespaceObject.getRouterRuntimeState,
+    getRouterServerSnapshot: ()=>router_state_namespaceObject.getRouterServerSnapshot
 });
-const context_namespaceObject = require("@modern-js/runtime/context");
+const router_state_namespaceObject = require("@modern-js/runtime-extensions/router-state");
 exports.applyRouterRuntimeState = __webpack_exports__.applyRouterRuntimeState;
 exports.applyRouterServerPrepareResult = __webpack_exports__.applyRouterServerPrepareResult;
-exports.createRouterRuntimeState = __webpack_exports__.createRouterRuntimeState;
 exports.createRouterServerSnapshot = __webpack_exports__.createRouterServerSnapshot;
 exports.getRouterRuntimeState = __webpack_exports__.getRouterRuntimeState;
 exports.getRouterServerSnapshot = __webpack_exports__.getRouterServerSnapshot;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "applyRouterRuntimeState",
     "applyRouterServerPrepareResult",
-    "createRouterRuntimeState",
     "createRouterServerSnapshot",
     "getRouterRuntimeState",
     "getRouterServerSnapshot"

package/dist/cjs/runtime/loaderBridge.js

@@ -30,6 +30,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     createRouteStaticData: ()=>routeStaticData_js_namespaceObject.createRouteStaticData,
     getLoaderHref: ()=>getLoaderHref,
+    getLoaderSignal: ()=>getLoaderSignal,
     handleModernLoaderError: ()=>handleModernLoaderError,
     handleModernLoaderResult: ()=>handleModernLoaderResult,
     isAbsoluteUrl: ()=>isAbsoluteUrl_js_namespaceObject.isAbsoluteUrl,
@@ -79,10 +80,13 @@ function mapSplatParamsForModernLoader(params, hasSplat) {
     return rest;
 }
 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;
+    const matchSignal = ctx?.abortController?.signal ?? ctx?.signal;
+    const requestSignal = ctx?.context?.request?.signal;
+    const signals = [
+        matchSignal,
+        requestSignal
+    ].filter((signal)=>signal instanceof AbortSignal);
+    return AbortSignal.any(signals);
 }
 function getLoaderHref(ctx) {
     if ('string' == typeof ctx?.location) return ctx.location;
@@ -145,6 +149,7 @@ function modernLoaderToTanstack(opts, modernLoader) {
 }
 exports.createRouteStaticData = __webpack_exports__.createRouteStaticData;
 exports.getLoaderHref = __webpack_exports__.getLoaderHref;
+exports.getLoaderSignal = __webpack_exports__.getLoaderSignal;
 exports.handleModernLoaderError = __webpack_exports__.handleModernLoaderError;
 exports.handleModernLoaderResult = __webpack_exports__.handleModernLoaderResult;
 exports.isAbsoluteUrl = __webpack_exports__.isAbsoluteUrl;
@@ -157,6 +162,7 @@ exports.throwTanstackRedirect = __webpack_exports__.throwTanstackRedirect;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createRouteStaticData",
     "getLoaderHref",
+    "getLoaderSignal",
     "handleModernLoaderError",
     "handleModernLoaderResult",
     "isAbsoluteUrl",