@quilted/quilt 0.6.11 → 0.6.12

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @quilted/quilt
 
+## 0.6.12
+
+### Patch Changes
+
+- [`9eb5ba81`](https://github.com/lemonmade/quilt/commit/9eb5ba8110a4691936f043084c87c4da94d524b8) Thanks [@lemonmade](https://github.com/lemonmade)! - Improve `renderToResponse` and remove `renderToFragmentResponse`
+
+- [`905e92ef`](https://github.com/lemonmade/quilt/commit/905e92ef32adad8658042f437b9cfbd248cce3c3) Thanks [@lemonmade](https://github.com/lemonmade)! - Simplify React exports
+
 ## 0.6.11
 
 ### Patch Changes

package/build/esm/react.mjs

@@ -1,2 +1 @@
-export * from '@quilted/react';
-export { default } from '@quilted/react';
+export * from '@quilted/react-utilities';

package/build/esm/server/ServerContext.mjs

@@ -2,7 +2,7 @@ import { AssetsContext } from '@quilted/react-assets/server';
 import { InitialUrlContext } from '@quilted/react-router';
 import { HTMLContext } from '@quilted/react-html/server';
 import { HttpServerContext } from '@quilted/react-http/server';
-import { maybeWrapContext } from '../utilities/react.mjs';
+import { jsx } from 'react/jsx-runtime';
 
 function ServerContext({
   url,
@@ -12,7 +12,23 @@ function ServerContext({
   children
 }) {
   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 ? /*#__PURE__*/jsx(InitialUrlContext.Provider, {
+    value: normalizedUrl,
+    children: children
+  }) : children;
+  const withHTML = html ? /*#__PURE__*/jsx(HTMLContext.Provider, {
+    value: html,
+    children: withInitialURL
+  }) : withInitialURL;
+  const withHTTPServer = http ? /*#__PURE__*/jsx(HttpServerContext.Provider, {
+    value: http,
+    children: withHTML
+  }) : withHTML;
+  const withAssets = assets ? /*#__PURE__*/jsx(AssetsContext.Provider, {
+    value: assets,
+    children: withHTTPServer
+  }) : withHTTPServer;
+  return withAssets;
 }
 
 export { ServerContext };

package/build/esm/server/request-router.mjs

@@ -9,41 +9,6 @@ import { RedirectResponse, HTMLResponse } from '@quilted/request-router';
 import { ServerContext } from './ServerContext.mjs';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
-async function renderToFragmentResponse(element, {
-  request
-}) {
-  const baseUrl = request.URL ?? new URL(request.url);
-  const html = new HTMLManager();
-  const http = new HttpManager({
-    headers: request.headers
-  });
-  const rendered = await extract(element, {
-    decorate(element) {
-      return /*#__PURE__*/jsx(ServerContext, {
-        http: http,
-        html: html,
-        url: baseUrl,
-        children: element
-      });
-    }
-  });
-  const {
-    headers,
-    statusCode = 200,
-    redirectUrl
-  } = http.state;
-  if (redirectUrl) {
-    return new RedirectResponse(redirectUrl, {
-      status: statusCode,
-      headers,
-      request
-    });
-  }
-  return new HTMLResponse(rendered ?? '', {
-    status: statusCode,
-    headers
-  });
-}
 async function renderToResponse(optionsOrElement, definitelyOptions) {
   let element;
   let options;
@@ -55,11 +20,12 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
   }
   const {
     request,
-    stream: shouldStream = false,
     assets,
     cacheKey: explicitCacheKey,
+    headers: explicitHeaders,
     waitUntil = noop,
-    renderHTML
+    stream: shouldStream = false,
+    renderHTML = true
   } = options;
   const baseUrl = request.URL ?? new URL(request.url);
   const cacheKey = explicitCacheKey ?? (await assets?.cacheKey?.(request)) ?? {};
@@ -71,8 +37,8 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     cacheKey
   });
   let responseStatus = 200;
-  let appHeaders;
   let appStream;
+  const headers = new Headers(explicitHeaders);
   if (shouldStream === false && element != null) {
     const rendered = await extract(element, {
       decorate(element) {
@@ -86,18 +52,27 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
       }
     });
     const {
-      headers,
+      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,
-        headers,
+        headers: headers,
         request
       });
     }
-    appHeaders = headers;
     responseStatus = statusCode;
     const appTransformStream = new TransformStream();
     const appWriter = appTransformStream.writable.getWriter();
@@ -128,16 +103,12 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     };
     waitUntil(renderAppStream());
   }
-  const {
-    headers,
-    body
-  } = await renderToHTMLStream(appStream);
+  const body = await renderToHTMLBody(appStream);
   return new HTMLResponse(body, {
     status: responseStatus,
     headers
   });
-  async function renderToHTMLStream(content) {
-    const headers = new Headers(appHeaders);
+  async function renderToHTMLBody(content) {
     const [synchronousAssets, preloadAssets] = await Promise.all([assets?.entry({
       cacheKey,
       modules: assetsManager.usedModules({
@@ -156,16 +127,16 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
         headers.append('Link', preloadHeader(scriptAssetPreloadAttributes(script)));
       }
     }
-    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();
     const body = responseStream.readable;
@@ -251,10 +222,7 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
       writer.close();
     };
     waitUntil(renderFullHTML());
-    return {
-      headers,
-      body
-    };
+    return body;
   }
 }
 function preloadHeader(attributes) {
@@ -288,4 +256,4 @@ function noop(..._args) {
   // noop
 }
 
-export { renderToFragmentResponse, renderToResponse };
+export { renderToResponse };

package/build/esm/server.mjs

@@ -6,5 +6,4 @@ export { parseAcceptLanguageHeader } from '@quilted/react-localize';
 export { createRequestRouterLocalization } from '@quilted/react-localize/request-router';
 export { ServerAction, useServerAction, useServerContext } from '@quilted/react-server-render';
 export { ServerContext } from './server/ServerContext.mjs';
-export { renderToFragmentResponse, renderToResponse } from './server/request-router.mjs';
-export { createAssetPreloader } from './server/preload.mjs';
+export { renderToResponse } from './server/request-router.mjs';

package/build/esnext/react.esnext

@@ -1,2 +1 @@
-export * from '@quilted/react';
-export { default } from '@quilted/react';
+export * from '@quilted/react-utilities';

package/build/esnext/server/ServerContext.esnext

@@ -1,8 +1,8 @@
+import { jsx } from 'react/jsx-runtime';
 import { AssetsContext } from '@quilted/react-assets/server';
 import { InitialUrlContext } from '@quilted/react-router';
 import { HTMLContext } from '@quilted/react-html/server';
 import { HttpServerContext } from '@quilted/react-http/server';
-import { maybeWrapContext } from '../utilities/react.esnext';
 
 function ServerContext({
   url,
@@ -12,19 +12,11 @@ function ServerContext({
   children
 }) {
   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 ? /* @__PURE__ */ jsx(InitialUrlContext.Provider, { value: normalizedUrl, children }) : children;
+  const withHTML = html ? /* @__PURE__ */ jsx(HTMLContext.Provider, { value: html, children: withInitialURL }) : withInitialURL;
+  const withHTTPServer = http ? /* @__PURE__ */ jsx(HttpServerContext.Provider, { value: http, children: withHTML }) : withHTML;
+  const withAssets = assets ? /* @__PURE__ */ jsx(AssetsContext.Provider, { value: assets, children: withHTTPServer }) : withHTTPServer;
+  return withAssets;
 }
 
 export { ServerContext };

package/build/esnext/server/request-router.esnext

@@ -9,28 +9,6 @@ import { extract } from '@quilted/react-server-render/server';
 import { RedirectResponse, HTMLResponse } from '@quilted/request-router';
 import { ServerContext } from './ServerContext.esnext';
 
-async function renderToFragmentResponse(element, { request }) {
-  const baseUrl = request.URL ?? new URL(request.url);
-  const html = new HTMLManager();
-  const http = new HttpManager({ headers: request.headers });
-  const rendered = await extract(element, {
-    decorate(element2) {
-      return /* @__PURE__ */ jsx(ServerContext, { http, html, url: baseUrl, children: element2 });
-    }
-  });
-  const { headers, statusCode = 200, redirectUrl } = http.state;
-  if (redirectUrl) {
-    return new RedirectResponse(redirectUrl, {
-      status: statusCode,
-      headers,
-      request
-    });
-  }
-  return new HTMLResponse(rendered ?? "", {
-    status: statusCode,
-    headers
-  });
-}
 async function renderToResponse(optionsOrElement, definitelyOptions) {
   let element;
   let options;
@@ -42,11 +20,12 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
   }
   const {
     request,
-    stream: shouldStream = false,
     assets,
     cacheKey: explicitCacheKey,
+    headers: explicitHeaders,
     waitUntil = noop,
-    renderHTML
+    stream: shouldStream = false,
+    renderHTML = true
   } = options;
   const baseUrl = request.URL ?? new URL(request.url);
   const cacheKey = explicitCacheKey ?? (await assets?.cacheKey?.(request) ?? {});
@@ -54,8 +33,8 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
   const http = new HttpManager({ headers: request.headers });
   const assetsManager = new AssetsManager({ cacheKey });
   let responseStatus = 200;
-  let appHeaders;
   let appStream;
+  const headers = new Headers(explicitHeaders);
   if (shouldStream === false && element != null) {
     const rendered = await extract(element, {
       decorate(element2) {
@@ -71,15 +50,25 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
         );
       }
     });
-    const { headers: headers2, 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,
-        headers: headers2,
+        headers,
         request
       });
     }
-    appHeaders = headers2;
     responseStatus = statusCode;
     const appTransformStream = new TransformStream();
     const appWriter = appTransformStream.writable.getWriter();
@@ -113,13 +102,12 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     };
     waitUntil(renderAppStream());
   }
-  const { headers, body } = await renderToHTMLStream(appStream);
+  const body = await renderToHTMLBody(appStream);
   return new HTMLResponse(body, {
     status: responseStatus,
     headers
   });
-  async function renderToHTMLStream(content) {
-    const headers2 = new Headers(appHeaders);
+  async function renderToHTMLBody(content) {
     const [synchronousAssets, preloadAssets] = await Promise.all([
       assets?.entry({
         cacheKey,
@@ -131,25 +119,28 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     ]);
     if (synchronousAssets) {
       for (const style of synchronousAssets.styles) {
-        headers2.append(
+        headers.append(
           "Link",
           preloadHeader(styleAssetPreloadAttributes(style))
         );
       }
       for (const script of synchronousAssets.scripts) {
-        headers2.append(
+        headers.append(
           "Link",
           preloadHeader(scriptAssetPreloadAttributes(script))
         );
       }
     }
-    if (renderHTML) {
+    if (typeof renderHTML === "function") {
       const body3 = await renderHTML(content, {
         manager: html,
+        headers,
         assets: synchronousAssets,
         preloadAssets
       });
-      return { headers: headers2, body: body3 };
+      return body3;
+    } else if (renderHTML === false || renderHTML === "fragment") {
+      return content;
     }
     const responseStream = new TextEncoderStream();
     const body2 = responseStream.readable;
@@ -249,7 +240,7 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
       writer.close();
     };
     waitUntil(renderFullHTML());
-    return { headers: headers2, body: body2 };
+    return body2;
   }
 }
 function preloadHeader(attributes) {
@@ -280,4 +271,4 @@ function diffBrowserAssetsEntries(newList, oldList) {
 function noop(..._args) {
 }
 
-export { renderToFragmentResponse, renderToResponse };
+export { renderToResponse };

package/build/esnext/server.esnext

@@ -6,5 +6,4 @@ export { parseAcceptLanguageHeader } from '@quilted/react-localize';
 export { createRequestRouterLocalization } from '@quilted/react-localize/request-router';
 export { ServerAction, useServerAction, useServerContext } from '@quilted/react-server-render';
 export { ServerContext } from './server/ServerContext.esnext';
-export { renderToFragmentResponse, renderToResponse } from './server/request-router.esnext';
-export { createAssetPreloader } from './server/preload.esnext';
+export { renderToResponse } from './server/request-router.esnext';