@umijs/server 4.0.85 → 4.0.87

package/dist/ssr.d.ts

@@ -3,6 +3,9 @@ interface RouteLoaders {
     [key: string]: () => Promise<any>;
 }
 export declare type ServerInsertedHTMLHook = (callbacks: () => React.ReactNode) => void;
+export interface IServerLoaderArgs {
+    request: Request;
+}
 interface CreateRequestHandlerOptions {
     routesWithServerLoader: RouteLoaders;
     PluginManager: any;

package/dist/ssr.js

@@ -55,7 +55,7 @@ var createJSXProvider = (Provider, serverInsertedHTMLCallbacks) => {
   return JSXProvider;
 };
 function createJSXGenerator(opts) {
-  return async (url) => {
+  return async (url, serverLoaderArgs) => {
     const {
       routesWithServerLoader,
       PluginManager,
@@ -87,7 +87,7 @@ function createJSXGenerator(opts) {
     await Promise.all(
       matches.filter((id) => routes[id].hasServerLoader).map(
         (id) => new Promise(async (resolve) => {
-          loaderData[id] = await executeLoader(id, routesWithServerLoader);
+          loaderData[id] = await executeLoader(id, routesWithServerLoader, serverLoaderArgs);
           resolve();
         })
       )
@@ -175,12 +175,16 @@ function createRequestHandler(opts) {
     if (req.url.startsWith("/__serverLoader") && req.query.route) {
       const data = await executeLoader(
         req.query.route,
-        opts.routesWithServerLoader
+        opts.routesWithServerLoader,
+        { request: req }
       );
       res.status(200).json(data);
       return;
     }
-    const jsx = await jsxGeneratorDeferrer(req.url);
+    const request = new Request(req.protocol + "://" + req.get("host") + req.originalUrl, {
+      headers: req.headers
+    });
+    const jsx = await jsxGeneratorDeferrer(req.url, { request });
     if (!jsx)
       return next();
     const writable = new import_stream.Writable();
@@ -209,7 +213,7 @@ function createUmiHandler(opts) {
       ...opts,
       ...params
     });
-    const jsx = await jsxGeneratorDeferrer(new URL(req.url).pathname);
+    const jsx = await jsxGeneratorDeferrer(new URL(req.url).pathname, { request: req });
     if (!jsx) {
       throw new Error("no page resource");
     }
@@ -219,7 +223,7 @@ function createUmiHandler(opts) {
 function createUmiServerLoader(opts) {
   return async function(req) {
     const query = Object.fromEntries(new URL(req.url).searchParams);
-    return await executeLoader(query.route, opts.routesWithServerLoader);
+    return await executeLoader(query.route, opts.routesWithServerLoader, { request: req });
   };
 }
 function matchRoutesForSSR(reqUrl, routesById) {
@@ -250,12 +254,12 @@ function createClientRoute(route) {
     index
   };
 }
-async function executeLoader(routeKey, routesWithServerLoader) {
+async function executeLoader(routeKey, routesWithServerLoader, serverLoaderArgs) {
   const mod = await routesWithServerLoader[routeKey]();
   if (!mod.serverLoader || typeof mod.serverLoader !== "function") {
     return;
   }
-  return await mod.serverLoader();
+  return mod.serverLoader(serverLoaderArgs);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.85",
+  "version": "4.0.87",
   "description": "@umijs/server",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/server#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -19,7 +19,7 @@
     "react": "18.1.0",
     "react-dom": "18.1.0",
     "react-router-dom": "6.3.0",
-    "@umijs/bundler-utils": "4.0.85"
+    "@umijs/bundler-utils": "4.0.87"
   },
   "publishConfig": {
     "access": "public"