fix: virtual:server-css-proxy wait for buildSteps.closeBundleServer

hi-ogawa · Jun 6, 2024 · 6882de1 · 6882de1
1 parent fbd6cd1
commit 6882de1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/packages/react-server/src/features/assets/plugin.ts b/packages/react-server/src/features/assets/plugin.ts
@@ -117,10 +117,7 @@ export function vitePluginServerAssets({
         return code + `if (import.meta.hot) { import.meta.hot.accept() }`;
       }
       if (manager.buildType) {
-        // TODO: this virtual also needs to wait for server build
-        if (1) {
-          return "";
-        }
+        await manager.buildSteps.closeBundleServer;
         // TODO: probe manifest to collect css?
         const files = await fs.promises.readdir("./dist/rsc/assets", {
           withFileTypes: true,

diff --git a/packages/react-server/src/plugin/index.ts b/packages/react-server/src/plugin/index.ts
@@ -69,9 +69,8 @@ class PluginStateManager {
   buildSteps = {
     buildStartBrowser: createManualPromise<void>(),
     buildStartServer: createManualPromise<void>(),
-    buildEndBrowser: createManualPromise<void>(),
-    buildEndServer: createManualPromise<void>(),
     virtualClientReferenes: createManualPromise<void>(),
+    closeBundleServer: createManualPromise<void>(),
   };
 
   routeToClientReferences: Record<string, string[]> = {};
@@ -207,13 +206,10 @@ export function vitePluginReactServer(options?: {
             }
           },
         },
-        buildEnd: {
+        closeBundle: {
           order: "post",
           async handler() {
-            if (manager.buildType === "parallel") {
-              manager.buildSteps.buildEndServer.resolve();
-              await manager.buildSteps.buildEndBrowser;
-            }
+            manager.buildSteps.closeBundleServer.resolve();
           },
         },
       },
@@ -380,15 +376,6 @@ export function vitePluginReactServer(options?: {
           }
         },
       },
-      buildEnd: {
-        order: "post",
-        async handler() {
-          if (manager.buildType === "parallel") {
-            manager.buildSteps.buildEndBrowser.resolve();
-            await manager.buildSteps.buildEndServer;
-          }
-        },
-      },
     },
     vitePluginSilenceDirectiveBuildWarning(),
     vitePluginClientUseServer({