@bleedingdev/modern-js-runtime 3.2.0-ultramodern.102 → 3.2.0-ultramodern.104

package/dist/esm-node/router/runtime/tanstack/plugin.mjs

@@ -62,49 +62,46 @@ function getCachedRouteModule(routeId) {
     if ("u" < typeof window) return;
     return window[routeModulesKey]?.[routeId];
 }
-async function preloadHydratedRouteComponents(router) {
+function preloadHydratedRouteComponents(router) {
     const preloadableRouter = router;
     const routesById = preloadableRouter.routesById || {};
     const matches = preloadableRouter.stores.matches.get();
-    await Promise.all(matches.map((match)=>{
-        if (!match.routeId) return;
+    return Promise.all(matches.map((match)=>{
+        if (void 0 === match.routeId || '' === match.routeId) return;
         const route = routesById[match.routeId];
         const component = route?.options?.component;
         const preload = component?.load || component?.preload;
         if ('function' != typeof preload) return;
         return Promise.resolve(preload.call(component)).then((routeModule)=>{
             const modernRouteId = route?.options?.staticData?.modernRouteId;
-            const resolvedComponent = pickRouteModuleComponent(modernRouteId && getCachedRouteModule(modernRouteId) || routeModule);
-            if (resolvedComponent && modernRouteId) route.options.component = withModernRouteMatchContext(resolvedComponent, modernRouteId);
+            const cachedRouteModule = 'string' == typeof modernRouteId && '' !== modernRouteId ? getCachedRouteModule(modernRouteId) : void 0;
+            const resolvedComponent = pickRouteModuleComponent(cachedRouteModule ?? routeModule);
+            if (void 0 !== resolvedComponent && 'string' == typeof modernRouteId && '' !== modernRouteId) route.options.component = withModernRouteMatchContext(resolvedComponent, modernRouteId);
         });
-    }));
+    })).then(()=>void 0);
 }
 function getTanstackSsrHydrationRecord(router) {
-    let hydrationRecord = routerHydrationRecords.get(router);
-    if (!hydrationRecord) {
-        hydrationRecord = {
-            promise: Promise.resolve(),
-            status: 'pending'
-        };
-        routerHydrationRecords.set(router, hydrationRecord);
-        try {
-            hydrationRecord.promise = hydrate(router).then(async (value)=>{
-                await preloadHydratedRouteComponents(router);
-                return value;
-            }).then((value)=>{
-                hydrationRecord.status = 'fulfilled';
-                return value;
-            }, (error)=>{
-                hydrationRecord.status = 'rejected';
-                hydrationRecord.error = error;
-                throw error;
-            });
-        } catch (error) {
+    const existingHydrationRecord = routerHydrationRecords.get(router);
+    if (void 0 !== existingHydrationRecord) return existingHydrationRecord;
+    const hydrationRecord = {
+        promise: Promise.resolve(),
+        status: 'pending'
+    };
+    routerHydrationRecords.set(router, hydrationRecord);
+    try {
+        hydrationRecord.promise = hydrate(router).then((value)=>preloadHydratedRouteComponents(router).then(()=>value)).then((value)=>{
+            hydrationRecord.status = 'fulfilled';
+            return value;
+        }, (error)=>{
             hydrationRecord.status = 'rejected';
             hydrationRecord.error = error;
-            hydrationRecord.promise = Promise.reject(error);
-            hydrationRecord.promise.catch(()=>{});
-        }
+            throw error;
+        });
+    } catch (error) {
+        hydrationRecord.status = 'rejected';
+        hydrationRecord.error = error;
+        hydrationRecord.promise = Promise.reject(error);
+        hydrationRecord.promise.catch(()=>{});
     }
     return hydrationRecord;
 }
@@ -225,13 +222,13 @@ const tanstackRouterPlugin = (userConfig = {})=>({
                 });
                 return cachedRouter;
             };
-            api.onBeforeRender(async (context)=>{
+            api.onBeforeRender((context)=>{
                 const mergedConfig = getMergedConfig();
-                if ("u" > typeof window && window._SSR_DATA && mergedConfig.unstable_reloadOnURLMismatch) {
+                if ("u" > typeof window && void 0 !== window._SSR_DATA && mergedConfig.unstable_reloadOnURLMismatch) {
                     const { ssrContext } = context;
                     const currentPathname = normalizePathname(window.location.pathname);
-                    const initialPathname = ssrContext?.request?.pathname && normalizePathname(ssrContext.request.pathname);
-                    if (initialPathname && initialPathname !== currentPathname) {
+                    const initialPathname = 'string' == typeof ssrContext?.request?.pathname ? normalizePathname(ssrContext.request.pathname) : void 0;
+                    if (void 0 !== initialPathname && '' !== initialPathname && initialPathname !== currentPathname) {
                         const errorMsg = `The initial URL ${initialPathname} and the URL ${currentPathname} to be hydrated do not match, reload.`;
                         console.error(errorMsg);
                         window.location.reload();
@@ -245,14 +242,14 @@ const tanstackRouterPlugin = (userConfig = {})=>({
                     useRouter: useRouter
                 };
                 const hasSSRBootstrap = "u" > typeof window && Boolean(window.$_TSR);
-                if (hasSSRBootstrap && getRouteObjects().length) {
+                if (hasSSRBootstrap && getRouteObjects().length > 0) {
                     const runtimeContext = context;
                     const router = getRouter(runtimeContext, getClientBasename(runtimeContext));
-                    if (router) await getTanstackSsrHydrationPromise(router);
+                    if (null != router) return getTanstackSsrHydrationPromise(router).then(()=>void 0);
                 }
             });
             api.wrapRoot((App)=>{
-                if (!getRouteObjects().length) return App;
+                if (0 === getRouteObjects().length) return App;
                 const RouterWrapper = ()=>{
                     const runtimeContext = useContext(InternalRuntimeContext);
                     const _basename = getClientBasename(runtimeContext);

package/dist/esm-node/router/runtime/tanstack/prefetchLink.mjs

@@ -5,7 +5,7 @@ function resolvePreloadFromPrefetch(prefetch, preload) {
     if (void 0 !== preload) return preload;
     if ('none' === prefetch) return false;
     if ('intent' === prefetch || 'render' === prefetch || 'viewport' === prefetch) return prefetch;
-    return preload;
+    return 'viewport';
 }
 const LinkComponentImpl = (props)=>{
     const { prefetch, preload, ...rest } = props;

package/dist/types/cli/entry.d.ts

@@ -1,2 +1,2 @@
-export declare const hasApp: (dir: string) => any;
-export declare const isRuntimeEntry: (dir: string) => any;
+export declare const hasApp: (dir: string) => string | false;
+export declare const isRuntimeEntry: (dir: string) => string | false;

package/dist/types/core/context/response/index.server.d.ts

@@ -1,4 +1,7 @@
-export declare const getResponseProxy: () => any;
+export declare const getResponseProxy: () => {
+    headers: Record<string, string>;
+    status: number;
+} | undefined;
 export declare const setHeaders: (headers: Record<string, string>) => void;
 export declare const setStatus: (status: number) => void;
 export declare const redirect: (url: string, init?: number | ResponseInit) => void;

package/dist/types/core/plugin/index.d.ts

@@ -2,4 +2,4 @@ import type { InternalRuntimeContext } from '@modern-js/plugin/runtime';
 import type { RuntimeConfig, RuntimeExtends, RuntimePlugin } from './types';
 export type { RuntimePlugin };
 export declare function registerPlugin(internalPlugins: RuntimePlugin[], runtimeConfig?: RuntimeConfig): InternalRuntimeContext<RuntimeExtends>;
-export declare function mergeConfig(config: Record<string, any>, ...otherConfig: Record<string, any>[]): any;
+export declare function mergeConfig(config: Record<string, any>, ...otherConfig: Record<string, any>[]): Record<string, any>;

package/dist/types/core/server/utils.d.ts

@@ -15,5 +15,15 @@ export declare function checkIsNode(): boolean;
  * license at https://github.com/remix-run/remix/blob/main/LICENSE.md
  */
 export declare function serializeErrors(errors: StaticHandlerContext['errors']): StaticHandlerContext['errors'];
-export declare function getSSRConfigByEntry(entryName: string, ssr?: ServerUserConfig['ssr'], ssrByEntries?: ServerUserConfig['ssrByEntries']): any;
+export declare function getSSRConfigByEntry(entryName: string, ssr?: ServerUserConfig['ssr'], ssrByEntries?: ServerUserConfig['ssrByEntries']): true | {
+    forceCSR?: boolean;
+    mode?: import("@modern-js/types").SSRMode;
+    preload?: boolean | {
+        [x: string]: unknown;
+    };
+    inlineScript?: boolean;
+    disablePrerender?: boolean;
+    unsafeHeaders?: string[];
+    moduleFederationAppSSR?: boolean;
+};
 export declare function getSSRMode(ssrConfig?: SSRConfig): 'string' | 'stream' | false;

package/dist/types/exports/head.d.ts

@@ -1,11 +1,11 @@
 import React from 'react';
-import { Helmet as AsyncHelmet, HelmetData, type HelmetDatum, type HelmetHTMLBodyDatum, type HelmetHTMLElementDatum, type HelmetProps, HelmetProvider, type HelmetServerState, type HelmetTags } from 'react-helmet-async';
+import { Helmet as AsyncHelmet, HelmetData as AsyncHelmetData, type HelmetDatum, type HelmetHTMLBodyDatum, type HelmetHTMLElementDatum, type HelmetProps, HelmetProvider, type HelmetServerState, type HelmetTags } from 'react-helmet-async';
 export declare const Helmet: (props: React.PropsWithChildren<HelmetProps>) => React.CElement<React.PropsWithChildren<HelmetProps>, AsyncHelmet> | null;
 declare const head: {
     Helmet: (props: React.PropsWithChildren<HelmetProps>) => React.CElement<React.PropsWithChildren<HelmetProps>, AsyncHelmet> | null;
-    HelmetData: typeof HelmetData;
+    HelmetData: typeof AsyncHelmetData;
     HelmetProvider: typeof HelmetProvider;
 };
 export default head;
-export type { HelmetDatum, HelmetHTMLBodyDatum, HelmetHTMLElementDatum, HelmetProps, HelmetServerState as HelmetData, HelmetTags, };
-export { HelmetData, HelmetProvider };
+export type { HelmetDatum, HelmetHTMLBodyDatum, HelmetHTMLElementDatum, HelmetProps, HelmetServerState, HelmetTags, };
+export { AsyncHelmetData as HelmetData, HelmetProvider };

package/dist/types/exports/loadable.d.ts

@@ -1,7 +1,7 @@
 type LoadableDefault = typeof import('@loadable/component').default;
 type LoadableLazy = typeof import('@loadable/component').lazy;
 type LoadableReady = typeof import('@loadable/component').loadableReady;
-type LoadableInternals = typeof import('@loadable/component').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+type LoadableInternals = unknown;
 declare const loadable: LoadableDefault;
 export declare const lazy: LoadableLazy;
 export declare const loadableReady: LoadableReady;

package/dist/types/router/cli/code/utils.d.ts

@@ -1,6 +1,6 @@
 export declare const walkDirectory: (dir: string) => string[];
 export declare const isPageComponentFile: (filePath: string) => boolean;
-export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => any;
+export declare const replaceWithAlias: (base: string, filePath: string, alias: string) => string;
 export declare const parseModule: ({ source, filename, }: {
     source: string;
     filename: string;

package/dist/types/router/cli/entry.d.ts

@@ -13,6 +13,6 @@ export declare const getEntrypointRoutesDir: (entrypoint: {
 export declare const getEntrypointRoutesOwner: (entrypoint: {
     [ROUTES_OWNER_META_KEY]?: string;
 }) => string | null;
-export declare const hasNestedRoutes: (dir: string, routesDir?: string) => any;
+export declare const hasNestedRoutes: (dir: string, routesDir?: string) => boolean;
 export declare const isRouteEntry: (dir: string, routesDir?: string) => string | false;
 export declare const modifyEntrypoints: (entrypoints: Entrypoint[], routesDir?: string, routesOwner?: string) => EntrypointWithRoutesMeta[];

package/dist/types/router/runtime/PrefetchLink.d.ts

@@ -13,14 +13,18 @@ import React from 'react';
  *
  * - "intent": Fetched when the user focuses or hovers the link
  * - "render": Fetched when the link is rendered
+ * - "viewport": Fetched when the link enters the viewport
  * - "none": Never fetched
  */
-type PrefetchBehavior = 'intent' | 'render' | 'none';
+type PrefetchBehavior = 'intent' | 'render' | 'viewport' | 'none';
+type PreloadBehavior = PrefetchBehavior | false;
 export interface LinkProps extends RouterLinkProps {
     prefetch?: PrefetchBehavior;
+    preload?: PreloadBehavior;
 }
 export interface NavLinkProps extends RouterNavLinkProps {
     prefetch?: PrefetchBehavior;
+    preload?: PreloadBehavior;
 }
 declare const Link: React.ForwardRefExoticComponent<LinkProps & React.RefAttributes<HTMLAnchorElement>>;
 declare const NavLink: React.ForwardRefExoticComponent<NavLinkProps & React.RefAttributes<HTMLAnchorElement>>;

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.2.0-ultramodern.102",
+  "version": "3.2.0-ultramodern.104",
   "engines": {
     "node": ">=20"
   },
@@ -233,12 +233,12 @@
     "isbot": "5.1.40",
     "react-helmet-async": "3.0.0",
     "react-is": "^19.2.6",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.102",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.102",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.102",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.102",
-    "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.2.0-ultramodern.102",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.102"
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.2.0-ultramodern.104",
+    "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.2.0-ultramodern.104",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.2.0-ultramodern.104",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.104",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.104",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.2.0-ultramodern.104"
   },
   "peerDependencies": {
     "react": "^19.2.6",
@@ -246,7 +246,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.4.2",
-    "@rsbuild/core": "2.0.7",
+    "@rsbuild/core": "2.0.10",
     "@rslib/core": "0.21.5",
     "@tanstack/history": "1.162.0",
     "@testing-library/dom": "^10.4.1",
@@ -257,7 +257,7 @@
     "@typescript/native-preview": "7.0.0-dev.20260527.2",
     "react": "^19.2.6",
     "react-dom": "^19.2.6",
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.102",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.2.0-ultramodern.104",
     "@scripts/rstest-config": "2.66.0"
   },
   "sideEffects": false,
@@ -267,7 +267,7 @@
   },
   "scripts": {
     "dev": "rslib build --watch",
-    "build": "rslib build && pnpm run gen-static",
+    "build": "rslib build && pnpm run gen-static && pnpm -w tsgo:dts \"$PWD\"",
     "gen-static": "node --disable-warning=ExperimentalWarning --experimental-strip-types ./scripts/gen-static.mts",
     "test": "rstest"
   }