@bleedingdev/modern-js-plugin-tanstack 3.2.0-ultramodern.98 → 3.4.0-ultramodern.0

package/dist/cjs/cli/index.js

@@ -24,11 +24,15 @@ function __webpack_require__(moduleId) {
     };
 })();
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __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");
     };
 })();
 (()=>{
@@ -48,11 +52,10 @@ var __webpack_exports__ = {};
 (()=>{
     __webpack_require__.r(__webpack_exports__);
     __webpack_require__.d(__webpack_exports__, {
+        collectCanonicalRoutesForEntry: ()=>external_tanstackTypes_js_namespaceObject.collectCanonicalRoutesForEntry,
         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,
@@ -70,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;
         }
@@ -86,6 +89,14 @@ var __webpack_exports__ = {};
     function createRegisterDtsContent(opts) {
         const importStatements = opts.entries.map((entryName, index)=>`import type { router as router${index} } from './${entryName}/router.gen';`).join('\n');
         const routerUnionType = opts.entries.map((_, index)=>`typeof router${index}`).join(' | ');
+        const canonicalEntries = Object.entries(opts.canonicalRoutes ?? {});
+        const canonicalRoutesAugmentation = canonicalEntries.length > 0 ? `
+declare module '${opts.i18nRuntimeModule || '@modern-js/plugin-i18n/runtime'}' {
+  interface UltramodernCanonicalRoutes {
+${canonicalEntries.map(([routePath, paramsType])=>`    '${routePath}': ${paramsType};`).join('\n')}
+  }
+}
+` : '';
         return `// This file is auto-generated by Modern.js. Do not edit manually.
 
 ${importStatements}
@@ -95,19 +106,21 @@ declare module '${opts.runtimeModule}' {
     router: ${routerUnionType};
   }
 }
-`;
+${canonicalRoutesAugmentation}`;
     }
     async function writeTanstackRegisterFile(opts) {
-        const { entries, generatedDirName = DEFAULT_GENERATED_DIR_NAME, runtimeModule = '@modern-js/plugin-tanstack/runtime', srcDirectory } = opts;
+        const { entries, generatedDirName = DEFAULT_GENERATED_DIR_NAME, runtimeModule = '@modern-js/plugin-tanstack/runtime', srcDirectory, canonicalRoutes, i18nRuntimeModule } = opts;
         if (0 === entries.length) return;
         const registerDtsPath = external_node_path_default().join(srcDirectory, generatedDirName, 'register.gen.d.ts');
         await writeFileIfChanged(registerDtsPath, createRegisterDtsContent({
             entries,
-            runtimeModule
+            runtimeModule,
+            canonicalRoutes,
+            i18nRuntimeModule
         }));
     }
     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)({
@@ -124,10 +137,21 @@ declare module '${opts.runtimeModule}' {
             if (mainEntryName && b === mainEntryName) return 1;
             return a.localeCompare(b);
         });
+        let canonicalRoutes = null;
+        if (i18nPluginInstalled) for (const entryName of registerEntries){
+            const entryCanonicalRoutes = (0, external_tanstackTypes_js_namespaceObject.collectCanonicalRoutesForEntry)(routesByEntry[entryName], {
+                localeParamHeuristic: true
+            });
+            if (entryCanonicalRoutes) canonicalRoutes = {
+                ...entryCanonicalRoutes,
+                ...canonicalRoutes ?? {}
+            };
+        }
         await writeTanstackRegisterFile({
             entries: registerEntries,
             generatedDirName,
-            srcDirectory: appContext.srcDirectory
+            srcDirectory: appContext.srcDirectory,
+            canonicalRoutes
         });
     }
     function tanstackRouterPlugin(options = {}) {
@@ -145,16 +169,42 @@ declare module '${opts.runtimeModule}' {
                     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
                         }
@@ -173,7 +223,9 @@ declare module '${opts.runtimeModule}' {
                         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, '..', '..')
                             ]
                         }
                     }));
@@ -190,15 +242,13 @@ declare module '${opts.runtimeModule}' {
                     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)=>{
@@ -212,15 +262,13 @@ declare module '${opts.runtimeModule}' {
                         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()
                             });
                         }
                     });
@@ -252,21 +300,19 @@ declare module '${opts.runtimeModule}' {
     }
     const src_cli = tanstackRouterPlugin;
 })();
+exports.collectCanonicalRoutesForEntry = __webpack_exports__.collectCanonicalRoutesForEntry;
 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;
 exports.writeTanstackRouterTypesForEntries = __webpack_exports__.writeTanstackRouterTypesForEntries;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "collectCanonicalRoutesForEntry",
     "createTanstackRsbuildRouteSplittingProfile",
     "default",
     "generateTanstackRouterTypesSourceForEntry",
-    "isTanstackRouterFrameworkEnabled",
-    "isTanstackStartRouteModuleSource",
     "resolveTanstackRouteCodeSplittingEnabled",
     "tanstackRouterPlugin",
     "writeTanstackRegisterFile",

package/dist/cjs/cli/routeSplitting.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __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");
     };
 })();
 (()=>{
@@ -23,20 +27,6 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    createTanstackRsbuildRouteSplittingProfile: ()=>createTanstackRsbuildRouteSplittingProfile,
-    isTanstackStartRouteModuleSource: ()=>isTanstackStartRouteModuleSource,
-    resolveTanstackRouteCodeSplittingEnabled: ()=>resolveTanstackRouteCodeSplittingEnabled
-});
-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;
@@ -47,35 +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,
+    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', {