feat(adapters): use middleware before serveStatic

Author: dai-shi

packages/waku/src/adapters/aws-lambda.ts

@@ -30,14 +30,14 @@ export default createServerEntryAdapter(
       }
       return c.text('404 Not Found', 404);
     });
-    if (isBuild) {
-      app.use(serveStatic({ root: path.join(config.distDir, DIST_PUBLIC) }));
-    }
     app.use(contextMiddleware());
     for (const middlewareFn of middlewareFns) {
       app.use(middlewareFn());
     }
     app.use(middlewareRunner(middlewareModules as never));
+    if (isBuild) {
+      app.use(serveStatic({ root: path.join(config.distDir, DIST_PUBLIC) }));
+    }
     app.use(rscMiddleware({ processRequest }));
     const buildOptions: BuildOptions = {
       distDir: config.distDir,

packages/waku/src/adapters/bun.ts

@@ -28,6 +28,11 @@ export default createServerEntryAdapter(
       }
       return c.text('404 Not Found', 404);
     });
+    app.use(contextMiddleware());
+    for (const middlewareFn of middlewareFns) {
+      app.use(middlewareFn());
+    }
+    app.use(middlewareRunner(middlewareModules as never));
     if (isBuild) {
       app.use(
         `${config.basePath}*`,
@@ -37,11 +42,6 @@ export default createServerEntryAdapter(
         }),
       );
     }
-    app.use(contextMiddleware());
-    for (const middlewareFn of middlewareFns) {
-      app.use(middlewareFn());
-    }
-    app.use(middlewareRunner(middlewareModules as never));
     app.use(rscMiddleware({ processRequest }));
     const buildOptions: BuildOptions = {
       distDir: config.distDir,

packages/waku/src/adapters/deno.ts

@@ -32,14 +32,14 @@ export default createServerEntryAdapter(
       }
       return c.text('404 Not Found', 404);
     });
-    if (serveStatic) {
-      app.use(serveStatic({ root: path.join(config.distDir, DIST_PUBLIC) }));
-    }
     app.use(contextMiddleware());
     for (const middlewareFn of middlewareFns) {
       app.use(middlewareFn());
     }
     app.use(middlewareRunner(middlewareModules as never));
+    if (serveStatic) {
+      app.use(serveStatic({ root: path.join(config.distDir, DIST_PUBLIC) }));
+    }
     app.use(rscMiddleware({ processRequest }));
     const buildOptions: BuildOptions = {
       distDir: config.distDir,

packages/waku/src/adapters/node.ts

@@ -29,6 +29,11 @@ export default createServerEntryAdapter(
       }
       return c.text('404 Not Found', 404);
     });
+    app.use(contextMiddleware());
+    for (const middlewareFn of middlewareFns) {
+      app.use(middlewareFn());
+    }
+    app.use(middlewareRunner(middlewareModules as never));
     if (isBuild) {
       app.use(
         `${config.basePath}*`,
@@ -38,11 +43,6 @@ export default createServerEntryAdapter(
         }),
       );
     }
-    app.use(contextMiddleware());
-    for (const middlewareFn of middlewareFns) {
-      app.use(middlewareFn());
-    }
-    app.use(middlewareRunner(middlewareModules as never));
     app.use(rscMiddleware({ processRequest }));
     const buildOptions: BuildOptions = {
       distDir: config.distDir,