vite-plugin-react-server 1.2.0-alpha.1 → 1.2.1

package/plugin/{getNodeEnv.ts → config/getNodeEnv.ts}

@@ -15,8 +15,10 @@ export const validEnvs = ["development", "test", "production"] as [
 export const isValidEnv = (env: string): env is (typeof validEnvs)[number] =>
   validEnvs.includes(env as never);
 
-export function getNodeEnv() {
-  const env = process.env.NODE_ENV;
+export function getNodeEnv<E extends string = typeof process.env.NODE_ENV>(
+  currentEnv: E = process.env.NODE_ENV as E
+) {
+  const env = currentEnv;
   if (!isValidEnv(env)) {
     return "production";
   }

package/plugin/config/index.ts

@@ -1,7 +1,6 @@
 export * from './autoDiscover/index.js';
 export * from './flightBindings.js';
 export * from './interpolatePattern.js';
-export * from './resolveDevServerConfig.js';
 export * from './resolvePages.js';
 export * from './resolveUserConfig.js';
 export * from './createModuleID.js';
@@ -18,3 +17,63 @@ export * from './extMap.js';
 export * from './resolveAllowedDirectives.js';
 export * from './resolveOptions.js';
 export * from './resolveUrlOption.js';
+export * from './getNodeEnv.js';
+export { resolveOptions } from "./resolveOptions.js";
+export { resolveBuildPages } from "./autoDiscover/resolveBuildPages.js";
+export { resolveAutoDiscover } from "./autoDiscover/resolveAutoDiscover.js";
+
+/**
+ * Main handler options creation (auto-selects environment)
+ * 
+ * RECOMMENDED: Use this for most cases - it automatically chooses the right implementation
+ * based on your current environment (react-server vs react-client).
+ * 
+ * Example:
+ * ```typescript
+ * import { createHandlerOptions } from "../config/index.js";
+ * const handlerOptions = await createHandlerOptions("/about", options);
+ * ```
+ */
+export { createHandlerOptions } from "./createHandlerOptions.js";
+
+/**
+ * Handler options creation (environment-specific, when you need explicit control)
+ * 
+ * Use these when you need to explicitly control which implementation to use,
+ * regardless of the current environment.
+ * 
+ * Examples:
+ * ```typescript
+ * // Force server implementation (for RSC streams)
+ * import { createHandlerOptionsServer } from "../config/index.js";
+ * const rscOptions = await createHandlerOptionsServer("/about", options);
+ * 
+ * // Force client implementation (for HTML streams)  
+ * import { createHandlerOptionsClient } from "../config/index.js";
+ * const htmlOptions = await createHandlerOptionsClient("/about", options);
+ * ```
+ */
+export { createHandlerOptions as createHandlerOptionsServer } from "./createHandlerOptions.server.js";
+export { createHandlerOptions as createHandlerOptionsClient } from "./createHandlerOptions.client.js";
+
+// Types for handler options
+export type {
+  CreateHandlerOptionsParams,
+  CreateHandlerOptionsServerFn,
+  CreateHandlerOptionsClientFn,
+  ResolvedDefaults,
+} from "./createHandlerOptions.types.js";
+
+// Re-export CreateHandlerOptions type from main types file
+export type { CreateHandlerOptions } from "../types.js";
+
+// State management
+export { getStashedUserOptions, getStashedHandlerOptions, stashHandlerOptions } from "./stashedOptionsState.js";
+export { getEnvironmentId } from "./stashedOptionsState.js";
+
+// Utilities
+export { getNodeEnv } from "./getNodeEnv.js";
+export { getCondition } from "./getCondition.js";
+export { DEFAULT_CONFIG } from "./defaults.js";
+
+

package/plugin/config/resolveDirectiveMatcher.ts

@@ -1,6 +1,5 @@
-import type { RegExpOpt, DeserializedRegExp } from "../types.js";
-import { parsePattern } from "./parsePattern.js";
-
+import type { RegExpOpt } from "../types.js";
+import { createPatternMatcher } from "../helpers/createPatternMatcher.js";
 
 /**
  * Resolves a pattern to a RegExp or function, handling string, RegExp, and function inputs.
@@ -12,46 +11,26 @@ import { parsePattern } from "./parsePattern.js";
  * @example
  * ```ts
  * // String patterns
- * resolveDirectiveMatcher("*.js").test("file.js")     // true
- * resolveDirectiveMatcher("*.{js,ts}").test("file.ts") // true
+ * resolveDirectiveMatcher("*.js")("file.js")     // true
+ * resolveDirectiveMatcher("*.{js,ts}")("file.ts") // true
  *
  * // RegExp patterns
- * resolveDirectiveMatcher(/\.js$/).test("file.js")    // true
- * resolveDirectiveMatcher(/\.js$/i).test("file.JS")   // true
+ * resolveDirectiveMatcher(/\.js$/)("file.js")    // true
+ * resolveDirectiveMatcher(/\.js$/i)("file.JS")   // true
  *
  * // Default patterns
- * resolveDirectiveMatcher(undefined, "*.js").test("file.js")     // true
- * resolveDirectiveMatcher(undefined, /\.js$/).test("file.js")    // true
+ * resolveDirectiveMatcher(undefined, "*.js")("file.js")     // true
+ * resolveDirectiveMatcher(undefined, /\.js$/)("file.js")    // true
  * ```
  */
 export function resolveDirectiveMatcher(
   pattern?: RegExpOpt,
   defaultPattern: RegExpOpt | ((source: string, moduleId?: string) => boolean) = () => false
 ): (source: string, moduleId?: string) => boolean {
-  if (typeof pattern === "function") {
-    return pattern;
-  } else if (pattern instanceof RegExp) {
-    return (source: string, _moduleId?: string) => pattern.test(source);
-  } else if (typeof pattern === "string") {
-    const regex = parsePattern(pattern);
-    return (source: string, _moduleId?: string) => regex.test(source);
-  } else if (
-    typeof pattern === "object" &&
-    pattern != null &&
-    "__isRegExp" in pattern
-  ) {
-    const deserialized = pattern as DeserializedRegExp;
-    const regex = new RegExp(deserialized.source, deserialized.flags);
-    return (source: string, _moduleId?: string) => regex.test(source);
-  } else if (typeof defaultPattern === "function") {
-    return defaultPattern;
-  } else if (defaultPattern instanceof RegExp) {
-    return (source: string, _moduleId?: string) => defaultPattern.test(source);
-  } else if (typeof defaultPattern === "string") {
-    const regex = parsePattern(defaultPattern);
-    return (source: string, _moduleId?: string) => regex.test(source);
-  } else {
-    return () => false;
-  }
+  return createPatternMatcher(pattern, defaultPattern, {
+    handleDeserialized: true,
+    fallback: () => false,
+    throwOnInvalid: false
+  });
 }
 

package/plugin/config/resolveEnv.ts

@@ -1,7 +1,7 @@
 import { loadEnv, type ResolvedConfig } from "vite";
 import { DEFAULT_CONFIG } from "./defaults.js";
 import { getCondition } from "./getCondition.js";
-import { getNodeEnv } from "../getNodeEnv.js";
+import { getNodeEnv } from "./getNodeEnv.js";
 import { getEnvKey } from "../env/getEnvKey.js";
 
 type NestedEnv = {
@@ -11,9 +11,7 @@ type NestedEnv = {
 function setNestedEnv(obj: NestedEnv, path: string[], value: string, verbose = false) {
   if (!path.length) return;
   const key = path[0];
-  if (verbose) {
-    console.log("setNestedEnv:", { key, path, value, currentObj: obj[key] });
-  }
+
   if (path.length === 1) {
     obj[key] = value;
     return;
@@ -102,10 +100,7 @@ export function resolveEnv(
         mergedEnv[modeKey] = modeValue;
       } else {
         // Fallback to default mode
-        mergedEnv[modeKey] =
-          process.env["NODE_ENV"] === "production"
-            ? "production"
-            : "development";
+        mergedEnv[modeKey] = getNodeEnv();
       }
     }
   }