@bleedingdev/modern-js-runtime 3.9.0-ultramodern.3 → 3.9.0-ultramodern.5

package/dist/types/core/server/string/loadable.d.ts

@@ -1,5 +1,5 @@
 import type { ReactElement } from 'react';
-import type { TInternalRuntimeContext } from '../../context/index.js';
+import type { createSSRRenderLifecycle } from '../shared.js';
 import type { ChunkSet, Collector } from './types.js';
 declare module '@loadable/server' {
     interface ChunkExtractor {
@@ -11,10 +11,9 @@ export interface LoadableCollectorOptions {
     nonce?: string;
     stats?: Record<string, any>;
     routeManifest?: Record<string, any>;
-    runtimeContext: TInternalRuntimeContext;
     template: string;
     entryName: string;
-    moduleFederationCssAssets?: string[];
+    lifecycle?: ReturnType<typeof createSSRRenderLifecycle>;
     chunkSet: ChunkSet;
     config: LoadableCollectorConfig;
 }
@@ -28,6 +27,10 @@ export interface LoadableCollectorConfig {
 export declare class LoadableCollector implements Collector {
     private options;
     private extractor?;
+    readonly stylesheetInfo: {
+        emittedAssets: string[];
+        attributes: Record<string, unknown>;
+    };
     constructor(options: LoadableCollectorOptions);
     private get existsAssets();
     collect(comopnent: ReactElement): ReactElement;

package/dist/types/core/server/string/ssrData.d.ts

@@ -1,7 +1,7 @@
 import type { StaticHandlerContext } from '@modern-js/runtime-utils/router';
 import type { TInternalRuntimeContext } from '../../context/index.js';
 import type { SSRServerContext } from '../../types.js';
-import type { SSRConfig } from '../shared.js';
+import type { createSSRRenderLifecycle, SSRConfig } from '../shared.js';
 import type { ChunkSet, Collector } from './types.js';
 export interface SSRDataCreatorOptions {
     runtimeContext: TInternalRuntimeContext;
@@ -10,6 +10,7 @@ export interface SSRDataCreatorOptions {
     ssrContext: SSRServerContext;
     ssrConfig?: SSRConfig;
     routerContext?: StaticHandlerContext;
+    lifecycle?: ReturnType<typeof createSSRRenderLifecycle>;
     nonce?: string;
     useJsonScript?: boolean;
 }

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

@@ -1,9 +1,5 @@
-import type { ReactElement } from 'react';
 import type { RenderLevel } from '../../constants.js';
-export interface Collector {
-    collect?: (comopnent: ReactElement) => ReactElement;
-    effect: () => void | Promise<void>;
-}
+export type { Collector } from '@modern-js/plugin/runtime';
 export type ChunkSet = {
     renderLevel: RenderLevel;
     ssrScripts: string;

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

@@ -1,6 +1,6 @@
 import React from 'react';
-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> | React.ReactElement<{}, string | React.JSXElementConstructor<any>> | null;
+import { 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.ReactElement<any, string | React.JSXElementConstructor<any>>;
 declare const head: {
     Helmet: typeof Helmet;
     HelmetData: typeof AsyncHelmetData;

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

@@ -1,4 +1,4 @@
-import { type LinkProps as RouterLinkProps, type NavLinkProps as RouterNavLinkProps } from '@modern-js/runtime-utils/router';
+import { type RouteObject, type LinkProps as RouterLinkProps, type NavLinkProps as RouterNavLinkProps } from '@modern-js/runtime-utils/router';
 import React from 'react';
 /**
  * Modified from https://github.com/remix-run/remix/blob/9a0601bd704d2f3ee622e0ddacab9b611eb0c5bc/packages/remix-react/components.tsx#L218
@@ -16,7 +16,7 @@ import React from 'react';
  * - "viewport": Fetched when the link enters the viewport
  * - "none": Never fetched
  */
-type PrefetchBehavior = 'intent' | 'render' | 'viewport' | 'none';
+type PrefetchBehavior = NonNullable<RouterLinkProps['prefetch']>;
 type PreloadBehavior = PrefetchBehavior | false;
 export interface LinkProps extends RouterLinkProps {
     prefetch?: PrefetchBehavior;
@@ -26,6 +26,31 @@ export interface NavLinkProps extends RouterNavLinkProps {
     prefetch?: PrefetchBehavior;
     preload?: PreloadBehavior;
 }
+/** Optional scheduling capability supplied by a runtime integration. */
+export interface LinkPrefetchPolicy {
+    observe(options: {
+        element: HTMLAnchorElement | null;
+        prefetch?: PrefetchBehavior;
+        preload?: PreloadBehavior;
+        notify: (state: {
+            code: boolean;
+            data: boolean;
+        }) => void;
+    }): {
+        onIntent: () => void;
+        onCancel: () => void;
+        dispose: () => void;
+    };
+    schedule(options: {
+        runtimeContext: object;
+        chunkLoader: object;
+        publicPath: string;
+        key: string;
+        run: () => Promise<unknown>;
+    }): () => void;
+    canWarmup: () => boolean;
+    allowData: (route: RouteObject) => boolean;
+}
 declare const Link: React.ForwardRefExoticComponent<LinkProps & React.RefAttributes<HTMLAnchorElement>>;
 declare const NavLink: React.ForwardRefExoticComponent<NavLinkProps & React.RefAttributes<HTMLAnchorElement>>;
 export { Link, NavLink };

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

@@ -1,6 +1,15 @@
 import type { RouteObject } from '@modern-js/runtime-utils/router';
-import type { TRuntimeContext } from '../../core/context/runtime.js';
-import type { RouterLifecycleContext } from './lifecycle.js';
+import type { TInternalRuntimeContext, TRuntimeContext } from '../../core/context/runtime.js';
+export type RouterLifecycleContext = {
+    framework: string;
+    phase: 'ssr-prepare' | 'client-create' | 'hydrate';
+    routes: RouteObject[];
+    runtimeContext: TInternalRuntimeContext;
+    basename?: string;
+    hydrationData?: unknown;
+    router?: unknown;
+    [key: string]: unknown;
+};
 export type RouterSyncHook<Handler extends (...args: any[]) => any> = {
     call: (...args: Parameters<Handler>) => ReturnType<Handler>;
     [key: string]: unknown;
@@ -12,6 +21,14 @@ declare const onAfterCreateRouter: RouterSyncHook<(context: RouterLifecycleConte
 declare const onBeforeHydrateRouter: RouterSyncHook<(context: RouterLifecycleContext) => void>;
 declare const onAfterHydrateRouter: RouterSyncHook<(context: RouterLifecycleContext) => void>;
 export { modifyRoutes, onAfterCreateRouter, onAfterHydrateRouter, onBeforeCreateRouter, onBeforeCreateRoutes, onBeforeHydrateRouter, };
+export declare const routerProviderRegistryHooks: {
+    modifyRoutes: RouterSyncHook<(routes: RouteObject[]) => RouteObject[]>;
+    onBeforeCreateRoutes: RouterSyncHook<(context: TRuntimeContext) => void>;
+    onBeforeCreateRouter: RouterSyncHook<(context: RouterLifecycleContext) => void>;
+    onAfterCreateRouter: RouterSyncHook<(context: RouterLifecycleContext) => void>;
+    onBeforeHydrateRouter: RouterSyncHook<(context: RouterLifecycleContext) => void>;
+    onAfterHydrateRouter: RouterSyncHook<(context: RouterLifecycleContext) => void>;
+};
 export type RouterExtendsHooks = {
     modifyRoutes: typeof modifyRoutes;
     onBeforeCreateRoutes: typeof onBeforeCreateRoutes;

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

@@ -1,22 +1,5 @@
-import type { RuntimePlugin } from '../../common.js';
-import type { RouterExtendsHooks } from './hooks.js';
-import type { RouterProviderRegistration } from './provider.js';
-import type { RouterConfig, SingleRouteConfig } from './types.js';
-type LocalRouterProvider = Omit<RouterProviderRegistration, 'isDefault'>;
-export type RouterPluginFactory = (userConfig?: Partial<RouterConfig>) => RuntimePlugin<{
-    extendHooks: RouterExtendsHooks;
-}>;
-/**
- * Create one router wrapper and its provider realm for a runtime entry. Optional
- * providers are supplied by the entry-owning integration (for example the
- * TanStack runtime/router module), so independently bundled apps never resolve
- * factories from another app's module graph.
- */
-export declare const createRouterPlugin: (localProviders?: readonly LocalRouterProvider[]) => RouterPluginFactory;
-export declare const routerPlugin: RouterPluginFactory;
-export default routerPlugin;
-export type { RouterExtendsHooks } from './hooks.js';
-export { modifyRoutes } from './plugin.js';
-export { createRouterProviderRealm, type RouterProviderFactory, type RouterProviderPlugin, type RouterProviderRealm, type RouterProviderRegistration, registerRouterProvider, resolveRouterProvider, } from './provider.js';
+export { type RouterExtendsHooks, type RouterLifecycleContext, routerProviderRegistryHooks, } from './hooks.js';
+export type { LinkPrefetchPolicy } from './PrefetchLink.js';
+export { modifyRoutes, routerPlugin, routerPlugin as default } from './plugin.js';
+export type { RouterConfig, SingleRouteConfig } from './types.js';
 export { renderRoutes } from './utils.js';
-export type { RouterConfig, SingleRouteConfig };

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

@@ -20,15 +20,11 @@ export type SingleRouteConfig = RouteProps & {
      */
     component?: React.ComponentType;
 };
-export type BuiltInRouterFramework = 'react-router' | 'tanstack';
-export type RouterFramework = BuiltInRouterFramework | (string & {});
 export type RouterConfig = {
     /**
-     * Select the router implementation used by Modern.js conventional routing.
-     * - `react-router` (default): React Router based integration
-     * - `tanstack`: TanStack Router integration
+     * Router implementation identifier for integrations that provide selection.
      */
-    framework?: RouterFramework;
+    framework?: string;
     routesConfig: {
         globalApp?: React.ComponentType<any>;
         routes?: ModernRoute[];
@@ -50,46 +46,9 @@ export type RouterConfig = {
     unstable_reloadOnURLMismatch?: boolean;
 };
 export type Routes = RouterConfig['routesConfig']['routes'];
-export interface RouterRouteMatchSnapshot {
-    routeId: string;
-    assetRouteId?: string;
-    pathname?: string;
-    params?: Record<string, string>;
-}
 export interface RouteManifest {
     routeAssets: RouteAssets;
 }
-export interface InternalRouterServerSnapshot {
-    framework?: RouterFramework;
-    basename?: string;
-    statusCode?: number;
-    errors?: Record<string, unknown>;
-    routerData?: {
-        loaderData?: Record<string, unknown>;
-        errors?: Record<string, unknown>;
-    };
-    hydrationScript?: string;
-    hydrationScripts?: string[];
-    matchedRouteIds?: string[];
-    matches?: RouterRouteMatchSnapshot[];
-}
-export interface InternalRouterRuntimeState {
-    framework: RouterFramework;
-    basename?: string;
-    instance?: unknown;
-    hydrationScript?: string;
-    hydrationScripts?: string[];
-    matchedRouteIds?: string[];
-    matches?: RouterRouteMatchSnapshot[];
-    serverSnapshot?: InternalRouterServerSnapshot;
-    cleanup?: () => void | Promise<void>;
-}
-export interface RouterServerPrepareResult {
-    state: InternalRouterRuntimeState;
-    snapshot?: InternalRouterServerSnapshot;
-    redirect?: Response;
-    cleanup?: () => void | Promise<void>;
-}
 export interface RouteAssets {
     [routeId: string]: {
         chunkIds?: (string | number)[];

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.9.0-ultramodern.3",
+  "version": "3.9.0-ultramodern.5",
   "engines": {
     "node": ">=20"
   },
@@ -69,26 +69,6 @@
       "types": "./dist/types/exports/head.d.ts",
       "default": "./dist/esm/exports/head.mjs"
     },
-    "./boundary-debugger": {
-      "types": "./dist/types/boundary-debugger/index.d.ts",
-      "default": "./dist/esm/boundary-debugger/index.mjs"
-    },
-    "./module-federation": {
-      "types": "./dist/types/module-federation/index.d.ts",
-      "default": "./dist/esm/module-federation/index.mjs"
-    },
-    "./module-federation/distributed-ssr": {
-      "types": "./dist/types/module-federation/distributed-ssr.d.ts",
-      "default": "./dist/esm/module-federation/distributed-ssr.mjs"
-    },
-    "./module-federation/manifest-recovery-runtime-plugin": {
-      "types": "./dist/types/module-federation/manifest-recovery-runtime-plugin.d.ts",
-      "node": {
-        "import": "./dist/esm/module-federation/manifest-recovery-runtime-plugin.mjs",
-        "require": "./dist/cjs/module-federation/manifest-recovery-runtime-plugin.js"
-      },
-      "default": "./dist/esm/module-federation/manifest-recovery-runtime-plugin.mjs"
-    },
     "./ssr": {
       "types": "./dist/types/core/server/index.d.ts",
       "default": "./dist/esm/core/server/index.mjs"
@@ -196,15 +176,6 @@
       "head": [
         "./dist/types/exports/head.d.ts"
       ],
-      "boundary-debugger": [
-        "./dist/types/boundary-debugger/index.d.ts"
-      ],
-      "module-federation": [
-        "./dist/types/module-federation/index.d.ts"
-      ],
-      "module-federation/manifest-recovery-runtime-plugin": [
-        "./dist/types/module-federation/manifest-recovery-runtime-plugin.d.ts"
-      ],
       "document": [
         "./dist/types/document/index.d.ts"
       ],
@@ -246,13 +217,13 @@
   "dependencies": {
     "@loadable/component": "5.16.7",
     "@loadable/server": "5.16.7",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.3",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.9.0-ultramodern.3",
-    "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.9.0-ultramodern.3",
-    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.3",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.3",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.3",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.3",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.9.0-ultramodern.5",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.9.0-ultramodern.5",
+    "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.9.0-ultramodern.5",
+    "@modern-js/runtime-extensions": "npm:@bleedingdev/modern-js-runtime-extensions@3.9.0-ultramodern.5",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.9.0-ultramodern.5",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.5",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.5",
     "@swc/core": "1.16.2",
     "@swc/helpers": "^0.5.23",
     "@swc/plugin-loadable-components": "^13.0.0",
@@ -273,7 +244,7 @@
     "react-dom": "^19.2.8"
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.3",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.9.0-ultramodern.5",
     "@remix-run/web-fetch": "^4.4.2",
     "@rsbuild/core": "2.2.3",
     "@rslib/core": "1.0.0",

package/rstest.config.mts

@@ -1,3 +1,4 @@
+import path from 'node:path';
 import type { ProjectConfig } from '@rstest/core';
 import { withTestPreset } from '@scripts/rstest-config';
 
@@ -23,7 +24,7 @@ export default {
       name: 'plugin-runtime-node',
       testEnvironment: 'node',
       exclude: [
-        'tests/boundary-debugger/client.test.tsx',
+        'tests/ssr/serverRender/workerLifecycle.test.tsx',
         'tests/router/plugin.client.test.tsx',
         'tests/router/prefetch.test.tsx',
         'tests/router/prefetch-realm-isolation.test.tsx',
@@ -48,11 +49,40 @@ export default {
         },
       ],
     }),
+    withTestPreset({
+      name: 'plugin-runtime-worker-lifecycle',
+      testEnvironment: 'node',
+      extends: commonConfig,
+      include: ['tests/ssr/serverRender/workerLifecycle.test.tsx'],
+      resolve: {
+        alias: {
+          '@modern-js/render/ssr': path.join(
+            __dirname,
+            '../render/src/server/ssr/index.ts',
+          ),
+          'react-server-dom-rspack/client.browser': path.join(
+            __dirname,
+            'tests/fixtures/rsc-client.ts',
+          ),
+          'react-server-dom-rspack/client.edge': path.join(
+            __dirname,
+            'tests/fixtures/rsc-client.ts',
+          ),
+          '@modern-js/render/rsc': path.join(
+            __dirname,
+            'tests/fixtures/rsc-server.ts',
+          ),
+          '@modern-js/render/rsc-worker': path.join(
+            __dirname,
+            'tests/fixtures/rsc-server.ts',
+          ),
+        },
+      },
+    }),
     withTestPreset({
       name: 'plugin-runtime-client',
       testEnvironment: 'happy-dom',
       include: [
-        'tests/boundary-debugger/client.test.tsx',
         'tests/router/plugin.client.test.tsx',
         'tests/router/prefetch.test.tsx',
         'tests/router/prefetch-realm-isolation.test.tsx',