rari 0.5.24 → 0.5.25

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-CXkIpRWF.mjs";
+import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-00sc6n_j.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-jOuczfIg.mjs";
 import "./server-build-CQpjQCX6.mjs";

package/dist/{vite-CXkIpRWF.mjs → vite-00sc6n_j.mjs}

@@ -3005,6 +3005,7 @@ const ${componentName$1} = registerClientReference(
 			resolveId(id) {
 				if (id === "virtual:rsc-integration") return id;
 				if (id === "virtual:rari-entry-client") return id;
+				if (id === "virtual:react-server-dom-rari-client") return id;
 				if (id === "virtual:app-router-provider") return `${id}.tsx`;
 				if (id === "./DefaultLoadingIndicator" || id === "./DefaultLoadingIndicator.tsx") return "virtual:default-loading-indicator.tsx";
 				if (id === "./LoadingErrorBoundary" || id === "./LoadingErrorBoundary.tsx") return "virtual:loading-error-boundary.tsx";
@@ -3094,6 +3095,7 @@ globalThis['~clientComponentPaths']["${relativePath}"] = "${componentId}";`;
 					return "export class LoadingComponentRegistry { loadComponent() { return Promise.resolve(null); } }";
 				}
 				if (id === "virtual:rsc-integration") return await loadRscClientRuntime();
+				if (id === "virtual:react-server-dom-rari-client") return await loadRuntimeFile("react-server-dom-rari-client.js");
 			},
 			async handleHotUpdate({ file, server }) {
 				if (!/\.(?:tsx?|jsx?)$/.test(file)) return;

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-CXkIpRWF.mjs";
+import { a as headers, i as rariRouter, n as defineRariOptions, o as RariResponse, r as rari, t as defineRariConfig } from "./vite-00sc6n_j.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-jOuczfIg.mjs";
 import "./server-build-CQpjQCX6.mjs";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rari",
   "type": "module",
-  "version": "0.5.24",
+  "version": "0.5.25",
   "description": "Runtime Accelerated Rendering Infrastructure (Rari)",
   "author": "Ryan Skinner",
   "license": "MIT",
@@ -89,19 +89,19 @@
     "picocolors": "^1.1.1"
   },
   "optionalDependencies": {
-    "rari-darwin-arm64": "0.5.18",
-    "rari-darwin-x64": "0.5.18",
-    "rari-linux-arm64": "0.5.18",
-    "rari-linux-x64": "0.5.18",
-    "rari-win32-x64": "0.5.18"
+    "rari-darwin-arm64": "0.5.19",
+    "rari-darwin-x64": "0.5.19",
+    "rari-linux-arm64": "0.5.19",
+    "rari-linux-x64": "0.5.19",
+    "rari-win32-x64": "0.5.19"
   },
   "devDependencies": {
     "@types/node": "^25.0.3",
     "@types/react": "^19.2.7",
-    "@typescript/native-preview": "7.0.0-dev.20251219.1",
+    "@typescript/native-preview": "^7.0.0-dev.20251223.1",
     "chokidar": "^5.0.0",
     "eslint": "^9.39.2",
-    "oxlint": "^1.34.0",
+    "oxlint": "^1.35.0",
     "rolldown-vite": "^7.3.0",
     "tsdown": "^0.17.3"
   }

package/src/runtime/AppRouterProvider.tsx

@@ -876,9 +876,7 @@ export function AppRouterProvider({ children, initialPayload, onNavigate }: AppR
         </div>
       )}
 
-      <div>
-        {contentToRender}
-      </div>
+      {contentToRender}
     </>
   )
 }

package/src/runtime/entry-client.js

@@ -2,9 +2,16 @@ import { ClientRouter } from 'rari/client'
 import React from 'react'
 import { createRoot } from 'react-dom/client'
 import { AppRouterProvider } from 'virtual:app-router-provider'
+import { createFromReadableStream } from 'virtual:react-server-dom-rari-client'
 import 'virtual:rsc-integration'
 import 'virtual:loading-component-map'
 
+if (typeof globalThis['~rari'] === 'undefined') {
+  globalThis['~rari'] = {}
+}
+globalThis['~rari'].AppRouterProvider = AppRouterProvider
+globalThis['~rari'].ClientRouter = ClientRouter
+
 // CLIENT_COMPONENT_IMPORTS_PLACEHOLDER
 
 if (typeof globalThis['~clientComponents'] === 'undefined') {
@@ -24,27 +31,62 @@ export async function renderApp() {
   }
 
   try {
-    const rariServerUrl = window.location.origin.includes(':5173')
-      ? 'http://localhost:3000'
-      : window.location.origin
-    const url = rariServerUrl + window.location.pathname + window.location.search
-
-    const response = await fetch(url, {
-      headers: {
-        Accept: 'text/x-component',
-      },
-    })
+    let element
+    let isFullDocument = false
 
-    if (!response.ok) {
-      throw new Error(`Failed to fetch RSC data: ${response.status}`)
+    const payloadScript = document.getElementById('__RARI_RSC_PAYLOAD__')
+
+    if (payloadScript && payloadScript.textContent) {
+      try {
+        const payloadJson = payloadScript.textContent
+
+        const stream = new ReadableStream({
+          start(controller) {
+            controller.enqueue(new TextEncoder().encode(payloadJson))
+            controller.close()
+          },
+        })
+
+        element = await createFromReadableStream(stream, {
+          moduleMap: globalThis['~clientComponents'] || {},
+        })
+      }
+      catch (e) {
+        console.error('[Rari] Failed to parse embedded RSC payload:', e)
+        element = null
+      }
     }
 
-    const rscWireFormat = await response.text()
+    if (!element) {
+      const rariServerUrl = window.location.origin.includes(':5173')
+        ? 'http://localhost:3000'
+        : window.location.origin
+      const url = rariServerUrl + window.location.pathname + window.location.search
 
-    const { element, isFullDocument } = parseRscWireFormat(rscWireFormat)
+      const response = await fetch(url, {
+        headers: {
+          Accept: 'text/x-component',
+        },
+      })
+
+      if (!response.ok) {
+        throw new Error(`Failed to fetch RSC data: ${response.status}`)
+      }
+
+      const rscWireFormat = await response.text()
+      const parsed = parseRscWireFormat(rscWireFormat)
+      element = parsed.element
+      isFullDocument = parsed.isFullDocument
+    }
 
     let contentToRender
-    if (isFullDocument) {
+    let hasProviders = false
+
+    if (payloadScript && element) {
+      contentToRender = element
+      hasProviders = true
+    }
+    else if (isFullDocument) {
       const bodyContent = extractBodyContent(element, false)
       if (bodyContent) {
         contentToRender = bodyContent
@@ -60,41 +102,67 @@ export async function renderApp() {
 
     let manifest = globalThis['~rari']?.appRoutesManifest
     if (!manifest) {
-      try {
-        const manifestUrl = window.location.origin.includes(':5173')
-          ? '/app-routes.json'
-          : '/app-routes.json'
+      const manifestScript = document.getElementById('__RARI_MANIFEST__')
 
-        const manifestResponse = await fetch(manifestUrl, {
-          headers: { 'Cache-Control': 'no-cache' },
-        })
-        if (manifestResponse.ok) {
-          const text = await manifestResponse.text()
-          manifest = JSON.parse(text)
+      if (manifestScript && manifestScript.textContent) {
+        try {
+          manifest = JSON.parse(manifestScript.textContent)
           if (!globalThis['~rari'])
             globalThis['~rari'] = {}
           globalThis['~rari'].appRoutesManifest = manifest
         }
+        catch (e) {
+          console.error('[Rari] Failed to parse embedded manifest:', e)
+        }
       }
-      catch (err) {
-        console.warn('[Rari] Failed to load manifest:', err)
+
+      if (!manifest) {
+        try {
+          const manifestUrl = window.location.origin.includes(':5173')
+            ? '/app-routes.json'
+            : '/app-routes.json'
+
+          const manifestResponse = await fetch(manifestUrl, {
+            headers: { 'Cache-Control': 'no-cache' },
+          })
+          if (manifestResponse.ok) {
+            const text = await manifestResponse.text()
+            manifest = JSON.parse(text)
+            if (!globalThis['~rari'])
+              globalThis['~rari'] = {}
+            globalThis['~rari'].appRoutesManifest = manifest
+          }
+        }
+        catch (err) {
+          console.warn('[Rari] Failed to load manifest:', err)
+        }
       }
     }
 
-    let wrappedContent = contentToRender
-
-    wrappedContent = React.createElement(
-      AppRouterProvider,
-      { initialPayload: { element, rscWireFormat } },
-      contentToRender,
-    )
+    let wrappedContent
 
-    if (manifest) {
+    if (hasProviders) {
+      if (!manifest) {
+        wrappedContent = contentToRender
+      }
+      else {
+        wrappedContent = contentToRender
+      }
+    }
+    else {
       wrappedContent = React.createElement(
-        ClientRouter,
-        { manifest, initialRoute: window.location.pathname },
-        wrappedContent,
+        AppRouterProvider,
+        { initialPayload: { element } },
+        contentToRender,
       )
+
+      if (manifest) {
+        wrappedContent = React.createElement(
+          ClientRouter,
+          { manifest, initialRoute: window.location.pathname },
+          wrappedContent,
+        )
+      }
     }
 
     const root = createRoot(rootElement)

package/src/runtime/react-server-dom-rari-client.js

@@ -0,0 +1,191 @@
+import React from 'react'
+
+export async function createFromReadableStream(stream, options = {}) {
+  const { moduleMap = {} } = options
+
+  const reader = stream.getReader()
+  const chunks = []
+
+  while (true) {
+    const { done, value } = await reader.read()
+    if (done)
+      break
+    chunks.push(value)
+  }
+
+  const combined = new Uint8Array(chunks.reduce((acc, chunk) => acc + chunk.length, 0))
+  let offset = 0
+  for (const chunk of chunks) {
+    combined.set(chunk, offset)
+    offset += chunk.length
+  }
+
+  const text = new TextDecoder().decode(combined)
+
+  const parsed = parseWireFormat(text)
+  return rscToReact(parsed.rootElement, parsed.modules, moduleMap)
+}
+
+export async function createFromFetch(fetchPromise, options = {}) {
+  const response = await fetchPromise
+  const text = await response.text()
+
+  const parsed = parseWireFormat(text)
+  return rscToReact(parsed.rootElement, parsed.modules, options.moduleMap || {})
+}
+
+function parseWireFormat(wireFormat) {
+  const lines = wireFormat.split('\n').filter(line => line.trim())
+  const modules = new Map()
+  const chunks = new Map()
+  let rootChunkId = null
+
+  for (const line of lines) {
+    const colonIndex = line.indexOf(':')
+    if (colonIndex === -1)
+      continue
+
+    const idStr = line.substring(0, colonIndex)
+    const content = line.substring(colonIndex + 1)
+    const id = idStr
+
+    try {
+      if (content.startsWith('I')) {
+        const moduleData = JSON.parse(content.substring(1))
+        if (Array.isArray(moduleData) && moduleData.length >= 3) {
+          const [path, chunksArray, exportName] = moduleData
+          modules.set(`$L${id}`, {
+            id: path,
+            chunks: chunksArray || [],
+            name: exportName || 'default',
+          })
+        }
+      }
+      else {
+        const data = JSON.parse(content)
+        chunks.set(id, data)
+
+        if (rootChunkId === null) {
+          rootChunkId = id
+        }
+      }
+    }
+    catch (e) {
+      console.error('[RSC Wire Format] Failed to parse line:', line, e)
+    }
+  }
+
+  const rootElement = rootChunkId !== null ? chunks.get(rootChunkId) : null
+
+  return {
+    modules,
+    chunks,
+    rootElement,
+  }
+}
+
+function rscToReact(rsc, wireModules, moduleMap) {
+  if (!rsc)
+    return null
+
+  if (typeof rsc === 'string' || typeof rsc === 'number' || typeof rsc === 'boolean') {
+    return rsc
+  }
+
+  if (Array.isArray(rsc)) {
+    if (rsc.length >= 4 && rsc[0] === '$') {
+      const [, type, key, props] = rsc
+
+      if (typeof type === 'string' && type.startsWith('$L')) {
+        const componentName = type.substring(2)
+
+        if (componentName === 'ClientRouter' && (!props || !props.manifest)) {
+          return props && props.children ? rscToReact(props.children, wireModules, moduleMap) : null
+        }
+
+        const Component = resolveClientComponent(componentName, wireModules, moduleMap)
+
+        if (Component) {
+          const processedProps = processProps(props, wireModules, moduleMap)
+          return React.createElement(Component, key ? { ...processedProps, key } : processedProps)
+        }
+
+        return null
+      }
+
+      const processedProps = processProps(props, wireModules, moduleMap)
+      return React.createElement(type, key ? { ...processedProps, key } : processedProps)
+    }
+
+    return rsc.map(child => rscToReact(child, wireModules, moduleMap))
+  }
+
+  return rsc
+}
+
+function resolveClientComponent(componentName, wireModules, moduleMap) {
+  if (componentName === 'AppRouterProvider') {
+    const AppRouterProvider = globalThis['~rari']?.AppRouterProvider
+    if (AppRouterProvider)
+      return AppRouterProvider
+  }
+
+  if (componentName === 'ClientRouter') {
+    const ClientRouter = globalThis['~rari']?.ClientRouter
+    if (ClientRouter)
+      return ClientRouter
+  }
+
+  if (wireModules && wireModules.size > 0) {
+    const moduleRef = `$L${componentName}`
+    const moduleInfo = wireModules.get(moduleRef)
+    if (moduleInfo) {
+      const clientComponents = globalThis['~clientComponents'] || {}
+      if (clientComponents[moduleInfo.id]) {
+        return clientComponents[moduleInfo.id].component
+      }
+    }
+  }
+
+  if (moduleMap[componentName]) {
+    return moduleMap[componentName]
+  }
+
+  const clientComponents = globalThis['~clientComponents'] || {}
+  for (const [id, info] of Object.entries(clientComponents)) {
+    if (id.includes(componentName) || info.name === componentName) {
+      return info.component
+    }
+  }
+
+  return null
+}
+
+function processProps(props, wireModules, moduleMap) {
+  if (!props || typeof props !== 'object')
+    return props
+
+  const processed = {}
+  for (const key in props) {
+    if (Object.prototype.hasOwnProperty.call(props, key)) {
+      if (key.startsWith('$') || key === 'ref') {
+        continue
+      }
+      if (key === 'children') {
+        processed[key] = props.children ? rscToReact(props.children, wireModules, moduleMap) : undefined
+      }
+      else {
+        processed[key] = props[key]
+      }
+    }
+  }
+  return processed
+}
+
+export function encodeReply(value) {
+  return JSON.stringify(value)
+}
+
+export function decodeReply(text) {
+  return JSON.parse(text)
+}

package/src/runtime/react-server-dom-shim.js

@@ -17,17 +17,17 @@ export function registerClientReference(clientReference, id, exportName) {
     async: false,
   })
 
-  Object.defineProperty(clientReference, '$typeof', {
+  Object.defineProperty(clientReference, '$$typeof', {
     value: Symbol.for('react.client.reference'),
     enumerable: false,
   })
 
-  Object.defineProperty(clientReference, '$id', {
+  Object.defineProperty(clientReference, '$$id', {
     value: key,
     enumerable: false,
   })
 
-  Object.defineProperty(clientReference, '$async', {
+  Object.defineProperty(clientReference, '$$async', {
     value: false,
     enumerable: false,
   })
@@ -70,17 +70,17 @@ export function registerServerReference(serverReference, id, exportName) {
     bound: false,
   })
 
-  Object.defineProperty(serverReference, '$typeof', {
+  Object.defineProperty(serverReference, '$$typeof', {
     value: Symbol.for('react.server.reference'),
     enumerable: false,
   })
 
-  Object.defineProperty(serverReference, '$id', {
+  Object.defineProperty(serverReference, '$$id', {
     value: key,
     enumerable: false,
   })
 
-  Object.defineProperty(serverReference, '$bound', {
+  Object.defineProperty(serverReference, '$$bound', {
     value: false,
     enumerable: false,
   })

package/src/vite/index.ts

@@ -1298,6 +1298,10 @@ const ${componentName} = registerClientReference(
         return id
       }
 
+      if (id === 'virtual:react-server-dom-rari-client') {
+        return id
+      }
+
       if (id === 'virtual:app-router-provider') {
         return `${id}.tsx`
       }
@@ -1460,6 +1464,10 @@ globalThis['~clientComponentPaths']["${relativePath}"] = "${componentId}";`
       if (id === 'virtual:rsc-integration') {
         return await loadRscClientRuntime()
       }
+
+      if (id === 'virtual:react-server-dom-rari-client') {
+        return await loadRuntimeFile('react-server-dom-rari-client.js')
+      }
     },
 
     async handleHotUpdate({ file, server }) {