@umijs/renderer-react 4.6.66 → 4.6.68

package/dist/appContext.d.ts

@@ -16,7 +16,7 @@ export declare const AppContext: React.Context<IAppContextType>;
 export declare function useAppData(): IAppContextType;
 export declare function useSelectedRoutes(): ISelectedRoutes[];
 export declare function useRouteProps<T extends Record<string, any> = any>(): T;
-declare type ServerLoaderFunc = (...args: any[]) => Promise<any> | any;
+type ServerLoaderFunc = (...args: any[]) => Promise<any> | any;
 export declare function useServerLoaderData<T extends ServerLoaderFunc = any>(): {
     data: Awaited<ReturnType<T>> | undefined;
 };

package/dist/appContext.js

@@ -31,7 +31,8 @@ export function useServerLoaderData() {
   var routes = useSelectedRoutes();
   var _useAppData2 = useAppData(),
     serverLoaderData = _useAppData2.serverLoaderData,
-    basename = _useAppData2.basename;
+    basename = _useAppData2.basename,
+    pluginManager = _useAppData2.pluginManager;
   var _React$useState = React.useState(function () {
       var ret = {};
       var has = false;
@@ -58,6 +59,7 @@ export function useServerLoaderData() {
           fetchServerLoader({
             id: route.route.id,
             basename: basename,
+            pluginManager: pluginManager,
             cb: resolve
           });
         });

package/dist/browser.d.ts

@@ -3,11 +3,11 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { IRouteComponents, IRoutesById } from './types';
 export declare function __getRoot(): ReactDOM.Root | null;
-export declare function Routes(): any;
+export declare function Routes(): React.ReactElement<any, string | React.JSXElementConstructor<any>> | null;
 /**
  * umi 渲染需要的配置，在node端调用的哦
  */
-export declare type RenderClientOpts = {
+export type RenderClientOpts = {
     /**
      * 配置 webpack 的 publicPath。
      * @doc https://umijs.org/docs/api/config#publicpath

package/dist/browser.js

@@ -166,6 +166,7 @@ var getBrowser = function getBrowser(opts, routesElement) {
           fetchServerLoader({
             id: id,
             basename: basename,
+            pluginManager: opts.pluginManager,
             cb: function cb(data) {
               // setServerLoaderData when startTransition because if ssr is enabled,
               // the component may being hydrated and setLoaderData will break the hydration
@@ -193,6 +194,7 @@ var getBrowser = function getBrowser(opts, routesElement) {
               return fetchServerLoader({
                 id: id,
                 basename: basename,
+                pluginManager: opts.pluginManager,
                 cb: function cb(data) {
                   // setServerLoaderData when startTransition because if ssr is enabled,
                   // the component may being hydrated and setLoaderData will break the hydration

package/dist/dataFetcher.d.ts

@@ -1,5 +1,10 @@
-export declare function fetchServerLoader({ id, basename, cb, }: {
+export interface IServerLoaderRequest {
+    url: string;
+    options: RequestInit;
+}
+export declare function fetchServerLoader({ id, basename, cb, pluginManager, }: {
     id: string;
     basename?: string;
     cb: (data: any) => void;
+    pluginManager?: any;
 }): void;

package/dist/dataFetcher.js

@@ -1,17 +1,37 @@
 export function fetchServerLoader(_ref) {
   var id = _ref.id,
     basename = _ref.basename,
-    cb = _ref.cb;
+    cb = _ref.cb,
+    pluginManager = _ref.pluginManager;
   var query = new URLSearchParams({
     route: id,
     url: window.location.href
   }).toString();
   // 在有basename的情况下__serverLoader的请求路径需要加上basename
   // FIXME: 先临时解自定义 serverLoader 请求路径的问题，后续改造 serverLoader 时再提取成类似 runtimeServerLoader 的配置项
-  var url = "".concat(withEndSlash(window.umiServerLoaderPath || basename), "__serverLoader?").concat(query);
-  fetch(url, {
-    credentials: 'include'
-  }).then(function (d) {
+  var defaultUrl = "".concat(withEndSlash(window.umiServerLoaderPath || basename), "__serverLoader?").concat(query);
+
+  // Runtime hook to let consumers rewrite the direct serverLoader request
+  // (e.g. add gateway headers/query when calling WebGW FaaS directly).
+  // The framework stays agnostic of any gateway protocol.
+  var req = {
+    url: defaultUrl,
+    options: {
+      credentials: 'include'
+    }
+  };
+  if (pluginManager !== null && pluginManager !== void 0 && pluginManager.applyPlugins) {
+    req = pluginManager.applyPlugins({
+      key: 'modifyServerLoaderRequest',
+      type: 'modify',
+      initialValue: req,
+      args: {
+        id: id,
+        basename: basename
+      }
+    });
+  }
+  fetch(req.url, req.options).then(function (d) {
     return d.json();
   }).then(cb).catch(console.error);
 }

package/dist/link.d.ts

@@ -1,2 +1,6 @@
-import React from 'react';
-export declare const LinkWithPrefetch: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+import React, { PropsWithChildren } from 'react';
+import { LinkProps } from 'react-router-dom';
+export declare const LinkWithPrefetch: React.ForwardRefExoticComponent<Omit<PropsWithChildren<{
+    prefetch?: boolean | 'intent' | 'render' | 'viewport' | 'none';
+    prefetchTimeout?: number;
+} & LinkProps & React.RefAttributes<HTMLAnchorElement>>, "ref"> & React.RefAttributes<unknown>>;

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { IhtmlPageOpts, ServerLoader } from '@umijs/server/dist/types';
+import type { IhtmlPageOpts, ServerLoader } from '@umijs/server';
 import type { RouteMatch, RouteObject } from 'react-router-dom';
 declare global {
     interface Window {
@@ -7,10 +7,10 @@ declare global {
         __UMI_BUILD_ClIENT_CSS__: any;
     }
 }
-declare type ClientLoaderFunctionArgs = {
+type ClientLoaderFunctionArgs = {
     serverLoader: ServerLoader;
 };
-export declare type ClientLoader = ((args: ClientLoaderFunctionArgs) => Promise<any>) & {
+export type ClientLoader = ((args: ClientLoaderFunctionArgs) => Promise<any>) & {
     hydrate?: boolean;
 };
 export interface IRouteSSRProps {
@@ -73,7 +73,7 @@ export interface IHtmlProps extends IHtmlHydrateOptions {
     };
     manifest?: any;
 }
-export declare type IScript = Partial<{
+export type IScript = Partial<{
     async: boolean;
     charset: string;
     content: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/renderer-react",
-  "version": "4.6.66",
+  "version": "4.6.68",
   "description": "@umijs/renderer-react",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/renderer-react#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -20,7 +20,8 @@
     "@loadable/component": "5.15.2",
     "history": "5.3.0",
     "react-helmet-async": "1.3.0",
-    "react-router-dom": "6.3.0"
+    "react-router-dom": "6.3.0",
+    "@umijs/server": "4.6.68"
   },
   "devDependencies": {
     "react": "18.3.1",