vite-plugin-react-server 1.1.19 → 1.2.0-alpha.0

package/plugin/config/resolveOptions.ts

@@ -3,16 +3,37 @@ import type { PreRenderedChunk } from "rollup";
 import type {
   StreamPluginOptions,
   ResolvedUserOptions,
-  PagePropOpt,
-  InlineCssOpt,
+  PageName,
+  PropsName,
+  HtmlName,
+  RootName,
 } from "../types.js";
-import { DEFAULT_CONFIG } from "./defaults.js";
+import {
+  BASE_PATTERNS,
+  DEFAULT_CONFIG,
+  DEFAULT_LOADER_CONFIG,
+} from "./defaults.js";
 import { join } from "node:path";
 import { pluginRoot } from "../root.js";
-import { CssCollector } from "../components/css-collector.js";
 import { createInputNormalizer } from "../helpers/inputNormalizer.js";
-import { resolveAutoDiscoverMatcher } from "./resolveAutoDiscoverMatcher.js";
-import { extMap } from "./extMap.js";
+import { getNodeEnv } from "../getNodeEnv.js";
+import { resolveDirectiveMatcher } from "./resolveDirectiveMatcher.js";
+import { resolveAllowedDirectives } from "./resolveAllowedDirectives.js";
+import { resolveRegExp } from "./resolveRegExp.js";
+import { parse } from "../loader/parse.js";
+
+export type ResolveOptionsReturn =
+  | {
+      type: "success";
+      userOptions: ResolvedUserOptions;
+      error?: never;
+    }
+  | { type: "error"; error: Error; userOptions?: never };
+
+export type ResolveOptionsFn = (
+  options: StreamPluginOptions
+) => ResolveOptionsReturn;
+
 // /**
 //  * Ensures a path ends with .js extension
 //  */
@@ -31,18 +52,23 @@ const handleSearchQuery = (path: string) => {
   if (!searchQuery) return path;
   const folder = path.split("/").slice(0, -1).join("/");
   const filename = path.split("/").pop();
-  return `${folder}/${filename}?${searchQuery}`;
+  const fileNameExtIndex = filename?.lastIndexOf(".");
+  const fileNameWithoutExt = filename?.slice(0, fileNameExtIndex);
+  const extension = filename?.slice(fileNameExtIndex);
+  return `${folder}/${fileNameWithoutExt}.${searchQuery}.${extension}`;
 };
 
 /**
- * Applies pattern matching to file paths
+ * Registers a path with an optional pattern matcher and extension.
+ * If a pattern matches and the path doesn't end with the extension, the extension is appended.
+ *
+ * @param path - The path to register
+ * @param pattern - Optional pattern matcher function that returns true if the path matches
+ * @param ext - Optional extension to append if pattern matches and path doesn't already end with it
  */
-const registerPath = (
-  path: string,
-  _pattern?: string | RegExp | ((path: string) => boolean) | undefined,
-  ext?: string | undefined
-) => {
-  if (ext && !path.endsWith(ext)) {
+const registerPath = (path: string, pattern?: RegExp, ext?: string) => {
+  // If we have a pattern and it doesn't match, or we have an extension and the path doesn't end with it, append the extension
+  if ((pattern && !pattern.test(path)) || (ext && !path.endsWith(ext))) {
     return path + ext;
   }
   return path;
@@ -52,14 +78,28 @@ const registerPath = (
 // Main Options Resolver
 // ============================================================================
 
-export const resolveOptions = <
-  T extends PagePropOpt = PagePropOpt,
-  InlineCSS extends InlineCssOpt = InlineCssOpt
->(
-  options: StreamPluginOptions<T, InlineCSS>
-):
-  | { type: "success"; userOptions: ResolvedUserOptions<T, InlineCSS> }
-  | { type: "error"; error: Error } => {
+const stashedUserOptions: Record<string, ResolvedUserOptions | null> = {};
+
+/**
+ * Resolves the user options for the plugin.
+ *
+ * @param options - The user options to resolve.
+ * @returns The resolved options.
+ */
+export const resolveOptions: ResolveOptionsFn = function _resolveOptions(
+  options
+) {
+  const envId = process.env.NODE_ENV ?? "development";
+
+  // Return stashed options if available
+  if (stashedUserOptions[envId]) {
+    return {
+      type: "success",
+      userOptions: stashedUserOptions[envId] as never,
+    };
+  }
+
+  const loaderMode = options.loader?.mode ?? getNodeEnv();
   // Module path configuration
   const moduleBase =
     typeof options.moduleBase === "string"
@@ -79,32 +119,21 @@ export const resolveOptions = <
     process.env["VITE_PROD"] === "1";
   const prodModuleBase = isProd && preserveModulesRoot ? moduleBase : undefined;
 
-  const {
-    pageExportName = DEFAULT_CONFIG.PAGE_EXPORT_NAME,
-    propsExportName = DEFAULT_CONFIG.PROPS_EXPORT_NAME,
-  } = options;
-
-  // Build configuration
-  const pages =
-    typeof options.build?.pages === "function"
-      ? options.build.pages
-      : Array.isArray(options.build?.pages)
-      ? options.build.pages
-      : DEFAULT_CONFIG.BUILD.pages;
-
-  let client = options.build?.client ?? DEFAULT_CONFIG.BUILD.client;
-  let server = options.build?.server ?? DEFAULT_CONFIG.BUILD.server;
-  const api = options.build?.api ?? DEFAULT_CONFIG.BUILD.api;
-  const staticBuild = options.build?.static ?? DEFAULT_CONFIG.BUILD.static;
-  const outDir = options.build?.outDir ?? DEFAULT_CONFIG.BUILD.outDir;
-  const assetsDir =
-    options.build?.assetsDir ?? `${DEFAULT_CONFIG.CLIENT_ASSETS_DIR}`;
+  const client =
+    typeof options.build?.client === "string"
+      ? options.build.client
+      : DEFAULT_CONFIG.BUILD.client;
+
+  const outDir =
+    typeof options.build?.outDir === "string"
+      ? options.build.outDir
+      : DEFAULT_CONFIG.BUILD.outDir;
 
   const moduleBasePath =
     typeof options.moduleBasePath === "string"
       ? options.moduleBasePath
       : process.env.VITE_BASE_URL ?? DEFAULT_CONFIG.MODULE_BASE_PATH;
-  
+
   const moduleBaseURL =
     typeof options.moduleBaseURL === "string"
       ? options.moduleBaseURL
@@ -135,6 +164,46 @@ export const resolveOptions = <
     typeof options.loaderPath === "string"
       ? join(projectRoot, options.loaderPath)
       : join(pluginRoot, DEFAULT_CONFIG.LOADER_PATH);
+
+  const preserveDirectives =
+    typeof options.build?.preserveDirectives === "boolean"
+      ? options.build.preserveDirectives
+      : DEFAULT_CONFIG.BUILD.preserveDirectives;
+
+  const jsExtension =
+    typeof options.build?.jsExtension === "string"
+      ? options.build.jsExtension
+      : DEFAULT_CONFIG.BUILD.jsExtension;
+  const cssExtension =
+    typeof options.build?.cssExtension === "string"
+      ? options.build.cssExtension
+      : DEFAULT_CONFIG.BUILD.cssExtension;
+  const cssModuleExtension =
+    typeof options.build?.cssModuleExtension === "string"
+      ? options.build.cssModuleExtension
+      : DEFAULT_CONFIG.BUILD.cssModuleExtension;
+  const htmlExtension =
+    typeof options.build?.htmlExtension === "string"
+      ? options.build.htmlExtension
+      : DEFAULT_CONFIG.BUILD.htmlExtension;
+  const jsonExtension =
+    typeof options.build?.jsonExtension === "string"
+      ? options.build.jsonExtension
+      : DEFAULT_CONFIG.BUILD.jsonExtension;
+  const rscExtension =
+    typeof options.build?.rscExtension === "string"
+      ? options.build.rscExtension
+      : DEFAULT_CONFIG.BUILD.rscExtension;
+
+  const rscOutputPath =
+    typeof options.build?.rscOutputPath === "string"
+      ? options.build.rscOutputPath
+      : DEFAULT_CONFIG.BUILD.rscOutputPath;
+  const htmlOutputPath =
+    typeof options.build?.htmlOutputPath === "string"
+      ? options.build.htmlOutputPath
+      : DEFAULT_CONFIG.BUILD.htmlOutputPath;
+
   // these will never be cleaned up, because, we are resolving the user options
   // and it's assumed they are relevant until the process stops
   if (process.env.VITE_BASE_URL !== moduleBaseURL) {
@@ -144,113 +213,99 @@ export const resolveOptions = <
     process.env.VITE_PUBLIC_ORIGIN = publicOrigin;
   }
 
-  const moduleExtension = resolveAutoDiscoverMatcher(
-    options.autoDiscover?.moduleExtension,
-    DEFAULT_CONFIG.AUTO_DISCOVER.moduleExtension
-  );
-  // Auto-discovery pattern matchers
-  const modulePattern = resolveAutoDiscoverMatcher(
+  const modulePattern = resolveRegExp(
     options.autoDiscover?.modulePattern,
-    options.autoDiscover?.moduleExtension
-      ? (id: string) => moduleExtension(id.toLowerCase())
-      : DEFAULT_CONFIG.AUTO_DISCOVER.modulePattern
+    DEFAULT_CONFIG.AUTO_DISCOVER.modulePattern
   );
 
-  const jsonPattern = resolveAutoDiscoverMatcher(
+  const jsonPattern = resolveRegExp(
     options.autoDiscover?.jsonPattern,
     DEFAULT_CONFIG.AUTO_DISCOVER.jsonPattern
   );
 
-  const cssPattern = resolveAutoDiscoverMatcher(
+  const cssPattern = resolveRegExp(
     options.autoDiscover?.cssPattern,
     DEFAULT_CONFIG.AUTO_DISCOVER.cssPattern
   );
 
-  const testHtml = resolveAutoDiscoverMatcher(
+  const htmlPattern = resolveRegExp(
     options.autoDiscover?.htmlPattern,
     DEFAULT_CONFIG.AUTO_DISCOVER.htmlPattern
   );
 
-  const testRsc = resolveAutoDiscoverMatcher(
+  const rscPattern = resolveRegExp(
     options.autoDiscover?.rscPattern,
     DEFAULT_CONFIG.AUTO_DISCOVER.rscPattern
   );
 
-  const clientComponents = resolveAutoDiscoverMatcher(
-    options.autoDiscover?.clientComponents,
-    options.autoDiscover?.moduleExtension
-      ? (id: string) => /(\.|\/)?client(\.|\/)?/.test(id.toLowerCase())
-      : DEFAULT_CONFIG.AUTO_DISCOVER.clientComponents
+  const clientPattern = resolveRegExp(
+    options.autoDiscover?.clientPattern,
+    DEFAULT_CONFIG.AUTO_DISCOVER.clientPattern
   );
 
-  const serverFunctions = resolveAutoDiscoverMatcher(
-    options.autoDiscover?.serverFunctions,
-    options.autoDiscover?.moduleExtension
-      ? (id: string) => /(\.|\/)?server(\.|\/)?/.test(id.toLowerCase())
-      : DEFAULT_CONFIG.AUTO_DISCOVER.serverFunctions
+  const serverPattern = resolveRegExp(
+    options.autoDiscover?.serverPattern,
+    DEFAULT_CONFIG.AUTO_DISCOVER.serverPattern
   );
 
-  const nodeOnly = resolveAutoDiscoverMatcher(
-    options.autoDiscover?.nodeOnly,
+  const nodePattern = resolveRegExp(
+    options.autoDiscover?.nodePattern,
     DEFAULT_CONFIG.AUTO_DISCOVER.nodeOnly
   );
 
-  const propsPattern = resolveAutoDiscoverMatcher(
+  const propsPattern = resolveRegExp(
     options.autoDiscover?.propsPattern,
-    options.autoDiscover?.moduleExtension
-      ? (id: string) =>
-          moduleExtension(id.toLowerCase()) &&
-          /(\.|\/)?props(\.|\/)/.test(id.toLowerCase())
-      : DEFAULT_CONFIG.AUTO_DISCOVER.propsPattern
+    DEFAULT_CONFIG.AUTO_DISCOVER.propsPattern
   );
 
-  const pagePattern = resolveAutoDiscoverMatcher(
+  const pagePattern = resolveRegExp(
     options.autoDiscover?.pagePattern,
-    options.autoDiscover?.moduleExtension
-      ? (id: string) =>
-          moduleExtension(id.toLowerCase()) &&
-          /(\.|\/)?page(\.|\/)/.test(id.toLowerCase())
-      : DEFAULT_CONFIG.AUTO_DISCOVER.pagePattern
+    DEFAULT_CONFIG.AUTO_DISCOVER.pagePattern
   );
 
-  const cssModulePattern = resolveAutoDiscoverMatcher(
+  const cssModulePattern = resolveRegExp(
     options.autoDiscover?.cssModulePattern,
     DEFAULT_CONFIG.AUTO_DISCOVER.cssModulePattern
   );
 
-  const vendorPattern = resolveAutoDiscoverMatcher(
+  const vendorPattern = resolveRegExp(
     options.autoDiscover?.vendorPattern,
     DEFAULT_CONFIG.AUTO_DISCOVER.vendorPattern
   );
 
-  const virtualPattern = resolveAutoDiscoverMatcher(
+  const virtualPattern = resolveRegExp(
     options.autoDiscover?.virtualPattern,
     DEFAULT_CONFIG.AUTO_DISCOVER.virtualPattern
   );
 
-  const dotFiles = resolveAutoDiscoverMatcher(
-    options.autoDiscover?.dotFiles,
-    DEFAULT_CONFIG.AUTO_DISCOVER.dotFiles
+  const dotPattern = resolveRegExp(
+    options.autoDiscover?.dotPattern,
+    BASE_PATTERNS.DOT_FILES
   );
 
-  const isServerFunctionCode = resolveAutoDiscoverMatcher(
-    options.autoDiscover?.isServerFunctionCode,
-    options.autoDiscover?.serverDirective
-      ? (code: string, moduleId?: string) =>
-          code.match(options.autoDiscover?.serverDirective!) != null ||
-          (moduleId && serverFunctions(moduleId)) ||
-          false
-      : DEFAULT_CONFIG.AUTO_DISCOVER.isServerFunctionCode
+  /** Loader options */
+  const serverDirective = resolveRegExp(
+    options.loader?.serverDirective,
+    DEFAULT_LOADER_CONFIG.serverDirective
+  );
+  const clientDirective = resolveRegExp(
+    options.loader?.clientDirective,
+    DEFAULT_LOADER_CONFIG.clientDirective
+  );
+  const isServerFunctionCode = resolveDirectiveMatcher(
+    serverDirective,
+    (code: string, moduleId?: string) =>
+      code.match(serverDirective) != null ||
+      (typeof moduleId === "string" && serverPattern.test(moduleId)) ||
+      false
   );
 
-  const isClientComponentCode = resolveAutoDiscoverMatcher(
-    options.autoDiscover?.isClientComponentCode,
-    options.autoDiscover?.clientDirective
-      ? (code: string, moduleId?: string) =>
-          code.match(options.autoDiscover?.clientDirective!) != null ||
-          (moduleId && clientComponents(moduleId)) ||
-          false
-      : DEFAULT_CONFIG.AUTO_DISCOVER.isClientComponentCode
+  const isClientComponentCode = resolveDirectiveMatcher(
+    clientDirective,
+    (code: string, moduleId?: string) =>
+      code.match(clientDirective) != null ||
+      (typeof moduleId === "string" && clientPattern.test(moduleId)) ||
+      false
   );
 
   const hashOption =
@@ -272,7 +327,7 @@ export const resolveOptions = <
   const hash = (n: string | null, ssr: boolean) => {
     if (!n) return "";
     if (ssr) return n;
-    if (hashString === "" || autoDiscover.nodeOnly(n)) {
+    if (hashString === "" || new RegExp(BASE_PATTERNS.EXT.NODE).test(n)) {
       return n;
     }
     const extensionIndex = n.lastIndexOf(".");
@@ -284,11 +339,6 @@ export const resolveOptions = <
       return n + hashString;
     }
   };
-  const jsExtension = options.autoDiscover?.jsExtension ?? ".js";
-  const cssExtension = options.autoDiscover?.cssExtension ?? ".css";
-  const htmlExtension = options.autoDiscover?.htmlExtension ?? ".html";
-  const jsonExtension = options.autoDiscover?.jsonExtension ?? ".json";
-  const rscExtension = options.autoDiscover?.rscExtension ?? ".rsc";
 
   // Output path resolution
   const getOutputPath = (n: string | null) => {
@@ -298,59 +348,27 @@ export const resolveOptions = <
       ? path.slice(moduleBase.length + moduleBasePath.length)
       : path;
 
-    if (vendorPattern(path))
-      return registerPath(
-        path,
-        options.autoDiscover?.vendorPattern,
-        jsExtension
-      );
-    if (cssModulePattern(path))
-      return registerPath(
-        path,
-        options.autoDiscover?.cssModulePattern,
-        cssExtension + jsExtension
-      );
-    if (cssPattern(path))
-      return registerPath(path, options.autoDiscover?.cssPattern, cssExtension);
-    if (clientComponents(path))
-      return registerPath(
-        path,
-        options.autoDiscover?.clientComponents,
-        jsExtension
-      );
-    if (testHtml(path))
-      return registerPath(
-        path,
-        options.autoDiscover?.htmlPattern,
-        htmlExtension
-      );
-    if (jsonPattern(path))
-      return registerPath(
-        path,
-        options.autoDiscover?.jsonPattern,
-        jsonExtension
-      );
-    if (propsPattern(path))
-      return registerPath(
-        path,
-        options.autoDiscover?.propsPattern,
-        jsExtension
-      );
-    if (pagePattern(path))
-      return registerPath(path, options.autoDiscover?.pagePattern, jsExtension);
-    if (serverFunctions(path))
-      return registerPath(
-        path,
-        options.autoDiscover?.serverFunctions,
-        jsExtension
-      );
-    if (modulePattern(path))
-      return registerPath(
-        path,
-        options.autoDiscover?.modulePattern,
-        jsExtension
-      );
-    return registerPath(path, options.autoDiscover?.modulePattern, jsExtension);
+    if (vendorPattern.test(path))
+      return registerPath(path, vendorPattern, jsExtension);
+    if (cssModulePattern.test(path))
+      return registerPath(path, cssModulePattern, cssExtension);
+    if (cssPattern.test(path))
+      return registerPath(path, cssPattern, cssExtension);
+    if (clientPattern.test(path))
+      return registerPath(path, clientPattern, jsExtension);
+    if (htmlPattern.test(path))
+      return registerPath(path, htmlPattern, htmlExtension);
+    if (jsonPattern.test(path))
+      return registerPath(path, jsonPattern, jsonExtension);
+    if (propsPattern.test(path))
+      return registerPath(path, propsPattern, jsExtension);
+    if (pagePattern.test(path))
+      return registerPath(path, pagePattern, jsExtension);
+    if (serverPattern.test(path))
+      return registerPath(path, serverPattern, jsExtension);
+    if (modulePattern.test(path))
+      return registerPath(path, modulePattern, jsExtension);
+    return registerPath(path, modulePattern, jsExtension);
   };
 
   const normalizer =
@@ -360,17 +378,10 @@ export const resolveOptions = <
       preserveModulesRoot: prodModuleBase,
       removeExtension: true,
       moduleBasePath,
+      moduleBaseURL,
     });
   // File naming functions
   const entryFile = (n: PreRenderedChunk, ssr: boolean) => {
-    if (vendorPattern(n.name)) {
-      const search = n.facadeModuleId?.split("?")[1];
-      if (search) {
-        return hash(`${n.name}.${search}${jsExtension}`, ssr);
-      } else {
-        return hash(`${n.name}${jsExtension}`, ssr);
-      }
-    }
     return hash(getOutputPath(normalizer(n.name)[0]), ssr);
   };
 
@@ -378,152 +389,257 @@ export const resolveOptions = <
     return hash(getOutputPath(normalizer(n.name)[0]), ssr);
   };
 
-  const assetFile = (n: PreRenderedAsset, ssr: boolean) => {
-    const firstName = n.names[0];
-    const extIndex = firstName.lastIndexOf(".");
-    const nameWithoutExtension = firstName.slice(0, extIndex);
-    const extension = firstName.slice(extIndex);
-    const assetName = normalizer(nameWithoutExtension)[0] + extension;
-    return hash(getOutputPath(assetName), ssr);
+  const assetFile: (n: PreRenderedAsset, ssr?: boolean) => string = (n: PreRenderedAsset, ssr = false) => {
+    if (n.names.length > 1) {
+      return n.names.map((name) => hash(name, ssr)).join(",");
+    }
+    let firstName = n.names[0];
+    
+    // Clean up asset paths by removing the moduleBase from within assets directory
+    // Transform: assets/src/page/file.css -> assets/page/file.css
+    const assetsDir = build.assetsDir || "assets";
+    if (firstName.startsWith(assetsDir + "/" + moduleBase + "/")) {
+      firstName = assetsDir + "/" + firstName.slice((assetsDir + "/" + moduleBase + "/").length);
+    }
+    // Handle moduleBasePath removal
+    else if (moduleBasePath && firstName.startsWith(moduleBasePath)) {
+      firstName = firstName.slice(moduleBasePath.length);
+    } else if(moduleBaseURL && moduleBaseURL !== "/" && moduleBaseURL !== "" && firstName.startsWith(moduleBaseURL)) {
+      firstName = firstName.slice(moduleBaseURL.length);
+    }
+    // Handle direct moduleBase removal  
+    else if (firstName.startsWith(moduleBase + "/")) {
+      firstName = firstName.slice(moduleBase.length + 1);
+    }
+    
+    // For CSS files, make sure we preserve the .css extension and don't apply JS extension mapping
+    if (firstName.endsWith('.css')) {
+      return hash(firstName, false);
+    }
+    
+    // For other assets, apply the extension mapping if needed
+    return hash(getOutputPath(firstName), false);
   };
-  const moduleID =
-    typeof options.moduleID === "function"
-      ? options.moduleID
-      : (id: string) => {
-          if (prodModuleBase && id.startsWith(prodModuleBase)) {
-            id = id.slice(prodModuleBase.length);
-          }
-          if (!id.startsWith(moduleBasePath)) {
-            id = join(moduleBasePath, id);
-          }
-          // in the case the moduleBase comes after the base path, remove it
-          if (prodModuleBase && id.startsWith("/" + prodModuleBase)) {
-            id = id.slice(prodModuleBase.length + 1);
-          }
-          // these paths will generally start with a /, simply ensure they always do
-          if (!id.startsWith("/")) {
-            id = "/" + id;
-          }
-          if (isProd) {
-            // generally it will work if we just use the .js extension for modules
-            return mapExtension(id);
-          }
-          // but for extra good development workflow, we keep the path intact
-          // not even stripping the moduleBase or ts extensions
-          return id;
-        };
 
-  const rscOutputPath =
-    options.build?.rscOutputPath ?? DEFAULT_CONFIG.BUILD.rscOutputPath;
-  const htmlOutputPath =
-    options.build?.htmlOutputPath ?? DEFAULT_CONFIG.BUILD.htmlOutputPath;
-
-  // Build configuration object
+  /**
+   * pages
+   * assetsDir
+   * client
+   * server
+   * static
+   * api
+   * outDir
+   * hash
+   * preserveDirectives
+   * preserveModulesRoot
+   * rscOutputPath
+   * htmlOutputPath
+   * entryFile
+   * chunkFile
+   * assetFile
+   * extensionMap
+   * moduleExtension
+   * jsExtension
+   * cssExtension
+   * htmlExtension
+   * jsonExtension
+   * rscExtension
+   * cssModuleExtension
+   * nodeExtension
+   */
   const build = {
-    pages,
-    client,
-    server,
-    static: staticBuild,
-    outDir,
-    assetsDir,
-    api,
-    hash: hashOption,
-    preserveModulesRoot,
-    rscOutputPath,
-    htmlOutputPath,
-    entryFile:
-      typeof options.build?.entryFile === "function"
-        ? options.build.entryFile
-        : entryFile,
-    chunkFile:
-      typeof options.build?.chunkFile === "function"
-        ? options.build.chunkFile
-        : chunkFile,
-    assetFile:
-      typeof options.build?.assetFile === "function"
-        ? options.build.assetFile
-        : assetFile,
-  };
-
-  // Auto-discovery configuration
-  const autoDiscover = {
+    pages: options.build?.pages ?? DEFAULT_CONFIG.BUILD.pages,
+    assetsDir: options.build?.assetsDir ?? DEFAULT_CONFIG.BUILD.assetsDir,
+    client: options.build?.client ?? DEFAULT_CONFIG.BUILD.client,
+    server: options.build?.server ?? DEFAULT_CONFIG.BUILD.server,
+    static: options.build?.static ?? DEFAULT_CONFIG.BUILD.static,
+    api: options.build?.api ?? DEFAULT_CONFIG.BUILD.api,
+    preserveModulesRoot:
+      options.build?.preserveModulesRoot ??
+      DEFAULT_CONFIG.BUILD.preserveModulesRoot,
+    outDir: options.build?.outDir ?? DEFAULT_CONFIG.BUILD.outDir,
+    hash: options.build?.hash ?? DEFAULT_CONFIG.BUILD.hash,
+    extensionMap: {
+      // File extensions first (more specific patterns should come first)
+      [BASE_PATTERNS.EXT.CSS]: cssExtension,
+      [BASE_PATTERNS.EXT.JSON]: jsonExtension,
+      [BASE_PATTERNS.EXT.HTML]: htmlExtension,
+      [BASE_PATTERNS.EXT.RSC]: rscExtension,
+      // Special case for .node files
+      [BASE_PATTERNS.EXT.NODE]:
+        BASE_PATTERNS.EXT.NODE +
+        (options.build?.jsExtension ?? DEFAULT_CONFIG.BUILD.jsExtension),
+      // General module pattern last (less specific)
+      [BASE_PATTERNS.MODULE]: jsExtension,
+      ...options.build?.extensionMap,
+    },
+    entryFile,
+    chunkFile,
+    assetFile,
+    preserveDirectives: preserveDirectives,
+    rscOutputPath: rscOutputPath,
+    htmlOutputPath: htmlOutputPath,
+    moduleExtension: jsExtension,
     jsExtension: jsExtension,
     cssExtension: cssExtension,
     htmlExtension: htmlExtension,
     jsonExtension: jsonExtension,
     rscExtension: rscExtension,
-    moduleExtension:
-      options.autoDiscover?.moduleExtension ??
-      DEFAULT_CONFIG.AUTO_DISCOVER.moduleExtension,
-    serverDirective:
-      options.autoDiscover?.serverDirective ??
-      DEFAULT_CONFIG.AUTO_DISCOVER.serverDirective,
-    clientDirective:
-      options.autoDiscover?.clientDirective ??
-      DEFAULT_CONFIG.AUTO_DISCOVER.clientDirective,
-    modulePattern: modulePattern,
-    cssPattern: cssPattern,
-    jsonPattern: jsonPattern,
-    clientComponents: clientComponents,
-    serverFunctions: serverFunctions,
-    nodeOnly: nodeOnly,
-    propsPattern: propsPattern,
-    pagePattern: pagePattern,
-    cssModulePattern: cssModulePattern,
-    vendorPattern: vendorPattern,
-    dotFiles: dotFiles,
-    virtualPattern: virtualPattern,
-    htmlPattern: testHtml,
-    rscPattern: testRsc,
-    isServerFunctionCode: isServerFunctionCode,
-    isClientComponentCode: isClientComponentCode,
-  };
-  const mapExtension = extMap(autoDiscover);
+    cssModuleExtension: cssModuleExtension,
+    nodeExtension: DEFAULT_CONFIG.BUILD.nodeExtension,
+  } satisfies ResolvedUserOptions["build"];
+
+  // Auto-discovery configuration
+  const autoDiscover = {
+    modulePattern,
+    jsonPattern,
+    cssPattern,
+    htmlPattern,
+    rscPattern,
+    clientPattern,
+    serverPattern,
+    nodePattern,
+    propsPattern,
+    pagePattern,
+    cssModulePattern,
+    vendorPattern,
+    virtualPattern,
+    dotPattern,
+  } satisfies ResolvedUserOptions["autoDiscover"];
+
+  const allowedDirectives = resolveAllowedDirectives(
+    options.loader?.allowedDirectives ?? DEFAULT_LOADER_CONFIG.allowedDirectives
+  );
+
+
+  // Create loader configuration
+  const loader = {
+    serverDirective: resolveRegExp(
+      options.loader?.serverDirective,
+      DEFAULT_LOADER_CONFIG.serverDirective
+    ),
+    clientDirective: resolveRegExp(
+      options.loader?.clientDirective,
+      DEFAULT_LOADER_CONFIG.clientDirective
+    ),
+    allowedDirectives: allowedDirectives,
+    getDirectiveType:
+      options.loader?.getDirectiveType ?? options.loader?.allowedDirectives
+        ? (directive: string) => {
+            if (options.loader?.allowedDirectives) {
+              if (Array.isArray(options.loader?.allowedDirectives)) {
+                return options.loader?.allowedDirectives.includes(directive)
+                  ? directive === "use server"
+                    ? "server"
+                    : "client"
+                  : undefined;
+              } else {
+                const config = options.loader?.allowedDirectives[directive];
+                return config
+                  ? directive === "use server"
+                    ? "server"
+                    : "client"
+                  : undefined;
+              }
+            }
+            return undefined;
+          }
+        : DEFAULT_LOADER_CONFIG.getDirectiveType,
+    mode: loaderMode,
+    importServerPath:
+      options.loader?.importServerPath ??
+      DEFAULT_CONFIG.RSC_LOADER[loaderMode].importServerPath,
+    importClientPath:
+      options.loader?.importClientPath ??
+      DEFAULT_CONFIG.RSC_LOADER[loaderMode].importClientPath,
+    registerClientReferenceName:
+      options.loader?.registerClientReferenceName ??
+      DEFAULT_CONFIG.RSC_LOADER[loaderMode].registerClientReferenceName,
+    registerServerReferenceName:
+      options.loader?.registerServerReferenceName ??
+      DEFAULT_CONFIG.RSC_LOADER[loaderMode].registerServerReferenceName,
+    isServerFunctionCode,
+    isClientComponentCode,
+    parse: parse,
+  } satisfies ResolvedUserOptions["loader"];
+
   const pipeableStreamOptions = options.pipeableStreamOptions
     ? options.pipeableStreamOptions
     : {};
 
   // Return resolved options
   try {
+    const userOptions: ResolvedUserOptions = {
+      projectRoot,
+      moduleBase,
+      moduleBasePath,
+      moduleBaseURL,
+      moduleRootPath,
+      publicOrigin,
+      build: build,
+      verbose: options.verbose ?? DEFAULT_CONFIG.VERBOSE,
+      onMetrics: options.onMetrics ?? DEFAULT_CONFIG.ON_METRICS,
+      onEvent: options.onEvent,
+      Page: options.Page,
+      props: options.props,
+      Html: options.Html ?? DEFAULT_CONFIG.HTML,
+      Root: options.Root ?? DEFAULT_CONFIG.ROOT,
+      components: options.components,
+              normalizer: normalizer,
+        moduleID: options.moduleID, // if not provided, will be created when config hook is called
+      pageExportName:
+        options.pageExportName ?? (DEFAULT_CONFIG.PAGE_EXPORT_NAME as PageName),
+      propsExportName:
+        options.propsExportName ??
+        (DEFAULT_CONFIG.PROPS_EXPORT_NAME as PropsName),
+      htmlExportName:
+        options.htmlExportName ?? (DEFAULT_CONFIG.HTML_EXPORT_NAME as HtmlName),
+      rootExportName:
+        options.rootExportName ?? (DEFAULT_CONFIG.ROOT_EXPORT_NAME as RootName),
+      css: {
+        inlineCss: options.css?.inlineCss ?? DEFAULT_CONFIG.CSS.inlineCss,
+        inlineThreshold:
+          options.css?.inlineThreshold ?? DEFAULT_CONFIG.CSS.inlineThreshold,
+        inlinePatterns:
+          options.css?.inlinePatterns ?? DEFAULT_CONFIG.CSS.inlinePatterns,
+        linkPatterns:
+          options.css?.linkPatterns ?? DEFAULT_CONFIG.CSS.linkPatterns,
+      },
+      htmlWorkerPath: htmlWorkerPath,
+      rscWorkerPath: rscWorkerPath,
+      loaderPath: loaderPath,
+      reactLoaderPath: options.reactLoaderPath ?? DEFAULT_CONFIG.REACT_LOADER_PATH,
+      cssLoaderPath: options.cssLoaderPath ?? DEFAULT_CONFIG.CSS_LOADER_PATH,
+      envLoaderPath: options.envLoaderPath ?? DEFAULT_CONFIG.ENV_LOADER_PATH,
+      clientEntry: options.clientEntry ?? DEFAULT_CONFIG.CLIENT_ENTRY,
+      serverEntry: options.serverEntry ?? DEFAULT_CONFIG.SERVER_ENTRY,
+      autoDiscover: autoDiscover,
+      loader: loader,
+      pipeableStreamOptions,
+      rscTimeout:
+        typeof options.rscTimeout === "number"
+          ? options.rscTimeout
+          : DEFAULT_CONFIG.RSC_TIMEOUT,
+      htmlWorkerStartupTimeout:
+        typeof options.htmlWorkerStartupTimeout === "number"
+          ? options.htmlWorkerStartupTimeout
+          : DEFAULT_CONFIG.HTML_WORKER_STARTUP_TIMEOUT,
+      rscWorkerStartupTimeout:
+        typeof options.rscWorkerStartupTimeout === "number"
+          ? options.rscWorkerStartupTimeout
+          : DEFAULT_CONFIG.RSC_WORKER_STARTUP_TIMEOUT,
+      panicThreshold:
+        typeof options.panicThreshold === "string"
+          ? options.panicThreshold
+          : DEFAULT_CONFIG.PANIC_THRESHOLD,
+    };
+
+    // Stash the resolved options
+    stashedUserOptions[envId] = userOptions;
+
     return {
       type: "success",
-      userOptions: {
-        projectRoot,
-        moduleBase,
-        moduleBasePath,
-        moduleBaseURL,
-        moduleRootPath,
-        publicOrigin,
-        build: build,
-        verbose: options.verbose ?? DEFAULT_CONFIG.VERBOSE,
-        onMetrics: options.onMetrics ?? DEFAULT_CONFIG.ON_METRICS,
-        onEvent: options.onEvent,
-        Page: options.Page ?? undefined,
-        props: options.props ?? undefined,
-        Html: options.Html ?? DEFAULT_CONFIG.HTML,
-        CssCollector: options.CssCollector ?? CssCollector,
-        normalizer: normalizer,
-        moduleID: moduleID,
-        pageExportName: pageExportName,
-        propsExportName: propsExportName,
-        css: {
-          inlineCss: options.css?.inlineCss ?? DEFAULT_CONFIG.CSS.inlineCss,
-          inlineThreshold:
-            options.css?.inlineThreshold ?? DEFAULT_CONFIG.CSS.inlineThreshold,
-          inlinePatterns:
-            options.css?.inlinePatterns ?? DEFAULT_CONFIG.CSS.inlinePatterns,
-          linkPatterns:
-            options.css?.linkPatterns ?? DEFAULT_CONFIG.CSS.linkPatterns,
-        },
-        htmlWorkerPath: htmlWorkerPath,
-        rscWorkerPath: rscWorkerPath,
-        loaderPath: loaderPath,
-        clientEntry: options.clientEntry ?? DEFAULT_CONFIG.CLIENT_ENTRY,
-        serverEntry: options.serverEntry ?? DEFAULT_CONFIG.SERVER_ENTRY,
-        //   moduleBaseExceptions: options.moduleBaseExceptions ?? [],
-        autoDiscover: autoDiscover,
-        pipeableStreamOptions,
-      } as ResolvedUserOptions<T, InlineCSS>,
+      userOptions,
     };
   } catch (error) {
     return {