chore: cleanup

Author: hi-ogawa

packages/rsc/src/core/rsc.ts

@@ -107,11 +107,11 @@ export function createClientManifest(): BundlerConfig {
     {
       get(_target, $$id, _receiver) {
         tinyassert(typeof $$id === "string");
-        let [key, name] = $$id.split("#");
-        tinyassert(key);
+        const [id, name] = $$id.split("#");
+        tinyassert(id);
         tinyassert(name);
         return {
-          id: JSON.stringify({ id: key, cacheTag, ...manifest[key], key }),
+          id: JSON.stringify({ id, cacheTag, ...manifest[id] }),
           name,
           chunks: [],
           async: true,
@@ -122,7 +122,7 @@ export function createClientManifest(): BundlerConfig {
 }
 
 export type ClientReferencePayload = {
-  key?: string;
+  key: string;
   id: string;
   js: string[];
   css: string[];

packages/rsc/src/plugin.ts

@@ -369,7 +369,6 @@ export default function vitePluginRsc({
                 css: [],
               },
             },
-            clientReferenceDeps: {},
             clientReferenceManifest: {},
           };
           return `export default ${JSON.stringify(manifest, null, 2)}`;
@@ -398,7 +397,6 @@ export default function vitePluginRsc({
           }
 
           const chunkToDeps = collectAssetDeps(bundle);
-          const clientReferenceDeps: Record<string, AssetDeps> = {};
           const clientReferenceManifest: ClientReferenceManifest = {};
           const idToDeps: Record<
             string,
@@ -417,8 +415,8 @@ export default function vitePluginRsc({
               `missing client reference chunk '${id}'`,
             );
             const { deps, chunk } = idToDeps[moduleId]!;
-            clientReferenceDeps[meta.referenceKey] = deps;
             clientReferenceManifest[meta.referenceKey] = {
+              key: meta.referenceKey,
               id: "/" + chunk.fileName,
               js: deps.js,
               css: deps.css,
@@ -431,7 +429,6 @@ export default function vitePluginRsc({
               bootstrapModules: [`/${entry.chunk.fileName}`],
               deps: entry.deps,
             },
-            clientReferenceDeps,
             clientReferenceManifest,
           };
           this.emitFile({
@@ -887,8 +884,6 @@ function generateDynamicImportCode(map: Record<string, string>) {
 
 export type AssetsManifest = {
   entry: { bootstrapModules: string[]; deps: AssetDeps };
-  // TODO: remove `clientReferenceDeps` in favor of `clientReferenceManifest`
-  clientReferenceDeps: Record<string, AssetDeps>;
   clientReferenceManifest: ClientReferenceManifest;
 };
 

packages/rsc/src/ssr.tsx

@@ -20,7 +20,7 @@ export function initialize(): void {
         );
         return wrapResourceProxy(mod, { js: [], css: modCss.default });
       } else {
-        const id = payload.key!;
+        const id = payload.key;
         const import_ = clientReferences.default[id];
         if (!import_) {
           throw new Error(`client reference not found '${id}'`);