fix: faviconPlugin should after staticPlugin & update integration test (

#6019)
web-infra-dev · Jul 30, 2024 · 604ad3a · 604ad3a
1 parent f19b9dc
commit 604ad3a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/.changeset/tender-trees-move.md b/.changeset/tender-trees-move.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/prod-server': patch
+'@modern-js/server-core': patch
+---
+
+fix: faviconPlugin should after staticPlugin
+fix: faviconPlugin 应该在 staticPlugin 之后
diff --git a/packages/server/core/src/plugins/default.ts b/packages/server/core/src/plugins/default.ts
@@ -11,7 +11,6 @@ import {
 } from './monitors';
 import { processedByPlugin } from './processedBy';
 import { logPlugin } from './log';
-import { faviconPlugin } from './favicon';
 
 export type CreateDefaultPluginsOptions = InjectRenderHandlerOptions & {
   logger?: Logger;
@@ -27,7 +26,6 @@ export function createDefaultPlugins(
     injectServerTiming(),
     logPlugin(),
     processedByPlugin(),
-    faviconPlugin(),
   ];
 
   return plugins;

diff --git a/packages/server/prod-server/src/apply.ts b/packages/server/prod-server/src/apply.ts
@@ -6,6 +6,7 @@ import {
   renderPlugin,
   NodeServer,
   createDefaultPlugins,
+  faviconPlugin,
 } from '@modern-js/server-core';
 import {
   serverStaticPlugin,
@@ -58,6 +59,7 @@ export async function applyPlugins(
     ...(options.plugins || []),
     injectResourcePlugin(),
     serverStaticPlugin(),
+    faviconPlugin(),
     renderPlugin(),
   ];
 

diff --git a/tests/integration/ssr/fixtures/partial/src/one/routes/a/page.tsx b/tests/integration/ssr/fixtures/partial/src/one/routes/a/page.tsx
@@ -3,7 +3,7 @@ import { Link, useLoaderData } from '@modern-js/runtime/router';
 export default () => {
   const data = useLoaderData() as string;
   return (
-    <div>
+    <div className="page-a">
       {data}
       <Link to="/b">jupmp to B</Link>
     </div>

diff --git a/tests/integration/ssr/tests/partial.test.ts b/tests/integration/ssr/tests/partial.test.ts
@@ -54,6 +54,7 @@ describe('test partial ssr', () => {
 
     await page.goto(`http://localhost:${appPort}/one/a`);
     await page.waitForSelector('#root_layout');
+    await page.waitForSelector('.page-a');
     const pageContent = await page.content();
     expect(pageContent).toContain('root layout');
     expect(pageContent).toContain('PageA Data');
@@ -66,6 +67,8 @@ describe('test partial ssr', () => {
 
     await page.goto(`http://localhost:${appPort}/one/b`);
     await page.waitForSelector('#root_layout');
+    await page.waitForSelector('.page-b');
+
     const pageContent = await page.content();
     expect(pageContent).toContain('root layout');
     expect(pageContent).toContain('PageB Data');
@@ -89,8 +92,11 @@ describe('test partial ssr', () => {
 
     await page.goto(`http://localhost:${appPort}/one/b/d`);
     await page.waitForSelector('#root_layout');
+    await page.waitForSelector('.page-d');
+
     const pageContent = await page.content();
     expect(pageContent).toContain('root layout');
+
     expect(pageContent).toContain('PageD Data');
   });
 });