rari 0.5.14 → 0.5.15

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-qjOIQBvr.mjs";
+import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-7bcdKkub.mjs";
 import { i as writeManifest, n as generateAppRouteManifest, r as loadManifest, t as AppRouteGenerator } from "./app-routes-DZjfJPdB.mjs";
 import { c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, m as extractServerPropsWithCache, p as extractServerProps, u as clearPropsCache } from "./runtime-client-AtnJSL0q.mjs";
-import "./server-build-CBAhNcXM.mjs";
+import "./server-build-MmIJHCpL.mjs";
 
 export { AppRouteGenerator, HttpRuntimeClient, RariResponse, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, headers, loadManifest, rari, rariRouter, writeManifest };

package/dist/server-build-BqMz9o5w.mjs

@@ -0,0 +1,3 @@
+import { n as createServerBuildPlugin, r as scanDirectory, t as ServerComponentBuilder } from "./server-build-MmIJHCpL.mjs";
+
+export { ServerComponentBuilder, scanDirectory };

package/dist/{server-build-CBAhNcXM.mjs → server-build-MmIJHCpL.mjs}

@@ -4,6 +4,39 @@ import process from "node:process";
 import { build } from "esbuild";
 
 //#region src/vite/server-build.ts
+function isNodeBuiltin(moduleName) {
+	return [
+		"fs",
+		"path",
+		"os",
+		"crypto",
+		"util",
+		"stream",
+		"events",
+		"process",
+		"buffer",
+		"url",
+		"querystring",
+		"zlib",
+		"http",
+		"https",
+		"net",
+		"tls",
+		"child_process",
+		"cluster",
+		"worker_threads",
+		"assert",
+		"dns",
+		"readline",
+		"repl",
+		"string_decoder",
+		"timers",
+		"tty",
+		"v8",
+		"vm",
+		"perf_hooks"
+	].includes(moduleName);
+}
 var ServerComponentBuilder = class {
 	serverComponents = /* @__PURE__ */ new Map();
 	serverActions = /* @__PURE__ */ new Map();
@@ -193,7 +226,7 @@ const ${importName} = (props) => {
 					loader
 				},
 				bundle: true,
-				platform: "neutral",
+				platform: "node",
 				target: "es2022",
 				format: "esm",
 				external: [],
@@ -256,11 +289,11 @@ const ${importName} = (props) => {
 									path: args.path,
 									external: true
 								};
-								if (args.path === "rari/client") return null;
-								if (/^[^./]/.test(args.path)) return {
+								if (args.path.startsWith("node:") || isNodeBuiltin(args.path)) return {
 									path: args.path,
 									external: true
 								};
+								if (args.path === "rari/client") return null;
 								return null;
 							});
 							build$1.onLoad({
@@ -382,7 +415,7 @@ const ${importName} = (props) => {
 					loader
 				},
 				bundle: true,
-				platform: "neutral",
+				platform: "node",
 				target: "es2022",
 				format: "esm",
 				outfile: outputPath,
@@ -440,11 +473,12 @@ const ${importName} = (props) => {
 									path: args.path,
 									external: true
 								};
-								if (args.path === "rari/client") return null;
-								return {
+								if (args.path.startsWith("node:") || isNodeBuiltin(args.path)) return {
 									path: args.path,
 									external: true
 								};
+								if (args.path === "rari/client") return null;
+								return null;
 							});
 						}
 					},
@@ -480,8 +514,31 @@ const ${importName} = (props) => {
 				code = code.replace(/import\s+\{[^}]*\}\s+from\s+['"]react\/jsx-dev-runtime['"];?\s*/g, "// jsx/jsxs are available as globals\n");
 				code = code.replace(/import\s+React\d*(?:\s*,\s*\{[^}]*\})?\s+from\s+['"]react['"];?\s*/g, "// React is available as globalThis.React\n");
 				code = code.replace(/import\s+\{[^}]*\}\s+from\s+['"]react['"];?\s*/g, "// React is available as globalThis.React\n");
-				code = code.replace(/import\s+\w+\s+from\s+['"]node:[^'"]+['"];?\s*/g, "// Node.js built-ins are available in Deno runtime\n");
-				code = code.replace(/import\s+\{[^}]*\}\s+from\s+['"]node:[^'"]+['"];?\s*/g, "// Node.js built-ins are available in Deno runtime\n");
+				code = code.replace(/import\s+\{([^}]+)\}\s+from\s+['"]node:fs['"];?\s*/g, (match, imports) => {
+					return imports.split(",").map((i) => i.trim()).map((imp) => {
+						if (imp === "readFileSync") return "const readFileSync = (path, encoding) => globalThis.Deno?.readTextFileSync ? globalThis.Deno.readTextFileSync(path) : \"\";";
+						if (imp === "existsSync") return "const existsSync = (path) => { try { globalThis.Deno?.statSync(path); return true; } catch { return false; } };";
+						if (imp === "statSync") return "const statSync = (path) => { const s = globalThis.Deno?.statSync(path); return { isFile: () => s?.isFile, isDirectory: () => s?.isDirectory, size: s?.size || 0 }; };";
+						if (imp === "readdirSync") return "const readdirSync = (path) => { const entries = []; for (const e of globalThis.Deno?.readDirSync(path) || []) entries.push(e.name); return entries; };";
+						return `const ${imp} = () => {};`;
+					}).join("\n");
+				});
+				code = code.replace(/import\s+\{([^}]+)\}\s+from\s+['"]node:path['"];?\s*/g, (match, imports) => {
+					return imports.split(",").map((i) => i.trim()).map((imp) => {
+						if (imp === "join") return "const join = (...parts) => parts.filter(p => p).join(\"/\").replace(/\\/+/g, \"/\") || \".\";";
+						if (imp === "resolve") return "const resolve = (...paths) => { const cwd = globalThis.Deno?.cwd?.() || \"/\"; let resolved = \"\"; let isAbs = false; for (let i = paths.length - 1; i >= -1 && !isAbs; i--) { const p = i >= 0 ? paths[i] : cwd; if (!p) continue; resolved = p + \"/\" + resolved; isAbs = p[0] === \"/\"; } const parts = resolved.split(\"/\").filter(Boolean); const result = []; for (const p of parts) { if (p === \"..\") { if (result.length && result[result.length-1] !== \"..\") result.pop(); else if (!isAbs) result.push(\"..\"); } else if (p !== \".\") result.push(p); } return (isAbs ? \"/\" : \"\") + result.join(\"/\") || \".\"; };";
+						if (imp === "dirname") return "const dirname = (path) => { const parts = path.split(\"/\").filter(Boolean); parts.pop(); return parts.length ? \"/\" + parts.join(\"/\") : \"/\"; };";
+						if (imp === "basename") return "const basename = (path) => path.split(\"/\").filter(Boolean).pop() || \"\";";
+						return `const ${imp} = () => {};`;
+					}).join("\n");
+				});
+				code = code.replace(/import\s+\{([^}]+)\}\s+from\s+['"]node:process['"];?\s*/g, (match, imports) => {
+					return imports.split(",").map((i) => i.trim()).map((imp) => {
+						if (imp === "cwd") return "const cwd = () => globalThis.Deno?.cwd?.() || \"/\";";
+						if (imp === "env") return "const env = new Proxy({}, { get: (_, prop) => globalThis.Deno?.env?.get?.(prop) });";
+						return `const ${imp} = () => {};`;
+					}).join("\n");
+				});
 				const finalTransformedCode = this.createSelfRegisteringModule(code, componentId);
 				await fs.promises.writeFile(outputPath, finalTransformedCode, "utf-8");
 				if (returnCode) return finalTransformedCode;
@@ -556,44 +613,53 @@ if (!globalThis["${componentId}"]) {
         try {
             const moduleKey = "${componentId}";
             let mainExport = null;
-            let exportedFunctions = {};
+            const exportedFunctions = {};
 
             globalThis.__server_functions = globalThis.__server_functions || {};
 
-        ${namedExports.map((name) => `
-        if (typeof ${name} !== 'undefined') {
-            globalThis.${name} = ${name};
-            globalThis.__server_functions['${name}'] = ${name};
-            exportedFunctions['${name}'] = ${name};
-        }`).join("")}
+            ${namedExports.map((name) => `if (typeof ${name} !== 'undefined') {
+                globalThis.${name} = ${name};
+                globalThis.__server_functions['${name}'] = ${name};
+                exportedFunctions['${name}'] = ${name};
+            }`).join("\n            ")}
 
-        ${defaultExportName ? `if (typeof ${defaultExportName} !== 'undefined') {
-            mainExport = ${defaultExportName};
-        } else ` : ""}{
-            const potentialExports = {};
-            ${namedExports.map((name) => `if (typeof ${name} !== 'undefined') potentialExports.${name} = ${name};`).join("\n            ")}
+            ${defaultExportName ? `if (typeof ${defaultExportName} !== 'undefined') {
+                mainExport = ${defaultExportName};
+            }` : ""}
 
-            if (Object.keys(potentialExports).length > 0) {
-                if (Object.keys(potentialExports).length === 1) {
-                    mainExport = potentialExports[Object.keys(potentialExports)[0]];
+            if (mainExport === null && Object.keys(exportedFunctions).length > 0) {
+                if (Object.keys(exportedFunctions).length === 1) {
+                    mainExport = exportedFunctions[Object.keys(exportedFunctions)[0]];
                 } else {
-                    mainExport = potentialExports;
+                    let componentFunction = null;
+                    let firstFunction = null;
+
+                    for (const [name, value] of Object.entries(exportedFunctions)) {
+                        if (typeof value === 'function') {
+                            if (!firstFunction) firstFunction = value;
+                            if (/^[A-Z]/.test(name)) {
+                                componentFunction = value;
+                                break;
+                            }
+                        }
+                    }
+
+                    mainExport = componentFunction || firstFunction;
                 }
             }
-        }
 
-        if (mainExport !== null) {
-            if (!globalThis[moduleKey]) {
-                globalThis[moduleKey] = mainExport;
-            }
+            if (mainExport !== null) {
+                if (!globalThis[moduleKey]) {
+                    globalThis[moduleKey] = mainExport;
+                }
 
-            globalThis.__rsc_components = globalThis.__rsc_components || {};
-            globalThis.__rsc_components[moduleKey] = mainExport;
+                globalThis.__rsc_components = globalThis.__rsc_components || {};
+                globalThis.__rsc_components[moduleKey] = mainExport;
 
-            if (typeof globalThis.RscModuleManager !== 'undefined' && globalThis.RscModuleManager.register) {
-                globalThis.RscModuleManager.register(moduleKey, mainExport, exportedFunctions);
+                if (typeof globalThis.RscModuleManager !== 'undefined' && globalThis.RscModuleManager.register) {
+                    globalThis.RscModuleManager.register(moduleKey, mainExport, exportedFunctions);
+                }
             }
-        }
         } catch (error) {
             console.error('Error in self-registration for ${componentId}:', error);
         }

package/dist/{vite-qjOIQBvr.mjs → vite-7bcdKkub.mjs}

@@ -1,5 +1,5 @@
 import { t as __require } from "./chunk-DFPPfDFE.mjs";
-import { n as createServerBuildPlugin } from "./server-build-CBAhNcXM.mjs";
+import { n as createServerBuildPlugin } from "./server-build-MmIJHCpL.mjs";
 import fs, { promises, stat, unwatchFile, watch, watchFile } from "node:fs";
 import * as sp from "node:path";
 import path, { join, relative, resolve, sep } from "node:path";
@@ -2716,7 +2716,7 @@ const ${componentName$1} = registerClientReference(
 				let serverComponentBuilder = null;
 				const discoverAndRegisterComponents = async () => {
 					try {
-						const { ServerComponentBuilder, scanDirectory } = await import("./server-build-C7crAeUc.mjs");
+						const { ServerComponentBuilder, scanDirectory } = await import("./server-build-BqMz9o5w.mjs");
 						const builder = new ServerComponentBuilder(projectRoot, {
 							outDir: "dist",
 							serverDir: "server",
@@ -2877,7 +2877,7 @@ const ${componentName$1} = registerClientReference(
 				const handleServerComponentHMR = async (filePath) => {
 					try {
 						if (!isServerComponent(filePath)) return;
-						const { ServerComponentBuilder } = await import("./server-build-C7crAeUc.mjs");
+						const { ServerComponentBuilder } = await import("./server-build-BqMz9o5w.mjs");
 						const builder = new ServerComponentBuilder(projectRoot, {
 							outDir: "dist",
 							serverDir: "server",

package/dist/vite.mjs

@@ -1,6 +1,6 @@
-import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-qjOIQBvr.mjs";
+import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-7bcdKkub.mjs";
 import { i as writeManifest, n as generateAppRouteManifest, r as loadManifest, t as AppRouteGenerator } from "./app-routes-DZjfJPdB.mjs";
 import { c as createHttpRuntimeClient, d as clearPropsCacheForComponent, f as extractMetadata, g as hasServerSideDataFetching, h as extractStaticParams, i as HttpRuntimeClient, m as extractServerPropsWithCache, p as extractServerProps, u as clearPropsCache } from "./runtime-client-AtnJSL0q.mjs";
-import "./server-build-CBAhNcXM.mjs";
+import "./server-build-MmIJHCpL.mjs";
 
 export { AppRouteGenerator, HttpRuntimeClient, RariResponse, clearPropsCache, clearPropsCacheForComponent, createHttpRuntimeClient, defineRariConfig, defineRariOptions, extractMetadata, extractServerProps, extractServerPropsWithCache, extractStaticParams, generateAppRouteManifest, hasServerSideDataFetching, headers, loadManifest, rari, rariRouter, writeManifest };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rari",
   "type": "module",
-  "version": "0.5.14",
+  "version": "0.5.15",
   "description": "Runtime Accelerated Rendering Infrastructure (Rari)",
   "author": "Ryan Skinner",
   "license": "MIT",
@@ -89,20 +89,20 @@
     "picocolors": "^1.1.1"
   },
   "optionalDependencies": {
-    "rari-darwin-arm64": "0.5.9",
-    "rari-darwin-x64": "0.5.9",
-    "rari-linux-arm64": "0.5.9",
-    "rari-linux-x64": "0.5.9",
-    "rari-win32-x64": "0.5.9"
+    "rari-darwin-arm64": "0.5.10",
+    "rari-darwin-x64": "0.5.10",
+    "rari-linux-arm64": "0.5.10",
+    "rari-linux-x64": "0.5.10",
+    "rari-win32-x64": "0.5.10"
   },
   "devDependencies": {
-    "@types/node": "^25.0.0",
+    "@types/node": "^25.0.1",
     "@types/react": "^19.2.7",
     "@typescript/native-preview": "7.0.0-dev.20251210.1",
     "chokidar": "^5.0.0",
     "eslint": "^9.39.1",
     "oxlint": "^1.32.0",
-    "rolldown-vite": "^7.2.10",
-    "tsdown": "^0.17.2"
+    "rolldown-vite": "^7.2.11",
+    "tsdown": "^0.17.3"
   }
 }

package/src/router/LoadingComponentRegistry.ts

@@ -79,10 +79,17 @@ export class LoadingComponentRegistry {
     if (exactLoader) {
       try {
         const module = await exactLoader()
-        if (module && module.default && typeof module.default === 'function') {
-          return module.default
+        if (module) {
+          if (module.default && typeof module.default === 'function') {
+            return module.default
+          }
+          const exportedValues = Object.values(module).filter(
+            (value): value is React.ComponentType => typeof value === 'function',
+          )
+          if (exportedValues.length > 0) {
+            return exportedValues[0]
+          }
         }
-        console.warn(`[LoadingRegistry] Invalid component for ${routePath}: module.default is not a function`)
       }
       catch (error) {
         console.warn(`[LoadingRegistry] Failed to load exact match for ${routePath}:`, error)
@@ -97,7 +104,17 @@ export class LoadingComponentRegistry {
       if (parentLoader) {
         try {
           const module = await parentLoader()
-          return module.default
+          if (module) {
+            if (module.default && typeof module.default === 'function') {
+              return module.default
+            }
+            const exportedValues = Object.values(module).filter(
+              (value): value is React.ComponentType => typeof value === 'function',
+            )
+            if (exportedValues.length > 0) {
+              return exportedValues[0]
+            }
+          }
         }
         catch (error) {
           console.warn(`[LoadingRegistry] Failed to load parent match for ${parentPath}:`, error)
@@ -110,7 +127,17 @@ export class LoadingComponentRegistry {
     if (rootLoader) {
       try {
         const module = await rootLoader()
-        return module.default
+        if (module) {
+          if (module.default && typeof module.default === 'function') {
+            return module.default
+          }
+          const exportedValues = Object.values(module).filter(
+            (value): value is React.ComponentType => typeof value === 'function',
+          )
+          if (exportedValues.length > 0) {
+            return exportedValues[0]
+          }
+        }
       }
       catch (error) {
         console.warn('[LoadingRegistry] Failed to load root loading component:', error)

package/src/vite/server-build.ts

@@ -4,6 +4,41 @@ import path from 'node:path'
 import process from 'node:process'
 import { build } from 'esbuild'
 
+function isNodeBuiltin(moduleName: string): boolean {
+  const nodeBuiltins = [
+    'fs',
+    'path',
+    'os',
+    'crypto',
+    'util',
+    'stream',
+    'events',
+    'process',
+    'buffer',
+    'url',
+    'querystring',
+    'zlib',
+    'http',
+    'https',
+    'net',
+    'tls',
+    'child_process',
+    'cluster',
+    'worker_threads',
+    'assert',
+    'dns',
+    'readline',
+    'repl',
+    'string_decoder',
+    'timers',
+    'tty',
+    'v8',
+    'vm',
+    'perf_hooks',
+  ]
+  return nodeBuiltins.includes(moduleName)
+}
+
 interface ServerComponentManifest {
   components: Record<
     string,
@@ -356,7 +391,7 @@ const ${importName} = (props) => {
           loader: loader as any,
         },
         bundle: true,
-        platform: 'neutral',
+        platform: 'node',
         target: 'es2022',
         format: 'esm',
         external: [],
@@ -410,12 +445,14 @@ const ${importName} = (props) => {
                 if (args.path === 'react' || args.path === 'react-dom' || args.path === 'react/jsx-runtime' || args.path === 'react/jsx-dev-runtime') {
                   return { path: args.path, external: true }
                 }
+
+                if (args.path.startsWith('node:') || isNodeBuiltin(args.path)) {
+                  return { path: args.path, external: true }
+                }
+
                 if (args.path === 'rari/client') {
                   return null
                 }
-                if (/^[^./]/.test(args.path)) {
-                  return { path: args.path, external: true }
-                }
 
                 return null
               })
@@ -607,7 +644,7 @@ const ${importName} = (props) => {
           loader: loader as any,
         },
         bundle: true,
-        platform: 'neutral',
+        platform: 'node',
         target: 'es2022',
         format: 'esm',
         outfile: outputPath,
@@ -656,10 +693,16 @@ const ${importName} = (props) => {
                 if (args.path === 'react' || args.path === 'react-dom' || args.path === 'react/jsx-runtime' || args.path === 'react/jsx-dev-runtime') {
                   return { path: args.path, external: true }
                 }
+
+                if (args.path.startsWith('node:') || isNodeBuiltin(args.path)) {
+                  return { path: args.path, external: true }
+                }
+
                 if (args.path === 'rari/client') {
                   return null
                 }
-                return { path: args.path, external: true }
+
+                return null
               })
             },
           },
@@ -723,13 +766,65 @@ const ${importName} = (props) => {
           /import\s+\{[^}]*\}\s+from\s+['"]react['"];?\s*/g,
           '// React is available as globalThis.React\n',
         )
+
+        code = code.replace(
+          /import\s+\{([^}]+)\}\s+from\s+['"]node:fs['"];?\s*/g,
+          (match, imports) => {
+            const importList = imports.split(',').map((i: string) => i.trim())
+            return importList.map((imp: string) => {
+              if (imp === 'readFileSync') {
+                return 'const readFileSync = (path, encoding) => globalThis.Deno?.readTextFileSync ? globalThis.Deno.readTextFileSync(path) : "";'
+              }
+              if (imp === 'existsSync') {
+                return 'const existsSync = (path) => { try { globalThis.Deno?.statSync(path); return true; } catch { return false; } };'
+              }
+              if (imp === 'statSync') {
+                return 'const statSync = (path) => { const s = globalThis.Deno?.statSync(path); return { isFile: () => s?.isFile, isDirectory: () => s?.isDirectory, size: s?.size || 0 }; };'
+              }
+              if (imp === 'readdirSync') {
+                return 'const readdirSync = (path) => { const entries = []; for (const e of globalThis.Deno?.readDirSync(path) || []) entries.push(e.name); return entries; };'
+              }
+              return `const ${imp} = () => {};`
+            }).join('\n')
+          },
+        )
+
         code = code.replace(
-          /import\s+\w+\s+from\s+['"]node:[^'"]+['"];?\s*/g,
-          '// Node.js built-ins are available in Deno runtime\n',
+          /import\s+\{([^}]+)\}\s+from\s+['"]node:path['"];?\s*/g,
+          (match, imports) => {
+            const importList = imports.split(',').map((i: string) => i.trim())
+            return importList.map((imp: string) => {
+              if (imp === 'join') {
+                return 'const join = (...parts) => parts.filter(p => p).join("/").replace(/\\/+/g, "/") || ".";'
+              }
+              if (imp === 'resolve') {
+                return 'const resolve = (...paths) => { const cwd = globalThis.Deno?.cwd?.() || "/"; let resolved = ""; let isAbs = false; for (let i = paths.length - 1; i >= -1 && !isAbs; i--) { const p = i >= 0 ? paths[i] : cwd; if (!p) continue; resolved = p + "/" + resolved; isAbs = p[0] === "/"; } const parts = resolved.split("/").filter(Boolean); const result = []; for (const p of parts) { if (p === "..") { if (result.length && result[result.length-1] !== "..") result.pop(); else if (!isAbs) result.push(".."); } else if (p !== ".") result.push(p); } return (isAbs ? "/" : "") + result.join("/") || "."; };'
+              }
+              if (imp === 'dirname') {
+                return 'const dirname = (path) => { const parts = path.split("/").filter(Boolean); parts.pop(); return parts.length ? "/" + parts.join("/") : "/"; };'
+              }
+              if (imp === 'basename') {
+                return 'const basename = (path) => path.split("/").filter(Boolean).pop() || "";'
+              }
+              return `const ${imp} = () => {};`
+            }).join('\n')
+          },
         )
+
         code = code.replace(
-          /import\s+\{[^}]*\}\s+from\s+['"]node:[^'"]+['"];?\s*/g,
-          '// Node.js built-ins are available in Deno runtime\n',
+          /import\s+\{([^}]+)\}\s+from\s+['"]node:process['"];?\s*/g,
+          (match, imports) => {
+            const importList = imports.split(',').map((i: string) => i.trim())
+            return importList.map((imp: string) => {
+              if (imp === 'cwd') {
+                return 'const cwd = () => globalThis.Deno?.cwd?.() || "/";'
+              }
+              if (imp === 'env') {
+                return 'const env = new Proxy({}, { get: (_, prop) => globalThis.Deno?.env?.get?.(prop) });'
+              }
+              return `const ${imp} = () => {};`
+            }).join('\n')
+          },
         )
 
         const finalTransformedCode = this.createSelfRegisteringModule(
@@ -864,50 +959,59 @@ if (!globalThis["${componentId}"]) {
         try {
             const moduleKey = "${componentId}";
             let mainExport = null;
-            let exportedFunctions = {};
+            const exportedFunctions = {};
 
             globalThis.__server_functions = globalThis.__server_functions || {};
 
-        ${namedExports
-          .map(
-            name => `
-        if (typeof ${name} !== 'undefined') {
-            globalThis.${name} = ${name};
-            globalThis.__server_functions['${name}'] = ${name};
-            exportedFunctions['${name}'] = ${name};
-        }`,
-          )
-          .join('')}
-
-        ${defaultExportName
-          ? `if (typeof ${defaultExportName} !== 'undefined') {
-            mainExport = ${defaultExportName};
-        } else `
-          : ''}{
-            const potentialExports = {};
-            ${namedExports.map(name => `if (typeof ${name} !== 'undefined') potentialExports.${name} = ${name};`).join('\n            ')}
-
-            if (Object.keys(potentialExports).length > 0) {
-                if (Object.keys(potentialExports).length === 1) {
-                    mainExport = potentialExports[Object.keys(potentialExports)[0]];
+            ${namedExports
+              .map(
+                name => `if (typeof ${name} !== 'undefined') {
+                globalThis.${name} = ${name};
+                globalThis.__server_functions['${name}'] = ${name};
+                exportedFunctions['${name}'] = ${name};
+            }`,
+              )
+              .join('\n            ')}
+
+            ${defaultExportName
+              ? `if (typeof ${defaultExportName} !== 'undefined') {
+                mainExport = ${defaultExportName};
+            }`
+              : ''}
+
+            if (mainExport === null && Object.keys(exportedFunctions).length > 0) {
+                if (Object.keys(exportedFunctions).length === 1) {
+                    mainExport = exportedFunctions[Object.keys(exportedFunctions)[0]];
                 } else {
-                    mainExport = potentialExports;
+                    let componentFunction = null;
+                    let firstFunction = null;
+
+                    for (const [name, value] of Object.entries(exportedFunctions)) {
+                        if (typeof value === 'function') {
+                            if (!firstFunction) firstFunction = value;
+                            if (/^[A-Z]/.test(name)) {
+                                componentFunction = value;
+                                break;
+                            }
+                        }
+                    }
+
+                    mainExport = componentFunction || firstFunction;
                 }
             }
-        }
 
-        if (mainExport !== null) {
-            if (!globalThis[moduleKey]) {
-                globalThis[moduleKey] = mainExport;
-            }
+            if (mainExport !== null) {
+                if (!globalThis[moduleKey]) {
+                    globalThis[moduleKey] = mainExport;
+                }
 
-            globalThis.__rsc_components = globalThis.__rsc_components || {};
-            globalThis.__rsc_components[moduleKey] = mainExport;
+                globalThis.__rsc_components = globalThis.__rsc_components || {};
+                globalThis.__rsc_components[moduleKey] = mainExport;
 
-            if (typeof globalThis.RscModuleManager !== 'undefined' && globalThis.RscModuleManager.register) {
-                globalThis.RscModuleManager.register(moduleKey, mainExport, exportedFunctions);
+                if (typeof globalThis.RscModuleManager !== 'undefined' && globalThis.RscModuleManager.register) {
+                    globalThis.RscModuleManager.register(moduleKey, mainExport, exportedFunctions);
+                }
             }
-        }
         } catch (error) {
             console.error('Error in self-registration for ${componentId}:', error);
         }

package/dist/server-build-C7crAeUc.mjs

@@ -1,3 +0,0 @@
-import { n as createServerBuildPlugin, r as scanDirectory, t as ServerComponentBuilder } from "./server-build-CBAhNcXM.mjs";
-
-export { ServerComponentBuilder, scanDirectory };