chore: tweak presets

hi-ogawa · Jul 1, 2024 · a5ec6a3 · a5ec6a3
1 parent d9e2f13
commit a5ec6a3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 19 deletions.
diff --git a/packages/react-server/examples/prerender/vite.config.ts b/packages/react-server/examples/prerender/vite.config.ts
@@ -12,7 +12,12 @@ export default defineConfig({
   plugins: [
     react(),
     vitePluginReactServer({
-      prerender: (_manifest, presets) => presets.default(),
+      prerender: async (_manifest, presets) => {
+        return [
+          ...(await presets.static()),
+          ...(await presets.generateStaticParams()),
+        ];
+      },
     }),
     vitePluginLogger(),
     vitePluginSsrMiddleware({

diff --git a/packages/react-server/src/features/prerender/plugin.ts b/packages/react-server/src/features/prerender/plugin.ts
@@ -12,9 +12,7 @@ type MaybePromise<T> = Promise<T> | T;
 
 export type PrerenderFn = (
   manifest: RouteModuleManifest,
-  presets: {
-    default: () => Promise<string[]>;
-  },
+  presets: ReturnType<typeof createPrerenderPresets>,
 ) => MaybePromise<string[]>;
 
 export function prerenderPlugin({
@@ -37,9 +35,8 @@ export function prerenderPlugin({
           path.resolve("dist/server/__entry_ssr.js")
         );
         const { router } = await entry.importReactServer();
-        const routes = await prerender(router.manifest, {
-          default: () => prerenderPresetDefault(router.manifest),
-        });
+        const presets = createPrerenderPresets(router.manifest);
+        const routes = await prerender(router.manifest, presets);
         const entries = Array<{
           route: string;
           html: string;
@@ -93,22 +90,33 @@ export function prerenderPlugin({
   ];
 }
 
-async function prerenderPresetDefault(manifest: RouteModuleManifest) {
-  const result: string[] = [];
-  for (const entry of manifest.entries) {
-    const page = entry.module?.page;
-    if (page) {
-      if (entry.dynamic) {
-        if (page.generateStaticParams) {
+function createPrerenderPresets(manifest: RouteModuleManifest) {
+  const entries = manifest.entries;
+
+  return {
+    static: async () => {
+      const result: string[] = [];
+      for (const entry of entries) {
+        const page = entry.module?.page;
+        if (page && !entry.dynamic) {
+          result.push(entry.pathname);
+        }
+      }
+      return result;
+    },
+
+    generateStaticParams: async () => {
+      const result: string[] = [];
+      for (const entry of entries) {
+        const page = entry.module?.page;
+        if (page && entry.dynamic && page.generateStaticParams) {
           const generated = await page.generateStaticParams();
           for (const params of generated) {
             result.push(entry.format(params));
           }
         }
-      } else {
-        result.push(entry.pathname);
       }
-    }
-  }
-  return result;
+      return result;
+    },
+  };
 }