@modern-js/runtime 3.0.5 → 3.1.0

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

@@ -39,6 +39,7 @@ __webpack_require__.d(__webpack_exports__, {
     renderWithReact18: ()=>renderWithReact18,
     renderWithReact17: ()=>renderWithReact17
 });
+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 index_js_namespaceObject = require("../context/index.js");
@@ -128,7 +129,9 @@ async function renderWithReact17(App, rootElement) {
 }
 async function hydrateWithReact18(App, rootElement) {
     const ReactDOM = await import("react-dom/client");
-    const root = ReactDOM.hydrateRoot(rootElement, App);
+    const root = ReactDOM.hydrateRoot(rootElement, App, {
+        identifierPrefix: constants_namespaceObject.SSR_HYDRATION_ID_PREFIX
+    });
     return root;
 }
 async function hydrateWithReact17(App, rootElement, callback) {

package/dist/cjs/core/server/stream/createReadableStream.js

@@ -28,6 +28,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_stream_namespaceObject = require("stream");
 const node_namespaceObject = require("@modern-js/runtime-utils/node");
+const constants_namespaceObject = require("@modern-js/utils/universal/constants");
 const external_common_js_namespaceObject = require("../../../common.js");
 const external_constants_js_namespaceObject = require("../../constants.js");
 const index_js_namespaceObject = require("../../context/index.js");
@@ -65,6 +66,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
     return new Promise((resolve)=>{
         const { pipe: reactStreamingPipe } = renderToPipeableStream(processedRootElement, {
             nonce: config.nonce,
+            identifierPrefix: constants_namespaceObject.SSR_HYDRATION_ID_PREFIX,
             [onReady] () {
                 let styledComponentsStyleTags = '';
                 extenders.forEach((extender)=>{

package/dist/cjs/core/server/string/index.js

@@ -36,6 +36,7 @@ __webpack_require__.d(__webpack_exports__, {
     renderString: ()=>renderString
 });
 const time_namespaceObject = require("@modern-js/runtime-utils/time");
+const constants_namespaceObject = require("@modern-js/utils/universal/constants");
 const server_namespaceObject = require("react-dom/server");
 var server_default = /*#__PURE__*/ __webpack_require__.n(server_namespaceObject);
 const external_react_helmet_namespaceObject = require("react-helmet");
@@ -104,7 +105,9 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
     const finalApp = collectors.reduce((pre, creator)=>creator.collect?.(pre) || pre, App);
     try {
         const end = (0, time_namespaceObject.time)();
-        html = server_default().renderToString(finalApp);
+        html = server_default().renderToString(finalApp, {
+            identifierPrefix: constants_namespaceObject.SSR_HYDRATION_ID_PREFIX
+        });
         chunkSet.renderLevel = external_constants_js_namespaceObject.RenderLevel.SERVER_RENDER;
         helmetData = external_react_helmet_default().renderStatic();
         const cost = end();

package/dist/cjs/router/cli/code/index.js

@@ -160,7 +160,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
                 }
                 const serverLoaderCombined = external_templates_js_namespaceObject.ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext);
                 if (serverLoaderCombined) {
-                    const serverLoaderFile = (0, external_utils_js_namespaceObject.getServerCombinedModueFile)(internalDirectory, entryName);
+                    const serverLoaderFile = (0, external_utils_js_namespaceObject.getServerCombinedModuleFile)(internalDirectory, entryName);
                     await utils_namespaceObject.fs.outputFile(serverLoaderFile, serverLoaderCombined);
                 }
                 await utils_namespaceObject.fs.outputFile(external_path_default().resolve(internalDirectory, `./${entryName}/${external_constants_js_namespaceObject.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, 'utf8');

package/dist/cjs/router/cli/code/utils.js

@@ -34,10 +34,10 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     parseModule: ()=>parseModule,
+    getServerCombinedModuleFile: ()=>getServerCombinedModuleFile,
     hasLoader: ()=>hasLoader,
-    isPageComponentFile: ()=>isPageComponentFile,
     getPathWithoutExt: ()=>getPathWithoutExt,
-    getServerCombinedModueFile: ()=>getServerCombinedModueFile,
+    isPageComponentFile: ()=>isPageComponentFile,
     getServerLoadersFile: ()=>getServerLoadersFile,
     walkDirectory: ()=>walkDirectory,
     hasAction: ()=>hasAction,
@@ -112,13 +112,13 @@ const hasAction = async (filename, source)=>{
     return false;
 };
 const getServerLoadersFile = (internalDirectory, entryName)=>external_path_default().join(internalDirectory, entryName, 'route-server-loaders.js');
-const getServerCombinedModueFile = (internalDirectory, entryName)=>external_path_default().join(internalDirectory, entryName, 'server-loader-combined.js');
+const getServerCombinedModuleFile = (internalDirectory, entryName)=>external_path_default().join(internalDirectory, entryName, 'server-loader-combined.js');
 const getPathWithoutExt = (filename)=>{
     const extname = external_path_default().extname(filename);
     return extname ? filename.slice(0, -extname.length) : filename;
 };
 exports.getPathWithoutExt = __webpack_exports__.getPathWithoutExt;
-exports.getServerCombinedModueFile = __webpack_exports__.getServerCombinedModueFile;
+exports.getServerCombinedModuleFile = __webpack_exports__.getServerCombinedModuleFile;
 exports.getServerLoadersFile = __webpack_exports__.getServerLoadersFile;
 exports.hasAction = __webpack_exports__.hasAction;
 exports.hasLoader = __webpack_exports__.hasLoader;
@@ -128,7 +128,7 @@ exports.replaceWithAlias = __webpack_exports__.replaceWithAlias;
 exports.walkDirectory = __webpack_exports__.walkDirectory;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "getPathWithoutExt",
-    "getServerCombinedModueFile",
+    "getServerCombinedModuleFile",
     "getServerLoadersFile",
     "hasAction",
     "hasLoader",

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

@@ -1,3 +1,4 @@
+import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
 import cookie from "cookie";
 import { getGlobalInternalRuntimeContext } from "../context/index.mjs";
 import { getInitialContext } from "../context/runtime.mjs";
@@ -86,7 +87,9 @@ async function renderWithReact17(App, rootElement) {
 }
 async function hydrateWithReact18(App, rootElement) {
     const ReactDOM = await import("react-dom/client");
-    const root = ReactDOM.hydrateRoot(rootElement, App);
+    const root = ReactDOM.hydrateRoot(rootElement, App, {
+        identifierPrefix: SSR_HYDRATION_ID_PREFIX
+    });
     return root;
 }
 async function hydrateWithReact17(App, rootElement, callback) {

package/dist/esm/core/server/stream/createReadableStream.mjs

@@ -1,5 +1,6 @@
 import { PassThrough, Readable, Transform } from "stream";
 import { storage } from "@modern-js/runtime-utils/node";
+import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common.mjs";
 import { RenderLevel } from "../../constants.mjs";
 import { getGlobalInternalRuntimeContext } from "../../context/index.mjs";
@@ -37,6 +38,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
     return new Promise((resolve)=>{
         const { pipe: reactStreamingPipe } = renderToPipeableStream(processedRootElement, {
             nonce: config.nonce,
+            identifierPrefix: SSR_HYDRATION_ID_PREFIX,
             [onReady] () {
                 let styledComponentsStyleTags = '';
                 extenders.forEach((extender)=>{

package/dist/esm/core/server/string/index.mjs

@@ -1,4 +1,5 @@
 import { time } from "@modern-js/runtime-utils/time";
+import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
 import server from "react-dom/server";
 import react_helmet from "react-helmet";
 import { RenderLevel } from "../../constants.mjs";
@@ -65,7 +66,9 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
     const finalApp = collectors.reduce((pre, creator)=>creator.collect?.(pre) || pre, App);
     try {
         const end = time();
-        html = server.renderToString(finalApp);
+        html = server.renderToString(finalApp, {
+            identifierPrefix: SSR_HYDRATION_ID_PREFIX
+        });
         chunkSet.renderLevel = RenderLevel.SERVER_RENDER;
         helmetData = react_helmet.renderStatic();
         const cost = end();

package/dist/esm/router/cli/code/index.mjs

@@ -6,7 +6,7 @@ import { resolveSSRMode } from "../../../cli/ssr/mode.mjs";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants.mjs";
 import { walk } from "./nestedRoutes.mjs";
 import { fileSystemRoutes, routesForServer, ssrLoaderCombinedModule } from "./templates.mjs";
-import { getServerCombinedModueFile, getServerLoadersFile } from "./utils.mjs";
+import { getServerCombinedModuleFile, getServerLoadersFile } from "./utils.mjs";
 async function generateRoutesForEntry(entrypoint, appContext) {
     const routes = [];
     if (entrypoint.nestedRoutesEntry) {
@@ -119,7 +119,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
                 }
                 const serverLoaderCombined = ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext);
                 if (serverLoaderCombined) {
-                    const serverLoaderFile = getServerCombinedModueFile(internalDirectory, entryName);
+                    const serverLoaderFile = getServerCombinedModuleFile(internalDirectory, entryName);
                     await fs.outputFile(serverLoaderFile, serverLoaderCombined);
                 }
                 await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`), code, 'utf8');

package/dist/esm/router/cli/code/utils.mjs

@@ -65,9 +65,9 @@ const hasAction = async (filename, source)=>{
     return false;
 };
 const getServerLoadersFile = (internalDirectory, entryName)=>path.join(internalDirectory, entryName, 'route-server-loaders.js');
-const getServerCombinedModueFile = (internalDirectory, entryName)=>path.join(internalDirectory, entryName, 'server-loader-combined.js');
+const getServerCombinedModuleFile = (internalDirectory, entryName)=>path.join(internalDirectory, entryName, 'server-loader-combined.js');
 const getPathWithoutExt = (filename)=>{
     const extname = path.extname(filename);
     return extname ? filename.slice(0, -extname.length) : filename;
 };
-export { getPathWithoutExt, getServerCombinedModueFile, getServerLoadersFile, hasAction, hasLoader, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };
+export { getPathWithoutExt, getServerCombinedModuleFile, getServerLoadersFile, hasAction, hasLoader, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };

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

@@ -1,4 +1,5 @@
 import "node:module";
+import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
 import cookie from "cookie";
 import { getGlobalInternalRuntimeContext } from "../context/index.mjs";
 import { getInitialContext } from "../context/runtime.mjs";
@@ -87,7 +88,9 @@ async function renderWithReact17(App, rootElement) {
 }
 async function hydrateWithReact18(App, rootElement) {
     const ReactDOM = await import("react-dom/client");
-    const root = ReactDOM.hydrateRoot(rootElement, App);
+    const root = ReactDOM.hydrateRoot(rootElement, App, {
+        identifierPrefix: SSR_HYDRATION_ID_PREFIX
+    });
     return root;
 }
 async function hydrateWithReact17(App, rootElement, callback) {

package/dist/esm-node/core/server/stream/createReadableStream.mjs

@@ -1,6 +1,7 @@
 import "node:module";
 import { PassThrough, Readable, Transform } from "stream";
 import { storage } from "@modern-js/runtime-utils/node";
+import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common.mjs";
 import { RenderLevel } from "../../constants.mjs";
 import { getGlobalInternalRuntimeContext } from "../../context/index.mjs";
@@ -38,6 +39,7 @@ const createReadableStreamFromElement = async (request, rootElement, options)=>{
     return new Promise((resolve)=>{
         const { pipe: reactStreamingPipe } = renderToPipeableStream(processedRootElement, {
             nonce: config.nonce,
+            identifierPrefix: SSR_HYDRATION_ID_PREFIX,
             [onReady] () {
                 let styledComponentsStyleTags = '';
                 extenders.forEach((extender)=>{

package/dist/esm-node/core/server/string/index.mjs

@@ -1,5 +1,6 @@
 import "node:module";
 import { time } from "@modern-js/runtime-utils/time";
+import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
 import server from "react-dom/server";
 import react_helmet from "react-helmet";
 import { RenderLevel } from "../../constants.mjs";
@@ -66,7 +67,9 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
     const finalApp = collectors.reduce((pre, creator)=>creator.collect?.(pre) || pre, App);
     try {
         const end = time();
-        html = server.renderToString(finalApp);
+        html = server.renderToString(finalApp, {
+            identifierPrefix: SSR_HYDRATION_ID_PREFIX
+        });
         chunkSet.renderLevel = RenderLevel.SERVER_RENDER;
         helmetData = react_helmet.renderStatic();
         const cost = end();

package/dist/esm-node/router/cli/code/index.mjs

@@ -7,7 +7,7 @@ import { resolveSSRMode } from "../../../cli/ssr/mode.mjs";
 import { FILE_SYSTEM_ROUTES_FILE_NAME } from "../constants.mjs";
 import { walk } from "./nestedRoutes.mjs";
 import { fileSystemRoutes, routesForServer, ssrLoaderCombinedModule } from "./templates.mjs";
-import { getServerCombinedModueFile, getServerLoadersFile } from "./utils.mjs";
+import { getServerCombinedModuleFile, getServerLoadersFile } from "./utils.mjs";
 async function generateRoutesForEntry(entrypoint, appContext) {
     const routes = [];
     if (entrypoint.nestedRoutesEntry) {
@@ -120,7 +120,7 @@ const generateCode = async (appContext, config, entrypoints, api)=>{
                 }
                 const serverLoaderCombined = ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext);
                 if (serverLoaderCombined) {
-                    const serverLoaderFile = getServerCombinedModueFile(internalDirectory, entryName);
+                    const serverLoaderFile = getServerCombinedModuleFile(internalDirectory, entryName);
                     await fs.outputFile(serverLoaderFile, serverLoaderCombined);
                 }
                 await fs.outputFile(path.resolve(internalDirectory, `./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`), code, 'utf8');

package/dist/esm-node/router/cli/code/utils.mjs

@@ -66,9 +66,9 @@ const hasAction = async (filename, source)=>{
     return false;
 };
 const getServerLoadersFile = (internalDirectory, entryName)=>path.join(internalDirectory, entryName, 'route-server-loaders.js');
-const getServerCombinedModueFile = (internalDirectory, entryName)=>path.join(internalDirectory, entryName, 'server-loader-combined.js');
+const getServerCombinedModuleFile = (internalDirectory, entryName)=>path.join(internalDirectory, entryName, 'server-loader-combined.js');
 const getPathWithoutExt = (filename)=>{
     const extname = path.extname(filename);
     return extname ? filename.slice(0, -extname.length) : filename;
 };
-export { getPathWithoutExt, getServerCombinedModueFile, getServerLoadersFile, hasAction, hasLoader, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };
+export { getPathWithoutExt, getServerCombinedModuleFile, getServerLoadersFile, hasAction, hasLoader, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };

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

@@ -8,5 +8,5 @@ export declare const parseModule: ({ source, filename, }: {
 export declare const hasLoader: (filename: string, source?: string) => Promise<boolean>;
 export declare const hasAction: (filename: string, source?: string) => Promise<boolean>;
 export declare const getServerLoadersFile: (internalDirectory: string, entryName: string) => string;
-export declare const getServerCombinedModueFile: (internalDirectory: string, entryName: string) => string;
+export declare const getServerCombinedModuleFile: (internalDirectory: string, entryName: string) => string;
 export declare const getPathWithoutExt: (filename: string) => string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.5",
+  "version": "3.1.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.0.5",
-    "@modern-js/plugin-data-loader": "3.0.5",
-    "@modern-js/render": "3.0.5",
-    "@modern-js/types": "3.0.5",
-    "@modern-js/runtime-utils": "3.0.5",
-    "@modern-js/utils": "3.0.5"
+    "@modern-js/plugin": "3.1.0",
+    "@modern-js/plugin-data-loader": "3.1.0",
+    "@modern-js/render": "3.1.0",
+    "@modern-js/runtime-utils": "3.1.0",
+    "@modern-js/types": "3.1.0",
+    "@modern-js/utils": "3.1.0"
   },
   "peerDependencies": {
     "react": ">=17.0.2",
@@ -240,9 +240,9 @@
     "react-dom": "^19.2.4",
     "ts-node": "^10.9.2",
     "typescript": "^5",
-    "@modern-js/app-tools": "3.0.5",
     "@modern-js/rslib": "2.68.10",
-    "@scripts/rstest-config": "2.66.0"
+    "@scripts/rstest-config": "2.66.0",
+    "@modern-js/app-tools": "3.1.0"
   },
   "sideEffects": false,
   "publishConfig": {