vite-plugin-react-server 0.3.5 → 0.3.7

package/plugin/react-server/plugin.ts

@@ -1,8 +1,9 @@
+import { readdirSync } from "fs";
+import type { ServerResponse } from "node:http";
 import { join, resolve } from "node:path";
 import { performance } from "node:perf_hooks";
 import { Worker } from "node:worker_threads";
-import type { Plugin as RollupPlugin } from "rollup";
-import type { Plugin as VitePlugin } from "vite";
+import React from "react";
 import {
   createLogger,
   type ResolvedConfig,
@@ -10,10 +11,14 @@ import {
   type ViteDevServer,
 } from "vite";
 import { checkFilesExist } from "../checkFilesExist.js";
-import { tryManifest } from "../helpers/tryManifest.js";
+import { DEFAULT_CONFIG } from "../config/defaults.js";
+import { getPluginRoot } from "../config/getPaths.js";
 import { resolveOptions } from "../config/resolveOptions.js";
 import { resolvePages } from "../config/resolvePages.js";
 import { resolveUserConfig } from "../config/resolveUserConfig.js";
+import { getModuleManifest } from "../helpers/getModuleManifest.js";
+import { tryManifest } from "../helpers/tryManifest.js";
+import { createBuildLoader } from '../loader/createBuildLoader.js';
 import type {
   BuildTiming,
   CheckFilesExistReturn,
@@ -25,17 +30,10 @@ import { type StreamPluginOptions } from "../types.js";
 import { createWorker } from "../worker/createWorker.js";
 import { renderPages } from "../worker/html/renderPages.js";
 import { createHandler } from "./createHandler.js";
-import { readdirSync } from "fs";
-import type { ServerResponse } from "node:http";
-import { DEFAULT_CONFIG } from "../config/defaults.js";
-import { getPluginRoot } from "../config/getPaths.js";
-import { getModuleManifest } from "../helpers/getModuleManifest.js";
-import { createBuildLoader } from '../loader/createBuildLoader.js';
-import React from "react";
 
 export function reactServerPlugin(
   options: StreamPluginOptions
-): VitePlugin & RollupPlugin & { meta: ReactStreamPluginMeta } {
+): import("vite").Plugin<{ meta: ReactStreamPluginMeta,  addCssFile: (path: string) => void } > {
   const timing: BuildTiming = {
     start: performance.now(),
   };
@@ -85,8 +83,8 @@ export function reactServerPlugin(
   return {
     name: "vite:react-stream-server",
     enforce: "post",
-    meta: { timing } as ReactStreamPluginMeta,
     api: {
+      meta: { timing },
       addCssFile(path: string) {
         buildCssFiles.add(path);
       },
@@ -114,7 +112,9 @@ export function reactServerPlugin(
         throw new Error("Transformer plugin not installed");
       }
       if (preserverIndex < transformerIndex) {
-        throw new Error("Transformer plugin isn't installed or isn't running before preserver");
+        throw new Error(
+          "Transformer plugin isn't installed or isn't running before preserver"
+        );
       }
     },
     async configureServer(server: ViteDevServer) {
@@ -195,20 +195,20 @@ export function reactServerPlugin(
       });
     },
     async config(config, configEnv): Promise<UserConfig> {
-      if(typeof config.root === 'string' && config.root !== root) {
-        console.log("[vite-plugin-react-server] Root dir changed", config.root, root);
-        root = config.root
+      if (typeof config.root === "string" && config.root !== root) {
+        console.log(
+          "[vite-plugin-react-server] Root dir changed",
+          config.root,
+          root
+        );
+        root = config.root;
       }
       const resolvedPages = await resolvePages(userOptions.build.pages);
       if (resolvedPages.type === "error") {
         throw resolvedPages.error;
       }
 
-      files = await checkFilesExist(
-        resolvedPages.pages,
-        userOptions,
-        root
-      );
+      files = await checkFilesExist(resolvedPages.pages, userOptions, root);
 
       const resolvedConfig = resolveUserConfig({
         condition: "react-server",
@@ -277,7 +277,6 @@ export function reactServerPlugin(
           nodeOptions: "--conditions=react-client",
         });
 
-
         // Get routes directly from pages
         const resolvedPages = await resolvePages(userOptions.build.pages);
         if (resolvedPages.type === "error") {
@@ -290,10 +289,10 @@ export function reactServerPlugin(
           (entry) => entry.isEntry
         );
         const css = entries.flatMap((entry) => entry.css);
-        const loader = createBuildLoader({ 
+        const loader = createBuildLoader({
           root,
           userConfig,
-          pluginContext: this
+          pluginContext: this,
         });
 
         const { failedRoutes, completedRoutes } = await renderPages(routes, {

package/plugin/transformer/plugin.ts

@@ -1,7 +1,6 @@
-import type { Plugin } from "vite";
 import { DEFAULT_CONFIG } from "../config/defaults.js";
-import { createClientComponentTransformer } from "./transformer-client-components.js";
 import type { StreamPluginOptions } from "../types.js";
+import { createClientComponentTransformer } from "./transformer-client-components.js";
 import { createServerActionTransformer } from "./transformer-server-actions.js";
 
 
@@ -32,12 +31,14 @@ import { createServerActionTransformer } from "./transformer-server-actions.js";
 
 export function reactTransformPlugin(
   options?: StreamPluginOptions
-): Plugin {
-  if(process.env['NODE_OPTIONS']?.match(/--conditions[= ]react-server/)) {
-    console.log('react-server')
+): import("vite").Plugin {
+  if (process.env["NODE_OPTIONS"]?.match(/--conditions[= ]react-server/)) {
+    console.log("react-server");
   } else {
-    console.log(process.env['NODE_OPTIONS'])
-    throw new Error('react-server condition not found, set NODE_OPTIONS="--conditions react-server"')
+    console.log(process.env["NODE_OPTIONS"]);
+    throw new Error(
+      'react-server condition not found, set NODE_OPTIONS="--conditions react-server"'
+    );
   }
   const projectRoot = options?.projectRoot || process.cwd();
   // const includeClient = options?.autoDiscover?.clientComponents || DEFAULT_CONFIG.AUTO_DISCOVER.clientComponents;
@@ -51,7 +52,7 @@ export function reactTransformPlugin(
 
   return {
     name: "vite:react-stream-transformer",
-    enforce: 'post',
+    enforce: "post",
 
     configResolved(config) {
       transformClientComponent = createClientComponentTransformer({
@@ -81,23 +82,29 @@ export function reactTransformPlugin(
     config(config) {
       // Get existing inputs
       const existingInput = config.build?.rollupOptions?.input || {};
-      const currentInputs = typeof existingInput === 'string' ? { default: existingInput } : existingInput;
+      const currentInputs =
+        typeof existingInput === "string"
+          ? { default: existingInput }
+          : existingInput;
 
       // Add client components
-      const entries = Array.from(clientComponents).reduce((acc, path) => ({
-        ...acc,
-        [path.replace(DEFAULT_CONFIG.FILE_REGEX, '')]: path
-      }), {});
+      const entries = Array.from(clientComponents).reduce(
+        (acc, path) => ({
+          ...acc,
+          [path.replace(DEFAULT_CONFIG.FILE_REGEX, "")]: path,
+        }),
+        {}
+      );
 
       return {
         build: {
           rollupOptions: {
             input: {
               ...currentInputs,
-              ...entries
-            }
-          }
-        }
+              ...entries,
+            },
+          },
+        },
       };
     },
 
@@ -119,13 +126,16 @@ export function reactTransformPlugin(
 
       // Track client component and transform
       clientComponents.add(id);
-      console.log('[TransformerPlugin] Found client component:', id);
+      console.log("[TransformerPlugin] Found client component:", id);
       return transformClientComponent.bind(this)(code, id, options);
     },
 
     // Log final client components list
     buildEnd() {
-      console.log('[TransformerPlugin] Final client components:', Array.from(clientComponents));
-    }
+      console.log(
+        "[TransformerPlugin] Final client components:",
+        Array.from(clientComponents)
+      );
+    },
   };
 }

package/plugin/worker/html/renderPages.ts

@@ -1,9 +1,10 @@
-import { join, resolve as resolvePath } from "node:path";
+import { dirname, join, resolve as resolvePath } from "node:path";
 import { Transform } from "node:stream";
 import type { Worker } from "node:worker_threads";
 import { createHandler } from "../../react-server/createHandler.js";
 import type { ResolvedUserConfig, StreamPluginOptions } from "../../types.js";
 import { mkdir, writeFile } from "node:fs/promises";
+import { mkdirSync } from "node:fs";
 
 interface PipeableStreamOptions {
   bootstrapModules?: string[];
@@ -93,7 +94,7 @@ export async function renderPages(
               const outputPath = route === '/' 
                 ? join(htmlRoot, 'index.html')
                 : join(htmlRoot, route, 'index.html');
-              
+              mkdirSync(dirname(outputPath), { recursive: true });
               const writePromise = writeFile(outputPath, html)
                 .catch(error => {
                   failedRoutes.set(route, error as Error);

package/dist/_virtual/sourcemap-codec.umd.js

@@ -1,11 +0,0 @@
-/**
- * vite-plugin-react-server
- * Copyright (c) Nico Brinkkemper
- * MIT License
- */
-import { __require as requireSourcemapCodec_umd } from '../node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.umd.js';
-
-var sourcemapCodec_umdExports = requireSourcemapCodec_umd();
-
-export { sourcemapCodec_umdExports as s };
-//# sourceMappingURL=sourcemap-codec.umd.js.map

package/dist/_virtual/sourcemap-codec.umd.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"sourcemap-codec.umd.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;"}

package/dist/_virtual/sourcemap-codec.umd2.js

@@ -1,9 +0,0 @@
-/**
- * vite-plugin-react-server
- * Copyright (c) Nico Brinkkemper
- * MIT License
- */
-var sourcemapCodec_umd = {exports: {}};
-
-export { sourcemapCodec_umd as __module };
-//# sourceMappingURL=sourcemap-codec.umd2.js.map

package/dist/_virtual/sourcemap-codec.umd2.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"sourcemap-codec.umd2.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;"}