@quilted/quilt 0.8.4 → 0.8.6

package/build/typescript/assets.d.ts

@@ -1,9 +1,4 @@
 import './assets/files.ts';
 import './assets/styles.ts';
 export * from '@quilted/assets';
-declare module '@quilted/assets' {
-    interface AssetsCacheKey {
-        browserGroup?: string;
-    }
-}
 //# sourceMappingURL=assets.d.ts.map

package/build/typescript/assets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../source/assets.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,CAAC;AAC3B,OAAO,oBAAoB,CAAC;AAE5B,cAAc,iBAAiB,CAAC;AAEhC,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAU,cAAc;QACtB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB;CACF"}
+{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../source/assets.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,CAAC;AAC3B,OAAO,oBAAoB,CAAC;AAE5B,cAAc,iBAAiB,CAAC"}

package/build/typescript/modules.d.ts

@@ -15,9 +15,9 @@ declare module 'quilt:module/request-router' {
     export default router;
 }
 declare module 'quilt:module/assets' {
-    import type { AssetsCacheKey, BrowserAssets as BrowserAssetsType } from '@quilted/assets';
+    import type { BrowserAssets as BrowserAssetsType } from '@quilted/assets';
     const BrowserAssets: {
-        new <CacheKey = AssetsCacheKey>(): BrowserAssetsType<CacheKey>;
+        new (): BrowserAssetsType;
     };
 }
 //# sourceMappingURL=modules.d.ts.map

package/build/typescript/modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../source/modules.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,kBAAkB,CAAC;IAChC,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;IAE7D,YAAY,EAAC,oBAAoB,EAAC,CAAC;IAEnC,MAAM,GAAG,EAAE,oBAAoB,CAAC;IAChC,eAAe,GAAG,CAAC;CACpB;AAED,OAAO,QAAQ,kBAAkB,CAAC;IAChC,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;IAE1C,MAAM,GAAG,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,eAAe,GAAG,CAAC;CACpB;AAED,OAAO,QAAQ,6BAA6B,CAAC;IAC3C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAC;IAE3D,MAAM,MAAM,EAAE,aAAa,CAAC;IAC5B,eAAe,MAAM,CAAC;CACvB;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,OAAO,KAAK,EACV,cAAc,EACd,aAAa,IAAI,iBAAiB,EACnC,MAAM,iBAAiB,CAAC;IAElB,MAAM,aAAa,EAAE;QAC1B,KAAK,QAAQ,GAAG,cAAc,KAAK,iBAAiB,CAAC,QAAQ,CAAC,CAAC;KAChE,CAAC;CACH"}
+{"version":3,"file":"modules.d.ts","sourceRoot":"","sources":["../../source/modules.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,kBAAkB,CAAC;IAChC,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;IAE7D,YAAY,EAAC,oBAAoB,EAAC,CAAC;IAEnC,MAAM,GAAG,EAAE,oBAAoB,CAAC;IAChC,eAAe,GAAG,CAAC;CACpB;AAED,OAAO,QAAQ,kBAAkB,CAAC;IAChC,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;IAE1C,MAAM,GAAG,EAAE,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAClD,eAAe,GAAG,CAAC;CACpB;AAED,OAAO,QAAQ,6BAA6B,CAAC;IAC3C,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAC;IAE3D,MAAM,MAAM,EAAE,aAAa,CAAC;IAC5B,eAAe,MAAM,CAAC;CACvB;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,OAAO,KAAK,EAAC,aAAa,IAAI,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;IAEjE,MAAM,aAAa,EAAE;QAC1B,QAAQ,iBAAiB,CAAC;KAC3B,CAAC;CACH"}

package/build/typescript/server/ServerContext.d.ts

@@ -1,8 +1,10 @@
 import type { RenderableProps, VNode } from 'preact';
 import { type BrowserDetails } from '@quilted/preact-browser/server';
+import { type BrowserAssets } from '@quilted/assets';
 interface Props {
     browser?: BrowserDetails;
+    assets?: BrowserAssets;
 }
-export declare function ServerContext({ browser, children }: RenderableProps<Props>): VNode<{}>;
+export declare function ServerContext({ browser, assets, children, }: RenderableProps<Props>): VNode<{}>;
 export {};
 //# sourceMappingURL=ServerContext.d.ts.map

package/build/typescript/server/ServerContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServerContext.d.ts","sourceRoot":"","sources":["../../../source/server/ServerContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,KAAK,EAAC,MAAM,QAAQ,CAAC;AAEnD,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,gCAAgC,CAAC;AAExC,UAAU,KAAK;IACb,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,wBAAgB,aAAa,CAAC,EAAC,OAAO,EAAE,QAAQ,EAAC,EAAE,eAAe,CAAC,KAAK,CAAC,GASjD,KAAK,CAAC,EAAE,CAAC,CAChC"}
+{"version":3,"file":"ServerContext.d.ts","sourceRoot":"","sources":["../../../source/server/ServerContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,KAAK,EAAC,MAAM,QAAQ,CAAC;AAEnD,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAC,KAAK,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAEnD,UAAU,KAAK;IACb,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAED,wBAAgB,aAAa,CAAC,EAC5B,OAAO,EACP,MAAM,EACN,QAAQ,GACT,EAAE,eAAe,CAAC,KAAK,CAAC,GAiBF,KAAK,CAAC,EAAE,CAAC,CAC/B"}

package/build/typescript/server/request-router.d.ts

@@ -1,10 +1,7 @@
 import { type VNode } from 'preact';
-import { type AssetsCacheKey, type BrowserAssets } from '@quilted/assets';
-import { BrowserDetails, BrowserResponse } from '@quilted/preact-browser/server';
+import { type BrowserAssets } from '@quilted/assets';
+import { BrowserResponse } from '@quilted/preact-browser/server';
 import { EnhancedResponse } from '@quilted/request-router';
-export declare function renderToStringWithServerContext(element: VNode<any>, { browser }?: {
-    browser?: BrowserDetails;
-}): Promise<string>;
 export interface RenderHTMLFunction {
     (content: ReadableStream<string>, context: {
         readonly response: BrowserResponse;
@@ -16,7 +13,6 @@ export interface RenderToResponseOptions {
     readonly stream?: 'headers' | false;
     readonly headers?: HeadersInit;
     readonly assets?: BrowserAssets;
-    readonly cacheKey?: Partial<AssetsCacheKey>;
     readonly serializations?: Iterable<[string, unknown]>;
     readonly renderHTML?: boolean | 'fragment' | 'document' | RenderHTMLFunction;
     waitUntil?(promise: Promise<any>): void;

package/build/typescript/server/request-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-router.d.ts","sourceRoot":"","sources":["../../../source/server/request-router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,KAAK,EAAW,MAAM,QAAQ,CAAC;AAM5D,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,aAAa,EAEnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,cAAc,EACd,eAAe,EAKhB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAe,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AAIvE,wBAAsB,+BAA+B,CACnD,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,EACnB,EAAC,OAAO,EAAC,GAAE;IAAC,OAAO,CAAC,EAAE,cAAc,CAAA;CAAM,mBAO3C;AAED,MAAM,WAAW,kBAAkB;IACjC,CACE,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,EAC/B,OAAO,EAAE;QACP,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;KACpC,GACA,cAAc,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;CACzE;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC;IACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAC5C,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,UAAU,GAAG,kBAAkB,CAAC;IAC7E,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;CACzC;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,EACnB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC7B,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"request-router.d.ts","sourceRoot":"","sources":["../../../source/server/request-router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,KAAK,EAAW,MAAM,QAAQ,CAAC;AAM5D,OAAO,EAGL,KAAK,aAAa,EAEnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,eAAe,EAKhB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAe,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AAIvE,MAAM,WAAW,kBAAkB;IACjC,CACE,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,EAC/B,OAAO,EAAE;QACP,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;KACpC,GACA,cAAc,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;CACzE;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC;IACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC;IAChC,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,UAAU,GAAG,kBAAkB,CAAC;IAC7E,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;CACzC;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,EACnB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC7B,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,gBAAgB,CAAC,CAAC"}

package/build/typescript/server.browser.d.ts

@@ -7,4 +7,6 @@ declare function noopCreateRequestRouterLocalization(): void;
 export { noopCreateRequestRouterLocalization as createRequestRouterLocalization };
 declare function noopRenderToResponse(): void;
 export { noopRenderToResponse as renderToResponse };
+declare function NoopServerContext(): null;
+export { NoopServerContext as ServerContext };
 //# sourceMappingURL=server.browser.d.ts.map

package/build/typescript/server.browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.browser.d.ts","sourceRoot":"","sources":["../../source/server.browser.ts"],"names":[],"mappings":"AAAA,iBAAS,kBAAkB,SAAK;AAEhC,OAAO,EACL,kBAAkB,IAAI,cAAc,EACpC,kBAAkB,IAAI,mBAAmB,EACzC,kBAAkB,IAAI,oBAAoB,GAC3C,CAAC;AACF,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iBAAiB,CAAC;AAEhC,OAAO,EAAC,yBAAyB,EAAC,MAAM,0BAA0B,CAAC;AAEnE,iBAAS,mCAAmC,SAAK;AACjD,OAAO,EAAC,mCAAmC,IAAI,+BAA+B,EAAC,CAAC;AAEhF,iBAAS,oBAAoB,SAAK;AAClC,OAAO,EAAC,oBAAoB,IAAI,gBAAgB,EAAC,CAAC"}
+{"version":3,"file":"server.browser.d.ts","sourceRoot":"","sources":["../../source/server.browser.ts"],"names":[],"mappings":"AAAA,iBAAS,kBAAkB,SAAK;AAEhC,OAAO,EACL,kBAAkB,IAAI,cAAc,EACpC,kBAAkB,IAAI,mBAAmB,EACzC,kBAAkB,IAAI,oBAAoB,GAC3C,CAAC;AACF,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iBAAiB,CAAC;AAEhC,OAAO,EAAC,yBAAyB,EAAC,MAAM,0BAA0B,CAAC;AAEnE,iBAAS,mCAAmC,SAAK;AACjD,OAAO,EAAC,mCAAmC,IAAI,+BAA+B,EAAC,CAAC;AAEhF,iBAAS,oBAAoB,SAAK;AAClC,OAAO,EAAC,oBAAoB,IAAI,gBAAgB,EAAC,CAAC;AAElD,iBAAS,iBAAiB,SAEzB;AACD,OAAO,EAAC,iBAAiB,IAAI,aAAa,EAAC,CAAC"}

package/build/typescript/server.d.ts

@@ -3,5 +3,6 @@ export * from '@quilted/preact-browser/server';
 export * from '@quilted/assets';
 export { parseAcceptLanguageHeader } from '@quilted/preact-localize';
 export { createRequestRouterLocalization } from '@quilted/preact-localize/request-router';
-export { renderToResponse, renderToStringWithServerContext, type RenderToResponseOptions, type RenderHTMLFunction, } from './server/request-router.tsx';
+export { renderToResponse, type RenderToResponseOptions, type RenderHTMLFunction, } from './server/request-router.tsx';
+export { ServerContext } from './server/ServerContext.tsx';
 //# sourceMappingURL=server.d.ts.map

package/build/typescript/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../source/server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AACjC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iBAAiB,CAAC;AAEhC,OAAO,EAAC,yBAAyB,EAAC,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAC,+BAA+B,EAAC,MAAM,yCAAyC,CAAC;AAExF,OAAO,EACL,gBAAgB,EAChB,+BAA+B,EAC/B,KAAK,uBAAuB,EAC5B,KAAK,kBAAkB,GACxB,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../source/server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,yBAAyB,CAAC;AACjC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iBAAiB,CAAC;AAEhC,OAAO,EAAC,yBAAyB,EAAC,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAC,+BAA+B,EAAC,MAAM,yCAAyC,CAAC;AAExF,OAAO,EACL,gBAAgB,EAChB,KAAK,uBAAuB,EAC5B,KAAK,kBAAkB,GACxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@quilted/quilt",
   "type": "module",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/lemonmade/quilt.git",
@@ -241,12 +241,12 @@
     "./build/esm/signals.mjs"
   ],
   "dependencies": {
-    "@quilted/assets": "^0.1.2",
-    "@quilted/async": "^0.4.2",
+    "@quilted/assets": "^0.1.5",
+    "@quilted/async": "^0.4.22",
     "@quilted/events": "^2.1.1",
-    "@quilted/graphql": "^3.3.5",
+    "@quilted/graphql": "^3.3.8",
     "@quilted/preact-async": "^0.1.2",
-    "@quilted/preact-browser": "^0.1.8",
+    "@quilted/preact-browser": "^0.1.10",
     "@quilted/preact-context": "^0.1.2",
     "@quilted/preact-graphql": "^0.1.0",
     "@quilted/preact-localize": "^0.3.0",

package/source/assets.ts

@@ -2,9 +2,3 @@ import './assets/files.ts';
 import './assets/styles.ts';
 
 export * from '@quilted/assets';
-
-declare module '@quilted/assets' {
-  interface AssetsCacheKey {
-    browserGroup?: string;
-  }
-}

package/source/modules.ts

@@ -22,12 +22,9 @@ declare module 'quilt:module/request-router' {
 }
 
 declare module 'quilt:module/assets' {
-  import type {
-    AssetsCacheKey,
-    BrowserAssets as BrowserAssetsType,
-  } from '@quilted/assets';
+  import type {BrowserAssets as BrowserAssetsType} from '@quilted/assets';
 
   export const BrowserAssets: {
-    new <CacheKey = AssetsCacheKey>(): BrowserAssetsType<CacheKey>;
+    new (): BrowserAssetsType;
   };
 }

package/source/server/ServerContext.tsx

@@ -2,14 +2,22 @@ import type {RenderableProps, VNode} from 'preact';
 
 import {
   BrowserDetailsContext,
+  BrowserAssetsManifestContext,
   type BrowserDetails,
 } from '@quilted/preact-browser/server';
 
+import {type BrowserAssets} from '@quilted/assets';
+
 interface Props {
   browser?: BrowserDetails;
+  assets?: BrowserAssets;
 }
 
-export function ServerContext({browser, children}: RenderableProps<Props>) {
+export function ServerContext({
+  browser,
+  assets,
+  children,
+}: RenderableProps<Props>) {
   const withBrowser = browser ? (
     <BrowserDetailsContext.Provider value={browser}>
       {children}
@@ -18,5 +26,13 @@ export function ServerContext({browser, children}: RenderableProps<Props>) {
     children
   );
 
-  return withBrowser as VNode<{}>;
+  const withAssets = assets ? (
+    <BrowserAssetsManifestContext.Provider value={assets}>
+      {withBrowser}
+    </BrowserAssetsManifestContext.Provider>
+  ) : (
+    withBrowser
+  );
+
+  return withAssets as VNode<{}>;
 }

package/source/server/request-router.tsx

@@ -7,12 +7,10 @@ import {
 import {
   styleAssetPreloadAttributes,
   scriptAssetPreloadAttributes,
-  type AssetsCacheKey,
   type BrowserAssets,
   type BrowserAssetsEntry,
 } from '@quilted/assets';
 import {
-  BrowserDetails,
   BrowserResponse,
   ScriptAsset,
   ScriptAssetPreload,
@@ -24,17 +22,6 @@ import {HTMLResponse, EnhancedResponse} from '@quilted/request-router';
 
 import {ServerContext} from './ServerContext.tsx';
 
-export async function renderToStringWithServerContext(
-  element: VNode<any>,
-  {browser}: {browser?: BrowserDetails} = {},
-) {
-  const rendered = await renderToStringAsync(
-    <ServerContext browser={browser}>{element}</ServerContext>,
-  );
-
-  return rendered;
-}
-
 export interface RenderHTMLFunction {
   (
     content: ReadableStream<string>,
@@ -50,7 +37,6 @@ export interface RenderToResponseOptions {
   readonly stream?: 'headers' | false;
   readonly headers?: HeadersInit;
   readonly assets?: BrowserAssets;
-  readonly cacheKey?: Partial<AssetsCacheKey>;
   readonly serializations?: Iterable<[string, unknown]>;
   readonly renderHTML?: boolean | 'fragment' | 'document' | RenderHTMLFunction;
   waitUntil?(promise: Promise<any>): void;
@@ -81,7 +67,6 @@ export async function renderToResponse(
     request,
     assets,
     status: explicitStatus,
-    cacheKey: explicitCacheKey,
     headers: explicitHeaders,
     serializations: explicitSerializations,
     waitUntil = noop,
@@ -91,13 +76,8 @@ export async function renderToResponse(
 
   const baseURL = (request as any).URL ?? new URL(request.url);
 
-  const cacheKey =
-    explicitCacheKey ??
-    (((await assets?.cacheKey?.(request)) ?? {}) as AssetsCacheKey);
-
   const browserResponse = new BrowserResponse({
     request,
-    cacheKey,
     status: explicitStatus,
     headers: new Headers(explicitHeaders),
     serializations: explicitSerializations,
@@ -109,9 +89,11 @@ export async function renderToResponse(
     let rendered: string;
 
     try {
-      rendered = await renderToStringWithServerContext(element, {
-        browser: browserResponse,
-      });
+      rendered = await renderToStringAsync(
+        <ServerContext assets={assets} browser={browserResponse}>
+          {element}
+        </ServerContext>,
+      );
     } catch (error) {
       if (error instanceof Response) {
         const mergedHeaders = new Headers(browserResponse.headers);
@@ -157,9 +139,11 @@ export async function renderToResponse(
         // this, they will explicitly turn on streaming and will have to use some in-app
         // to manually handle redirects (e.g., by rendering a script tag that uses JavaScript
         // to redirect)
-        const rendered = await renderToStringWithServerContext(element, {
-          browser: browserResponse,
-        });
+        const rendered = await renderToStringAsync(
+          <ServerContext assets={assets} browser={browserResponse}>
+            {element}
+          </ServerContext>,
+        );
 
         appWriter.write(rendered);
       }
@@ -198,15 +182,16 @@ export async function renderToResponse(
 
       writer.write(`<!DOCTYPE html>`);
 
-      const [synchronousAssets, preloadAssets] = await Promise.all([
-        assets?.entry({
-          cacheKey,
-          modules: browserResponse.assets.get({timing: 'load'}),
-        }),
-        assets?.modules(browserResponse.assets.get({timing: 'preload'}), {
-          cacheKey,
-        }),
-      ]);
+      const synchronousAssets = assets?.entry({
+        request,
+        modules: browserResponse.assets.get({timing: 'load'}),
+      });
+      const preloadAssets = assets?.modules(
+        browserResponse.assets.get({timing: 'preload'}),
+        {
+          request,
+        },
+      );
 
       if (synchronousAssets) {
         for (const style of synchronousAssets.styles) {
@@ -294,15 +279,17 @@ export async function renderToResponse(
 
       if (element != null) writer.write(`</div>`);
 
-      const [newSynchronousAssets, newPreloadAssets] = await Promise.all([
-        assets?.entry({
-          cacheKey,
-          modules: browserResponse.assets.get({timing: 'load'}),
-        }),
-        assets?.modules(browserResponse.assets.get({timing: 'preload'}), {
-          cacheKey,
-        }),
-      ]);
+      const newSynchronousAssets = assets?.entry({
+        request,
+        modules: browserResponse.assets.get({timing: 'load'}),
+      });
+
+      const newPreloadAssets = assets?.modules(
+        browserResponse.assets.get({timing: 'preload'}),
+        {
+          request,
+        },
+      );
 
       if (newSynchronousAssets) {
         const diffedSynchronousAssets = diffBrowserAssetsEntries(

package/source/server.browser.ts

@@ -15,3 +15,8 @@ export {noopCreateRequestRouterLocalization as createRequestRouterLocalization};
 
 function noopRenderToResponse() {}
 export {noopRenderToResponse as renderToResponse};
+
+function NoopServerContext() {
+  return null;
+}
+export {NoopServerContext as ServerContext};

package/source/server.ts

@@ -11,7 +11,7 @@ export {createRequestRouterLocalization} from '@quilted/preact-localize/request-
 
 export {
   renderToResponse,
-  renderToStringWithServerContext,
   type RenderToResponseOptions,
   type RenderHTMLFunction,
 } from './server/request-router.tsx';
+export {ServerContext} from './server/ServerContext.tsx';