@bleedingdev/modern-js-plugin-tanstack 3.8.1-ultramodern.1 → 3.8.1-ultramodern.3

package/src/runtime/routeTree/staticData.ts

@@ -1,8 +1,9 @@
 // @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
 
 export function mergeModernRouteHandle(route: {
-  config?: { handle?: Record<string, unknown> } | unknown;
+  config?: unknown;
   handle?: Record<string, unknown>;
+  [key: string]: unknown;
 }) {
   const config = route.config as { handle?: Record<string, unknown> } | null;
   const handle = {
@@ -12,55 +13,3 @@ export function mergeModernRouteHandle(route: {
 
   return Object.keys(handle).length > 0 ? handle : undefined;
 }
-
-export function createRouteStaticData(opts: {
-  modernRouteId?: string;
-  modernRouteAction?: unknown;
-  modernRouteHandle?: unknown;
-  modernRouteHasAction?: boolean;
-  modernRouteHasClientLoader?: boolean;
-  modernRouteHasLoader?: boolean;
-  modernRouteIsClientComponent?: boolean;
-  modernRouteLoader?: unknown;
-  modernRouteShouldRevalidate?: unknown;
-}) {
-  const staticData: Record<string, unknown> = {};
-
-  if (opts.modernRouteId) {
-    staticData.modernRouteId = opts.modernRouteId;
-  }
-
-  if (opts.modernRouteAction) {
-    staticData.modernRouteAction = opts.modernRouteAction;
-  }
-
-  if (opts.modernRouteHandle) {
-    staticData.modernRouteHandle = opts.modernRouteHandle;
-  }
-
-  if (opts.modernRouteHasAction) {
-    staticData.modernRouteHasAction = true;
-  }
-
-  if (opts.modernRouteHasClientLoader) {
-    staticData.modernRouteHasClientLoader = true;
-  }
-
-  if (opts.modernRouteHasLoader) {
-    staticData.modernRouteHasLoader = true;
-  }
-
-  if (opts.modernRouteIsClientComponent) {
-    staticData.modernRouteIsClientComponent = true;
-  }
-
-  if (opts.modernRouteLoader) {
-    staticData.modernRouteLoader = opts.modernRouteLoader;
-  }
-
-  if (opts.modernRouteShouldRevalidate) {
-    staticData.modernRouteShouldRevalidate = opts.modernRouteShouldRevalidate;
-  }
-
-  return Object.keys(staticData).length > 0 ? staticData : undefined;
-}

package/src/runtime/rsc/client.tsx

@@ -57,5 +57,3 @@ const adapter = createSerializationAdapter({
 export function getTanstackRscSerializationAdapters() {
   return [adapter];
 }
-
-export const rscSerializationAdapter = getTanstackRscSerializationAdapters;

package/src/runtime/rsc/server.tsx

@@ -188,8 +188,6 @@ export function getTanstackRscSerializationAdapters() {
   return [adapter];
 }
 
-export const rscSerializationAdapter = getTanstackRscSerializationAdapters;
-
 function createReadableStreamEmitter<T>(): SlotEmitter<T> {
   let closed = false;
   const queue: T[] = [];

package/src/runtime/submitAction.ts

@@ -6,6 +6,7 @@ import {
   formDataToUrlSearchParams,
   toFormData,
 } from './formData';
+import { isRedirectResponse } from './loaderBridge';
 
 export class RouteActionResponseError<TData = unknown> extends Error {
   readonly response: Response;
@@ -55,13 +56,6 @@ function resolveRouteHandlers(router: AnyRouter, actionTo: string) {
   };
 }
 
-function isRedirectResponse(value: unknown): value is Response {
-  if (!(value instanceof Response)) {
-    return false;
-  }
-  return [301, 302, 303, 307, 308].includes(value.status);
-}
-
 async function parseResponseData(response: Response) {
   if (response.status === 204) {
     return null;

package/src/runtime/utils.tsx

@@ -1,10 +1,9 @@
 // @effect-diagnostics strictBooleanExpressions:off
 import type { RouteObject } from '@modern-js/runtime-utils/router';
 import React from 'react';
+import { mergeModernRouteHandle } from './routeTree/staticData';
 import type { ModernRoute } from './types';
 
-export type SSRMode = 'string' | 'stream';
-
 type RouterConfig = {
   routesConfig: {
     globalApp?: React.ComponentType<any>;
@@ -49,13 +48,6 @@ function withGlobalLayout(
   };
 }
 
-function getRouteHandle(route: ModernRoute) {
-  return {
-    ...route.handle,
-    ...(typeof route.config === 'object' ? route.config?.handle : {}),
-  };
-}
-
 function toTanstackRouteObject(
   route: ModernRoute,
   globalApp?: React.ComponentType<GlobalAppProps>,
@@ -67,7 +59,7 @@ function toTanstackRouteObject(
       loader: route.loader,
       action: route.action,
       shouldRevalidate: route.shouldRevalidate,
-      handle: getRouteHandle(route),
+      handle: mergeModernRouteHandle(route) ?? {},
       index: route.index,
       hasLoader: route.hasLoader || Boolean(route.loader),
       hasClientLoader: route.hasClientLoader || Boolean(route.clientData),
@@ -108,8 +100,6 @@ export function createTanstackRouteObjectsFromConfig({
   routesConfig,
 }: {
   routesConfig: RouterConfig['routesConfig'];
-  props?: Record<string, unknown>;
-  ssrMode?: SSRMode;
 }): RouteObject[] | null {
   if (!routesConfig) {
     return null;

package/src/shared/routeStaticData.ts

@@ -0,0 +1,7 @@
+export function createRouteStaticData<const T extends Record<string, unknown>>(
+  opts: T,
+): Partial<T> {
+  return Object.fromEntries(
+    Object.entries(opts).filter(([, value]) => Boolean(value)),
+  ) as Partial<T>;
+}

package/tests/router/cli.test.ts

@@ -306,13 +306,14 @@ describe('tanstack router cli plugin', () => {
     });
   });
 
-  test('exposes canonical route params through a custom i18n runtime module', async () => {
+  test('typechecks custom runtime module augmentations', async () => {
     tempDir = await mkdtemp(path.join(tmpdir(), 'modern-tanstack-cli-'));
     const srcDirectory = path.join(tempDir, 'src');
 
     await writeTanstackRegisterFile({
       entries: ['main'],
       generatedDirName: 'tanstack',
+      runtimeModule: '@my-org/tanstack/runtime',
       srcDirectory,
       canonicalRoutes: {
         '/talks': 'Record<string, never>',
@@ -324,6 +325,7 @@ describe('tanstack router cli plugin', () => {
       entries: ['main'],
       generatedDirName: 'tanstack',
       srcDirectory,
+      runtimeModule: '@my-org/tanstack/runtime',
       i18nRuntimeModule: '@my-org/i18n/runtime',
       canonicalTypeChecks: [
         "import type { UltramodernCanonicalRoutes } from '@my-org/i18n/runtime';",

package/dist/cjs/runtime/routeTree.js

@@ -1,46 +0,0 @@
-"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__, {
-    createRouteTreeFromRouteObjects: ()=>index_js_namespaceObject.createRouteTreeFromRouteObjects,
-    getModernRouteIdsFromMatches: ()=>index_js_namespaceObject.getModernRouteIdsFromMatches,
-    pickRouteModuleComponent: ()=>index_js_namespaceObject.pickRouteModuleComponent
-});
-const index_js_namespaceObject = require("./routeTree/index.js");
-exports.createRouteTreeFromRouteObjects = __webpack_exports__.createRouteTreeFromRouteObjects;
-exports.getModernRouteIdsFromMatches = __webpack_exports__.getModernRouteIdsFromMatches;
-exports.pickRouteModuleComponent = __webpack_exports__.pickRouteModuleComponent;
-for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "createRouteTreeFromRouteObjects",
-    "getModernRouteIdsFromMatches",
-    "pickRouteModuleComponent"
-].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});

package/dist/esm/runtime/routeTree.mjs

@@ -1 +0,0 @@
-export { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches, pickRouteModuleComponent } from "./routeTree/index.mjs";

package/dist/esm/runtime/rsc/index.mjs

@@ -1 +0,0 @@
-export { CompositeComponent, getTanstackRscSerializationAdapters, rscSerializationAdapter } from "./client.mjs";

package/dist/esm-node/runtime/routeTree.mjs

@@ -1,2 +0,0 @@
-import "node:module";
-export { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches, pickRouteModuleComponent } from "./routeTree/index.mjs";

package/dist/esm-node/runtime/rsc/index.mjs

@@ -1,2 +0,0 @@
-import "node:module";
-export { CompositeComponent, getTanstackRscSerializationAdapters, rscSerializationAdapter } from "./client.mjs";

package/dist/types/runtime/routeTree.d.ts

@@ -1 +0,0 @@
-export { createRouteTreeFromRouteObjects, getModernRouteIdsFromMatches, pickRouteModuleComponent, } from './routeTree/index';

package/dist/types/runtime/rsc/index.d.ts

@@ -1,2 +0,0 @@
-export { CompositeComponent, getTanstackRscSerializationAdapters, rscSerializationAdapter, } from './client';
-export type { AnyCompositeComponent, AnyRenderableServerComponent, CompositeComponentProps, } from './symbols';

package/src/runtime/routeTree.ts

@@ -1,7 +0,0 @@
-// @effect-diagnostics asyncFunction:off strictBooleanExpressions:off
-
-export {
-  createRouteTreeFromRouteObjects,
-  getModernRouteIdsFromMatches,
-  pickRouteModuleComponent,
-} from './routeTree/index';

package/src/runtime/rsc/index.ts

@@ -1,10 +0,0 @@
-export {
-  CompositeComponent,
-  getTanstackRscSerializationAdapters,
-  rscSerializationAdapter,
-} from './client';
-export type {
-  AnyCompositeComponent,
-  AnyRenderableServerComponent,
-  CompositeComponentProps,
-} from './symbols';