vite-plugin-react-server 1.4.1 → 1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-react-server",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "Vite plugin for React Server Components (RSC)",
   "type": "module",
   "main": "./dist/plugin/index.js",
@@ -40,7 +40,10 @@
       "default": "./dist/plugin/utils/index.server.js"
     },
     "./metrics": "./dist/plugin/metrics/index.js",
-    "./stream": "./dist/plugin/stream/index.js",
+    "./stream": {
+      "react-server": "./dist/plugin/stream/index.server.js",
+      "default": "./dist/plugin/stream/index.client.js"
+    },
     "./stream/client": "./dist/plugin/stream/index.client.js",
     "./stream/server": "./dist/plugin/stream/index.server.js",
     "./env": {
@@ -48,25 +51,128 @@
     },
     "./config": "./dist/plugin/config/index.js",
     "./error": "./dist/plugin/error/index.js",
-    "./vendor": "./dist/plugin/vendor/index.js",
+    "./vendor": {
+      "react-server": "./dist/plugin/vendor/vendor.server.js",
+      "default": "./dist/plugin/vendor/vendor.client.js"
+    },
     "./vendor.server": "./dist/plugin/vendor/vendor.server.js",
     "./vendor.client": "./dist/plugin/vendor/vendor.client.js",
     "./vendor.static": "./dist/plugin/vendor/vendor.static.js",
     "./file-preserver": "./dist/plugin/file-preserver/plugin.js",
     "./loader": "./dist/plugin/loader/index.js",
     "./helpers": "./dist/plugin/helpers/index.js",
-    "./helpers/resolveStreamElements": "./dist/plugin/helpers/resolveStreamElements.js",
-    "./dev-server": "./dist/plugin/dev-server/index.js",
-    "./dev-server/configureReactServer": "./dist/plugin/dev-server/configureReactServer.js",
-    "./dev-server/handleServerAction": "./dist/plugin/dev-server/handleServerAction.js",
-    "./stream/handleRscStream": "./dist/plugin/stream/handleRscStream.js",
-    "./stream/createRscStream": "./dist/plugin/stream/createRscStream.js",
-    "./dev-server/restartWorker": "./dist/plugin/dev-server/restartWorker.js",
-    "./dev-server/cleanupServerAction": "./dist/plugin/dev-server/cleanupServerAction.js",
+    "./helpers/resolveStreamElements": {
+      "react-server": "./dist/plugin/helpers/resolveStreamElements.server.js",
+      "default": "./dist/plugin/helpers/resolveStreamElements.client.js"
+    },
+    "./dev-server": {
+      "react-server": "./dist/plugin/dev-server/index.server.js",
+      "default": "./dist/plugin/dev-server/index.client.js"
+    },
+    "./dev-server/configureReactServer": {
+      "react-server": "./dist/plugin/dev-server/configureReactServer.server.js",
+      "default": "./dist/plugin/dev-server/configureReactServer.client.js"
+    },
+    "./dev-server/handleServerAction": {
+      "react-server": "./dist/plugin/dev-server/handleServerAction.server.js",
+      "default": "./dist/plugin/dev-server/handleServerAction.client.js"
+    },
+    "./stream/handleRscStream": {
+      "react-server": "./dist/plugin/stream/handleRscStream.server.js",
+      "default": "./dist/plugin/stream/handleRscStream.client.js"
+    },
+    "./stream/createRscStream": {
+      "react-server": "./dist/plugin/stream/createRscStream.server.js",
+      "default": "./dist/plugin/stream/createRscStream.client.js"
+    },
+    "./dev-server/restartWorker": {
+      "react-server": "./dist/plugin/dev-server/restartWorker.server.js",
+      "default": "./dist/plugin/dev-server/restartWorker.client.js"
+    },
+    "./dev-server/cleanupServerAction": {
+      "react-server": "./dist/plugin/dev-server/cleanupServerAction.server.js",
+      "default": "./dist/plugin/dev-server/cleanupServerAction.client.js"
+    },
     "./env-loader": "./dist/plugin/loader/env-loader.js",
     "./css-loader": "./dist/plugin/loader/css-loader.js",
     "./directives": "./dist/plugin/loader/directives/index.js",
-    "./register": "./dist/plugin/vendor/register-vendor.js"
+    "./register": "./dist/plugin/vendor/register-vendor.js",
+    "./config/createHandlerOptions": {
+      "react-server": "./dist/plugin/config/createHandlerOptions.server.js",
+      "default": "./dist/plugin/config/createHandlerOptions.client.js"
+    },
+    "./dev-server/configureRequestHandler": {
+      "react-server": "./dist/plugin/dev-server/configureRequestHandler.server.js",
+      "default": "./dist/plugin/dev-server/configureRequestHandler.client.js"
+    },
+    "./env/plugin": {
+      "react-server": "./dist/plugin/env/plugin.server.js",
+      "default": "./dist/plugin/env/plugin.client.js"
+    },
+    "./helpers/handleServerAction": {
+      "react-server": "./dist/plugin/helpers/handleServerAction.server.js",
+      "default": "./dist/plugin/helpers/handleServerAction.client.js"
+    },
+    "./orchestrator/createPluginOrchestrator": {
+      "react-server": "./dist/plugin/orchestrator/createPluginOrchestrator.server.js",
+      "default": "./dist/plugin/orchestrator/createPluginOrchestrator.client.js"
+    },
+    "./plugin": {
+      "react-server": "./dist/plugin/plugin.server.js",
+      "default": "./dist/plugin/plugin.client.js"
+    },
+    "./react-client": {
+      "react-server": "./dist/plugin/react-client/index.server.js",
+      "default": "./dist/plugin/react-client/index.client.js"
+    },
+    "./react-client/plugin": {
+      "react-server": "./dist/plugin/react-client/plugin.server.js",
+      "default": "./dist/plugin/react-client/plugin.client.js"
+    },
+    "./react-server/plugin": {
+      "react-server": "./dist/plugin/react-server/plugin.server.js",
+      "default": "./dist/plugin/react-server/plugin.client.js"
+    },
+    "./react-static/createBuildLoader": {
+      "react-server": "./dist/plugin/react-static/createBuildLoader.server.js",
+      "default": "./dist/plugin/react-static/createBuildLoader.client.js"
+    },
+    "./react-static": {
+      "react-server": "./dist/plugin/react-static/index.server.js",
+      "default": "./dist/plugin/react-static/index.client.js"
+    },
+    "./react-static/plugin": {
+      "react-server": "./dist/plugin/react-static/plugin.server.js",
+      "default": "./dist/plugin/react-static/plugin.client.js"
+    },
+    "./react-static/renderPage": {
+      "react-server": "./dist/plugin/react-static/renderPage.server.js",
+      "default": "./dist/plugin/react-static/renderPage.client.js"
+    },
+    "./react-static/rscToHtmlStream": {
+      "react-server": "./dist/plugin/react-static/rscToHtmlStream.server.js",
+      "default": "./dist/plugin/react-static/rscToHtmlStream.client.js"
+    },
+    "./react-static/temporaryReferences": {
+      "react-server": "./dist/plugin/react-static/temporaryReferences.server.js",
+      "default": "./dist/plugin/react-static/temporaryReferences.client.js"
+    },
+    "./stream/createFromNodeStream": {
+      "react-server": "./dist/plugin/stream/createFromNodeStream.server.js",
+      "default": "./dist/plugin/stream/createFromNodeStream.client.js"
+    },
+    "./stream/createHtmlStream": {
+      "react-server": "./dist/plugin/stream/createHtmlStream.server.js",
+      "default": "./dist/plugin/stream/createHtmlStream.client.js"
+    },
+    "./stream/createRenderToPipeableStreamHandler": {
+      "react-server": "./dist/plugin/stream/createRenderToPipeableStreamHandler.server.js",
+      "default": "./dist/plugin/stream/createRenderToPipeableStreamHandler.client.js"
+    },
+    "./transformer/plugin": {
+      "react-server": "./dist/plugin/transformer/plugin.server.js",
+      "default": "./dist/plugin/transformer/plugin.client.js"
+    }
   },
   "typesVersions": {
     "*": {
@@ -288,7 +394,6 @@
     "supports-color": "^10.0.0",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
-    "tsx": "^4.19.2",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.33.1",
     "vite": "^6.3.5",
@@ -298,5 +403,10 @@
   "bin": {
     "check-react-version": "./scripts/check-react-version.mjs",
     "patch": "./bin/patch.mjs"
+  },
+  "dependencies": {
+    "acorn": "^8.16.0",
+    "picocolors": "^1.1.1",
+    "tsx": "^4.21.0"
   }
 }

package/plugin/config/autoDiscover/resolveAutoDiscover.ts

@@ -177,6 +177,10 @@ export const resolveAutoDiscover: ResolveAutoDiscoverFn =
       ...clientEntry,
       ...cssInputs,
     };
+    // If no client entries found, fall back to index.html so SSR environment has inputs
+    if (Object.keys(clientInputsCollection).length === 0) {
+      Object.assign(clientInputsCollection, indexHtmlInputs);
+    }
     
     const serverInputsCollection = {
       ...clientInputsCollection,

package/plugin/config/getCondition.ts

@@ -203,9 +203,10 @@ export function assertReactServer(): asserts this is {
   const currentCondition = getCurrentCondition();
   if (currentCondition !== "react-server") {
     // Debug-only: avoid Node-only APIs to keep this file browser-safe
-    throw new Error(
-      `Condition mismatch, should be react-server. Set NODE_OPTIONS="--conditions=react-server" or --conditions=react-server`
+    console.warn(
+      `[vite-plugin-react-server] Condition mismatch: expected react-server. Set NODE_OPTIONS="--conditions=react-server"`
     );
+    return; // Don't throw — Vite 7 may load both condition variants during config bundling
   }
 }
 
@@ -215,9 +216,10 @@ export function assertNonReactServer(): asserts this is {
   const currentCondition = getCurrentCondition();
   if (currentCondition === "react-server") {
     // Debug-only: avoid Node-only APIs to keep this file browser-safe
-    throw new Error(
-      `Condition mismatch, should not be react-server. Remove NODE_OPTIONS="--conditions=react-server" or --conditions=react-server`
+    console.warn(
+      `[vite-plugin-react-server] Condition mismatch: unexpected react-server condition on this module.`
     );
+    return; // Don't throw — Vite 7 may load both condition variants during config bundling
   }
 }
 

package/plugin/dev-server/configureReactServer.server.ts

@@ -78,16 +78,8 @@ export const configureReactServer: ConfigureReactServerFn =
       }
       activeStreams.clear();
       activeControllers.clear();
-    });
-
-    // Handle restart completion
-    server.ws.on("full-reload", () => {
-      isRestarting = false;
-      logger.info("[vite-plugin-react-server] ✅ Server restart completed");
-    });
 
-    // Fallback: reset restart flag after a timeout
-    server.ws.on("restart", () => {
+      // Fallback: reset restart flag after a timeout
       setTimeout(() => {
         if (isRestarting) {
           isRestarting = false;
@@ -98,6 +90,12 @@ export const configureReactServer: ConfigureReactServerFn =
       }, 5000); // 5 second timeout
     });
 
+    // Handle restart completion
+    server.ws.on("full-reload", () => {
+      isRestarting = false;
+      logger.info("[vite-plugin-react-server] ✅ Server restart completed");
+    });
+
     const loader = async (id: string) => {
       const [moduleID, exportName] = id.split("#");
       
@@ -550,7 +548,6 @@ export const configureReactServer: ConfigureReactServerFn =
 
         res.statusCode = 500;
         res.setHeader("Content-Type", "text/x-component; charset=utf-8");
-        res.setHeader("Content-Length", "0"); // Will be updated after streaming
         
         // Note: Worker cleanup is handled by the response close handler
       }

package/plugin/dev-server/plugin.client.ts

@@ -95,6 +95,8 @@ export const vitePluginReactDevServer: VitePluginFn = function _vitePluginReactS
       
       // Skip client components — let @vitejs/plugin-react handle them with Fast Refresh
       const isClientFile = isSourceFile && (() => {
+        // Check filename pattern (.client.tsx, etc.) — matches isClientComponentByName
+        if (/\.client\.(js|ts|jsx|tsx)$/.test(file)) return true;
         try {
           const head = readFileSync(file, 'utf-8').slice(0, 200);
           return /^\s*["']use client["']/.test(head.split('\n')[0]);

package/plugin/dev-server/plugin.server.ts

@@ -44,6 +44,8 @@ export const vitePluginReactDevServer = function _vitePluginReactServerDevServer
       if (envName === 'client') {
         // Check if it's a client component — let Fast Refresh handle it
         const isClient = (file.endsWith('.tsx') || file.endsWith('.ts') || file.endsWith('.jsx') || file.endsWith('.js')) && (() => {
+          // Check filename pattern (.client.tsx, .client.ts, etc.) — matches isClientComponentByName
+          if (/\.client\.(js|ts|jsx|tsx)$/.test(file)) return true;
           try {
             const head = readFileSync(file, 'utf-8').slice(0, 200);
             return /^\s*["']use client["']/.test(head.split('\n')[0]);
@@ -77,55 +79,6 @@ export const vitePluginReactDevServer = function _vitePluginReactServerDevServer
       }
       return [];
     },
-    handleHotUpdate({ file, server }: { file: string; server: ViteDevServer }) {
-      const moduleBase = userOptions.moduleBase || "src";
-      const projectRoot = userOptions.projectRoot || server.config.root;
-      const normalizedFile = file.replace(projectRoot, '').replace(/^\/+/, '');
-      const isSourceFile = normalizedFile.startsWith(moduleBase + '/') && 
-        (file.endsWith('.tsx') || file.endsWith('.ts') || file.endsWith('.jsx') || file.endsWith('.js'));
-      
-      // Skip client components — let @vitejs/plugin-react handle them
-      // with Fast Refresh (preserves component-level state).
-      const isClientFile = isSourceFile && (() => {
-        try {
-          const head = readFileSync(file, 'utf-8').slice(0, 200);
-          return /^\s*["']use client["']/.test(head.split('\n')[0]);
-        } catch { return false; }
-      })();
-      
-      if (isSourceFile && !isClientFile) {
-        server.config.logger.info(`[vite-plugin-react-server] File changed (RSC refetch): ${normalizedFile}`);
-        
-        // Send custom HMR event so client can refetch RSC stream
-        server.ws.send({
-          type: 'custom',
-          event: 'vite-plugin-react-server:server-component-update',
-          data: {
-            file: normalizedFile,
-            path: file,
-          },
-        });
-        
-        // Invalidate the server module so next request gets fresh content
-        const mod = server.environments['server']?.moduleGraph?.getModulesByFile(file);
-        if (mod) {
-          for (const m of mod) {
-            server.environments['server']?.moduleGraph?.invalidateModule(m);
-          }
-        }
-        
-        // Return empty array to prevent Vite's default full-page reload
-        // The client will refetch the RSC stream via the custom event
-        return [];
-      }
-      
-      if (isClientFile) {
-        // Client components are handled by @vitejs/plugin-react (Fast Refresh)
-        // or Vite's client-side HMR. Return empty to prevent the server
-        // environment from triggering a full page reload.
-        return [];
-      }
-    },
   };
 
   const serverPlugin = {

package/plugin/error/index.ts

@@ -1,6 +1,5 @@
 export { toError } from "./toError.js";
 export { logError } from "./logError.js";
-export { enhanceError, createContextualError } from "./enhanceError.js";
 export { handleError } from "./handleError.js";
 export { shouldPanic, PANIC_SYMBOL, isPanic } from "./shouldPanic.js";
-export { assertPanic } from "./assertPanic.js";
+export { shouldCausePanic, handlePanicThreshold, isPanicError } from "./panicThresholdHandler.js";

package/plugin/error/setupGlobalErrorHandler.ts

@@ -4,12 +4,13 @@ import type {
 } from "./types.js";
 
 let isGlobalHandlerSetup = false;
+let uncaughtExceptionHandler: ((error: Error) => void) | null = null;
+let unhandledRejectionHandler: ((reason: unknown, promise: Promise<unknown>) => void) | null = null;
 
 export const setupGlobalErrorHandler: SetupGlobalErrorHandlerFn =
   function _setupGlobalErrorHandler(options) {
     const { panicThreshold, logger, verbose = false } = options;
 
-    // Set up global error handling for all panic threshold levels
     if (isGlobalHandlerSetup) {
       return;
     }
@@ -20,39 +21,32 @@ export const setupGlobalErrorHandler: SetupGlobalErrorHandlerFn =
       );
     }
 
-    // Set up our error handlers
-    process.on("uncaughtException", (error: Error) => {
+    uncaughtExceptionHandler = (error: Error) => {
       if (verbose) {
         logger.info(
           `Global error handler caught uncaught exception: ${error.message}`
         );
       }
 
-      // Handle the error gracefully based on panic threshold
       logger.warn(
         `Uncaught exception handled by panic threshold (${panicThreshold}): ${error.message}`
       );
+    };
 
-      // Don't call process.exit - let the error be handled gracefully
-    });
-
-    process.on(
-      "unhandledRejection",
-      (reason: unknown, _promise: Promise<unknown>) => {
-        if (verbose) {
-          logger.info(
-            `Global error handler caught unhandled rejection: ${reason}`
-          );
-        }
-
-        // Handle the rejection gracefully based on panic threshold
-        logger.warn(
-          `Unhandled rejection handled by panic threshold (${panicThreshold}): ${reason}`
+    unhandledRejectionHandler = (reason: unknown, _promise: Promise<unknown>) => {
+      if (verbose) {
+        logger.info(
+          `Global error handler caught unhandled rejection: ${reason}`
         );
-
-        // Don't call process.exit - let the rejection be handled gracefully
       }
-    );
+
+      logger.warn(
+        `Unhandled rejection handled by panic threshold (${panicThreshold}): ${reason}`
+      );
+    };
+
+    process.on("uncaughtException", uncaughtExceptionHandler);
+    process.on("unhandledRejection", unhandledRejectionHandler);
 
     isGlobalHandlerSetup = true;
   };
@@ -63,9 +57,14 @@ export const cleanupGlobalErrorHandler: CleanupGlobalErrorHandlerFn =
       return;
     }
 
-    // Remove our handlers
-    process.removeAllListeners("uncaughtException");
-    process.removeAllListeners("unhandledRejection");
+    if (uncaughtExceptionHandler) {
+      process.removeListener("uncaughtException", uncaughtExceptionHandler);
+      uncaughtExceptionHandler = null;
+    }
+    if (unhandledRejectionHandler) {
+      process.removeListener("unhandledRejection", unhandledRejectionHandler);
+      unhandledRejectionHandler = null;
+    }
 
     isGlobalHandlerSetup = false;
   };

package/plugin/helpers/createRscRenderHelpers.ts

@@ -46,32 +46,3 @@ export function createReactElement(
 /**
  * Pure function for storing headless stream data
  */
-export function storeHeadlessStreamData(
-  context: RscRenderContext,
-  finalOptions: CreateHandlerOptions
-): void {
-  // Determine if this is a headless stream by checking if htmlPath is empty
-  const isHeadless = finalOptions.htmlPath === "";
-
-  if (
-    context.headlessStreamElements &&
-    isHeadless &&
-    !context.headlessStreamErrors?.has(context.route)
-  ) {
-    // Store the rendered elements for reuse
-    const element = createElementWithReact(React, {
-      ...finalOptions,
-      Html: React.Fragment,
-      as: React.Fragment,
-    });
-    context.headlessStreamElements.set(context.id, {
-      elements: element,
-      errored: false,
-    });
-  }
-}
-
-export const createRscRenderHelpers = {
-  createReactElement,
-  storeHeadlessStreamData,
-};

package/plugin/helpers/createSharedLoader.ts

@@ -146,7 +146,12 @@ export async function createSharedLoader({
     throw new Error(`Module "${moduleId}" has no exports, can't find ${exportName}`);
   }
   if (exportName && !(exportName in result)) {
-    throw new Error(`Module "${moduleId}" does not export "${exportName}"`);
+    throw new Error(
+      `Module "${moduleId}" does not export "${exportName}". ` +
+      (exportName !== 'default'
+        ? `Did you use \`export default\`? Use \`export function ${exportName}(...)\` or set pageExportName: "default" in your plugin config.`
+        : `The module does not have a default export.`)
+    );
   }
 
   return result;

package/plugin/helpers/headlessStreamState.ts

@@ -51,72 +51,3 @@ export function hasHeadlessStreamError(
 ): boolean {
   return state.errors.has(route);
 }
-
-/**
- * Gets the headless stream error for a route.
- * 
- * @param state - The headless stream state
- * @param route - The route to get the error for
- * @returns The error if it exists, undefined otherwise
- */
-export function getHeadlessStreamError(
-  state: HeadlessStreamState,
-  route: string
-): Error | undefined {
-  return state.errors.get(route);
-}
-
-/**
- * Stores headless stream elements for reuse.
- * 
- * @param state - The headless stream state
- * @param streamId - The stream ID
- * @param data - The stream data to store
- */
-export function storeHeadlessStreamElements(
-  state: HeadlessStreamState,
-  streamId: string,
-  data: HeadlessStreamData
-): void {
-  state.elements.set(streamId, data);
-}
-
-/**
- * Gets headless stream elements for reuse.
- * 
- * @param state - The headless stream state
- * @param streamId - The stream ID
- * @returns The stream data if it exists, undefined otherwise
- */
-export function getHeadlessStreamElements(
-  state: HeadlessStreamState,
-  streamId: string
-): HeadlessStreamData | undefined {
-  return state.elements.get(streamId);
-}
-
-/**
- * Cleans up headless stream elements after use.
- * 
- * @param state - The headless stream state
- * @param streamId - The stream ID to clean up
- */
-export function cleanupHeadlessStreamElements(
-  state: HeadlessStreamState,
-  streamId: string
-): void {
-  state.elements.delete(streamId);
-}
-
-/**
- * Clears all headless stream errors for a route.
- * 
- * @param state - The headless stream state
- * @param route - The route to clear errors for
- */
-export function clearHeadlessStreamErrors(
-  state: HeadlessStreamState,
-  route: string
-): void {
-  state.errors.delete(route);
-}

package/plugin/helpers/index.ts

@@ -35,11 +35,8 @@ export * from "./getBundleManifest.js";
 
 // Module handling
 export * from "./moduleRefs.js";
-export * from "./moduleResolver.js";
 
 // Utility functions
-export * from "./stashReturnValue.js";
-export * from "./workerManager.js";
 
 // Unified render helpers
 export * from "./validateRscRenderMessage.js";

package/plugin/helpers/requestInfo.ts

@@ -118,7 +118,6 @@ export function requestInfo(
     hasHtmlHeader ||
     (isFolder &&
       !hasRscHeader &&
-      !hasRscQueryParam &&
       !isRsc &&
       !isJsRequest &&
       !isFormActionRequest));
@@ -181,7 +180,7 @@ export function requestInfo(
     if (mimeType) {
       contentType = mimeType + "; charset=utf-8";
     } else {
-      contentType = "application/octet-stream; charset=utf-8";
+      contentType = "application/octet-stream";
     }
   }
 

package/plugin/helpers/resolveComponent.ts

@@ -77,7 +77,12 @@ export async function resolveComponent<T = RootComponentType | HtmlComponentType
       }
       return {
         type: "error",
-        error: new Error(`Export "${moduleExportName}" not found in module ${modulePath}.`),
+        error: new Error(
+          `Export "${moduleExportName}" not found in module ${modulePath}. ` +
+          (moduleExportName !== "default"
+            ? `Did you use \`export default\`? Use \`export function ${moduleExportName}(...)\` or set pageExportName: "default" in your plugin config.`
+            : `The module does not have a default export.`)
+        ),
       };
     }
 

package/plugin/helpers/workerCleanup.ts

@@ -1,4 +1,4 @@
-import type { Worker, MessagePort } from "node:worker_threads";
+import type { Worker } from "node:worker_threads";
 
 /**
  * Centralized worker cleanup utilities
@@ -45,41 +45,4 @@ export function cleanupWorker(
   }
 }
 
-/**
- * Safely cleans up MessagePorts with consistent error handling
- */
-export function cleanupMessagePorts(
-  ports: (MessagePort | null | undefined)[],
-  options: { logErrors?: boolean } = {}
-): void {
-  const { logErrors = false } = options;
-
-  for (const port of ports) {
-    if (!port) continue;
-
-    try {
-      // Remove onmessage handlers (property assignment cleanup)
-      (port as any).onmessage = null;
-      // Close the port
-      port.close();
-    } catch (error) {
-      if (logErrors) {
-        console.warn('[workerCleanup] Error during MessagePort cleanup:', error);
-      }
-      // Always ignore cleanup errors
-    }
-  }
-}
 
-/**
- * Comprehensive cleanup for worker + MessagePorts combination
- * This is the most common cleanup pattern in the codebase
- */
-export function cleanupWorkerAndPorts(
-  worker: Worker | null | undefined,
-  ports: (MessagePort | null | undefined)[],
-  options: WorkerCleanupOptions = {}
-): void {
-  cleanupMessagePorts(ports, { logErrors: options.logErrors });
-  cleanupWorker(worker, options);
-}

package/plugin/index.client.ts

@@ -0,0 +1,4 @@
+export { vitePluginReactServer } from './plugin.client.js';
+export { vitePluginReactServer as vitePluginReactClient } from './plugin.client.js';
+export { createPluginOrchestrator } from './orchestrator/createPluginOrchestrator.client.js';
+export { getCondition } from './config/getCondition.js';

package/plugin/index.server.ts

@@ -0,0 +1,4 @@
+export { vitePluginReactServer } from './plugin.server.js';
+export { vitePluginReactServer as vitePluginReactClient } from './plugin.server.js';
+export { createPluginOrchestrator } from './orchestrator/createPluginOrchestrator.server.js';
+export { getCondition } from './config/getCondition.js';