rari 0.5.4 → 0.5.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rari",
   "type": "module",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Runtime Accelerated Rendering Infrastructure (Rari)",
   "author": "Ryan Skinner",
   "license": "MIT",
@@ -89,11 +89,11 @@
     "picocolors": "^1.1.1"
   },
   "optionalDependencies": {
-    "rari-darwin-arm64": "0.5.0",
-    "rari-darwin-x64": "0.5.0",
-    "rari-linux-arm64": "0.5.0",
-    "rari-linux-x64": "0.5.0",
-    "rari-win32-x64": "0.5.0"
+    "rari-darwin-arm64": "0.5.1",
+    "rari-darwin-x64": "0.5.1",
+    "rari-linux-arm64": "0.5.1",
+    "rari-linux-x64": "0.5.1",
+    "rari-win32-x64": "0.5.1"
   },
   "devDependencies": {
     "@types/node": "^24.10.1",

package/src/runtime/AppRouterProvider.tsx

@@ -53,7 +53,6 @@ export function AppRouterProvider({ children, initialPayload, onNavigate }: AppR
   })
 
   const loadingRegistryRef = useRef<LoadingComponentRegistry>(new LoadingComponentRegistry())
-  const layoutInstancesRef = useRef<Map<string, React.ReactElement>>(new Map())
   const pendingFetchesRef = useRef<Map<string, Promise<any>>>(new Map())
   const failureHistoryRef = useRef<HMRFailure[]>([])
   const lastSuccessfulPayloadRef = useRef<string | null>(null)
@@ -183,35 +182,37 @@ export function AppRouterProvider({ children, initialPayload, onNavigate }: AppR
 
     if (Array.isArray(rsc)) {
       if (rsc.length >= 4 && rsc[0] === '$') {
-        const [, type, key, props] = rsc
+        const [, type, serverKey, props] = rsc
 
         if (typeof type === 'string' && type.startsWith('$L')) {
           const moduleInfo = modules.get(type)
-          if (moduleInfo) {
-            const Component = (globalThis as any).__clientComponents?.[moduleInfo.id]?.component
-            if (Component) {
-              const isLayout = moduleInfo.id.includes('layout')
-              const stableKey = isLayout ? `layout-${moduleInfo.id}` : key
-
-              const childProps = {
-                ...props,
-                children: props.children ? rscToReact(props.children, modules, isLayout ? moduleInfo.id : layoutPath) : undefined,
-              }
 
-              const element = React.createElement(Component, { key: stableKey, ...childProps })
+          if (!moduleInfo) {
+            console.warn('[AppRouterProvider] Module info not found for type:', type, '- skipping component')
+            return null
+          }
 
-              if (isLayout) {
-                layoutInstancesRef.current.set(stableKey, true as any)
-              }
+          const Component = (globalThis as any).__clientComponents?.[moduleInfo.id]?.component
 
-              return element
-            }
+          if (!Component) {
+            console.warn('[AppRouterProvider] Component not loaded for module:', moduleInfo.id, '- skipping component')
+            return null
           }
-          return null
+
+          const effectiveKey = serverKey || `fallback-${Math.random()}`
+
+          const childProps = {
+            ...props,
+            children: props.children ? rscToReact(props.children, modules, layoutPath) : undefined,
+          }
+
+          const element = React.createElement(Component, { key: effectiveKey, ...childProps })
+
+          return element
         }
 
         const processedProps = processProps(props, modules, layoutPath)
-        return React.createElement(type, key ? { ...processedProps, key } : processedProps)
+        return React.createElement(type, serverKey ? { ...processedProps, key: serverKey } : processedProps)
       }
       return rsc.map(child => rscToReact(child, modules, layoutPath))
     }
@@ -420,20 +421,6 @@ export function AppRouterProvider({ children, initialPayload, onNavigate }: AppR
           throw error
         }
 
-        if (layoutDiff && layoutDiff.unmountLayouts.length > 0) {
-          layoutDiff.unmountLayouts.forEach((layout) => {
-            const keysToRemove: string[] = []
-            layoutInstancesRef.current.forEach((_, key) => {
-              if (key.includes(layout.path)) {
-                keysToRemove.push(key)
-              }
-            })
-            keysToRemove.forEach((key) => {
-              layoutInstancesRef.current.delete(key)
-            })
-          })
-        }
-
         setRscPayload(parsedPayload)
 
         lastSuccessfulPayloadRef.current = rscWireFormat