@umijs/renderer-react 4.6.54 → 4.6.55

package/dist/html.d.ts

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

package/dist/html.js

@@ -16,16 +16,37 @@ var EnableJsScript = function EnableJsScript() {
     }
   });
 };
+function normalizeClientCssPaths(css) {
+  if (Array.isArray(css)) {
+    return css.filter(Boolean);
+  }
+  return css ? [css] : [];
+}
+function isCssAsset(asset) {
+  return /\.css(?:[?#].*)?$/.test(asset) && !/\.css\.map(?:[?#].*)?$/.test(asset);
+}
+function isUtoopackSingleCss(asset) {
+  return /\.single\.css(?:[?#].*)?$/.test(asset);
+}
+export function getClientCssPaths(manifest) {
+  var assets = (manifest === null || manifest === void 0 ? void 0 : manifest.assets) || {};
+  var umiCss = normalizeClientCssPaths(assets['umi.css']);
+  if (umiCss.length) {
+    return umiCss;
+  }
+  return Object.values(assets).filter(function (asset) {
+    return typeof asset === 'string' && isCssAsset(asset) && !isUtoopackSingleCss(asset);
+  });
+}
 var GlobalDataScript = function GlobalDataScript(props) {
-  var _manifest$assets;
   var loaderData = props.loaderData,
     htmlPageOpts = props.htmlPageOpts,
     manifest = props.manifest;
-  var clientCssPath = (manifest === null || manifest === void 0 || (_manifest$assets = manifest.assets) === null || _manifest$assets === void 0 ? void 0 : _manifest$assets['umi.css']) || '';
+  var clientCssPaths = getClientCssPaths(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_ClIENT_CSS__ = '").concat(clientCssPath, "'")
+      __html: "window.__UMI_LOADER_DATA__ = ".concat(JSON.stringify(loaderData || {}), "; window.__UMI_METADATA_LOADER_DATA__ = ").concat(JSON.stringify(htmlPageOpts || {}), "; window.__UMI_BUILD_ClIENT_CSS__ = ").concat(JSON.stringify(clientCssPaths.length <= 1 ? clientCssPaths[0] || '' : clientCssPaths))
     }
   });
 };
@@ -130,7 +151,7 @@ export function Html(_ref) {
   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 clientCss = typeof window === 'undefined' ? manifest === null || manifest === void 0 ? void 0 : manifest.assets['umi.css'] : window.__UMI_BUILD_ClIENT_CSS__;
+  var clientCssPaths = typeof window === 'undefined' ? getClientCssPaths(manifest) : normalizeClientCssPaths(window.__UMI_BUILD_ClIENT_CSS__);
   return (
     /*#__PURE__*/
     // FIXME: Resolve the hydrate warning for suppressHydrationWarning(3)
@@ -142,10 +163,13 @@ export function Html(_ref) {
     }), /*#__PURE__*/React.createElement("meta", {
       name: "viewport",
       content: "width=device-width, initial-scale=1"
-    }), clientCss && /*#__PURE__*/React.createElement("link", {
-      suppressHydrationWarning: true,
-      rel: "stylesheet",
-      href: clientCss
+    }), clientCssPaths.map(function (clientCss) {
+      return /*#__PURE__*/React.createElement("link", {
+        key: clientCss,
+        suppressHydrationWarning: true,
+        rel: "stylesheet",
+        href: clientCss
+      });
     }), /*#__PURE__*/React.createElement(HydrateMetadata, {
       htmlPageOpts: htmlPageOpts
     })), /*#__PURE__*/React.createElement("body", null, /*#__PURE__*/React.createElement(EnableJsScript, null), /*#__PURE__*/React.createElement("div", {

package/package.json

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