@quilted/quilt 0.6.11 → 0.6.13

package/build/typescript/react.d.ts

@@ -1,3 +1,2 @@
-export * from '@quilted/react';
-export { default } from '@quilted/react';
+export * from '@quilted/react-utilities';
 //# sourceMappingURL=react.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"react.d.ts","sourceRoot":"","sources":["../../source/react.ts"],"names":[],"mappings":"AACA,cAAc,gBAAgB,CAAC;AAE/B,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"react.d.ts","sourceRoot":"","sources":["../../source/react.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC"}

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

@@ -0,0 +1,2 @@
+export * from '@quilted/request-router';
+//# sourceMappingURL=request-router.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"request-router.d.ts","sourceRoot":"","sources":["../../source/request-router.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC"}

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

@@ -8,6 +8,6 @@ interface Props {
     http?: HttpManager;
     assets?: AssetsManager;
 }
-export declare function ServerContext({ url, html, http, assets, children, }: PropsWithChildren<Props>): import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
+export declare function ServerContext({ url, html, http, assets, children, }: PropsWithChildren<Props>): string | number | boolean | Iterable<import("react").ReactNode> | import("react").JSX.Element | null | undefined;
 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,iBAAiB,EAAC,MAAM,OAAO,CAAC;AAE7C,OAAO,EAAgB,KAAK,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAE/E,OAAO,EAAc,KAAK,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAoB,KAAK,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAI/E,UAAU,KAAK;IACb,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAED,wBAAgB,aAAa,CAAC,EAC5B,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,QAAQ,GACT,EAAE,iBAAiB,CAAC,KAAK,CAAC,0FAgB1B"}
+{"version":3,"file":"ServerContext.d.ts","sourceRoot":"","sources":["../../../source/server/ServerContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,OAAO,CAAC;AAE7C,OAAO,EAAgB,KAAK,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAE/E,OAAO,EAAc,KAAK,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAoB,KAAK,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAE/E,UAAU,KAAK;IACb,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,MAAM,CAAC,EAAE,aAAa,CAAC;CACxB;AAED,wBAAgB,aAAa,CAAC,EAC5B,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,QAAQ,GACT,EAAE,iBAAiB,CAAC,KAAK,CAAC,oHAkC1B"}

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

@@ -2,19 +2,23 @@ import { type ReactElement } from 'react';
 import { type AssetsCacheKey, type BrowserAssets, type BrowserAssetsEntry } from '@quilted/assets';
 import { HTMLManager } from '@quilted/react-html/server';
 import { HTMLResponse, RedirectResponse } from '@quilted/request-router';
+export interface RenderHTMLFunction {
+    (content: ReadableStream<string>, context: {
+        readonly manager: HTMLManager;
+        readonly headers: Headers;
+        readonly assets?: BrowserAssetsEntry;
+        readonly preloadAssets?: BrowserAssetsEntry;
+    }): ReadableStream<any> | string | Promise<ReadableStream<any> | string>;
+}
 export interface RenderOptions<CacheKey = AssetsCacheKey> {
     readonly request: Request;
     readonly stream?: 'headers' | false;
+    readonly headers?: HeadersInit;
     readonly assets?: BrowserAssets<CacheKey>;
     readonly cacheKey?: CacheKey;
+    readonly renderHTML?: boolean | 'fragment' | 'document' | RenderHTMLFunction;
     waitUntil?(promise: Promise<any>): void;
-    renderHTML?(content: ReadableStream<string>, context: {
-        readonly manager: HTMLManager;
-        readonly assets?: BrowserAssetsEntry;
-        readonly preloadAssets?: BrowserAssetsEntry;
-    }): ReadableStream<any> | Promise<ReadableStream<any>>;
 }
-export declare function renderToFragmentResponse(element: ReactElement<any>, { request }: Pick<RenderOptions<any>, 'request'>): Promise<RedirectResponse | HTMLResponse>;
 export declare function renderToResponse<CacheKey = AssetsCacheKey>(element: ReactElement<any>, options: RenderOptions<CacheKey>): Promise<HTMLResponse | RedirectResponse>;
 export declare function renderToResponse<CacheKey = AssetsCacheKey>(options: RenderOptions<CacheKey>): Promise<HTMLResponse | RedirectResponse>;
 //# sourceMappingURL=request-router.d.ts.map

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,YAAY,EAAC,MAAM,OAAO,CAAC;AAGxD,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACxB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAML,WAAW,EACZ,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AAIvE,MAAM,WAAW,aAAa,CAAC,QAAQ,GAAG,cAAc;IACtD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC1C,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC7B,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACxC,UAAU,CAAC,CACT,OAAO,EAAE,cAAc,CAAC,MAAM,CAAC,EAC/B,OAAO,EAAE;QACP,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;QAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC;QACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,kBAAkB,CAAC;KAC7C,GACA,cAAc,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;CACvD;AAED,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,EAC1B,EAAC,OAAO,EAAC,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,4CA8B/C;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,GAAG,cAAc,EAC9D,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,EAC1B,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,GAC/B,OAAO,CAAC,YAAY,GAAG,gBAAgB,CAAC,CAAC;AAC5C,wBAAsB,gBAAgB,CAAC,QAAQ,GAAG,cAAc,EAC9D,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,GAC/B,OAAO,CAAC,YAAY,GAAG,gBAAgB,CAAC,CAAC"}
+{"version":3,"file":"request-router.d.ts","sourceRoot":"","sources":["../../../source/server/request-router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,YAAY,EAAC,MAAM,OAAO,CAAC;AAGxD,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACxB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAML,WAAW,EACZ,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAC,YAAY,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,OAAO,EAAE,WAAW,CAAC;QAC9B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC;QACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,kBAAkB,CAAC;KAC7C,GACA,cAAc,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;CACzE;AAED,MAAM,WAAW,aAAa,CAAC,QAAQ,GAAG,cAAc;IACtD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,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,QAAQ,CAAC,CAAC;IAC1C,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC7B,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,CAAC,QAAQ,GAAG,cAAc,EAC9D,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,EAC1B,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,GAC/B,OAAO,CAAC,YAAY,GAAG,gBAAgB,CAAC,CAAC;AAC5C,wBAAsB,gBAAgB,CAAC,QAAQ,GAAG,cAAc,EAC9D,OAAO,EAAE,aAAa,CAAC,QAAQ,CAAC,GAC/B,OAAO,CAAC,YAAY,GAAG,gBAAgB,CAAC,CAAC"}

package/build/typescript/server.d.ts

@@ -9,6 +9,5 @@ export { createRequestRouterLocalization } from '@quilted/react-localize/request
 export { ServerAction, useServerAction, useServerContext, } from '@quilted/react-server-render';
 export type { ServerActionKind, ServerActionOptions, ServerActionPerform, ServerRenderPass, ServerRenderRequestContext, } from '@quilted/react-server-render';
 export { ServerContext } from './server/ServerContext.tsx';
-export { renderToResponse, renderToFragmentResponse, } from './server/request-router.tsx';
-export { createAssetPreloader, type AssetPreloadOptions, } from './server/preload.ts';
+export { renderToResponse } from './server/request-router.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,IAAI,EACJ,SAAS,EACT,WAAW,EACX,WAAW,EACX,gBAAgB,IAAI,qBAAqB,GAC1C,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,qBAAqB,EACrB,4BAA4B,EAC5B,0BAA0B,EAC1B,oCAAoC,GACrC,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,KAAK,EACL,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,oBAAoB,EACpB,0BAA0B,EAC1B,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,aAAa,EACb,aAAa,EACb,gBAAgB,IAAI,uBAAuB,GAC5C,MAAM,8BAA8B,CAAC;AACtC,YAAY,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAC,yBAAyB,EAAC,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAC,+BAA+B,EAAC,MAAM,wCAAwC,CAAC;AACvF,OAAO,EACL,YAAY,EACZ,eAAe,EACf,gBAAgB,GACjB,MAAM,8BAA8B,CAAC;AACtC,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,EAChB,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AACzD,OAAO,EACL,gBAAgB,EAChB,wBAAwB,GACzB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,oBAAoB,EACpB,KAAK,mBAAmB,GACzB,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../source/server.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,SAAS,EACT,WAAW,EACX,WAAW,EACX,gBAAgB,IAAI,qBAAqB,GAC1C,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,qCAAqC,CAAC;AAE7C,OAAO,EACL,oBAAoB,EACpB,2BAA2B,EAC3B,qBAAqB,EACrB,4BAA4B,EAC5B,0BAA0B,EAC1B,oCAAoC,GACrC,MAAM,iBAAiB,CAAC;AACzB,YAAY,EACV,KAAK,EACL,cAAc,EACd,aAAa,EACb,kBAAkB,EAClB,oBAAoB,EACpB,0BAA0B,EAC1B,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,aAAa,EACb,aAAa,EACb,gBAAgB,IAAI,uBAAuB,GAC5C,MAAM,8BAA8B,CAAC;AACtC,YAAY,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAC,yBAAyB,EAAC,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAC,+BAA+B,EAAC,MAAM,wCAAwC,CAAC;AACvF,OAAO,EACL,YAAY,EACZ,eAAe,EACf,gBAAgB,GACjB,MAAM,8BAA8B,CAAC;AACtC,YAAY,EACV,gBAAgB,EAChB,mBAAmB,EACnB,mBAAmB,EACnB,gBAAgB,EAChB,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAC,aAAa,EAAC,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@quilted/quilt",
   "type": "module",
-  "version": "0.6.11",
+  "version": "0.6.13",
   "repository": {
     "type": "git",
     "url": "https://github.com/lemonmade/quilt.git",
@@ -97,12 +97,6 @@
       "quilt:esnext": "./build/esnext/react/testing.esnext",
       "import": "./build/esm/react/testing.mjs"
     },
-    "./react/tools": {
-      "types": "./build/typescript/react/tools.d.ts",
-      "quilt:source": "./source/react/tools.ts",
-      "quilt:esnext": "./build/esnext/react/tools.esnext",
-      "import": "./build/esm/react/tools.mjs"
-    },
     "./graphql": {
       "types": "./build/typescript/graphql.d.ts",
       "quilt:source": "./source/graphql.ts",
@@ -134,10 +128,10 @@
       "import": "./build/esm/env.mjs"
     },
     "./request-router": {
-      "types": "./build/typescript/request-router/index.d.ts",
-      "quilt:source": "./source/request-router/index.ts",
-      "quilt:esnext": "./build/esnext/request-router/index.esnext",
-      "import": "./build/esm/request-router/index.mjs"
+      "types": "./build/typescript/request-router.d.ts",
+      "quilt:source": "./source/request-router.ts",
+      "quilt:esnext": "./build/esnext/request-router.esnext",
+      "import": "./build/esm/request-router.mjs"
     },
     "./request-router/node": {
       "types": "./build/typescript/request-router/node.d.ts",
@@ -221,9 +215,6 @@
       "react/testing": [
         "./build/typescript/react/testing.d.ts"
       ],
-      "react/tools": [
-        "./build/typescript/react/tools.d.ts"
-      ],
       "modules": [
         "./build/typescript/modules.d.ts"
       ]
@@ -258,12 +249,11 @@
     "@quilted/request-router": "^0.2.0",
     "@quilted/signals": "^0.2.0",
     "@quilted/threads": "^2.0.0",
-    "@quilted/useful-react-types": "^2.0.0",
     "jest-matcher-utils": "^29.0.0"
   },
   "peerDependencies": {
     "graphql": "^16.7.0",
-    "preact": "^10.19.0",
+    "preact": "^10.20.0",
     "prettier": "^2.0.0 || ^3.0.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
@@ -290,12 +280,12 @@
     }
   },
   "devDependencies": {
-    "@types/prettier": "^2.0.0",
     "expect": "^29.0.0",
-    "preact": "^10.19.0",
+    "preact": "^10.20.0",
+    "prettier": "^3.2.0",
     "react": "npm:@quilted/react@^18.2.0",
     "react-dom": "npm:@quilted/react-dom@^18.2.0",
-    "vitest": "^1.1.0"
+    "vitest": "^1.4.0"
   },
   "scripts": {
     "build": "rollup --config configuration/rollup.config.js"

package/source/react.ts

@@ -1,4 +1 @@
-// @ts-expect-error not used for types
-export * from '@quilted/react';
-// @ts-expect-error not used for types
-export {default} from '@quilted/react';
+export * from '@quilted/react-utilities';

package/source/server/ServerContext.tsx

@@ -5,8 +5,6 @@ import {InitialUrlContext} from '@quilted/react-router';
 import {HTMLContext, type HTMLManager} from '@quilted/react-html/server';
 import {HttpServerContext, type HttpManager} from '@quilted/react-http/server';
 
-import {maybeWrapContext} from '../utilities/react.tsx';
-
 interface Props {
   url?: string | URL;
   html?: HTMLManager;
@@ -23,17 +21,35 @@ export function ServerContext({
 }: PropsWithChildren<Props>) {
   const normalizedUrl = typeof url === 'string' ? new URL(url) : url;
 
-  return maybeWrapContext(
-    AssetsContext,
-    assets,
-    maybeWrapContext(
-      HttpServerContext,
-      http,
-      maybeWrapContext(
-        HTMLContext,
-        html,
-        maybeWrapContext(InitialUrlContext, normalizedUrl, children),
-      ),
-    ),
+  const withInitialURL = normalizedUrl ? (
+    <InitialUrlContext.Provider value={normalizedUrl}>
+      {children}
+    </InitialUrlContext.Provider>
+  ) : (
+    children
+  );
+
+  const withHTML = html ? (
+    <HTMLContext.Provider value={html}>{withInitialURL}</HTMLContext.Provider>
+  ) : (
+    withInitialURL
+  );
+
+  const withHTTPServer = http ? (
+    <HttpServerContext.Provider value={http}>
+      {withHTML}
+    </HttpServerContext.Provider>
+  ) : (
+    withHTML
+  );
+
+  const withAssets = assets ? (
+    <AssetsContext.Provider value={assets}>
+      {withHTTPServer}
+    </AssetsContext.Provider>
+  ) : (
+    withHTTPServer
   );
+
+  return withAssets;
 }

package/source/server/request-router.tsx

@@ -24,54 +24,26 @@ import {HTMLResponse, RedirectResponse} from '@quilted/request-router';
 
 import {ServerContext} from './ServerContext.tsx';
 
-export interface RenderOptions<CacheKey = AssetsCacheKey> {
-  readonly request: Request;
-  readonly stream?: 'headers' | false;
-  readonly assets?: BrowserAssets<CacheKey>;
-  readonly cacheKey?: CacheKey;
-  waitUntil?(promise: Promise<any>): void;
-  renderHTML?(
+export interface RenderHTMLFunction {
+  (
     content: ReadableStream<string>,
     context: {
       readonly manager: HTMLManager;
+      readonly headers: Headers;
       readonly assets?: BrowserAssetsEntry;
       readonly preloadAssets?: BrowserAssetsEntry;
     },
-  ): ReadableStream<any> | Promise<ReadableStream<any>>;
+  ): ReadableStream<any> | string | Promise<ReadableStream<any> | string>;
 }
 
-export async function renderToFragmentResponse(
-  element: ReactElement<any>,
-  {request}: Pick<RenderOptions<any>, 'request'>,
-) {
-  const baseUrl = (request as any).URL ?? new URL(request.url);
-  const html = new HTMLManager();
-  const http = new HttpManager({headers: request.headers});
-
-  const rendered = await extract(element, {
-    decorate(element) {
-      return (
-        <ServerContext http={http} html={html} url={baseUrl}>
-          {element}
-        </ServerContext>
-      );
-    },
-  });
-
-  const {headers, statusCode = 200, redirectUrl} = http.state;
-
-  if (redirectUrl) {
-    return new RedirectResponse(redirectUrl, {
-      status: statusCode as 301,
-      headers,
-      request,
-    });
-  }
-
-  return new HTMLResponse(rendered ?? '', {
-    status: statusCode,
-    headers,
-  });
+export interface RenderOptions<CacheKey = AssetsCacheKey> {
+  readonly request: Request;
+  readonly stream?: 'headers' | false;
+  readonly headers?: HeadersInit;
+  readonly assets?: BrowserAssets<CacheKey>;
+  readonly cacheKey?: CacheKey;
+  readonly renderHTML?: boolean | 'fragment' | 'document' | RenderHTMLFunction;
+  waitUntil?(promise: Promise<any>): void;
 }
 
 export async function renderToResponse<CacheKey = AssetsCacheKey>(
@@ -97,11 +69,12 @@ export async function renderToResponse<CacheKey = AssetsCacheKey>(
 
   const {
     request,
-    stream: shouldStream = false,
     assets,
     cacheKey: explicitCacheKey,
+    headers: explicitHeaders,
     waitUntil = noop,
-    renderHTML,
+    stream: shouldStream = false,
+    renderHTML = true,
   } = options;
 
   const baseUrl = (request as any).URL ?? new URL(request.url);
@@ -115,8 +88,8 @@ export async function renderToResponse<CacheKey = AssetsCacheKey>(
   const assetsManager = new AssetsManager<CacheKey>({cacheKey});
 
   let responseStatus = 200;
-  let appHeaders: Headers | undefined;
   let appStream: ReadableStream<any> | undefined;
+  const headers = new Headers(explicitHeaders);
 
   if (shouldStream === false && element != null) {
     const rendered = await extract(element, {
@@ -134,17 +107,29 @@ export async function renderToResponse<CacheKey = AssetsCacheKey>(
       },
     });
 
-    const {headers, statusCode = 200, redirectUrl} = http.state;
+    const {headers: appHeaders, statusCode = 200, redirectUrl} = http.state;
+
+    const hasSetCookieHeader = typeof appHeaders.getSetCookie === 'function';
+
+    if (hasSetCookieHeader) {
+      for (const cookie of appHeaders.getSetCookie()) {
+        headers.append('Set-Cookie', cookie);
+      }
+    }
+
+    for (const [header, value] of appHeaders.entries()) {
+      if (hasSetCookieHeader && header.toLowerCase() === 'set-cookie') continue;
+      headers.set(header, value);
+    }
 
     if (redirectUrl) {
       return new RedirectResponse(redirectUrl, {
         status: statusCode as 301,
-        headers,
+        headers: headers,
         request,
       });
     }
 
-    appHeaders = headers;
     responseStatus = statusCode;
 
     const appTransformStream = new TransformStream();
@@ -187,16 +172,16 @@ export async function renderToResponse<CacheKey = AssetsCacheKey>(
     waitUntil(renderAppStream());
   }
 
-  const {headers, body} = await renderToHTMLStream(appStream);
+  const body = await renderToHTMLBody(appStream);
 
   return new HTMLResponse(body, {
     status: responseStatus,
     headers,
   });
 
-  async function renderToHTMLStream(content: ReadableStream<any>) {
-    const headers = new Headers(appHeaders);
-
+  async function renderToHTMLBody(
+    content: ReadableStream<any>,
+  ): Promise<ReadableStream<any> | string> {
     const [synchronousAssets, preloadAssets] = await Promise.all([
       assets?.entry({
         cacheKey,
@@ -223,14 +208,17 @@ export async function renderToResponse<CacheKey = AssetsCacheKey>(
       }
     }
 
-    if (renderHTML) {
+    if (typeof renderHTML === 'function') {
       const body = await renderHTML(content, {
         manager: html,
+        headers,
         assets: synchronousAssets,
         preloadAssets,
       });
 
-      return {headers, body};
+      return body;
+    } else if (renderHTML === false || renderHTML === 'fragment') {
+      return content;
     }
 
     const responseStream = new TextEncoderStream();
@@ -347,7 +335,7 @@ export async function renderToResponse<CacheKey = AssetsCacheKey>(
 
     waitUntil(renderFullHTML());
 
-    return {headers, body};
+    return body;
   }
 }
 

package/source/server.ts

@@ -53,11 +53,4 @@ export type {
 } from '@quilted/react-server-render';
 
 export {ServerContext} from './server/ServerContext.tsx';
-export {
-  renderToResponse,
-  renderToFragmentResponse,
-} from './server/request-router.tsx';
-export {
-  createAssetPreloader,
-  type AssetPreloadOptions,
-} from './server/preload.ts';
+export {renderToResponse} from './server/request-router.tsx';

package/tsconfig.json

@@ -30,7 +30,6 @@
     {"path": "../request-router"},
     {"path": "../signals"},
     {"path": "../threads"},
-    {"path": "../useful-react-types"},
     {"path": "../workers"}
   ]
 }

package/build/esm/react/tools.mjs

@@ -1,2 +0,0 @@
-export * from '@quilted/useful-react-types';
-export * from '@quilted/react-utilities';

package/build/esm/server/preload.mjs

@@ -1,35 +0,0 @@
-import { JSONResponse } from '@quilted/request-router';
-
-function createAssetPreloader(options) {
-  return async function handler(request, requestContext) {
-    const manifest = await assetsForRequest(request, {
-      ...options,
-      context: requestContext
-    });
-    return new JSONResponse(manifest);
-  };
-}
-async function assetsForRequest(request, {
-  assets,
-  context,
-  cacheKey: getCacheKey
-}) {
-  const url = new URL(request.url);
-  const modules = url.searchParams.get('modules')?.split(',') ?? [];
-  const includeStyles = url.searchParams.get('styles') !== 'false';
-  const includeScripts = url.searchParams.get('scripts') !== 'false';
-  const cacheKey = (await getCacheKey?.(request, context)) ?? (await assets.cacheKey?.(request));
-  const {
-    styles,
-    scripts
-  } = await assets.entry({
-    modules,
-    cacheKey
-  });
-  const result = {};
-  if (includeStyles) result.styles = styles;
-  if (includeScripts) result.scripts = scripts;
-  return result;
-}
-
-export { createAssetPreloader };

package/build/esm/utilities/react.mjs

@@ -1,10 +0,0 @@
-import { jsx } from 'react/jsx-runtime';
-
-function maybeWrapContext(Context, value, children) {
-  return value ? /*#__PURE__*/jsx(Context.Provider, {
-    value: value,
-    children: children
-  }) : children;
-}
-
-export { maybeWrapContext };

package/build/esnext/react/tools.esnext

@@ -1,2 +0,0 @@
-export * from '@quilted/useful-react-types';
-export * from '@quilted/react-utilities';

package/build/esnext/server/preload.esnext

@@ -1,34 +0,0 @@
-import { JSONResponse } from '@quilted/request-router';
-
-function createAssetPreloader(options) {
-  return async function handler(request, requestContext) {
-    const manifest = await assetsForRequest(request, {
-      ...options,
-      context: requestContext
-    });
-    return new JSONResponse(manifest);
-  };
-}
-async function assetsForRequest(request, {
-  assets,
-  context,
-  cacheKey: getCacheKey
-}) {
-  const url = new URL(request.url);
-  const modules = url.searchParams.get("modules")?.split(",") ?? [];
-  const includeStyles = url.searchParams.get("styles") !== "false";
-  const includeScripts = url.searchParams.get("scripts") !== "false";
-  const cacheKey = await getCacheKey?.(request, context) ?? await assets.cacheKey?.(request);
-  const { styles, scripts } = await assets.entry({
-    modules,
-    cacheKey
-  });
-  const result = {};
-  if (includeStyles)
-    result.styles = styles;
-  if (includeScripts)
-    result.scripts = scripts;
-  return result;
-}
-
-export { createAssetPreloader };

package/build/esnext/utilities/react.esnext

@@ -1,7 +0,0 @@
-import { jsx } from 'react/jsx-runtime';
-
-function maybeWrapContext(Context, value, children) {
-  return value ? /* @__PURE__ */ jsx(Context.Provider, { value, children }) : children;
-}
-
-export { maybeWrapContext };

package/build/typescript/react/jsx-runtime.d.ts

@@ -1,2 +0,0 @@
-export * from '@quilted/react/jsx-runtime';
-//# sourceMappingURL=jsx-runtime.d.ts.map

package/build/typescript/react/jsx-runtime.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"jsx-runtime.d.ts","sourceRoot":"","sources":["../../../source/react/jsx-runtime.ts"],"names":[],"mappings":"AACA,cAAc,4BAA4B,CAAC"}

package/build/typescript/react/tools.d.ts

@@ -1,3 +0,0 @@
-export * from '@quilted/useful-react-types';
-export * from '@quilted/react-utilities';
-//# sourceMappingURL=tools.d.ts.map

package/build/typescript/react/tools.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../source/react/tools.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC"}

package/build/typescript/react-dom/server.d.ts

@@ -1,2 +0,0 @@
-export * from '@quilted/react-dom/server';
-//# sourceMappingURL=server.d.ts.map

package/build/typescript/react-dom/server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../source/react-dom/server.ts"],"names":[],"mappings":"AACA,cAAc,2BAA2B,CAAC"}

package/build/typescript/react-dom/test-utils.d.ts

@@ -1,2 +0,0 @@
-export * from '@quilted/react-dom/test-utils';
-//# sourceMappingURL=test-utils.d.ts.map

package/build/typescript/react-dom/test-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../../../source/react-dom/test-utils.ts"],"names":[],"mappings":"AACA,cAAc,+BAA+B,CAAC"}

package/build/typescript/react-dom.d.ts

@@ -1,3 +0,0 @@
-export * from '@quilted/react-dom';
-export { default } from '@quilted/react-dom';
-//# sourceMappingURL=react-dom.d.ts.map

package/build/typescript/react-dom.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"react-dom.d.ts","sourceRoot":"","sources":["../../source/react-dom.ts"],"names":[],"mappings":"AACA,cAAc,oBAAoB,CAAC;AAEnC,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC"}

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

@@ -1,2 +0,0 @@
-export * from '@quilted/request-router';
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/request-router/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC"}

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

@@ -1,8 +0,0 @@
-import type { AssetsCacheKey, BrowserAssets } from '@quilted/assets';
-import { type EnhancedRequest, type RequestHandler, type RequestContext } from '@quilted/request-router';
-export interface AssetPreloadOptions<Context = RequestContext, CacheKey = AssetsCacheKey> {
-    readonly assets: BrowserAssets<CacheKey>;
-    cacheKey?(request: EnhancedRequest, context: Context): CacheKey | Promise<CacheKey>;
-}
-export declare function createAssetPreloader<Context = RequestContext, CacheKey = AssetsCacheKey>(options: AssetPreloadOptions<Context, CacheKey>): RequestHandler<Context>;
-//# sourceMappingURL=preload.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"preload.d.ts","sourceRoot":"","sources":["../../../source/server/preload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EAEd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,cAAc,EACpB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,WAAW,mBAAmB,CAClC,OAAO,GAAG,cAAc,EACxB,QAAQ,GAAG,cAAc;IAEzB,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACzC,QAAQ,CAAC,CACP,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO,GACf,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACjC;AAED,wBAAgB,oBAAoB,CAClC,OAAO,GAAG,cAAc,EACxB,QAAQ,GAAG,cAAc,EACzB,OAAO,EAAE,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAS1E"}

package/build/typescript/utilities/react.d.ts

@@ -1,3 +0,0 @@
-import type { Context as ReactContext, ReactNode, ReactElement } from 'react';
-export declare function maybeWrapContext<T>(Context: ReactContext<T>, value: T | null | undefined, children: ReactNode): ReactElement;
-//# sourceMappingURL=react.d.ts.map

package/build/typescript/utilities/react.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"react.d.ts","sourceRoot":"","sources":["../../../source/utilities/react.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,OAAO,IAAI,YAAY,EAAE,SAAS,EAAE,YAAY,EAAC,MAAM,OAAO,CAAC;AAE5E,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EACxB,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,EAC3B,QAAQ,EAAE,SAAS,GAClB,YAAY,CAMd"}

package/source/react/jsx-runtime.ts

@@ -1,2 +0,0 @@
-// @ts-expect-error not used for types
-export * from '@quilted/react/jsx-runtime';

package/source/react/tools.ts

@@ -1,2 +0,0 @@
-export * from '@quilted/useful-react-types';
-export * from '@quilted/react-utilities';

package/source/react-dom/server.ts

@@ -1,2 +0,0 @@
-// @ts-expect-error not used for types
-export * from '@quilted/react-dom/server';

package/source/react-dom/test-utils.ts

@@ -1,2 +0,0 @@
-// @ts-expect-error not used for types
-export * from '@quilted/react-dom/test-utils';

package/source/react-dom.ts

@@ -1,4 +0,0 @@
-// @ts-expect-error not used for types
-export * from '@quilted/react-dom';
-// @ts-expect-error not used for types
-export {default} from '@quilted/react-dom';