@modern-js/runtime 2.67.11 → 2.68.1

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

@@ -1,16 +1,8 @@
 import { useRouteLoaderData as useRouteData } from '@modern-js/runtime-utils/router';
-import { routerPlugin } from './plugin';
-import type { RouterConfig, SingleRouteConfig } from './types';
 export * from '@modern-js/runtime-utils/router';
-export type { SingleRouteConfig, RouterConfig };
-export { renderRoutes } from './utils';
-export { routerPlugin };
-export default routerPlugin;
-export { modifyRoutes } from './plugin';
-export type { RouterExtendsHooks } from './hooks';
-export * from './withRouter';
 export { Link, NavLink } from './PrefetchLink';
 export type { LinkProps, NavLinkProps } from './PrefetchLink';
 export declare const useRouteLoaderData: typeof useRouteData;
 export { createShouldRevalidate, handleRouteModule, handleRouteModuleError, } from './routeModule';
+export * from './withRouter';
 export type { LoaderFunction, LoaderFunctionArgs } from './types';

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

@@ -0,0 +1,8 @@
+import { routerPlugin } from './plugin';
+import type { RouterConfig, SingleRouteConfig } from './types';
+export { routerPlugin };
+export default routerPlugin;
+export type { SingleRouteConfig, RouterConfig };
+export type { RouterExtendsHooks } from './hooks';
+export { renderRoutes } from './utils';
+export { modifyRoutes } from './plugin';

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

@@ -0,0 +1,14 @@
+import { type StaticHandlerContext } from '@modern-js/runtime-utils/node/router';
+import { type RouteObject } from '@modern-js/runtime-utils/router';
+import React from 'react';
+import type { ServerPayload } from '../../core/context';
+export declare const createServerPayload: (routerContext: StaticHandlerContext, routes: RouteObject[]) => ServerPayload;
+export declare const handleRSCRedirect: (headers: Headers, basename: string, status: number) => Response;
+export declare const prepareRSCRoutes: (routes: RouteObject[]) => Promise<void>;
+export declare const createClientRouterFromPayload: (payload: ServerPayload, originalRoutes: RouteObject[], basename?: string) => import("@modern-js/runtime-utils/remix-router").Router;
+interface RSCStaticRouterProps {
+    basename?: string;
+    useJsonScript?: boolean;
+}
+export declare const RSCStaticRouter: React.FC<RSCStaticRouterProps>;
+export {};

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

@@ -1,18 +1,38 @@
 import { type Router, type StaticHandlerContext } from '@modern-js/runtime-utils/remix-router';
+import { type RouteObject } from '@modern-js/runtime-utils/router';
 import type { NestedRoute, PageRoute, SSRMode } from '@modern-js/types';
-import type React from 'react';
+import React from 'react';
 import type { RouterConfig } from './types';
 export declare function getRouteComponents(routes: (NestedRoute | PageRoute)[], { globalApp, ssrMode, props, }: {
-    globalApp?: React.ComponentType<any>;
+    globalApp?: React.ComponentType<GlobalAppProps>;
     ssrMode?: SSRMode;
-    props?: Record<string, any>;
+    props?: Record<string, unknown>;
 }): React.ReactElement<any, string | React.JSXElementConstructor<any>>[];
+interface GlobalAppProps {
+    Component: React.ComponentType;
+    [key: string]: unknown;
+}
+export declare function getRouteObjects(routes: (NestedRoute | PageRoute)[], { globalApp, ssrMode, props, }: {
+    globalApp?: React.ComponentType<GlobalAppProps>;
+    ssrMode?: SSRMode;
+    props?: Record<string, unknown>;
+}): RouteObject[];
+export declare function createRouteObjectsFromConfig({ routesConfig, props, ssrMode, }: {
+    routesConfig: RouterConfig['routesConfig'];
+    props?: Record<string, unknown>;
+    ssrMode?: SSRMode;
+}): RouteObject[] | null;
 export declare function renderRoutes({ routesConfig, props, ssrMode, }: {
     routesConfig: RouterConfig['routesConfig'];
-    props?: Record<string, any>;
+    props?: Record<string, unknown>;
     ssrMode?: SSRMode;
 }): React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | null;
-export declare function getLocation(serverContext: any): string;
+export declare function getLocation(serverContext: {
+    request?: {
+        pathname?: string;
+        url?: string;
+    };
+} | undefined): string;
 export declare const urlJoin: (...parts: string[]) => string;
 export declare function standardSlash(str: string): string;
 /**
@@ -25,3 +45,4 @@ export declare function serializeErrors(errors: StaticHandlerContext['errors']):
  * license at https://github.com/remix-run/remix/blob/main/LICENSE.md
  */
 export declare function deserializeErrors(errors: Router['state']['errors']): Router['state']['errors'];
+export {};

package/dist/types/rsc/client.d.ts

@@ -1 +1,2 @@
 export * from '@modern-js/render/client';
+export declare const isRedirectResponse: (res: Response) => boolean;

package/dist/types/rsc/server.d.ts

@@ -1 +1,2 @@
 export * from '@modern-js/render/rsc';
+export declare function processRSCStream(rscStream: ReadableStream, controller: ReadableStreamDefaultController<Uint8Array>, encoder: TextEncoder): Promise<void>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.11",
+  "version": "2.68.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -106,6 +106,11 @@
       "jsnext:source": "./src/router/runtime/server.ts",
       "default": "./dist/esm/router/runtime/server.js"
     },
+    "./router/internal": {
+      "types": "./dist/types/router/internal.d.ts",
+      "jsnext:source": "./src/router/internal.ts",
+      "default": "./dist/esm/router/internal.js"
+    },
     "./loadable-bundler-plugin": {
       "types": "./dist/types/cli/ssr/loadable-bundler-plugin.d.ts",
       "jsnext:source": "./src/cli/ssr/loadable-bundler-plugin.ts",
@@ -178,6 +183,9 @@
       "router/server": [
         "./dist/types/router/runtime/server.d.ts"
       ],
+      "router/internal": [
+        "./dist/types/router/internal.d.ts"
+      ],
       "loadable-bundler-plugin": [
         "./dist/types/cli/ssr/loadable-bundler-plugin.d.ts"
       ],
@@ -204,20 +212,20 @@
     "@types/styled-components": "^5.1.14",
     "cookie": "0.7.2",
     "es-module-lexer": "^1.1.0",
-    "esbuild": "0.17.19",
+    "esbuild": "0.25.5",
     "invariant": "^2.2.4",
     "isbot": "3.7.1",
     "react-helmet": "^6.1.0",
     "react-is": "^18",
-    "react-side-effect": "^2.1.1",
+    "react-side-effect": "^2.1.2",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.67.11",
-    "@modern-js/plugin-data-loader": "2.67.11",
-    "@modern-js/plugin-v2": "2.67.11",
-    "@modern-js/render": "2.67.11",
-    "@modern-js/runtime-utils": "2.67.11",
-    "@modern-js/types": "2.67.11",
-    "@modern-js/utils": "2.67.11"
+    "@modern-js/plugin": "2.68.1",
+    "@modern-js/plugin-data-loader": "2.68.1",
+    "@modern-js/plugin-v2": "2.68.1",
+    "@modern-js/render": "2.68.1",
+    "@modern-js/runtime-utils": "2.68.1",
+    "@modern-js/utils": "2.68.1",
+    "@modern-js/types": "2.68.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -225,7 +233,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.3.22",
+    "@rsbuild/core": "1.4.4",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.30",
@@ -241,9 +249,10 @@
     "ts-node": "^10.9.1",
     "typescript": "^5",
     "webpack": "^5.99.8",
-    "@modern-js/app-tools": "2.67.11",
+    "@modern-js/app-tools": "2.68.1",
     "@scripts/build": "2.66.0",
-    "@scripts/jest-config": "2.66.0"
+    "@scripts/jest-config": "2.66.0",
+    "@modern-js/core": "2.68.1"
   },
   "sideEffects": false,
   "publishConfig": {

package/static/modern-inline.js

@@ -1 +1 @@
-function runWindowFn(){window[document.currentScript.getAttribute("data-fn-name")](...JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function runRouterDataFn(){_ROUTER_DATA[document.currentScript.getAttribute("data-fn-name")](...JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function initRouterData(e){var r=document.getElementById(e);if(r)try{_ROUTER_DATA=JSON.parse(r.textContent)}catch(r){console.error("parse ".concat(e," error"),t),_ROUTER_DATA={}}};initRouterData('__MODERN_ROUTER_DATA__');_ROUTER_DATA.s = function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};_ROUTER_DATA.r = function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};_ROUTER_DATA.p = function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};function mergeLoaderData(e,n){const r=n.reduce((function(e,{key:n,routerDataFnName:r,routerDataFnArgs:a}){const t=a.map((e=>{if("undefined"!==e&&null!==e)return JSON.parse(e)}));return console.info("args",t),{...e,[n]:_ROUTER_DATA[r](...t)}}),{});Object.assign(_ROUTER_DATA.loaderData[e],r)}
+function runWindowFn(){window[document.currentScript.getAttribute("data-fn-name")].apply(window,JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function runRouterDataFn(){_ROUTER_DATA[document.currentScript.getAttribute("data-fn-name")].apply(_ROUTER_DATA,JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function initRouterData(e){var r=document.getElementById(e);if(r)try{_ROUTER_DATA=JSON.parse(r.textContent)}catch(r){console.error("parse ".concat(e," error"),t),_ROUTER_DATA={}}};initRouterData('__MODERN_ROUTER_DATA__');_ROUTER_DATA.s = function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};_ROUTER_DATA.r = function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};_ROUTER_DATA.p = function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};function mergeLoaderData(e,n){var r=n.reduce((function(e,{key:n,routerDataFnName:r,routerDataFnArgs:a}){var t=a.map((e=>{if("undefined"!==e&&null!==e)return JSON.parse(e)}));return console.info("args",t),{...e,[n]:_ROUTER_DATA[r](...t)}}),{});Object.assign(_ROUTER_DATA.loaderData[e],r)}