fix(rsc): tree-shake unused client reference module and fix build error

hi-ogawa · hi-ogawa · commit c1e53b80e5f3 · 2025-09-08T16:29:06.000+09:00
diff --git a/packages/plugin-rsc/examples/starter/package.json b/packages/plugin-rsc/examples/starter/package.json
@@ -18,6 +18,7 @@
     "@types/react-dom": "^19.1.9",
     "@vitejs/plugin-react": "latest",
     "@vitejs/plugin-rsc": "latest",
+    "react-tweet": "^3.2.2",
     "rsc-html-stream": "^0.0.7",
     "vite": "^7.1.4"
   }
diff --git a/packages/plugin-rsc/examples/starter/src/root.tsx b/packages/plugin-rsc/examples/starter/src/root.tsx
@@ -4,6 +4,13 @@ import { getServerCounter, updateServerCounter } from './action.tsx'
 import reactLogo from './assets/react.svg'
 import { ClientCounter } from './client.tsx'
 
+// repro
+import { Tweet } from 'react-tweet'
+console.log(Tweet)
+// import { useTweet } from 'react-tweet';
+// console.log(useTweet)
+// repro
+
 export function Root(props: { url: URL }) {
   return (
     <html lang="en">
diff --git a/packages/plugin-rsc/src/plugin.ts b/packages/plugin-rsc/src/plugin.ts
@@ -1226,12 +1226,14 @@ function vitePluginUseClient(
           // group client reference modules by `clientChunks` option
           manager.clientReferenceGroups = {}
           for (const meta of Object.values(manager.clientReferenceMetaMap)) {
+            // no server chunk associated when the module is tree-shaken
+            if (!meta.serverChunk) continue
             let name =
               useClientPluginOptions.clientChunks?.({
                 id: meta.importId,
                 normalizedId: manager.toRelativeId(meta.importId),
-                serverChunk: meta.serverChunk!,
-              }) ?? meta.serverChunk!
+                serverChunk: meta.serverChunk,
+              }) ?? meta.serverChunk
             // ensure clean virtual id to avoid interfering with other plugins
             name = cleanUrl(name.replaceAll('..', '__'))
             const group = (manager.clientReferenceGroups[name] ??= [])
@@ -1333,6 +1335,7 @@ function vitePluginUseClient(
         }
       },
       generateBundle(_options, bundle) {
+        if (manager.isScanBuild) return
         if (this.environment.name !== serverEnvironmentName) return
 
         // analyze rsc build to inform later client reference building.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`"@types/react-dom": "^19.1.9",`
`19`	`19`	`"@vitejs/plugin-react": "latest",`
`20`	`20`	`"@vitejs/plugin-rsc": "latest",`
	`21`	`+ "react-tweet": "^3.2.2",`
`21`	`22`	`"rsc-html-stream": "^0.0.7",`
`22`	`23`	`"vite": "^7.1.4"`
`23`	`24`	`}`