@umijs/renderer-react 4.3.33 → 4.3.35

package/dist/browser.js

@@ -146,38 +146,15 @@ var getBrowser = function getBrowser(opts, routesElement) {
       })) || []).filter(Boolean);
       matchedRouteIds.forEach(function (id) {
         var _opts$routes$id, _opts$routes$id2;
-        // preload
-        // @ts-ignore
-        var manifest = window.__umi_manifest__;
-        if (manifest) {
-          var routeIdReplaced = id.replace(/[\/\-]/g, '_');
-          var preloadId = "preload-".concat(routeIdReplaced, ".js");
-          if (!document.getElementById(preloadId)) {
-            var keys = Object.keys(manifest).filter(function (k) {
-              return k.startsWith(routeIdReplaced + '.');
-            });
-            keys.forEach(function (key) {
-              if (!/\.(js|css)$/.test(key)) {
-                throw Error("preload not support ".concat(key, " file"));
-              }
-              var file = manifest[key];
-              var link = document.createElement('link');
-              link.rel = 'preload';
-              link.as = 'style';
-              if (key.endsWith('.js')) {
-                link.as = 'script';
-                link.id = preloadId;
-              }
-              // publicPath already in the manifest,
-              // but if runtimePublicPath is true, we need to replace it
-              if (opts.runtimePublicPath) {
-                file = file.replace(new RegExp("^".concat(opts.publicPath)),
-                // @ts-ignore
-                window.publicPath);
-              }
-              link.href = file;
-              document.head.appendChild(link);
-            });
+        // preload lazy component
+        // window.__umi_manifest__ is available when routePrefetch and manifest config is enabled
+        // __umi_manifest__ is not needed for preload, keep this is for compatibility and minimal change
+        if (window.__umi_manifest__) {
+          var _opts$routeComponents;
+          // ref: https://github.com/facebook/react/blob/0940414/packages/react/src/ReactLazy.js#L135
+          var lazyCtor = (_opts$routeComponents = opts.routeComponents[id]) === null || _opts$routeComponents === void 0 || (_opts$routeComponents = _opts$routeComponents._payload) === null || _opts$routeComponents === void 0 ? void 0 : _opts$routeComponents._result;
+          if (typeof lazyCtor == 'function') {
+            lazyCtor();
           }
         }
         var clientLoader = (_opts$routes$id = opts.routes[id]) === null || _opts$routes$id === void 0 ? void 0 : _opts$routes$id.clientLoader;

package/dist/html.js

@@ -101,8 +101,7 @@ var HydrateMetadata = function HydrateMetadata(props) {
       dangerouslySetInnerHTML: {
         __html: content
       },
-      key: key,
-      crossOrigin: "anonymous"
+      key: key
     }, rest));
   }));
 };
@@ -160,8 +159,7 @@ export function Html(_ref) {
         dangerouslySetInnerHTML: {
           __html: content
         },
-        key: key,
-        crossOrigin: "anonymous"
+        key: key
       }, rest));
     })))
   );

package/dist/link.d.ts

@@ -2,4 +2,4 @@ import React, { PropsWithChildren } from 'react';
 import { LinkProps } from 'react-router-dom';
 export declare function LinkWithPrefetch(props: PropsWithChildren<{
     prefetch?: boolean;
-} & LinkProps & React.RefAttributes<HTMLAnchorElement>>): React.JSX.Element | null;
+} & LinkProps & React.RefAttributes<HTMLAnchorElement>>): JSX.Element | null;

package/dist/routes.js

@@ -111,12 +111,9 @@ function RemoteComponentReactRouter5(props) {
     route: route,
     routes: clientRoutes
   };
-  var Remote = function Remote() {
-    return /*#__PURE__*/React.createElement(Component, ComponentProps, props.hasChildren && /*#__PURE__*/React.createElement(Outlet, null));
-  };
   return props.useStream ? /*#__PURE__*/React.createElement(React.Suspense, {
     fallback: /*#__PURE__*/React.createElement(props.loadingComponent, null)
-  }, /*#__PURE__*/React.createElement(Remote, null)) : /*#__PURE__*/React.createElement(Remote, null);
+  }, /*#__PURE__*/React.createElement(Component, ComponentProps, props.hasChildren && /*#__PURE__*/React.createElement(Outlet, null))) : /*#__PURE__*/React.createElement(Component, ComponentProps, props.hasChildren && /*#__PURE__*/React.createElement(Outlet, null));
 }
 function RemoteComponent(props) {
   var Component = props.loader;

package/dist/withRouter.d.ts

@@ -14,4 +14,4 @@ export interface RouteComponentProps<T = ReturnType<typeof useParams>> {
     params?: T;
     navigate?: ReturnType<typeof useNavigate>;
 }
-export declare function withRouter<P extends RouteComponentProps<P>>(Component: React.ComponentType<P>): (props: P) => React.JSX.Element;
+export declare function withRouter<P extends RouteComponentProps<P>>(Component: React.ComponentType<P>): (props: P) => JSX.Element;

package/package.json

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