fix(server): should get context from unstable middleware correctly (#…

…6391)

.changeset/strong-toes-trade.md

@@ -0,0 +1,7 @@
+---
+'@modern-js/plugin-data-loader': patch
+'@modern-js/server-core': patch
+---
+
+fix(server): should get context from unstable middleware correctly
+fix(server): 应该正确地获取到 loaderContext

packages/cli/plugin-data-loader/src/runtime/index.ts

@@ -64,6 +64,7 @@ export const handleRequest = async ({
   onError?: (error: unknown) => void;
   onTiming?: (name: string, dur: number) => void;
   context: {
+    loaderContext?: Map<string, unknown>;
     reporter?: Reporter;
   };
 }): Promise<Response | void> => {
@@ -77,13 +78,13 @@ export const handleRequest = async ({
 
   const basename = entry.urlPath;
   const end = time();
-  const { reporter } = context;
+  const { reporter, loaderContext } = context;
   const routes = transformNestedRoutes(routesConfig, reporter);
   const { queryRoute } = createStaticHandler(routes, {
     basename,
   });
 
-  const requestContext = createRequestContext();
+  const requestContext = createRequestContext(loaderContext);
   // initial requestContext
   // 1. inject reporter
   requestContext.set(reporterCtx, reporter);

packages/server/core/src/plugins/render/dataHandler.ts

@@ -11,6 +11,7 @@ export const dataHandler = async (
     onError,
     onTiming,
     serverManifest,
+    loaderContext,
   }: SSRRenderOptions & {
     serverRoutes: ServerRoute[];
   },
@@ -28,6 +29,7 @@ export const dataHandler = async (
     serverRoutes,
     context: {
       reporter,
+      loaderContext,
     },
     onTiming,
     onError,

packages/server/core/src/types/server.ts

@@ -35,6 +35,7 @@ type ServerLoaderBundle = {
     routes: NestedRoute[];
     context: {
       reporter?: Reporter;
+      loaderContext?: Map<string, unknown>;
     };
 
     onError?: OnError;

tests/integration/server-hook/new-middleware/src/routes/login/page.tsx

@@ -1,3 +1,12 @@
+import { Link } from '@modern-js/runtime/router';
+
 export default function Page() {
-  return <div>Login</div>;
+  return (
+    <div>
+      Login
+      <Link className="to-home" to="/">
+        Home
+      </Link>
+    </div>
+  );
 }

tests/integration/server-hook/new-middleware/tests/index.test.ts

@@ -96,4 +96,21 @@ describe('test new middleware run correctly', () => {
 
     expect(body).toMatch(message);
   });
+
+  test('should get loaderContext correctly', async () => {
+    const url = `http://localhost:${port}/`;
+    const response = await axios.get(url);
+    const body = response.data;
+    expect(body).toMatch('Liming');
+    await page.goto(`http://localhost:${port}/login`, {
+      waitUntil: ['networkidle0'],
+    });
+
+    const element = await page.$('.to-home');
+    await element?.click();
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    const rootElm = await page.$('#root');
+    const targetText = await page.evaluate(el => el?.textContent, rootElm);
+    expect(targetText?.trim()).toEqual('Hello Liming');
+  });
 });