new defineEntries (and context middleware)

docs/redirects.mdx

@@ -52,9 +52,9 @@ import type { Config } from 'waku/config';
 
 export default {
   middleware: () => [
+    import('waku/middleware/context'),
     import('./src/middleware/redirects.js'),
     import('waku/middleware/dev-server'),
-    import('waku/middleware/headers'),
     import('waku/middleware/rsc'),
     import('waku/middleware/ssr'),
   ],

e2e/fixtures/broken-links/waku.config.ts

@@ -1,9 +1,9 @@
 /** @type {import('waku/config').Config} */
 export default {
   middleware: () => [
+    import('waku/middleware/context'),
     import('./src/redirects.js'),
     import('waku/middleware/dev-server'),
-    import('waku/middleware/headers'),
     import('waku/middleware/rsc'),
     import('waku/middleware/ssr'),
   ],

examples/12_nossr/waku.config.ts

@@ -1,6 +1,7 @@
 /** @type {import('waku/config').Config} */
 export default {
   middleware: () => [
+    import('waku/middleware/context'),
     import('waku/middleware/dev-server'),
     import('waku/middleware/rsc'),
     import('waku/middleware/fallback'),

examples/31_minimal/src/entries.tsx

@@ -1,27 +1,24 @@
-import { defineEntries } from 'waku/server';
-import { Slot } from 'waku/client';
+import {
+  new_defineEntries,
+  unstable_renderRsc as renderRsc,
+  unstable_decodeRscPath as decodeRscPath,
+} from 'waku/minimal/server';
 
 import App from './components/App';
 
-export default defineEntries(
-  // renderEntries
-  async (rscPath) => {
-    return {
-      App: <App name={rscPath || 'Waku'} />,
-    };
-  },
-  // getBuildConfig
-  async () => [{ pathname: '/', entries: [{ rscPath: '' }] }],
-  // getSsrConfig
-  async (pathname) => {
-    switch (pathname) {
-      case '/':
-        return {
-          rscPath: '',
-          html: <Slot id="App" />,
-        };
-      default:
-        return null;
+export default new_defineEntries({
+  unstable_handleRequest: async (config, ctx) => {
+    const basePrefix = config.basePath + config.rscBase + '/';
+    if (ctx.req.url.pathname.startsWith(basePrefix)) {
+      const rscPath = decodeRscPath(
+        decodeURI(ctx.req.url.pathname.slice(basePrefix.length)),
+      );
+      ctx.res.body = renderRsc(config, ctx, {
+        App: <App name={rscPath || 'Waku'} />,
+      });
     }
   },
-);
+  unstable_getBuildConfig: async () => [
+    { pathname: '/', entries: [{ rscPath: '' }] },
+  ],
+});

examples/31_minimal/waku.config.ts

@@ -0,0 +1,9 @@
+/** @type {import('waku/config').Config} */
+export default {
+  middleware: () => [
+    import('waku/middleware/context'),
+    import('waku/middleware/dev-server'),
+    import('waku/middleware/handler'),
+    import('waku/middleware/fallback'),
+  ],
+};

examples/38_cookies/waku.config.ts

@@ -1,9 +1,9 @@
 /** @type {import('waku/config').Config} */
 export default {
   middleware: () => [
+    import('waku/middleware/context'),
     import('./src/middleware/cookie.js'),
     import('waku/middleware/dev-server'),
-    import('waku/middleware/headers'),
     import('waku/middleware/rsc'),
     import('waku/middleware/ssr'),
   ],

examples/39_api/waku.config.ts

@@ -1,9 +1,9 @@
 /** @type {import('waku/config').Config} */
 export default {
   middleware: () => [
+    import('waku/middleware/context'),
     import('./src/middleware/api.js'),
     import('waku/middleware/dev-server'),
-    import('waku/middleware/headers'),
     import('waku/middleware/rsc'),
     import('waku/middleware/ssr'),
   ],

packages/waku/package.json

@@ -42,6 +42,14 @@
       "types": "./dist/client.d.ts",
       "default": "./dist/client.js"
     },
+    "./minimal/server": {
+      "types": "./dist/minimal/server.d.ts",
+      "default": "./dist/minimal/server.js"
+    },
+    "./minimal/client": {
+      "types": "./dist/minimal/client.d.ts",
+      "default": "./dist/minimal/client.js"
+    },
     "./server": {
       "types": "./dist/server.d.ts",
       "default": "./dist/server.js"