@umijs/renderer-react 4.0.0-canary.20240517.1 → 4.0.0-canary.20240605.1

package/dist/browser.d.ts

@@ -28,14 +28,16 @@ export declare type RenderClientOpts = {
      * @doc 一般不需要改，微前端的时候会变化
      */
     rootElement?: HTMLElement;
-    /**
-     * 是否从根节点开始渲染, 默认 false, 即从 html 开始渲染
-     */
-    renderFromRoot?: boolean;
-    /**
-     * 内部流程, 渲染特殊 html 节点, 不要使用!!!
-     */
-    __SPECIAL_HTML_DO_NOT_USE_OR_YOU_WILL_BE_FIRED?: boolean;
+    __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+        /**
+         * 内部流程, 渲染特殊 app 节点, 不要使用!!!
+         */
+        pureApp?: boolean;
+        /**
+         * 内部流程, 渲染特殊 html 节点, 不要使用!!!
+         */
+        pureHtml?: boolean;
+    };
     /**
      * 当前的路由配置
      */

package/dist/browser.js

@@ -280,7 +280,7 @@ export function renderClient(opts) {
       loaderData: loaderData,
       mountElementId: opts.mountElementId
     };
-    ReactDOM.hydrateRoot(opts.renderFromRoot ? rootElement : document, /*#__PURE__*/React.createElement(Html, hydtateHtmloptions, /*#__PURE__*/React.createElement(Browser, null)));
+    ReactDOM.hydrateRoot(opts.__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.pureApp ? rootElement : document, /*#__PURE__*/React.createElement(Html, hydtateHtmloptions, /*#__PURE__*/React.createElement(Browser, null)));
     return;
   }
   if (ReactDOM.createRoot) {

package/dist/html.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import { IHtmlProps } from './types';
-export declare function Html({ children, loaderData, manifest, htmlPageOpts, renderFromRoot, __SPECIAL_HTML_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, mountElementId, }: React.PropsWithChildren<IHtmlProps>): JSX.Element;
+export declare function Html({ children, loaderData, manifest, htmlPageOpts, __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, mountElementId, }: React.PropsWithChildren<IHtmlProps>): JSX.Element;

package/dist/html.js

@@ -109,12 +109,11 @@ export function Html(_ref) {
     loaderData = _ref.loaderData,
     manifest = _ref.manifest,
     htmlPageOpts = _ref.htmlPageOpts,
-    renderFromRoot = _ref.renderFromRoot,
-    __SPECIAL_HTML_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = _ref.__SPECIAL_HTML_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+    __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = _ref.__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
     mountElementId = _ref.mountElementId;
   // TODO: 处理 head 标签，比如 favicon.ico 的一致性
   // TODO: root 支持配置
-  if (__SPECIAL_HTML_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) {
+  if (__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== null && __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== void 0 && __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.pureHtml) {
     return /*#__PURE__*/React.createElement("html", null, /*#__PURE__*/React.createElement("head", null), /*#__PURE__*/React.createElement("body", null, /*#__PURE__*/React.createElement(EnableJsScript, null), /*#__PURE__*/React.createElement("div", {
       id: mountElementId
     }, children), /*#__PURE__*/React.createElement(GlobalDataScript, {
@@ -123,7 +122,7 @@ export function Html(_ref) {
       htmlPageOpts: htmlPageOpts
     })));
   }
-  if (renderFromRoot) {
+  if (__INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== null && __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED !== void 0 && __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.pureApp) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, children);
   }
   var serverBuildManifest = typeof window === 'undefined' ? manifest : window.__UMI_BUILD_MANIFEST_DATA__;

package/dist/types.d.ts

@@ -49,8 +49,10 @@ export interface ILoaderData {
 }
 interface IHtmlHydrateOptions {
     htmlPageOpts?: IhtmlPageOpts;
-    renderFromRoot?: boolean;
-    __SPECIAL_HTML_DO_NOT_USE_OR_YOU_WILL_BE_FIRED?: boolean;
+    __INTERNAL_DO_NOT_USE_OR_YOU_WILL_BE_FIRED?: {
+        pureApp: boolean;
+        pureHtml: boolean;
+    };
     mountElementId?: string;
 }
 export interface IRootComponentOptions extends IHtmlHydrateOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.0-canary.20240517.1",
+  "version": "4.0.0-canary.20240605.1",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -23,8 +23,8 @@
     "react-router-dom": "6.3.0"
   },
   "devDependencies": {
-    "react": "18.3.1",
-    "react-dom": "18.3.1"
+    "react": "18.1.0",
+    "react-dom": "18.1.0"
   },
   "peerDependencies": {
     "react": ">=16.8",