@bleedingdev/modern-js-runtime 3.5.0-ultramodern.98 → 3.5.0-ultramodern.99

package/dist/cjs/cli/index.js

@@ -112,12 +112,10 @@ const runtimePlugin = (params)=>({
             });
             api.config(()=>{
                 const { appDirectory, metaName } = api.getAppContext();
-                const isReact18 = (0, utils_namespaceObject.isReact18)(appDirectory);
-                process.env.IS_REACT18 = isReact18.toString();
                 return {
                     source: {
                         globalVars: {
-                            'process.env.IS_REACT18': process.env.IS_REACT18
+                            'process.env.IS_REACT18': 'true'
                         },
                         include: [
                             new RegExp(`[\\\\/]node_modules[\\\\/]@${metaName}[\\\\/]runtime[\\\\/].*[\\\\/]head\\.`)
@@ -126,14 +124,6 @@ const runtimePlugin = (params)=>({
                     tools: {
                         bundlerChain: (chain)=>{
                             chain.module.rule('modern-entry').test(/\.jsx?$/).include.add(external_path_default().resolve(appDirectory, 'node_modules', `.${metaName}`)).end().sideEffects(true);
-                        },
-                        rspack: (_config, { appendPlugins, rspack })=>{
-                            if (!isReact18) appendPlugins([
-                                new rspack.IgnorePlugin({
-                                    resourceRegExp: /^react-dom\/client$/,
-                                    contextRegExp: /@modern-js\/runtime/
-                                })
-                            ]);
                         }
                     }
                 };

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

@@ -31,13 +31,12 @@ __webpack_require__.d(__webpack_exports__, {
     createNestedAppRenderer: ()=>createNestedAppRenderer,
     hydrateWithReact: ()=>external_hydrate_js_namespaceObject.hydrateWithReact,
     hydrateWithReact17: ()=>hydrateWithReact17,
-    hydrateWithReact18: ()=>hydrateWithReact18,
     render: ()=>render,
     renderWithReact17: ()=>renderWithReact17,
     renderWithReact18: ()=>renderWithReact18
 });
-const constants_namespaceObject = require("@modern-js/utils/universal/constants");
 const external_cookie_namespaceObject = require("cookie");
+const client_namespaceObject = require("react-dom/client");
 const index_js_namespaceObject = require("../context/index.js");
 const runtime_js_namespaceObject = require("../context/runtime.js");
 const wrapper_js_namespaceObject = require("../react/wrapper.js");
@@ -107,8 +106,8 @@ async function renderApp(App, id, hydrateFromSsrData, internalRuntimeContext) {
             return renderFunc(App, rootElement);
         }
         async function ModernHydrate(App, callback) {
-            const hydrateFunc = IS_REACT18 ? hydrateWithReact18 : hydrateWithReact17;
-            return hydrateFunc(App, rootElement, callback);
+            if (IS_REACT18) return (0, external_hydrate_js_namespaceObject.hydrateWithReact)(App, rootElement);
+            return hydrateWithReact17(App, rootElement, callback);
         }
         if (hydrateFromSsrData && process.env.MODERN_ENABLE_HYDRATION && window._SSR_DATA) return (0, external_hydrate_js_namespaceObject.hydrateRoot)(App, context, ModernRender, ModernHydrate);
         return ModernRender((0, wrapper_js_namespaceObject.wrapRuntimeContextProvider)(App, context));
@@ -123,8 +122,7 @@ function createNestedAppRenderer() {
     return (App, id)=>renderApp(App, id, false, internalRuntimeContext);
 }
 async function renderWithReact18(App, rootElement) {
-    const ReactDOM = await import("react-dom/client");
-    const root = ReactDOM.createRoot(rootElement);
+    const root = (0, client_namespaceObject.createRoot)(rootElement);
     root.render(App);
     return root;
 }
@@ -133,13 +131,6 @@ async function renderWithReact17(App, rootElement) {
     ReactDOM.render(App, rootElement);
     return rootElement;
 }
-async function hydrateWithReact18(App, rootElement) {
-    const ReactDOM = await import("react-dom/client");
-    const root = ReactDOM.hydrateRoot(rootElement, App, {
-        identifierPrefix: constants_namespaceObject.SSR_HYDRATION_ID_PREFIX
-    });
-    return root;
-}
 async function hydrateWithReact17(App, rootElement, callback) {
     const ReactDOM = await import("react-dom");
     const root = ReactDOM.hydrate(App, rootElement, callback);
@@ -148,7 +139,6 @@ async function hydrateWithReact17(App, rootElement, callback) {
 exports.createNestedAppRenderer = __webpack_exports__.createNestedAppRenderer;
 exports.hydrateWithReact = __webpack_exports__.hydrateWithReact;
 exports.hydrateWithReact17 = __webpack_exports__.hydrateWithReact17;
-exports.hydrateWithReact18 = __webpack_exports__.hydrateWithReact18;
 exports.render = __webpack_exports__.render;
 exports.renderWithReact17 = __webpack_exports__.renderWithReact17;
 exports.renderWithReact18 = __webpack_exports__.renderWithReact18;
@@ -156,7 +146,6 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createNestedAppRenderer",
     "hydrateWithReact",
     "hydrateWithReact17",
-    "hydrateWithReact18",
     "render",
     "renderWithReact17",
     "renderWithReact18"

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

@@ -127,7 +127,7 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
         createReplaceHtml(html),
         createReplaceChunkJs(jsChunk, entryName),
         createReplaceChunkCss(cssChunk),
-        createReplaceSSRDataScript(ssrScripts),
+        createReplaceSSRDataScript(ssrScripts, entryName),
         (0, external_helmet_js_namespaceObject.createReplaceHelemt)(helmetData),
         ...htmlModifiers
     ]);
@@ -136,8 +136,8 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
 function createReplaceHtml(html) {
     return (template)=>(0, external_utils_js_namespaceObject.safeReplace)(template, external_constants_js_namespaceObject_1.HTML_PLACEHOLDER, html);
 }
-function createReplaceSSRDataScript(data) {
-    return (template)=>(0, external_utils_js_namespaceObject.safeReplace)(template, external_constants_js_namespaceObject_1.SSR_DATA_PLACEHOLDER, data);
+function createReplaceSSRDataScript(data, entryName) {
+    return (template)=>(0, external_scriptOrder_js_namespaceObject.replaceChunkJsPlaceholder)(template, data, entryName, external_constants_js_namespaceObject_1.SSR_DATA_PLACEHOLDER);
 }
 function createReplaceChunkJs(js, entryName) {
     return (template)=>(0, external_scriptOrder_js_namespaceObject.replaceChunkJsPlaceholder)(template, js, entryName);

package/dist/esm/cli/index.mjs

@@ -1,4 +1,4 @@
-import { cleanRequireCache, isReact18 as utils_isReact18 } from "@modern-js/utils";
+import { cleanRequireCache } from "@modern-js/utils";
 import path_0 from "path";
 import { documentPlugin } from "../document/cli/index.mjs";
 import { getEntrypointRoutesDir, getEntrypointRoutesOwner, handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints, isRouteEntry, routerPlugin, updateNestedRoutesSpec } from "../router/cli/index.mjs";
@@ -54,12 +54,10 @@ const runtimePlugin = (params)=>({
             });
             api.config(()=>{
                 const { appDirectory, metaName } = api.getAppContext();
-                const isReact18 = utils_isReact18(appDirectory);
-                process.env.IS_REACT18 = isReact18.toString();
                 return {
                     source: {
                         globalVars: {
-                            'process.env.IS_REACT18': process.env.IS_REACT18
+                            'process.env.IS_REACT18': 'true'
                         },
                         include: [
                             new RegExp(`[\\\\/]node_modules[\\\\/]@${metaName}[\\\\/]runtime[\\\\/].*[\\\\/]head\\.`)
@@ -68,14 +66,6 @@ const runtimePlugin = (params)=>({
                     tools: {
                         bundlerChain: (chain)=>{
                             chain.module.rule('modern-entry').test(/\.jsx?$/).include.add(path_0.resolve(appDirectory, 'node_modules', `.${metaName}`)).end().sideEffects(true);
-                        },
-                        rspack: (_config, { appendPlugins, rspack })=>{
-                            if (!isReact18) appendPlugins([
-                                new rspack.IgnorePlugin({
-                                    resourceRegExp: /^react-dom\/client$/,
-                                    contextRegExp: /@modern-js\/runtime/
-                                })
-                            ]);
                         }
                     }
                 };

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

@@ -1,5 +1,5 @@
-import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
 import { parseCookie } from "cookie";
+import { createRoot } from "react-dom/client";
 import { getGlobalInternalRuntimeContext } from "../context/index.mjs";
 import { getInitialContext } from "../context/runtime.mjs";
 import { wrapRuntimeContextProvider } from "../react/wrapper.mjs";
@@ -69,8 +69,8 @@ async function renderApp(App, id, hydrateFromSsrData, internalRuntimeContext) {
             return renderFunc(App, rootElement);
         }
         async function ModernHydrate(App, callback) {
-            const hydrateFunc = IS_REACT18 ? hydrateWithReact18 : hydrateWithReact17;
-            return hydrateFunc(App, rootElement, callback);
+            if (IS_REACT18) return hydrateWithReact(App, rootElement);
+            return hydrateWithReact17(App, rootElement, callback);
         }
         if (hydrateFromSsrData && process.env.MODERN_ENABLE_HYDRATION && window._SSR_DATA) return hydrateRoot(App, context, ModernRender, ModernHydrate);
         return ModernRender(wrapRuntimeContextProvider(App, context));
@@ -85,8 +85,7 @@ function createNestedAppRenderer() {
     return (App, id)=>renderApp(App, id, false, internalRuntimeContext);
 }
 async function renderWithReact18(App, rootElement) {
-    const ReactDOM = await import("react-dom/client");
-    const root = ReactDOM.createRoot(rootElement);
+    const root = createRoot(rootElement);
     root.render(App);
     return root;
 }
@@ -95,16 +94,9 @@ async function renderWithReact17(App, rootElement) {
     ReactDOM.render(App, rootElement);
     return rootElement;
 }
-async function hydrateWithReact18(App, rootElement) {
-    const ReactDOM = await import("react-dom/client");
-    const root = ReactDOM.hydrateRoot(rootElement, App, {
-        identifierPrefix: SSR_HYDRATION_ID_PREFIX
-    });
-    return root;
-}
 async function hydrateWithReact17(App, rootElement, callback) {
     const ReactDOM = await import("react-dom");
     const root = ReactDOM.hydrate(App, rootElement, callback);
     return root;
 }
-export { createNestedAppRenderer, hydrateWithReact, hydrateWithReact17, hydrateWithReact18, render, renderWithReact17, renderWithReact18 };
+export { createNestedAppRenderer, hydrateWithReact, hydrateWithReact17, render, renderWithReact17, renderWithReact18 };

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

@@ -85,7 +85,7 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
         createReplaceHtml(html),
         createReplaceChunkJs(jsChunk, entryName),
         createReplaceChunkCss(cssChunk),
-        createReplaceSSRDataScript(ssrScripts),
+        createReplaceSSRDataScript(ssrScripts, entryName),
         createReplaceHelemt(helmetData),
         ...htmlModifiers
     ]);
@@ -94,8 +94,8 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
 function createReplaceHtml(html) {
     return (template)=>safeReplace(template, HTML_PLACEHOLDER, html);
 }
-function createReplaceSSRDataScript(data) {
-    return (template)=>safeReplace(template, SSR_DATA_PLACEHOLDER, data);
+function createReplaceSSRDataScript(data, entryName) {
+    return (template)=>replaceChunkJsPlaceholder(template, data, entryName, SSR_DATA_PLACEHOLDER);
 }
 function createReplaceChunkJs(js, entryName) {
     return (template)=>replaceChunkJsPlaceholder(template, js, entryName);

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

@@ -1,6 +1,6 @@
 import __rslib_shim_module__ from "node:module";
 const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
-import { cleanRequireCache, isReact18 as utils_isReact18 } from "@modern-js/utils";
+import { cleanRequireCache } from "@modern-js/utils";
 import path_0 from "path";
 import { documentPlugin } from "../document/cli/index.mjs";
 import { getEntrypointRoutesDir, getEntrypointRoutesOwner, handleFileChange, handleGeneratorEntryCode, handleModifyEntrypoints, isRouteEntry, routerPlugin, updateNestedRoutesSpec } from "../router/cli/index.mjs";
@@ -56,12 +56,10 @@ const runtimePlugin = (params)=>({
             });
             api.config(()=>{
                 const { appDirectory, metaName } = api.getAppContext();
-                const isReact18 = utils_isReact18(appDirectory);
-                process.env.IS_REACT18 = isReact18.toString();
                 return {
                     source: {
                         globalVars: {
-                            'process.env.IS_REACT18': process.env.IS_REACT18
+                            'process.env.IS_REACT18': 'true'
                         },
                         include: [
                             new RegExp(`[\\\\/]node_modules[\\\\/]@${metaName}[\\\\/]runtime[\\\\/].*[\\\\/]head\\.`)
@@ -70,14 +68,6 @@ const runtimePlugin = (params)=>({
                     tools: {
                         bundlerChain: (chain)=>{
                             chain.module.rule('modern-entry').test(/\.jsx?$/).include.add(path_0.resolve(appDirectory, 'node_modules', `.${metaName}`)).end().sideEffects(true);
-                        },
-                        rspack: (_config, { appendPlugins, rspack })=>{
-                            if (!isReact18) appendPlugins([
-                                new rspack.IgnorePlugin({
-                                    resourceRegExp: /^react-dom\/client$/,
-                                    contextRegExp: /@modern-js\/runtime/
-                                })
-                            ]);
                         }
                     }
                 };

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

@@ -1,6 +1,6 @@
 import "node:module";
-import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
 import { parseCookie } from "cookie";
+import { createRoot } from "react-dom/client";
 import { getGlobalInternalRuntimeContext } from "../context/index.mjs";
 import { getInitialContext } from "../context/runtime.mjs";
 import { wrapRuntimeContextProvider } from "../react/wrapper.mjs";
@@ -70,8 +70,8 @@ async function renderApp(App, id, hydrateFromSsrData, internalRuntimeContext) {
             return renderFunc(App, rootElement);
         }
         async function ModernHydrate(App, callback) {
-            const hydrateFunc = IS_REACT18 ? hydrateWithReact18 : hydrateWithReact17;
-            return hydrateFunc(App, rootElement, callback);
+            if (IS_REACT18) return hydrateWithReact(App, rootElement);
+            return hydrateWithReact17(App, rootElement, callback);
         }
         if (hydrateFromSsrData && process.env.MODERN_ENABLE_HYDRATION && window._SSR_DATA) return hydrateRoot(App, context, ModernRender, ModernHydrate);
         return ModernRender(wrapRuntimeContextProvider(App, context));
@@ -86,8 +86,7 @@ function createNestedAppRenderer() {
     return (App, id)=>renderApp(App, id, false, internalRuntimeContext);
 }
 async function renderWithReact18(App, rootElement) {
-    const ReactDOM = await import("react-dom/client");
-    const root = ReactDOM.createRoot(rootElement);
+    const root = createRoot(rootElement);
     root.render(App);
     return root;
 }
@@ -96,16 +95,9 @@ async function renderWithReact17(App, rootElement) {
     ReactDOM.render(App, rootElement);
     return rootElement;
 }
-async function hydrateWithReact18(App, rootElement) {
-    const ReactDOM = await import("react-dom/client");
-    const root = ReactDOM.hydrateRoot(rootElement, App, {
-        identifierPrefix: SSR_HYDRATION_ID_PREFIX
-    });
-    return root;
-}
 async function hydrateWithReact17(App, rootElement, callback) {
     const ReactDOM = await import("react-dom");
     const root = ReactDOM.hydrate(App, rootElement, callback);
     return root;
 }
-export { createNestedAppRenderer, hydrateWithReact, hydrateWithReact17, hydrateWithReact18, render, renderWithReact17, renderWithReact18 };
+export { createNestedAppRenderer, hydrateWithReact, hydrateWithReact17, render, renderWithReact17, renderWithReact18 };

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

@@ -86,7 +86,7 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
         createReplaceHtml(html),
         createReplaceChunkJs(jsChunk, entryName),
         createReplaceChunkCss(cssChunk),
-        createReplaceSSRDataScript(ssrScripts),
+        createReplaceSSRDataScript(ssrScripts, entryName),
         createReplaceHelemt(helmetData),
         ...htmlModifiers
     ]);
@@ -95,8 +95,8 @@ async function generateHtml(App, htmlTemplate, chunkSet, collectors, htmlModifie
 function createReplaceHtml(html) {
     return (template)=>safeReplace(template, HTML_PLACEHOLDER, html);
 }
-function createReplaceSSRDataScript(data) {
-    return (template)=>safeReplace(template, SSR_DATA_PLACEHOLDER, data);
+function createReplaceSSRDataScript(data, entryName) {
+    return (template)=>replaceChunkJsPlaceholder(template, data, entryName, SSR_DATA_PLACEHOLDER);
 }
 function createReplaceChunkJs(js, entryName) {
     return (template)=>replaceChunkJsPlaceholder(template, js, entryName);

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

@@ -9,5 +9,4 @@ export declare function render(App: React.ReactElement<{
 export declare function createNestedAppRenderer(): RenderFunc;
 export declare function renderWithReact18(App: React.ReactElement, rootElement: HTMLElement): Promise<import("react-dom/client").Root>;
 export declare function renderWithReact17(App: React.ReactElement, rootElement: HTMLElement): Promise<HTMLElement>;
-export declare function hydrateWithReact18(App: React.ReactElement, rootElement: HTMLElement): Promise<import("react-dom/client").Root>;
 export declare function hydrateWithReact17(App: React.ReactElement, rootElement: HTMLElement, callback?: () => void): Promise<any>;

package/package.json

@@ -17,7 +17,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.5.0-ultramodern.98",
+  "version": "3.5.0-ultramodern.99",
   "engines": {
     "node": ">=20"
   },
@@ -246,12 +246,12 @@
   "dependencies": {
     "@loadable/component": "5.16.7",
     "@loadable/server": "5.16.7",
-    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.98",
-    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.5.0-ultramodern.98",
-    "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.5.0-ultramodern.98",
-    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.98",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.98",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.98",
+    "@modern-js/plugin": "npm:@bleedingdev/modern-js-plugin@3.5.0-ultramodern.99",
+    "@modern-js/plugin-data-loader": "npm:@bleedingdev/modern-js-plugin-data-loader@3.5.0-ultramodern.99",
+    "@modern-js/render": "npm:@bleedingdev/modern-js-render@3.5.0-ultramodern.99",
+    "@modern-js/runtime-utils": "npm:@bleedingdev/modern-js-runtime-utils@3.5.0-ultramodern.99",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.99",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.99",
     "@swc/core": "1.15.43",
     "@swc/helpers": "^0.5.23",
     "@swc/plugin-loadable-components": "^11.15.0",
@@ -272,13 +272,14 @@
     "react-dom": "^19.2.7"
   },
   "devDependencies": {
-    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.98",
+    "@modern-js/app-tools": "npm:@bleedingdev/modern-js-app-tools@3.5.0-ultramodern.99",
     "@remix-run/web-fetch": "^4.4.2",
     "@rsbuild/core": "2.1.5",
     "@rslib/core": "0.23.2",
     "@scripts/rstest-config": "2.66.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
+    "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.37",
     "@types/loadable__server": "5.12.11",
     "@types/node": "^26.1.1",