@bleedingdev/modern-js-plugin-tanstack 3.4.0-ultramodern.2 → 3.4.0-ultramodern.3

package/dist/cjs/cli/index.js

@@ -73,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 && cli.getEntrypointRoutesOwner) {
+        if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner && cli.updateNestedRoutesSpec) {
             runtimeRouterCli = cli;
             return runtimeRouterCli;
         }
@@ -284,11 +284,8 @@ ${canonicalRoutesAugmentation}`;
                     if (isTanstackEntrypoint(entrypoint)) {
                         const { distDirectory } = api.getAppContext();
                         const nestedRoutesSpecPath = external_node_path_default().resolve(distDirectory, utils_namespaceObject.NESTED_ROUTE_SPEC_FILE);
-                        const existingNestedRoutes = await utils_namespaceObject.fs.pathExists(nestedRoutesSpecPath) ? await utils_namespaceObject.fs.readJSON(nestedRoutesSpecPath) : {};
-                        await utils_namespaceObject.fs.outputJSON(nestedRoutesSpecPath, {
-                            ...existingNestedRoutes,
-                            ...nestedRoutesForServer
-                        });
+                        const { updateNestedRoutesSpec } = getRuntimeRouterCli();
+                        await updateNestedRoutesSpec(nestedRoutesSpecPath, nestedRoutesForServer);
                     }
                     return {
                         entrypoint,

package/dist/esm/cli/index.mjs

@@ -16,7 +16,7 @@ let runtimeRouterCli;
 function getRuntimeRouterCli() {
     if (runtimeRouterCli) return runtimeRouterCli;
     const cli = __webpack_require__(2320);
-    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner) {
+    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner && cli.updateNestedRoutesSpec) {
         runtimeRouterCli = cli;
         return runtimeRouterCli;
     }
@@ -227,11 +227,8 @@ function tanstackRouterPlugin(options = {}) {
                 if (isTanstackEntrypoint(entrypoint)) {
                     const { distDirectory } = api.getAppContext();
                     const nestedRoutesSpecPath = node_path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE);
-                    const existingNestedRoutes = await fs.pathExists(nestedRoutesSpecPath) ? await fs.readJSON(nestedRoutesSpecPath) : {};
-                    await fs.outputJSON(nestedRoutesSpecPath, {
-                        ...existingNestedRoutes,
-                        ...nestedRoutesForServer
-                    });
+                    const { updateNestedRoutesSpec } = getRuntimeRouterCli();
+                    await updateNestedRoutesSpec(nestedRoutesSpecPath, nestedRoutesForServer);
                 }
                 return {
                     entrypoint,

package/dist/esm-node/cli/index.mjs

@@ -20,7 +20,7 @@ let runtimeRouterCli;
 function getRuntimeRouterCli() {
     if (runtimeRouterCli) return runtimeRouterCli;
     const cli = __webpack_require__("@modern-js/runtime/cli?9b14");
-    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner) {
+    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner && cli.updateNestedRoutesSpec) {
         runtimeRouterCli = cli;
         return runtimeRouterCli;
     }
@@ -231,11 +231,8 @@ function tanstackRouterPlugin(options = {}) {
                 if (isTanstackEntrypoint(entrypoint)) {
                     const { distDirectory } = api.getAppContext();
                     const nestedRoutesSpecPath = node_path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE);
-                    const existingNestedRoutes = await fs.pathExists(nestedRoutesSpecPath) ? await fs.readJSON(nestedRoutesSpecPath) : {};
-                    await fs.outputJSON(nestedRoutesSpecPath, {
-                        ...existingNestedRoutes,
-                        ...nestedRoutesForServer
-                    });
+                    const { updateNestedRoutesSpec } = getRuntimeRouterCli();
+                    await updateNestedRoutesSpec(nestedRoutesSpecPath, nestedRoutesForServer);
                 }
                 return {
                     entrypoint,

package/package.json

@@ -18,7 +18,7 @@
     "modern.js",
     "tanstack-router"
   ],
-  "version": "3.4.0-ultramodern.2",
+  "version": "3.4.0-ultramodern.3",
   "engines": {
     "node": ">=20"
   },
@@ -77,13 +77,13 @@
     "@swc/helpers": "^0.5.23",
     "@tanstack/react-router": "1.170.16",
     "@tanstack/router-core": "1.171.13",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.4.0-ultramodern.2",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.4.0-ultramodern.2",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.2",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.4.0-ultramodern.2"
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.4.0-ultramodern.3",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.3",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.4.0-ultramodern.3",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.4.0-ultramodern.3"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "3.4.0-ultramodern.2",
+    "@modern-js/runtime": "3.4.0-ultramodern.3",
     "react": "^19.2.7",
     "react-dom": "^19.2.7"
   },
@@ -98,8 +98,8 @@
     "@typescript/native-preview": "7.0.0-dev.20260624.1",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.4.0-ultramodern.2",
-    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.4.0-ultramodern.2",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.4.0-ultramodern.3",
+    "@modern-js/runtime": "npm:@bleedingdev/modern-js-runtime@3.4.0-ultramodern.3",
     "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": [

package/src/cli/index.ts

@@ -83,6 +83,10 @@ type RuntimeRouterCliHelpers = {
     },
   ) => Promise<Entrypoint[]>;
   isRouteEntry: (dir: string, routesDir?: string) => string | false;
+  updateNestedRoutesSpec: (
+    specPath: string,
+    nextRoutes: Record<string, unknown>,
+  ) => Promise<void>;
 };
 
 let runtimeRouterCli: RuntimeRouterCliHelpers | undefined;
@@ -97,7 +101,8 @@ function getRuntimeRouterCli(): RuntimeRouterCliHelpers {
   if (
     cli.handleGeneratorEntryCode &&
     cli.getEntrypointRoutesDir &&
-    cli.getEntrypointRoutesOwner
+    cli.getEntrypointRoutesOwner &&
+    cli.updateNestedRoutesSpec
   ) {
     runtimeRouterCli = cli as RuntimeRouterCliHelpers;
     return runtimeRouterCli;
@@ -497,19 +502,11 @@ export function tanstackRouterPlugin(
             distDirectory,
             NESTED_ROUTE_SPEC_FILE,
           );
-          const existingNestedRoutes = (await fs.pathExists(
+          const { updateNestedRoutesSpec } = getRuntimeRouterCli();
+          await updateNestedRoutesSpec(
             nestedRoutesSpecPath,
-          ))
-            ? ((await fs.readJSON(nestedRoutesSpecPath)) as Record<
-                string,
-                unknown
-              >)
-            : {};
-
-          await fs.outputJSON(nestedRoutesSpecPath, {
-            ...existingNestedRoutes,
-            ...nestedRoutesForServer,
-          });
+            nestedRoutesForServer,
+          );
         }
 
         return {

package/tests/router/cli.test.ts

@@ -57,6 +57,18 @@ rstest.mock('@modern-js/runtime/cli', () => {
       const routesEntry = path.join(dir, routesDir);
       return fs.existsSync(routesEntry) ? routesEntry : false;
     },
+    updateNestedRoutesSpec: async (
+      specPath: string,
+      nextRoutes: Record<string, unknown>,
+    ) => {
+      const existingRoutes = fs.existsSync(specPath)
+        ? await fs.readJSON(specPath)
+        : {};
+      await fs.outputJSON(specPath, {
+        ...existingRoutes,
+        ...nextRoutes,
+      });
+    },
   };
 });
 

package/tests/router/tanstackTypes.test.ts

@@ -279,9 +279,14 @@ describe('tanstack router type generation', () => {
     );
 
     await expect(
-      execFileAsync('tsgo', ['--noEmit', '-p', 'tsconfig.json'], {
-        cwd: tempDir,
-      }),
+      execFileAsync(
+        process.platform === 'win32' ? 'tsgo.cmd' : 'tsgo',
+        ['--noEmit', '-p', 'tsconfig.json'],
+        {
+          cwd: tempDir,
+          shell: process.platform === 'win32',
+        },
+      ),
     ).resolves.toBeDefined();
   });