vite-plugin-react-server 0.3.11 → 0.3.12

package/plugin/helpers/resolveFilePath.ts

@@ -1,108 +0,0 @@
-import { join, basename } from "node:path";
-import { access, realpath } from "node:fs/promises";
-import { normalizePath } from "vite";
-import { getDistDir, getMode, getNodePath, getPluginRoot } from "../config/getPaths.js";
-import pkg from "../../package.json" with { type: 'json' };
-
-type ResolveOptions = {
-  projectRoot?: string;
-  nodePath?: string;
-  pluginRoot?: string;
-  filePath: string;
-  subDir?: string;
-  normalize?: boolean;
-  distDir?: string;
-  mode?: "production" | "development" | "test";
-};
-
-export async function resolveFilePath({ 
-  projectRoot = process.cwd(),
-  nodePath = getNodePath(projectRoot),
-  mode = getMode(),
-  pluginRoot = getPluginRoot(),
-  distDir = getDistDir(mode),
-  filePath,
-  subDir,
-  normalize = false,
-}: ResolveOptions) {
-  try {
-    let resolvedPath: string | undefined;
-
-    // Helper to check if file exists
-    const exists = async (path: string) => {
-      try {
-        await access(path);
-        return true;
-      } catch {
-        return false;
-      }
-    };
-
-    // If it's a plugin export (like '/rsc-worker'), use exports map
-    if (filePath.startsWith('/') && filePath.slice(1) in pkg.exports) {
-      const exportPath = filePath.slice(1);
-      const pluginPath = pkg.exports[exportPath as keyof typeof pkg.exports];
-      return join(process.cwd(), pluginRoot, pluginPath); // Make absolute
-    }
-
-    // In test mode, preserve relative paths
-    if (mode === 'test' && !filePath.startsWith('/')) {
-      return filePath;
-    }
-
-    // For all other paths, try relative to project root first
-    const projectPath = join(projectRoot, filePath);
-    if (await exists(projectPath)) {
-      return normalize ? normalizePath(projectPath) : projectPath;
-    }
-
-    // 1. Try dist folder
-    const distPath = join(distDir, subDir ?? '', basename(filePath));
-    if (await exists(distPath)) {
-      resolvedPath = await realpath(distPath);
-    }
-
-    // 2. Try node_modules path
-    if (!resolvedPath && filePath.startsWith('/node_modules/')) {
-      const npmPath = join(nodePath, filePath.slice('/node_modules/'.length));
-      if (await exists(npmPath)) {
-        resolvedPath = await realpath(npmPath);
-      }
-    }
-
-    // 3. Try direct path
-    if (!resolvedPath && await exists(filePath)) {
-      resolvedPath = await realpath(filePath);
-    }
-
-    // 4. Try relative to project root
-    if (!resolvedPath) {
-      const projectPath = join(projectRoot, filePath);
-      if (await exists(projectPath)) {
-        resolvedPath = await realpath(projectPath);
-      }
-    }
-
-    if (!resolvedPath) {
-      throw new Error(
-        `Could not resolve path. Tried:\n` +
-        `- ${distPath}\n` +
-        `- ${join(nodePath, filePath.slice('/node_modules/'.length))}\n` +
-        `- ${filePath}\n` +
-        `- ${join(projectRoot, filePath)}`
-      );
-    }
-
-    return normalize ? normalizePath(
-      resolvedPath
-        .replace(pluginRoot, "/node_modules/vite-plugin-react-server")
-        .replace(projectRoot, "/")
-        .replace(nodePath, "/node_modules")
-        .replace(/^(?!\/)/, '/')
-    ) : resolvedPath;
-
-  } catch (error) {
-    // If realpath fails, return normalized input path
-    return normalize ? normalizePath(filePath) : filePath;
-  }
-} 

package/plugin/helpers/resolveWorkerModule.ts

@@ -1,41 +0,0 @@
-import { tryManifest } from "./tryManifest.js";
-
-export async function resolveWorkerModule(
-  moduleGraph: Set<string> | string[],
-  options: {
-    root: string,
-    outDir: string,
-    workerPath: string
-  }
-) {
-  console.log('Resolving worker module:', {
-    moduleGraph: Array.from(moduleGraph),
-    options
-  });
-
-  // Try module graph first
-  const workerModule = Array.from(moduleGraph).find(id => 
-    id.includes(options.workerPath)
-  );
-
-  console.log('Found in module graph:', workerModule);
-
-  if (workerModule) {
-    return workerModule;
-  }
-
-  // Fallback to manifest
-  const resolvedManifest = tryManifest({
-    root: options.root,
-    outDir: options.outDir,
-    ssrManifest: false
-  });
-
-  console.log('Manifest result:', resolvedManifest);
-
-  if (resolvedManifest.type === "error") {
-    throw new Error(`Could not find worker path in module graph or manifest: ${options.workerPath}`);
-  }
-
-  return resolvedManifest.manifest[options.workerPath]?.file;
-} 

package/plugin/helpers/validateModuleBase.ts

@@ -1,30 +0,0 @@
-import type { InputOption } from "rollup";
-
-export function validateModuleBase(
-  input: InputOption,
-  moduleBase: string,
-  moduleBaseExceptions: string[]
-) {
-  for (const [key, value] of Object.entries(input)) {
-    const isException =
-      moduleBaseExceptions.includes(key) || ["/index", "index"].includes(key);
-    if (!key.includes("/")) return;
-    if (value.startsWith("//")) {
-      throw new Error(`Path shouldn't start with //`);
-    }
-    if (!key.startsWith(moduleBase) && !isException) {
-      throw new Error(
-        `Invalid input: ${key} does not start with ${moduleBase}. If this is a valid key, add it to moduleBaseExceptions otherwise put the file in the ${moduleBase} directory. Exception: ${moduleBaseExceptions.join(
-          ", "
-        )}`
-      );
-    }
-    if (!value.startsWith("/" + moduleBase) && !isException) {
-      throw new Error(
-        `Invalid value: ${value} does not start with ${moduleBase}. If this is a valid path, add it to moduleBaseExceptions otherwise put the file in the ${moduleBase} directory. Exception: ${moduleBaseExceptions.join(
-          ", "
-        )}`
-      );
-    }
-  }
-}

package/plugin/helpers/validateResolvedConfig.ts

@@ -1,21 +0,0 @@
-import type { ResolvedConfig } from "vite";
-
-export function validateResolvedConfig(config: ResolvedConfig): asserts config is ResolvedConfig {
-    if (
-      typeof config === "object" &&
-      config != null &&
-      "build" in config &&
-      typeof config.build === "object" &&
-      config.build != null &&
-      "rollupOptions" in config.build &&
-      typeof config.build.rollupOptions === "object" &&
-      config.build.rollupOptions != null &&
-      "input" in config.build.rollupOptions &&
-      typeof config.build.rollupOptions.input === "object" &&
-      config.build.rollupOptions.input != null
-    ) {
-      return undefined; 
-    }
-    throw new Error("Invalid config");
-  };
-  

package/plugin/transformer/transformer-client-components.ts

@@ -1,168 +0,0 @@
-import type { PluginContext } from "rollup";
-import type { TransformerOptions } from "./types.js";
-import { DEFAULT_CONFIG } from "../config/defaults.js";
-import { createInputNormalizer } from "../helpers/inputNormalizer.js";
-import type { ResolvedUserConfig, ResolvedUserOptions } from "../types.js";
-import type { ConfigEnv } from "vite";
-import { join } from "path";
-import { tryManifest } from "../helpers/tryManifest.js";
-
-export function createClientComponentTransformer(
-  {
-    moduleBase = DEFAULT_CONFIG.MODULE_BASE,
-    projectRoot,
-    moduleId,
-    build,
-  }: ResolvedUserOptions,
-  config: ResolvedUserConfig,
-  configEnv: ConfigEnv
-) {
-  let moduleIdFn = moduleId;
-  const normalizer = createInputNormalizer({
-    root: projectRoot,
-    preserveModulesRoot: moduleBase,
-    removeExtension: true,
-  });
-  const isClient = config.build.outDir?.endsWith(build.client);
-  const isServer = config.build.outDir?.endsWith(build.server);
-  const references = isServer
-    ? tryManifest({
-        root: projectRoot,
-        outDir: join(build.outDir, build.client),
-        ssrManifest: false,
-      }).manifest
-    : null;
-
-  return {
-    name: "vite-plugin-react-server:client-components-transformer",
-
-    async transform(
-      this: PluginContext,
-      code: string,
-      id: string,
-      options?: { ssr?: boolean }
-    ) {
-      try {
-        // Skip node_modules and vite internal files
-        if (id.includes("node_modules") || id.includes("vite/dist")) {
-          return null;
-        }
-
-        // Check if this is a client component from metadata or directive
-        let rest = id.split("/");
-        let fileName = rest.pop() as string;
-        let dir = rest.join("/");
-        if (dir.startsWith(projectRoot)) {
-          dir = dir.replace(projectRoot, "");
-        }
-        const index = dir.indexOf(moduleBase);
-        if (index !== -1) {
-          if (configEnv.command === "build") {
-            if (isServer) {
-              dir = join(build.assetsDir, dir.slice(index + moduleBase.length));
-            } else {
-              dir = new URL(
-                dir,
-                `file://${config?.server?.host ?? "localhost"}:${
-                  config?.server?.port ?? configEnv.isPreview ? 4173 : 5173
-                }`
-              ).pathname;
-            }
-          } else if (configEnv.command === "serve") {
-            dir = "";
-          }
-        }
-        if (!fileName) fileName = id;
-        const info = this?.getModuleInfo(id);
-        const hasDirective = code.match(/^["']use client["'];?/);
-        const isClientComponent =
-          hasDirective || info?.meta?.["directives"]?.includes("use client");
-
-        if (!isClientComponent) {
-          return null; // Not a client component, skip
-        }
-
-        let transformedCode = code;
-        const moduleId = moduleIdFn!(id, configEnv.isSsrBuild ?? false);
-        const [key, value] = normalizer([moduleId, id]);
-        // Find all named exports
-        const exportMatches = Array.from(
-          code.matchAll(/export\s+(?:const|let|var|function|class)\s+(\w+)/g)
-        );
-
-        if (!exportMatches.length) {
-          return null;
-        }
-
-        // Transform each export
-        for (const [fullMatch, exportName] of exportMatches) {
-          if (!exportName) continue;
-          console.log("exportName", dir, fileName, exportName);
-          const isClass = fullMatch.includes("class");
-          // Remove export keyword
-          transformedCode = transformedCode.replace(
-            fullMatch,
-            fullMatch.replace("export ", "")
-          );
-          let path = `import.meta.url`;
-          // path from moduleBase to value
-          const { manifest, error } = tryManifest({
-            root: projectRoot,
-            outDir: join(build.outDir, build.client),
-            ssrManifest: false,
-          });
-          if (error) {
-            console.error(`[RSC] Error getting manifest: ${error}`);
-            continue;
-          }
-          const fileFromManifest = manifest[join(moduleBase, value)]?.file;
-          if (fileFromManifest) {
-            path = JSON.stringify(fileFromManifest);
-          } else {
-            console.error(`[RSC] File not found in manifest: ${value}`);
-            continue;
-          }
-
-          transformedCode += `const ${exportName}Ref = Object.defineProperties(${
-            isClass
-              ? `class extends ${exportName} {
-        constructor(...args) { super(...args); }
-      }`
-              : `function(...args) { return ${exportName}.apply(null, args); }`
-          },
-  {
-    $$typeof: { value: Symbol.for("react.client.reference") },
-    $$id: { value: \`\${${path}}${"#" + exportName}\` }
-  }
-);
-export { ${exportName}Ref as ${exportName} };`;
-        }
-        return { code: transformedCode, map: null };
-      } catch (error) {
-        console.error(
-          `[RSC] Error transforming client component: ${id}`,
-          error
-        );
-        throw error;
-      }
-    },
-  } as const;
-}
-
-/**
- * transformedCode += `
-const ${exportName}Ref = Object.defineProperties(
-  ${
-    isClass
-      ? `class extends ${exportName} {
-          constructor(...args) { super(...args); }
-        }`
-      : `function(...args) { return ${exportName}.apply(null, args); }`
-  },
-  {
-    $$typeof: { value: Symbol.for("react.client.reference") },
-    $$id: { value: ${JSON.stringify(moduleId + "#" + exportName)} }
-  }
-);
-export { ${exportName}Ref as ${exportName} };`;
- */

package/plugin/transformer/transformer-server-actions.ts

@@ -1,125 +0,0 @@
-import { SourceMapGenerator } from "source-map";
-import type { TransformerOptions } from "./types.js";
-import { DEFAULT_CONFIG } from "../config/defaults.js";
-import type { ResolvedUserOptions, ResolvedUserConfig } from "../types.js";
-import type { ConfigEnv } from "vite";
-import { createInputNormalizer } from "../helpers/inputNormalizer.js";
-
-export function createServerActionTransformer({
-  moduleBase = DEFAULT_CONFIG.MODULE_BASE,
-  projectRoot,
-  moduleId,
-}: ResolvedUserOptions, config: ResolvedUserConfig, configEnv: ConfigEnv) {
-  let moduleIdFn = moduleId;
-  const normalizer = createInputNormalizer({
-    root: projectRoot,
-    preserveModulesRoot: moduleBase,
-    removeExtension: DEFAULT_CONFIG.FILE_REGEX,
-  });
-  return {
-    name: "vite-plugin-react-server:server-actions-transformer",
-
-    async transform(
-      code: string,
-      path: string,
-        { ssr }: { ssr: boolean } = { ssr: false }
-      ) {
-      try {
-        let transformedCode = code;
-        const directiveMatch = code.match(/^["']use server["'];?/);
-        const moduleId = moduleIdFn(path, ssr);
-        const [key,value] = normalizer(moduleId);
-
-
-        // Log the path transformation
-        console.log("[RSC Transform] Module path transformation:", {
-          original: path,
-          transformed: moduleId,
-        });
-
-        // Find all named exports
-        const exportMatches = Array.from(
-          code.matchAll(/export\s+(?:const|let|var|function|class)\s+(\w+)/g)
-        );
-
-        if (!exportMatches.length) {
-          console.warn(
-            `[RSC] No exports found in server action module: ${path}`
-          );
-          return null;
-        }
-
-        // Transform each export
-        for (const [fullMatch, exportName] of exportMatches) {
-          if (!exportName) {
-            console.warn(
-              `[RSC] Invalid export in server action module: ${path}`
-            );
-            continue;
-          }
-
-          const isClass = fullMatch.includes("class");
-
-          // Remove export keyword
-          transformedCode = transformedCode.replace(
-            fullMatch,
-            fullMatch.replace("export ", "")
-          );
-
-          if (!directiveMatch || directiveMatch.index !== 0) {
-            // Server action
-          } else {
-            // Client component
-            transformedCode += `
-const ${exportName}Ref = Object.defineProperties(
-  ${
-    isClass
-      ? `class extends ${exportName} {
-          constructor(...args) { super(...args); }
-        }`
-      : `function(...args) { return ${exportName}.apply(null, args); }`
-  },
-  {
-    $$typeof: { value: Symbol.for("react.server.reference") },
-    $$src: { value: ${JSON.stringify(value)} },
-    $$id: { value: import.meta.url.slice(import.meta.url.indexOf("/${key}")}) + ${JSON.stringify("#" + exportName)} },
-    $$async: { value: true }
-  }
-);
-export { ${exportName}Ref as ${exportName} };
-            `;
-          }
-        }
-
-        return {
-          code: transformedCode,
-          map: new SourceMapGenerator({ file: path }).toString(),
-        };
-      } catch (error) {
-        console.error(
-          `[RSC] Error transforming client component: ${path}`,
-          error
-        );
-        throw error;
-      }
-    },
-  };
-}
-
-/**
- * transformedCode += `
-const ${exportName}Ref = Object.defineProperties(
-  ${
-    isClass
-      ? `class extends ${exportName} {
-          constructor(...args) { super(...args); }
-        }`
-      : `function(...args) { return ${exportName}.apply(null, args); }`
-  },
-  {
-    $$typeof: { value: Symbol.for("react.client.reference") },
-    $$id: { value: ${JSON.stringify(moduleId + "#" + exportName)} }
-  }
-);
-export { ${exportName}Ref as ${exportName} };`;
- */

package/plugin/worker/rsc/createRscStream.ts

@@ -1,42 +0,0 @@
-import { renderToPipeableStream 
-  // @ts-ignore
-} from "react-server-dom-esm/server.node";
-import type { Writable } from "node:stream";
-import type { MessagePort } from "node:worker_threads";
-import type { RscRenderState } from "../types.js";
-
-export function createRscStream(
-  renderState: RscRenderState,
-  writeStream: Writable,
-  parentPort: MessagePort | null
-) {
-  console.log("[createRscStream] Creating stream for:", renderState.id);
-
-  const stream = renderToPipeableStream(renderState.componentImport, {
-    onShellReady() {
-      console.log("[createRscStream] onShellReady called for:", renderState.id);
-      stream.pipe(writeStream);
-    },
-    onAllReady() {
-      console.log("[createRscStream] onAllReady called for:", renderState.id);
-      writeStream.on("finish", () => {
-        parentPort?.postMessage({
-          type: "WROTE_FILE",
-          id: renderState.id,
-          outputPath: renderState.rscOutputPath
-        });
-      });
-    },
-    onError(error: unknown) {
-      console.error("[createRscStream] Render error:", error);
-      parentPort?.postMessage({
-        type: "ERROR",
-        error: error instanceof Error ? error.message : String(error),
-        id: renderState.id
-      });
-      stream.abort();
-    }
-  });
-
-  return stream;
-}

package/plugin/worker/rsc/development.ts

@@ -1,6 +0,0 @@
-import { createRscStream as devCreateRscStream } from './createRscStream.js';
-import { createWorker as devCreateWorker } from '../createWorker.js';
-
-// Development-specific implementations
-export const createRscStream = devCreateRscStream;
-export const createWorker = devCreateWorker; 

package/plugin/worker/rsc/production.ts

@@ -1,6 +0,0 @@
-import { createRscStream as prodCreateRscStream } from './createRscStream.js';
-import { createWorker as prodCreateWorker } from '../createWorker.js';
-
-// Production-specific optimizations could go here
-export const createRscStream = prodCreateRscStream;
-export const createWorker = prodCreateWorker;