@quilted/quilt 0.8.4 → 0.8.6

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @quilted/quilt
 
+## 0.8.6
+
+### Patch Changes
+
+- [`d409c19`](https://github.com/lemonmade/quilt/commit/d409c1930834449160e90b6bedf0fe3f7325d4b0) Thanks [@lemonmade](https://github.com/lemonmade)! - Add more server rendering hooks
+
+- Updated dependencies [[`c365777`](https://github.com/lemonmade/quilt/commit/c365777123caf40d2e08aa405180ea9efbd34cac), [`d409c19`](https://github.com/lemonmade/quilt/commit/d409c1930834449160e90b6bedf0fe3f7325d4b0), [`5a8036d`](https://github.com/lemonmade/quilt/commit/5a8036d39d93c576812428ecc8fe537a30696dba)]:
+  - @quilted/async@0.4.22
+  - @quilted/preact-browser@0.1.10
+  - @quilted/graphql@3.3.8
+
+## 0.8.5
+
+### Patch Changes
+
+- [`ed66780`](https://github.com/lemonmade/quilt/commit/ed66780bfe57daa031d92d0787bde2f424536e30) Thanks [@lemonmade](https://github.com/lemonmade)! - Remove cache key and simplify browser assets type
+
+- Updated dependencies [[`ed66780`](https://github.com/lemonmade/quilt/commit/ed66780bfe57daa031d92d0787bde2f424536e30)]:
+  - @quilted/preact-browser@0.1.9
+  - @quilted/assets@0.1.5
+
 ## 0.8.4
 
 ### Patch Changes

package/build/esm/server/ServerContext.mjs

@@ -1,15 +1,20 @@
-import { BrowserDetailsContext } from '@quilted/preact-browser/server';
+import { BrowserDetailsContext, BrowserAssetsManifestContext } from '@quilted/preact-browser/server';
 import { jsx } from 'preact/jsx-runtime';
 
 function ServerContext({
   browser,
+  assets,
   children
 }) {
   const withBrowser = browser ? jsx(BrowserDetailsContext.Provider, {
     value: browser,
     children: children
   }) : children;
-  return withBrowser;
+  const withAssets = assets ? jsx(BrowserAssetsManifestContext.Provider, {
+    value: assets,
+    children: withBrowser
+  }) : withBrowser;
+  return withAssets;
 }
 
 export { ServerContext };

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

@@ -6,15 +6,6 @@ import { EnhancedResponse, HTMLResponse } from '@quilted/request-router';
 import { ServerContext } from './ServerContext.mjs';
 import { jsx, jsxs, Fragment } from 'preact/jsx-runtime';
 
-async function renderToStringWithServerContext(element, {
-  browser
-} = {}) {
-  const rendered = await renderToStringAsync(jsx(ServerContext, {
-    browser: browser,
-    children: element
-  }));
-  return rendered;
-}
 async function renderToResponse(optionsOrElement, definitelyOptions) {
   let element;
   let options;
@@ -28,7 +19,6 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     request,
     assets,
     status: explicitStatus,
-    cacheKey: explicitCacheKey,
     headers: explicitHeaders,
     serializations: explicitSerializations,
     waitUntil = noop,
@@ -36,10 +26,8 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     renderHTML = true
   } = options;
   const baseURL = request.URL ?? new URL(request.url);
-  const cacheKey = explicitCacheKey ?? (await assets?.cacheKey?.(request)) ?? {};
   const browserResponse = new BrowserResponse({
     request,
-    cacheKey,
     status: explicitStatus,
     headers: new Headers(explicitHeaders),
     serializations: explicitSerializations
@@ -48,9 +36,11 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
   if (shouldStream === false && element != null) {
     let rendered;
     try {
-      rendered = await renderToStringWithServerContext(element, {
-        browser: browserResponse
-      });
+      rendered = await renderToStringAsync(jsx(ServerContext, {
+        assets: assets,
+        browser: browserResponse,
+        children: element
+      }));
     } catch (error) {
       if (error instanceof Response) {
         const mergedHeaders = new Headers(browserResponse.headers);
@@ -87,9 +77,11 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
         // 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(jsx(ServerContext, {
+          assets: assets,
+          browser: browserResponse,
+          children: element
+        }));
         appWriter.write(rendered);
       }
       appWriter.close();
@@ -115,16 +107,17 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     const renderFullHTML = async function renderFullHTML() {
       const writer = responseStream.writable.getWriter();
       writer.write(`<!DOCTYPE html>`);
-      const [synchronousAssets, preloadAssets] = await Promise.all([assets?.entry({
-        cacheKey,
+      const synchronousAssets = assets?.entry({
+        request,
         modules: browserResponse.assets.get({
           timing: 'load'
         })
-      }), assets?.modules(browserResponse.assets.get({
+      });
+      const preloadAssets = assets?.modules(browserResponse.assets.get({
         timing: 'preload'
       }), {
-        cacheKey
-      })]);
+        request
+      });
       if (synchronousAssets) {
         for (const style of synchronousAssets.styles) {
           browserResponse.headers.append('Link', preloadHeader(styleAssetPreloadAttributes(style)));
@@ -186,16 +179,17 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
         writer.write(value);
       }
       if (element != null) writer.write(`</div>`);
-      const [newSynchronousAssets, newPreloadAssets] = await Promise.all([assets?.entry({
-        cacheKey,
+      const newSynchronousAssets = assets?.entry({
+        request,
         modules: browserResponse.assets.get({
           timing: 'load'
         })
-      }), assets?.modules(browserResponse.assets.get({
+      });
+      const newPreloadAssets = assets?.modules(browserResponse.assets.get({
         timing: 'preload'
       }), {
-        cacheKey
-      })]);
+        request
+      });
       if (newSynchronousAssets) {
         const diffedSynchronousAssets = diffBrowserAssetsEntries(newSynchronousAssets, synchronousAssets);
         const diffedPreloadAssets = diffBrowserAssetsEntries(newPreloadAssets, preloadAssets);
@@ -254,4 +248,4 @@ function noop(..._args) {
   // noop
 }
 
-export { renderToResponse, renderToStringWithServerContext };
+export { renderToResponse };

package/build/esm/server.browser.mjs

@@ -5,5 +5,8 @@ export { parseAcceptLanguageHeader } from '@quilted/preact-localize';
 function noopRenderToString() {}
 function noopCreateRequestRouterLocalization() {}
 function noopRenderToResponse() {}
+function NoopServerContext() {
+  return null;
+}
 
-export { noopCreateRequestRouterLocalization as createRequestRouterLocalization, noopRenderToResponse as renderToResponse, noopRenderToString as renderToStaticMarkup, noopRenderToString as renderToString, noopRenderToString as renderToStringAsync };
+export { NoopServerContext as ServerContext, noopCreateRequestRouterLocalization as createRequestRouterLocalization, noopRenderToResponse as renderToResponse, noopRenderToString as renderToStaticMarkup, noopRenderToString as renderToString, noopRenderToString as renderToStringAsync };

package/build/esm/server.mjs

@@ -3,4 +3,5 @@ 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 } from './server/request-router.mjs';
+export { renderToResponse } from './server/request-router.mjs';
+export { ServerContext } from './server/ServerContext.mjs';

package/build/esnext/server/ServerContext.esnext

@@ -1,9 +1,14 @@
 import { jsx } from 'preact/jsx-runtime';
-import { BrowserDetailsContext } from '@quilted/preact-browser/server';
+import { BrowserDetailsContext, BrowserAssetsManifestContext } from '@quilted/preact-browser/server';
 
-function ServerContext({ browser, children }) {
+function ServerContext({
+  browser,
+  assets,
+  children
+}) {
   const withBrowser = browser ? /* @__PURE__ */ jsx(BrowserDetailsContext.Provider, { value: browser, children }) : children;
-  return withBrowser;
+  const withAssets = assets ? /* @__PURE__ */ jsx(BrowserAssetsManifestContext.Provider, { value: assets, children: withBrowser }) : withBrowser;
+  return withAssets;
 }
 
 export { ServerContext };

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

@@ -6,12 +6,6 @@ import { BrowserResponse, ScriptAsset, StyleAsset, StyleAssetPreload, ScriptAsse
 import { EnhancedResponse, HTMLResponse } from '@quilted/request-router';
 import { ServerContext } from './ServerContext.esnext';
 
-async function renderToStringWithServerContext(element, { browser } = {}) {
-  const rendered = await renderToStringAsync(
-    /* @__PURE__ */ jsx(ServerContext, { browser, children: element })
-  );
-  return rendered;
-}
 async function renderToResponse(optionsOrElement, definitelyOptions) {
   let element;
   let options;
@@ -25,7 +19,6 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     request,
     assets,
     status: explicitStatus,
-    cacheKey: explicitCacheKey,
     headers: explicitHeaders,
     serializations: explicitSerializations,
     waitUntil = noop,
@@ -33,10 +26,8 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     renderHTML = true
   } = options;
   const baseURL = request.URL ?? new URL(request.url);
-  const cacheKey = explicitCacheKey ?? (await assets?.cacheKey?.(request) ?? {});
   const browserResponse = new BrowserResponse({
     request,
-    cacheKey,
     status: explicitStatus,
     headers: new Headers(explicitHeaders),
     serializations: explicitSerializations
@@ -45,9 +36,9 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
   if (shouldStream === false && element != null) {
     let rendered;
     try {
-      rendered = await renderToStringWithServerContext(element, {
-        browser: browserResponse
-      });
+      rendered = await renderToStringAsync(
+        /* @__PURE__ */ jsx(ServerContext, { assets, browser: browserResponse, children: element })
+      );
     } catch (error) {
       if (error instanceof Response) {
         const mergedHeaders = new Headers(browserResponse.headers);
@@ -78,9 +69,9 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     const renderAppStream = async function renderAppStream2() {
       const appWriter = appTransformStream.writable.getWriter();
       if (element != null) {
-        const rendered = await renderToStringWithServerContext(element, {
-          browser: browserResponse
-        });
+        const rendered = await renderToStringAsync(
+          /* @__PURE__ */ jsx(ServerContext, { assets, browser: browserResponse, children: element })
+        );
         appWriter.write(rendered);
       }
       appWriter.close();
@@ -106,15 +97,16 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     const renderFullHTML = async function renderFullHTML2() {
       const writer = responseStream.writable.getWriter();
       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) {
           browserResponse.headers.append(
@@ -193,15 +185,16 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
         writer.write(value);
       }
       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(
           newSynchronousAssets,
@@ -277,4 +270,4 @@ function diffBrowserAssetsEntries(newList, oldList) {
 function noop(..._args) {
 }
 
-export { renderToResponse, renderToStringWithServerContext };
+export { renderToResponse };

package/build/esnext/server.browser.esnext

@@ -8,5 +8,8 @@ function noopCreateRequestRouterLocalization() {
 }
 function noopRenderToResponse() {
 }
+function NoopServerContext() {
+  return null;
+}
 
-export { noopCreateRequestRouterLocalization as createRequestRouterLocalization, noopRenderToResponse as renderToResponse, noopRenderToString as renderToStaticMarkup, noopRenderToString as renderToString, noopRenderToString as renderToStringAsync };
+export { NoopServerContext as ServerContext, noopCreateRequestRouterLocalization as createRequestRouterLocalization, noopRenderToResponse as renderToResponse, noopRenderToString as renderToStaticMarkup, noopRenderToString as renderToString, noopRenderToString as renderToStringAsync };

package/build/esnext/server.esnext

@@ -3,4 +3,5 @@ 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 } from './server/request-router.esnext';
+export { renderToResponse } from './server/request-router.esnext';
+export { ServerContext } from './server/ServerContext.esnext';