@modern-js/runtime 3.6.0 → 3.7.0

package/dist/cjs/cli/ssr/index.js

@@ -76,7 +76,9 @@ const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
                     source: {
                         define: {
                             'process.env.MODERN_TARGET': isServerEnvironment ? JSON.stringify('node') : JSON.stringify('browser'),
-                            'process.env.MODERN_SSR_ENV': JSON.stringify(ssrEnv)
+                            'process.env.MODERN_SSR_ENV': JSON.stringify(ssrEnv),
+                            'process.env.MODERN_ENABLE_HYDRATION': JSON.stringify((0, utils_namespaceObject.isUseSSRBundle)(userConfig)),
+                            'process.env.MODERN_ENABLE_RSC': JSON.stringify(Boolean(userConfig.server?.rsc))
                         }
                     },
                     output: {

package/dist/cjs/core/browser/hydrate.js

@@ -28,13 +28,21 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    hydrateRoot: ()=>hydrateRoot
+    hydrateRoot: ()=>hydrateRoot,
+    hydrateWithReact: ()=>hydrateWithReact
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const component_namespaceObject = require("@loadable/component");
+const constants_namespaceObject = require("@modern-js/utils/universal/constants");
+const client_namespaceObject = require("react-dom/client");
 const external_constants_js_namespaceObject = require("../constants.js");
 const wrapper_js_namespaceObject = require("../react/wrapper.js");
 const external_withCallback_js_namespaceObject = require("./withCallback.js");
+async function hydrateWithReact(App, rootElement) {
+    return (0, client_namespaceObject.hydrateRoot)(rootElement, App, {
+        identifierPrefix: constants_namespaceObject.SSR_HYDRATION_ID_PREFIX
+    });
+}
 function hydrateRoot(App, context, ModernRender, ModernHydrate) {
     const hydrateContext = {
         ...context,
@@ -78,8 +86,10 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
     }
 }
 exports.hydrateRoot = __webpack_exports__.hydrateRoot;
+exports.hydrateWithReact = __webpack_exports__.hydrateWithReact;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "hydrateRoot"
+    "hydrateRoot",
+    "hydrateWithReact"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/core/browser/index.js

@@ -37,11 +37,10 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    hydrateWithReact: ()=>hydrateWithReact,
+    hydrateWithReact: ()=>external_hydrate_js_namespaceObject.hydrateWithReact,
     render: ()=>render,
     renderWithReact: ()=>renderWithReact
 });
-const constants_namespaceObject = require("@modern-js/utils/universal/constants");
 const external_cookie_namespaceObject = require("cookie");
 var external_cookie_default = /*#__PURE__*/ __webpack_require__.n(external_cookie_namespaceObject);
 const client_namespaceObject = require("react-dom/client");
@@ -108,10 +107,12 @@ async function render(App, id) {
         async function ModernRender(App) {
             return renderWithReact(App, rootElement);
         }
-        async function ModernHydrate(App) {
-            return hydrateWithReact(App, rootElement);
+        if (process.env.MODERN_ENABLE_HYDRATION && window._SSR_DATA) {
+            async function ModernHydrate(App) {
+                return (0, external_hydrate_js_namespaceObject.hydrateWithReact)(App, rootElement);
+            }
+            return (0, external_hydrate_js_namespaceObject.hydrateRoot)(App, context, ModernRender, ModernHydrate);
         }
-        if (window._SSR_DATA) return (0, external_hydrate_js_namespaceObject.hydrateRoot)(App, context, ModernRender, ModernHydrate);
         return ModernRender((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(App, context));
     }
     throw Error('`render` function needs id in browser environment, it needs to be string or element');
@@ -121,12 +122,6 @@ async function renderWithReact(App, rootElement) {
     root.render(App);
     return root;
 }
-async function hydrateWithReact(App, rootElement) {
-    const root = (0, client_namespaceObject.hydrateRoot)(rootElement, App, {
-        identifierPrefix: constants_namespaceObject.SSR_HYDRATION_ID_PREFIX
-    });
-    return root;
-}
 exports.hydrateWithReact = __webpack_exports__.hydrateWithReact;
 exports.render = __webpack_exports__.render;
 exports.renderWithReact = __webpack_exports__.renderWithReact;

package/dist/cjs/router/runtime/plugin.js

@@ -101,10 +101,10 @@ const routerPlugin = (userConfig = {})=>({
                 };
                 let cachedRouter = null;
                 const RouterWrapper = (props)=>{
-                    const routerResult = useRouterCreation({
+                    const routerResult = useRouterCreation(process.env.MODERN_ENABLE_RSC ? {
                         ...props,
                         rscPayload: props?.rscPayload
-                    }, {
+                    } : props, {
                         api: api,
                         createRoutes,
                         supportHtml5History,
@@ -158,16 +158,15 @@ function useRouterCreation(props, options) {
     const baseUrl = selectBasePath(location.pathname).replace(/^\/*/, '/');
     const _basename = '/' === baseUrl ? (0, external_utils_js_namespaceObject.urlJoin)(baseUrl, runtimeContext._internalRouterBaseName || basename || '') : baseUrl;
     const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
-    const rscPayload = props?.rscPayload ? safeUse(props.rscPayload) : null;
-    let hydrationData = window._ROUTER_DATA || rscPayload;
+    const rscPayload = process.env.MODERN_ENABLE_RSC && props?.rscPayload ? safeUse(props.rscPayload) : null;
+    let hydrationData = process.env.MODERN_ENABLE_RSC ? window._ROUTER_DATA || rscPayload : window._ROUTER_DATA;
     return (0, external_react_namespaceObject.useMemo)(()=>{
         if (hydrationData?.errors) hydrationData = {
             ...hydrationData,
             errors: (0, external_utils_js_namespaceObject.deserializeErrors)(hydrationData.errors)
         };
-        const isRscClient = (0, index_js_namespaceObject.getGlobalIsRscClient)();
         let routes = null;
-        routes = isRscClient ? createRoutes ? createRoutes() : (0, external_utils_js_namespaceObject.createRouteObjectsFromConfig)({
+        routes = process.env.MODERN_ENABLE_RSC && (0, index_js_namespaceObject.getGlobalIsRscClient)() ? createRoutes ? createRoutes() : (0, external_utils_js_namespaceObject.createRouteObjectsFromConfig)({
             routesConfig: finalRouteConfig
         }) : createRoutes ? createRoutes() : (0, router_namespaceObject.createRoutesFromElements)((0, external_utils_js_namespaceObject.renderRoutes)({
             routesConfig: finalRouteConfig,
@@ -175,7 +174,7 @@ function useRouterCreation(props, options) {
         }));
         if (!routes) routes = [];
         const hooks = api.getHooks();
-        if (rscPayload) try {
+        if (process.env.MODERN_ENABLE_RSC && rscPayload) try {
             const router = (0, external_rsc_router_js_namespaceObject.createClientRouterFromPayload)(rscPayload, routes, _basename);
             return {
                 router,

package/dist/esm/cli/ssr/index.mjs

@@ -32,7 +32,9 @@ const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
                     source: {
                         define: {
                             'process.env.MODERN_TARGET': isServerEnvironment ? JSON.stringify('node') : JSON.stringify('browser'),
-                            'process.env.MODERN_SSR_ENV': JSON.stringify(ssrEnv)
+                            'process.env.MODERN_SSR_ENV': JSON.stringify(ssrEnv),
+                            'process.env.MODERN_ENABLE_HYDRATION': JSON.stringify(isUseSSRBundle(userConfig)),
+                            'process.env.MODERN_ENABLE_RSC': JSON.stringify(Boolean(userConfig.server?.rsc))
                         }
                     },
                     output: {

package/dist/esm/core/browser/hydrate.mjs

@@ -1,9 +1,16 @@
 import { jsx } from "react/jsx-runtime";
 import { loadableReady } from "@loadable/component";
+import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
+import { hydrateRoot } from "react-dom/client";
 import { RenderLevel } from "../constants.mjs";
 import { wrapRuntimeContextProvider } from "../react/wrapper.mjs";
 import { WithCallback } from "./withCallback.mjs";
-function hydrateRoot(App, context, ModernRender, ModernHydrate) {
+async function hydrateWithReact(App, rootElement) {
+    return hydrateRoot(rootElement, App, {
+        identifierPrefix: SSR_HYDRATION_ID_PREFIX
+    });
+}
+function hydrate_hydrateRoot(App, context, ModernRender, ModernHydrate) {
     const hydrateContext = {
         ...context,
         get routes () {
@@ -45,4 +52,4 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
         return ModernRender(wrapRuntimeContextProvider(App, context));
     }
 }
-export { hydrateRoot };
+export { hydrateWithReact, hydrate_hydrateRoot as hydrateRoot };

package/dist/esm/core/browser/index.mjs

@@ -1,10 +1,9 @@
-import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
 import cookie from "cookie";
-import { createRoot, hydrateRoot } from "react-dom/client";
+import { createRoot } from "react-dom/client";
 import { getGlobalInternalRuntimeContext } from "../context/index.mjs";
 import { getInitialContext } from "../context/runtime.mjs";
 import { wrapRuntimeContextProvider } from "../react/wrapper.mjs";
-import { hydrateRoot as external_hydrate_mjs_hydrateRoot } from "./hydrate.mjs";
+import { hydrateRoot, hydrateWithReact } from "./hydrate.mjs";
 const getQuery = ()=>window.location.search.substring(1).split('&').reduce((res, item)=>{
         const [key, value] = item.split('=');
         if (key) res[key] = value;
@@ -64,10 +63,12 @@ async function render(App, id) {
         async function ModernRender(App) {
             return renderWithReact(App, rootElement);
         }
-        async function ModernHydrate(App) {
-            return hydrateWithReact(App, rootElement);
+        if (process.env.MODERN_ENABLE_HYDRATION && window._SSR_DATA) {
+            async function ModernHydrate(App) {
+                return hydrateWithReact(App, rootElement);
+            }
+            return hydrateRoot(App, context, ModernRender, ModernHydrate);
         }
-        if (window._SSR_DATA) return external_hydrate_mjs_hydrateRoot(App, context, ModernRender, ModernHydrate);
         return ModernRender(wrapRuntimeContextProvider(App, context));
     }
     throw Error('`render` function needs id in browser environment, it needs to be string or element');
@@ -77,10 +78,4 @@ async function renderWithReact(App, rootElement) {
     root.render(App);
     return root;
 }
-async function hydrateWithReact(App, rootElement) {
-    const root = hydrateRoot(rootElement, App, {
-        identifierPrefix: SSR_HYDRATION_ID_PREFIX
-    });
-    return root;
-}
 export { hydrateWithReact, render, renderWithReact };

package/dist/esm/router/runtime/plugin.mjs

@@ -66,10 +66,10 @@ const routerPlugin = (userConfig = {})=>({
                 };
                 let cachedRouter = null;
                 const RouterWrapper = (props)=>{
-                    const routerResult = useRouterCreation({
+                    const routerResult = useRouterCreation(process.env.MODERN_ENABLE_RSC ? {
                         ...props,
                         rscPayload: props?.rscPayload
-                    }, {
+                    } : props, {
                         api: api,
                         createRoutes,
                         supportHtml5History,
@@ -123,16 +123,15 @@ function useRouterCreation(props, options) {
     const baseUrl = selectBasePath(location.pathname).replace(/^\/*/, '/');
     const _basename = '/' === baseUrl ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || basename || '') : baseUrl;
     const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
-    const rscPayload = props?.rscPayload ? safeUse(props.rscPayload) : null;
-    let hydrationData = window._ROUTER_DATA || rscPayload;
+    const rscPayload = process.env.MODERN_ENABLE_RSC && props?.rscPayload ? safeUse(props.rscPayload) : null;
+    let hydrationData = process.env.MODERN_ENABLE_RSC ? window._ROUTER_DATA || rscPayload : window._ROUTER_DATA;
     return (0, __rspack_external_react.useMemo)(()=>{
         if (hydrationData?.errors) hydrationData = {
             ...hydrationData,
             errors: deserializeErrors(hydrationData.errors)
         };
-        const isRscClient = getGlobalIsRscClient();
         let routes = null;
-        routes = isRscClient ? createRoutes ? createRoutes() : createRouteObjectsFromConfig({
+        routes = process.env.MODERN_ENABLE_RSC && getGlobalIsRscClient() ? createRoutes ? createRoutes() : createRouteObjectsFromConfig({
             routesConfig: finalRouteConfig
         }) : createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
             routesConfig: finalRouteConfig,
@@ -140,7 +139,7 @@ function useRouterCreation(props, options) {
         }));
         if (!routes) routes = [];
         const hooks = api.getHooks();
-        if (rscPayload) try {
+        if (process.env.MODERN_ENABLE_RSC && rscPayload) try {
             const router = createClientRouterFromPayload(rscPayload, routes, _basename);
             return {
                 router,

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

@@ -34,7 +34,9 @@ const ssrBuilderPlugin = (modernAPI, outputModule, exportLoadablePath)=>({
                     source: {
                         define: {
                             'process.env.MODERN_TARGET': isServerEnvironment ? JSON.stringify('node') : JSON.stringify('browser'),
-                            'process.env.MODERN_SSR_ENV': JSON.stringify(ssrEnv)
+                            'process.env.MODERN_SSR_ENV': JSON.stringify(ssrEnv),
+                            'process.env.MODERN_ENABLE_HYDRATION': JSON.stringify(isUseSSRBundle(userConfig)),
+                            'process.env.MODERN_ENABLE_RSC': JSON.stringify(Boolean(userConfig.server?.rsc))
                         }
                     },
                     output: {

package/dist/esm-node/core/browser/hydrate.mjs

@@ -1,10 +1,17 @@
 import "node:module";
 import { jsx } from "react/jsx-runtime";
 import { loadableReady } from "@loadable/component";
+import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
+import { hydrateRoot } from "react-dom/client";
 import { RenderLevel } from "../constants.mjs";
 import { wrapRuntimeContextProvider } from "../react/wrapper.mjs";
 import { WithCallback } from "./withCallback.mjs";
-function hydrateRoot(App, context, ModernRender, ModernHydrate) {
+async function hydrateWithReact(App, rootElement) {
+    return hydrateRoot(rootElement, App, {
+        identifierPrefix: SSR_HYDRATION_ID_PREFIX
+    });
+}
+function hydrate_hydrateRoot(App, context, ModernRender, ModernHydrate) {
     const hydrateContext = {
         ...context,
         get routes () {
@@ -46,4 +53,4 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
         return ModernRender(wrapRuntimeContextProvider(App, context));
     }
 }
-export { hydrateRoot };
+export { hydrateWithReact, hydrate_hydrateRoot as hydrateRoot };

package/dist/esm-node/core/browser/index.mjs

@@ -1,11 +1,10 @@
 import "node:module";
-import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
 import cookie from "cookie";
-import { createRoot, hydrateRoot } from "react-dom/client";
+import { createRoot } from "react-dom/client";
 import { getGlobalInternalRuntimeContext } from "../context/index.mjs";
 import { getInitialContext } from "../context/runtime.mjs";
 import { wrapRuntimeContextProvider } from "../react/wrapper.mjs";
-import { hydrateRoot as external_hydrate_mjs_hydrateRoot } from "./hydrate.mjs";
+import { hydrateRoot, hydrateWithReact } from "./hydrate.mjs";
 const getQuery = ()=>window.location.search.substring(1).split('&').reduce((res, item)=>{
         const [key, value] = item.split('=');
         if (key) res[key] = value;
@@ -65,10 +64,12 @@ async function render(App, id) {
         async function ModernRender(App) {
             return renderWithReact(App, rootElement);
         }
-        async function ModernHydrate(App) {
-            return hydrateWithReact(App, rootElement);
+        if (process.env.MODERN_ENABLE_HYDRATION && window._SSR_DATA) {
+            async function ModernHydrate(App) {
+                return hydrateWithReact(App, rootElement);
+            }
+            return hydrateRoot(App, context, ModernRender, ModernHydrate);
         }
-        if (window._SSR_DATA) return external_hydrate_mjs_hydrateRoot(App, context, ModernRender, ModernHydrate);
         return ModernRender(wrapRuntimeContextProvider(App, context));
     }
     throw Error('`render` function needs id in browser environment, it needs to be string or element');
@@ -78,10 +79,4 @@ async function renderWithReact(App, rootElement) {
     root.render(App);
     return root;
 }
-async function hydrateWithReact(App, rootElement) {
-    const root = hydrateRoot(rootElement, App, {
-        identifierPrefix: SSR_HYDRATION_ID_PREFIX
-    });
-    return root;
-}
 export { hydrateWithReact, render, renderWithReact };

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

@@ -67,10 +67,10 @@ const routerPlugin = (userConfig = {})=>({
                 };
                 let cachedRouter = null;
                 const RouterWrapper = (props)=>{
-                    const routerResult = useRouterCreation({
+                    const routerResult = useRouterCreation(process.env.MODERN_ENABLE_RSC ? {
                         ...props,
                         rscPayload: props?.rscPayload
-                    }, {
+                    } : props, {
                         api: api,
                         createRoutes,
                         supportHtml5History,
@@ -124,16 +124,15 @@ function useRouterCreation(props, options) {
     const baseUrl = selectBasePath(location.pathname).replace(/^\/*/, '/');
     const _basename = '/' === baseUrl ? urlJoin(baseUrl, runtimeContext._internalRouterBaseName || basename || '') : baseUrl;
     const { unstable_getBlockNavState: getBlockNavState } = runtimeContext;
-    const rscPayload = props?.rscPayload ? safeUse(props.rscPayload) : null;
-    let hydrationData = window._ROUTER_DATA || rscPayload;
+    const rscPayload = process.env.MODERN_ENABLE_RSC && props?.rscPayload ? safeUse(props.rscPayload) : null;
+    let hydrationData = process.env.MODERN_ENABLE_RSC ? window._ROUTER_DATA || rscPayload : window._ROUTER_DATA;
     return (0, __rspack_external_react.useMemo)(()=>{
         if (hydrationData?.errors) hydrationData = {
             ...hydrationData,
             errors: deserializeErrors(hydrationData.errors)
         };
-        const isRscClient = getGlobalIsRscClient();
         let routes = null;
-        routes = isRscClient ? createRoutes ? createRoutes() : createRouteObjectsFromConfig({
+        routes = process.env.MODERN_ENABLE_RSC && getGlobalIsRscClient() ? createRoutes ? createRoutes() : createRouteObjectsFromConfig({
             routesConfig: finalRouteConfig
         }) : createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
             routesConfig: finalRouteConfig,
@@ -141,7 +140,7 @@ function useRouterCreation(props, options) {
         }));
         if (!routes) routes = [];
         const hooks = api.getHooks();
-        if (rscPayload) try {
+        if (process.env.MODERN_ENABLE_RSC && rscPayload) try {
             const router = createClientRouterFromPayload(rscPayload, routes, _basename);
             return {
                 router,

package/dist/types/core/browser/hydrate.d.ts

@@ -1,4 +1,5 @@
 import type React from 'react';
-import type { Root } from 'react-dom/client';
+import { type Root } from 'react-dom/client';
 import type { TRuntimeContext } from '../context/runtime';
+export declare function hydrateWithReact(App: React.ReactElement, rootElement: HTMLElement): Promise<Root>;
 export declare function hydrateRoot(App: React.ReactElement, context: TRuntimeContext, ModernRender: (App: React.ReactElement) => Promise<HTMLElement | Root>, ModernHydrate: (App: React.ReactElement) => Promise<HTMLElement | Root>): Promise<HTMLElement | Root>;

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

@@ -1,7 +1,8 @@
 import type React from 'react';
+import { hydrateWithReact } from './hydrate';
+export { hydrateWithReact };
 export type RenderFunc = typeof render;
 export declare function render(App: React.ReactElement<{
     basename: string;
 }>, id?: HTMLElement | string): Promise<HTMLElement | import("react-dom/client").Root>;
 export declare function renderWithReact(App: React.ReactElement, rootElement: HTMLElement): Promise<import("react-dom/client").Root>;
-export declare function hydrateWithReact(App: React.ReactElement, rootElement: HTMLElement): Promise<import("react-dom/client").Root>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.6.0",
+  "version": "3.7.0",
   "engines": {
     "node": ">=20"
   },
@@ -215,12 +215,12 @@
     "isbot": "3.8.0",
     "react-helmet": "^6.1.0",
     "react-is": "^18.3.1",
-    "@modern-js/plugin": "3.6.0",
-    "@modern-js/plugin-data-loader": "3.6.0",
-    "@modern-js/render": "3.6.0",
-    "@modern-js/runtime-utils": "3.6.0",
-    "@modern-js/types": "3.6.0",
-    "@modern-js/utils": "3.6.0"
+    "@modern-js/plugin": "3.7.0",
+    "@modern-js/plugin-data-loader": "3.7.0",
+    "@modern-js/render": "3.7.0",
+    "@modern-js/runtime-utils": "3.7.0",
+    "@modern-js/types": "3.7.0",
+    "@modern-js/utils": "3.7.0"
   },
   "peerDependencies": {
     "react": ">=18.0.0",
@@ -240,7 +240,7 @@
     "react-dom": "^19.2.7",
     "ts-node": "^10.9.2",
     "typescript": "^5",
-    "@modern-js/app-tools": "3.6.0",
+    "@modern-js/app-tools": "3.7.0",
     "@modern-js/rslib": "2.68.10",
     "@scripts/rstest-config": "2.66.0"
   },