chore(react-server-dom-vite): minor fixup (#81)

Author: hi-ogawa

react-server-dom-vite-example/package.json

@@ -12,7 +12,7 @@
 		"lint-check": "biome check ."
 	},
 	"dependencies": {
-		"@jacob-ebey/react-server-dom-vite": "19.0.0-experimental.14",
+		"react-server-dom-vite": "npm:@jacob-ebey/react-server-dom-vite@19.0.0-experimental.14",
 		"react": "^19.0.0",
 		"react-dom": "^19.0.0"
 	},

react-server-dom-vite-example/pnpm-lock.yaml

@@ -1,6 +1,6 @@
-import ReactClient from "@jacob-ebey/react-server-dom-vite/client";
 import React from "react";
 import ReactDomClient from "react-dom/client";
+import ReactClient from "react-server-dom-vite/client";
 import type { ServerPayload } from "./entry.rsc";
 import type { CallServerFn } from "./types";
 import { clientReferenceManifest } from "./utils/client-reference";

react-server-dom-vite-example/src/entry.client.tsx

@@ -1,5 +1,5 @@
-import ReactServer from "@jacob-ebey/react-server-dom-vite/server";
 import type { ReactFormState } from "react-dom/client";
+import ReactServer from "react-server-dom-vite/server";
 import { Router } from "./app/routes";
 import type {
 	ClientReferenceMetadataManifest,

react-server-dom-vite-example/src/entry.rsc.tsx

@@ -1,6 +1,6 @@
 import type { IncomingMessage, ServerResponse } from "node:http";
-import ReactClient from "@jacob-ebey/react-server-dom-vite/client";
 import ReactDomServer from "react-dom/server";
+import ReactClient from "react-server-dom-vite/client";
 import type { ModuleRunner } from "vite/module-runner";
 import type { ServerPayload } from "./entry.rsc";
 import { clientReferenceManifest } from "./utils/client-reference";

react-server-dom-vite-example/src/entry.ssr.tsx

@@ -1,6 +1,6 @@
 /// <reference types="vite/client" />
 
-declare module "@jacob-ebey/react-server-dom-vite/server" {
+declare module "react-server-dom-vite/server" {
 	export function renderToPipeableStream<T>(
 		data: T,
 		manifest: import(".").ClientReferenceMetadataManifest,
@@ -21,7 +21,7 @@ declare module "@jacob-ebey/react-server-dom-vite/server" {
 	): Promise<import("react-dom/client").ReactFormState>;
 }
 
-declare module "@jacob-ebey/react-server-dom-vite/client" {
+declare module "react-server-dom-vite/client" {
 	export function createFromNodeStream<T>(
 		stream: import("node:stream").Readable,
 		manifest: import(".").ClientReferenceManifest,

react-server-dom-vite-example/src/types/ambient.d.ts

@@ -19,6 +19,9 @@ export default defineConfig({
 	appType: "custom",
 	environments: {
 		client: {
+			optimizeDeps: {
+				include: ["react-dom/client", "react-server-dom-vite/client"],
+			},
 			build: {
 				manifest: true,
 				outDir: "dist/client",
@@ -41,7 +44,7 @@ export default defineConfig({
 					"react",
 					"react/jsx-runtime",
 					"react/jsx-dev-runtime",
-					"@jacob-ebey/react-server-dom-vite/server",
+					"react-server-dom-vite/server",
 				],
 			},
 			resolve: {
@@ -190,12 +193,15 @@ function vitePluginUseClient(): Plugin[] {
 							return;
 						}
 						clientReferences[id] = id; // TODO: normalize
-						const matches = code.matchAll(/export function (\w+)\(/g);
+						const matches = [
+							...code.matchAll(/export function (\w+)\(/g),
+							...code.matchAll(/export (default) (function|class) /g),
+						];
 						const result = [
-							`import $$ReactServer from "@jacob-ebey/react-server-dom-vite/server"`,
+							`import $$ReactServer from "react-server-dom-vite/server"`,
 							...[...matches].map(
 								([, name]) =>
-									`export const ${name} = $$ReactServer.registerClientReference({}, ${JSON.stringify(id)}, ${JSON.stringify(name)})`,
+									`export ${name === "default" ? "default" : `const ${name} =`} $$ReactServer.registerClientReference({}, ${JSON.stringify(id)}, ${JSON.stringify(name)})`,
 							),
 						].join(";\n");
 						return { code: result, map: null };
@@ -225,7 +231,7 @@ function vitePluginUseServer(): Plugin[] {
 						const matches = code.matchAll(/export async function (\w+)\(/g);
 						const result = [
 							code,
-							`import $$ReactServer from "@jacob-ebey/react-server-dom-vite/server"`,
+							`import $$ReactServer from "react-server-dom-vite/server"`,
 							...[...matches].map(
 								([, name]) =>
 									`${name} = $$ReactServer.registerServerReference(${name}, ${JSON.stringify(id)}, ${JSON.stringify(name)})`,
@@ -235,7 +241,7 @@ function vitePluginUseServer(): Plugin[] {
 					} else {
 						const matches = code.matchAll(/export async function (\w+)\(/g);
 						const result = [
-							`import $$ReactClient from "@jacob-ebey/react-server-dom-vite/client"`,
+							`import $$ReactClient from "react-server-dom-vite/client"`,
 							...[...matches].map(
 								([, name]) =>
 									`export const ${name} = $$ReactClient.createServerReference(${JSON.stringify(id + "#" + name)}, (...args) => __callServer(...args))`,