@umijs/renderer-react 4.0.0-canary.20240510.1 → 4.0.0-canary.20240513.1

package/dist/browser.d.ts

@@ -29,10 +29,9 @@ export declare type RenderClientOpts = {
      */
     rootElement?: HTMLElement;
     /**
-     * ssr 是否从 app root 根节点开始 render
-     * @doc 默认 false, 从 app root 开始 render，为 true 时从 html 开始
+     * 内部流程, 渲染特殊 html 节点, 不要使用!!!
      */
-    renderFromRoot?: boolean;
+    __SPECIAL_HTML_DO_NOT_USE_OR_YOU_WILL_BE_FIRED?: 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.__SPECIAL_HTML_DO_NOT_USE_OR_YOU_WILL_BE_FIRED ? 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, mountElementId, }: React.PropsWithChildren<IHtmlProps>): JSX.Element;
+export declare function Html({ children, loaderData, manifest, htmlPageOpts, __SPECIAL_HTML_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, mountElementId, }: React.PropsWithChildren<IHtmlProps>): JSX.Element;

package/dist/html.js

@@ -9,6 +9,17 @@ var RE_URL = /^(http:|https:)?\/\//;
 function isUrl(str) {
   return RE_URL.test(str) || str.startsWith('/') && !str.startsWith('/*') || str.startsWith('./') || str.startsWith('../');
 }
+var GlobalDataScript = function GlobalDataScript(props) {
+  var loaderData = props.loaderData,
+    htmlPageOpts = props.htmlPageOpts,
+    manifest = props.manifest;
+  return /*#__PURE__*/React.createElement("script", {
+    suppressHydrationWarning: true,
+    dangerouslySetInnerHTML: {
+      __html: "window.__UMI_LOADER_DATA__ = ".concat(JSON.stringify(loaderData || {}), "; window.__UMI_METADATA_LOADER_DATA__ = ").concat(JSON.stringify(htmlPageOpts || {}), "; window.__UMI_BUILD_MANIFEST_DATA__ = ").concat(JSON.stringify(manifest) || {})
+    }
+  });
+};
 function normalizeScripts(script) {
   var extraProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (typeof script === 'string') {
@@ -91,16 +102,22 @@ 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,
     mountElementId = _ref.mountElementId;
   // TODO: 处理 head 标签，比如 favicon.ico 的一致性
   // TODO: root 支持配置
-  if (renderFromRoot) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(HydrateMetadata, {
-      htmlPageOpts: htmlPageOpts
+  if (__SPECIAL_HTML_DO_NOT_USE_OR_YOU_WILL_BE_FIRED) {
+    return /*#__PURE__*/React.createElement("html", null, /*#__PURE__*/React.createElement("head", null), /*#__PURE__*/React.createElement("body", null, /*#__PURE__*/React.createElement("noscript", {
+      dangerouslySetInnerHTML: {
+        __html: "<b>Enable JavaScript to run this app.</b>"
+      }
     }), /*#__PURE__*/React.createElement("div", {
       id: mountElementId
-    }, children));
+    }, children), /*#__PURE__*/React.createElement(GlobalDataScript, {
+      manifest: manifest,
+      loaderData: loaderData,
+      htmlPageOpts: htmlPageOpts
+    })));
   }
   var serverBuildManifest = typeof window === 'undefined' ? manifest : window.__UMI_BUILD_MANIFEST_DATA__;
   return (
@@ -126,11 +143,10 @@ export function Html(_ref) {
       }
     }), /*#__PURE__*/React.createElement("div", {
       id: mountElementId
-    }, children), /*#__PURE__*/React.createElement("script", {
-      suppressHydrationWarning: true,
-      dangerouslySetInnerHTML: {
-        __html: "window.__UMI_LOADER_DATA__ = ".concat(JSON.stringify(loaderData || {}), "; window.__UMI_METADATA_LOADER_DATA__ = ").concat(JSON.stringify(htmlPageOpts || {}), "; window.__UMI_BUILD_MANIFEST_DATA__ = ").concat(JSON.stringify(manifest) || {})
-      }
+    }, children), /*#__PURE__*/React.createElement(GlobalDataScript, {
+      manifest: manifest,
+      loaderData: loaderData,
+      htmlPageOpts: htmlPageOpts
     }), htmlPageOpts === null || htmlPageOpts === void 0 || (_htmlPageOpts$scripts = htmlPageOpts.scripts) === null || _htmlPageOpts$scripts === void 0 ? void 0 : _htmlPageOpts$scripts.map(function (script, key) {
       var _normalizeScripts2 = normalizeScripts(script),
         content = _normalizeScripts2.content,

package/dist/types.d.ts

@@ -49,7 +49,7 @@ export interface ILoaderData {
 }
 interface IHtmlHydrateOptions {
     htmlPageOpts?: IhtmlPageOpts;
-    renderFromRoot?: boolean;
+    __SPECIAL_HTML_DO_NOT_USE_OR_YOU_WILL_BE_FIRED?: boolean;
     mountElementId?: string;
 }
 export interface IRootComponentOptions extends IHtmlHydrateOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.0.0-canary.20240510.1",
+  "version": "4.0.0-canary.20240513.1",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",