fix(dev): proper not found handling (#1136)

close #1135

Author: dai-shi

e2e/fixtures/define-router/src/entries.tsx

@@ -1,7 +1,6 @@
 import type { ReactNode } from 'react';
 import { unstable_defineRouter as defineRouter } from 'waku/router/server';
 import { Slot, Children } from 'waku/minimal/client';
-import { unstable_defineEntries as defineEntries } from 'waku/minimal/server';
 
 import Layout from './routes/layout.js';
 import Page from './routes/page.js';
@@ -62,16 +61,4 @@ const router: ReturnType<typeof defineRouter> = defineRouter({
   },
 });
 
-const entries: ReturnType<typeof defineEntries> = defineEntries({
-  handleRequest: async (input, utils) => {
-    if (input.type === 'custom') {
-      return null; // no ssr
-    }
-    return router.handleRequest(input, utils);
-  },
-  handleBuild: (utils) => {
-    return router.handleBuild(utils);
-  },
-});
-
-export default entries;
+export default router;

e2e/ssr-basic.spec.ts

@@ -25,6 +25,11 @@ for (const mode of ['DEV', 'PRD'] as const) {
       await expect(page.getByTestId('count')).toHaveText('3');
     });
 
+    test('not found', async ({ page }) => {
+      await page.goto(`http://localhost:${port}/does-not-exist.txt`);
+      await expect(page.getByText('Not Found')).toBeVisible();
+    });
+
     test('vercel ai', async ({ page }) => {
       await page.goto(`http://localhost:${port}/`);
       const aiLocator = page.getByTestId('vercel-ai');

packages/waku/src/lib/middleware/dev-server-impl.ts

@@ -128,7 +128,7 @@ const createMainViteServer = (
               include: ['react-server-dom-webpack/client.edge'],
             },
           },
-          appType: 'custom',
+          appType: 'mpa',
           server: { middlewareMode: true },
         },
         config,
@@ -460,6 +460,8 @@ export const devServer: Middleware = (options) => {
     const body = await readablePromise;
     if (body) {
       ctx.res.body = body;
+    } else if (ctx.res.status === 404) {
+      delete ctx.res.status;
     }
   };
 };

packages/waku/src/lib/plugins/vite-plugin-rsc-index.ts

@@ -44,19 +44,23 @@ export function rscIndexPlugin(opts: {
     },
     configureServer(server) {
       return () => {
-        server.middlewares.use((req, res) => {
-          server
-            .transformIndexHtml(req.url || '', html)
-            .then((content) => {
-              res.statusCode = 200;
-              res.setHeader('content-type', 'text/html; charset=utf-8');
-              res.end(content);
-            })
-            .catch((err) => {
-              console.error('Error transforming index.html', err);
-              res.statusCode = 500;
-              res.end('Internal Server Error');
-            });
+        server.middlewares.use((req, res, next) => {
+          if (req.url === opts.basePath) {
+            server
+              .transformIndexHtml(req.url, html)
+              .then((content) => {
+                res.statusCode = 200;
+                res.setHeader('content-type', 'text/html; charset=utf-8');
+                res.end(content);
+              })
+              .catch((err) => {
+                console.error('Error transforming index.html', err);
+                res.statusCode = 500;
+                res.end('Internal Server Error');
+              });
+          } else {
+            next();
+          }
         });
       };
     },