refactor: prerenderPlugin

hi-ogawa · Jul 5, 2024 · 9f14962 · 9f14962
1 parent 29e4f4d
commit 9f14962
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/packages/react-server/src/features/prerender/plugin.ts b/packages/react-server/src/features/prerender/plugin.ts
@@ -27,28 +27,37 @@ type PrerenderEntry = {
   data: string;
 };
 
-export function prerenderPlugin({
-  manager,
-  prerender,
-}: {
+export function prerenderPlugin(options: {
   manager: PluginStateManager;
-  prerender: PrerenderFn;
+  prerender?: PrerenderFn;
 }): Plugin[] {
   return [
     {
       name: prerenderPlugin + ":build",
       enforce: "post",
-      apply: () => manager.buildType === "ssr",
+      apply: () => !!options.prerender && options.manager.buildType === "ssr",
+      config: () => {
+        return {
+          build: {
+            rollupOptions: {
+              input: {
+                __entry_ssr: "@hiogawa/react-server/entry/ssr",
+              },
+            },
+          },
+        };
+      },
       writeBundle: {
         sequential: true,
         handler() {
-          return processPrerender(prerender);
+          tinyassert(options.prerender);
+          return processPrerender(options.prerender);
         },
       },
     },
     {
       name: prerenderPlugin + ":preview",
-      apply: (_config, env) => !!env.isPreview,
+      apply: (_config, env) => !!options.prerender && !!env.isPreview,
       configurePreviewServer(server) {
         const outDir = server.config.build.outDir;
         server.middlewares.use((req, _res, next) => {
@@ -149,7 +158,7 @@ export function pprPlugin(options: {
           build: {
             rollupOptions: {
               input: {
-                // create a separate entry to replace content during writeBundle
+                __entry_ssr: "@hiogawa/react-server/entry/ssr",
                 __ppr_manifest: "virtual:ppr-manifest",
               },
             },

diff --git a/packages/react-server/src/plugin/index.ts b/packages/react-server/src/plugin/index.ts
@@ -296,12 +296,6 @@ export function vitePluginReactServer(options?: {
           outDir: env.isSsrBuild ? "dist/server" : "dist/client",
           rollupOptions: env.isSsrBuild
             ? {
-                input:
-                  options?.prerender || options?.ppr
-                    ? {
-                        __entry_ssr: "@hiogawa/react-server/entry/ssr",
-                      }
-                    : undefined,
                 output: OUTPUT_SERVER_JS_EXT,
               }
             : {
@@ -427,9 +421,7 @@ export function vitePluginReactServer(options?: {
     ...vitePluginClientUseClient({ manager }),
     ...vitePluginServerAssets({ manager, entryBrowser, entryServer }),
     ...routeManifestPluginClient({ manager }),
-    ...(options?.prerender
-      ? prerenderPlugin({ manager, prerender: options.prerender })
-      : []),
+    ...prerenderPlugin({ manager, prerender: options?.prerender }),
     ...pprPlugin({ manager, ppr: options?.ppr }),
     validateImportPlugin({
       "client-only": true,