breaking(minimal): handleBuild API for build (#1093)

also changes define-router
dai-shi · Dec 28, 2024 · ba89aa2 · ba89aa2
1 parent ec87f81
commit ba89aa2
Show file tree

Hide file tree

Showing 23 changed files with 849 additions and 376 deletions.
diff --git a/e2e/fixtures/define-router/src/entries.tsx b/e2e/fixtures/define-router/src/entries.tsx
@@ -69,8 +69,8 @@ const entries: ReturnType<typeof defineEntries> = defineEntries({
     }
     return router.handleRequest(input, utils);
   },
-  getBuildConfig: (utils) => {
-    return router.getBuildConfig(utils);
+  handleBuild: (utils) => {
+    return router.handleBuild(utils);
   },
 });
 

diff --git a/e2e/fixtures/rsc-basic/src/entries.tsx b/e2e/fixtures/rsc-basic/src/entries.tsx
@@ -12,7 +12,7 @@ const entries: ReturnType<typeof defineEntries> = defineEntries({
       return renderRsc({ _value: value });
     }
   },
-  getBuildConfig: async () => [{ pathSpec: [], entries: [{ rscPath: '' }] }],
+  handleBuild: () => null,
 });
 
 export default entries;
diff --git a/e2e/fixtures/rsc-css-modules/src/entries.tsx b/e2e/fixtures/rsc-css-modules/src/entries.tsx
@@ -12,7 +12,7 @@ const entries: ReturnType<typeof defineEntries> = defineEntries({
       return renderRsc({ _value: value });
     }
   },
-  getBuildConfig: async () => [{ pathSpec: [], entries: [{ rscPath: '' }] }],
+  handleBuild: () => null,
 });
 
 export default entries;
diff --git a/e2e/fixtures/ssr-basic/src/entries.tsx b/e2e/fixtures/ssr-basic/src/entries.tsx
@@ -1,5 +1,6 @@
 import { unstable_defineEntries as defineEntries } from 'waku/minimal/server';
 import { Slot } from 'waku/minimal/client';
+import { unstable_createAsyncIterable as createAsyncIterable } from 'waku/server';
 
 import App from './components/App.js';
 
@@ -18,7 +19,16 @@ const entries: ReturnType<typeof defineEntries> = defineEntries({
       });
     }
   },
-  getBuildConfig: async () => [{ pathSpec: [], entries: [{ rscPath: '' }] }],
+  handleBuild: () =>
+    createAsyncIterable(async () => {
+      const tasks = [
+        async () => ({
+          type: 'htmlHead' as const,
+          pathSpec: [],
+        }),
+      ];
+      return tasks;
+    }),
 });
 
 export default entries;
diff --git a/e2e/fixtures/ssr-context-provider/src/entries.tsx b/e2e/fixtures/ssr-context-provider/src/entries.tsx
@@ -1,5 +1,6 @@
 import { unstable_defineEntries as defineEntries } from 'waku/minimal/server';
 import { Slot } from 'waku/minimal/client';
+import { unstable_createAsyncIterable as createAsyncIterable } from 'waku/server';
 
 import App from './components/app.js';
 
@@ -16,7 +17,16 @@ const entries: ReturnType<typeof defineEntries> = defineEntries({
       return renderHtml({ App: <App /> }, <Slot id="App" />, { rscPath: '' });
     }
   },
-  getBuildConfig: async () => [{ pathSpec: [], entries: [{ rscPath: '' }] }],
+  handleBuild: () =>
+    createAsyncIterable(async () => {
+      const tasks = [
+        async () => ({
+          type: 'htmlHead' as const,
+          pathSpec: [],
+        }),
+      ];
+      return tasks;
+    }),
 });
 
 export default entries;
diff --git a/e2e/fixtures/ssr-swr/src/entries.tsx b/e2e/fixtures/ssr-swr/src/entries.tsx
@@ -1,5 +1,6 @@
 import { unstable_defineEntries as defineEntries } from 'waku/minimal/server';
 import { Slot } from 'waku/minimal/client';
+import { unstable_createAsyncIterable as createAsyncIterable } from 'waku/server';
 
 import App from './components/App.js';
 
@@ -18,7 +19,16 @@ const entries: ReturnType<typeof defineEntries> = defineEntries({
       });
     }
   },
-  getBuildConfig: async () => [{ pathSpec: [], entries: [{ rscPath: '' }] }],
+  handleBuild: () =>
+    createAsyncIterable(async () => {
+      const tasks = [
+        async () => ({
+          type: 'htmlHead' as const,
+          pathSpec: [],
+        }),
+      ];
+      return tasks;
+    }),
 });
 
 export default entries;
diff --git a/e2e/fixtures/ssr-target-bundle/src/entries.tsx b/e2e/fixtures/ssr-target-bundle/src/entries.tsx
@@ -1,5 +1,6 @@
 import { unstable_defineEntries as defineEntries } from 'waku/minimal/server';
 import { Slot } from 'waku/minimal/client';
+import { unstable_createAsyncIterable as createAsyncIterable } from 'waku/server';
 
 import App from './components/App.js';
 
@@ -18,7 +19,16 @@ const entries: ReturnType<typeof defineEntries> = defineEntries({
       });
     }
   },
-  getBuildConfig: async () => [{ pathSpec: [], entries: [{ rscPath: '' }] }],
+  handleBuild: () =>
+    createAsyncIterable(async () => {
+      const tasks = [
+        async () => ({
+          type: 'htmlHead' as const,
+          pathSpec: [],
+        }),
+      ];
+      return tasks;
+    }),
 });
 
 export default entries;
diff --git a/examples/12_nossr/src/entries.ts b/examples/12_nossr/src/entries.ts
@@ -14,7 +14,7 @@ export default defineEntries({
     }
     return router.handleRequest(input, utils);
   },
-  getBuildConfig: (utils) => {
-    return router.getBuildConfig(utils);
+  handleBuild: (utils) => {
+    return router.handleBuild(utils);
   },
 });
diff --git a/examples/31_minimal/src/entries.tsx b/examples/31_minimal/src/entries.tsx
@@ -1,5 +1,6 @@
 import { unstable_defineEntries as defineEntries } from 'waku/minimal/server';
 import { Slot } from 'waku/minimal/client';
+import { unstable_createAsyncIterable as createAsyncIterable } from 'waku/server';
 
 import App from './components/App';
 
@@ -14,5 +15,42 @@ export default defineEntries({
       });
     }
   },
-  getBuildConfig: async () => [{ pathSpec: [], entries: [{ rscPath: '' }] }],
+  handleBuild: ({
+    // renderRsc,
+    // renderHtml,
+    // rscPath2pathname,
+    unstable_generatePrefetchCode,
+  }) =>
+    createAsyncIterable(async () => {
+      const moduleIds = new Set<string>();
+      const generateHtmlHead = () =>
+        `<script type="module" async>${unstable_generatePrefetchCode(
+          [''],
+          moduleIds,
+        )}</script>`;
+      const tasks = [
+        async () => ({
+          type: 'htmlHead' as const,
+          pathSpec: [],
+          head: generateHtmlHead(),
+        }),
+        // async () => ({
+        //   type: 'file' as const,
+        //   pathname: rscPath2pathname(''),
+        //   body: renderRsc(
+        //     { App: <App name="Waku" /> },
+        //     { moduleIdCallback: (id) => moduleIds.add(id) },
+        //   ),
+        // }),
+        // async () => ({
+        //   type: 'file' as const,
+        //   pathname: '/',
+        //   body: renderHtml({ App: <App name="Waku" /> }, <Slot id="App" />, {
+        //     rscPath: '',
+        //     htmlHead: generateHtmlHead(),
+        //   }).then(({ body }) => body),
+        // }),
+      ];
+      return tasks;
+    }),
 });
diff --git a/examples/32_minimal_js/src/entries.jsx b/examples/32_minimal_js/src/entries.jsx
@@ -1,5 +1,6 @@
 import { unstable_defineEntries as defineEntries } from 'waku/minimal/server';
 import { Slot } from 'waku/minimal/client';
+import { unstable_createAsyncIterable as createAsyncIterable } from 'waku/server';
 
 import App from './components/app';
 
@@ -14,5 +15,42 @@ export default defineEntries({
       });
     }
   },
-  getBuildConfig: async () => [{ pathSpec: [], entries: [{ rscPath: '' }] }],
+  handleBuild: ({
+    // renderRsc,
+    // renderHtml,
+    // rscPath2pathname,
+    unstable_generatePrefetchCode,
+  }) =>
+    createAsyncIterable(async () => {
+      const moduleIds = new Set();
+      const generateHtmlHead = () =>
+        `<script type="module" async>${unstable_generatePrefetchCode(
+          [''],
+          moduleIds,
+        )}</script>`;
+      const tasks = [
+        async () => ({
+          type: 'htmlHead',
+          pathSpec: [],
+          head: generateHtmlHead(),
+        }),
+        // async () => ({
+        //   type: 'file',
+        //   pathname: rscPath2pathname(''),
+        //   body: await renderRsc(
+        //     { App: <App name="Waku" /> },
+        //     { moduleIdCallback: (id) => moduleIds.add(id) },
+        //   ),
+        // }),
+        // async () => ({
+        //   type: 'file',
+        //   pathname: '/',
+        //   body: renderHtml({ App: <App name="Waku" /> }, <Slot id="App" />, {
+        //     rscPath: '',
+        //     htmlHead: generateHtmlHead(),
+        //   }).then(({ body }) => body),
+        // }),
+      ];
+      return tasks;
+    }),
 });
diff --git a/examples/33_promise/src/entries.tsx b/examples/33_promise/src/entries.tsx
@@ -1,5 +1,6 @@
 import { unstable_defineEntries as defineEntries } from 'waku/minimal/server';
 import { Children, Slot } from 'waku/minimal/client';
+import { unstable_createAsyncIterable as createAsyncIterable } from 'waku/server';
 
 import App from './components/App';
 
@@ -30,5 +31,42 @@ export default defineEntries({
       );
     }
   },
-  getBuildConfig: async () => [{ pathSpec: [], entries: [{ rscPath: '' }] }],
+  handleBuild: ({
+    // renderRsc,
+    // renderHtml,
+    // rscPath2pathname,
+    unstable_generatePrefetchCode,
+  }) =>
+    createAsyncIterable(async () => {
+      const moduleIds = new Set<string>();
+      const generateHtmlHead = () =>
+        `<script type="module" async>${unstable_generatePrefetchCode(
+          [''],
+          moduleIds,
+        )}</script>`;
+      const tasks = [
+        async () => ({
+          type: 'htmlHead' as const,
+          pathSpec: [],
+          head: generateHtmlHead(),
+        }),
+        // async () => ({
+        //   type: 'file' as const,
+        //   pathname: rscPath2pathname(''),
+        //   body: await renderRsc(
+        //     { App: <App name="Waku" /> },
+        //     { moduleIdCallback: (id) => moduleIds.add(id) },
+        //   ),
+        // }),
+        // async () => ({
+        //   type: 'file' as const,
+        //   pathname: '/',
+        //   body: renderHtml({ App: <App name="Waku" /> }, <Slot id="App" />, {
+        //     rscPath: '',
+        //     htmlHead: generateHtmlHead(),
+        //   }).then(({ body }) => body),
+        // }),
+      ];
+      return tasks;
+    }),
 });
diff --git a/examples/34_functions/src/entries.tsx b/examples/34_functions/src/entries.tsx
@@ -1,5 +1,6 @@
 import { unstable_defineEntries as defineEntries } from 'waku/minimal/server';
 import { Slot } from 'waku/minimal/client';
+import { unstable_createAsyncIterable as createAsyncIterable } from 'waku/server';
 
 import App from './components2/App';
 import { runWithRerender } from './als';
@@ -25,5 +26,42 @@ export default defineEntries({
       });
     }
   },
-  getBuildConfig: async () => [{ pathSpec: [], entries: [{ rscPath: '' }] }],
+  handleBuild: ({
+    // renderRsc,
+    // renderHtml,
+    // rscPath2pathname,
+    unstable_generatePrefetchCode,
+  }) =>
+    createAsyncIterable(async () => {
+      const moduleIds = new Set<string>();
+      const generateHtmlHead = () =>
+        `<script type="module" async>${unstable_generatePrefetchCode(
+          [''],
+          moduleIds,
+        )}</script>`;
+      const tasks = [
+        async () => ({
+          type: 'htmlHead' as const,
+          pathSpec: [],
+          head: generateHtmlHead(),
+        }),
+        // async () => ({
+        //   type: 'file' as const,
+        //   pathname: rscPath2pathname(''),
+        //   body: await renderRsc(
+        //     { App: <App name="Waku" /> },
+        //     { moduleIdCallback: (id) => moduleIds.add(id) },
+        //   ),
+        // }),
+        // async () => ({
+        //   type: 'file' as const,
+        //   pathname: '/',
+        //   body: renderHtml({ App: <App name="Waku" /> }, <Slot id="App" />, {
+        //     rscPath: '',
+        //     htmlHead: generateHtmlHead(),
+        //   }).then(({ body }) => body),
+        // }),
+      ];
+      return tasks;
+    }),
 });