@quilted/quilt 0.6.13 → 0.6.15

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

@@ -1,12 +1,9 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { isValidElement } from 'react';
-import { renderToStaticMarkup } from 'react-dom/server';
+import { renderToStringAsync, renderToStaticMarkup } from 'preact-render-to-string';
 import { styleAssetPreloadAttributes, scriptAssetPreloadAttributes } from '@quilted/assets';
-import { AssetsManager } from '@quilted/react-assets/server';
-import { HttpManager } from '@quilted/react-http/server';
-import { HTMLManager, Head, Script, Style, StylePreload, ScriptPreload } from '@quilted/react-html/server';
-import { extract } from '@quilted/react-server-render/server';
-import { RedirectResponse, HTMLResponse } from '@quilted/request-router';
+import { BrowserResponse, ScriptAsset, StyleAsset, StyleAssetPreload, ScriptAssetPreload } from '@quilted/react-browser/server';
+import { HTMLResponse } from '@quilted/request-router';
 import { ServerContext } from './ServerContext.esnext';
 
 async function renderToResponse(optionsOrElement, definitelyOptions) {
@@ -21,55 +18,28 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
   const {
     request,
     assets,
+    status: explicitStatus,
     cacheKey: explicitCacheKey,
     headers: explicitHeaders,
+    serializations: explicitSerializations,
     waitUntil = noop,
     stream: shouldStream = false,
     renderHTML = true
   } = options;
-  const baseUrl = request.URL ?? new URL(request.url);
+  const baseURL = request.URL ?? new URL(request.url);
   const cacheKey = explicitCacheKey ?? (await assets?.cacheKey?.(request) ?? {});
-  const html = new HTMLManager();
-  const http = new HttpManager({ headers: request.headers });
-  const assetsManager = new AssetsManager({ cacheKey });
-  let responseStatus = 200;
+  const browserResponse = new BrowserResponse({
+    request,
+    cacheKey,
+    status: explicitStatus,
+    headers: new Headers(explicitHeaders),
+    serializations: explicitSerializations
+  });
   let appStream;
-  const headers = new Headers(explicitHeaders);
   if (shouldStream === false && element != null) {
-    const rendered = await extract(element, {
-      decorate(element2) {
-        return /* @__PURE__ */ jsx(
-          ServerContext,
-          {
-            http,
-            html,
-            url: baseUrl,
-            assets: assetsManager,
-            children: element2
-          }
-        );
-      }
-    });
-    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,
-        request
-      });
-    }
-    responseStatus = statusCode;
+    const rendered = await renderToStringAsync(
+      /* @__PURE__ */ jsx(ServerContext, { browser: browserResponse, children: element })
+    );
     const appTransformStream = new TransformStream();
     const appWriter = appTransformStream.writable.getWriter();
     appStream = appTransformStream.readable;
@@ -82,20 +52,9 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     const renderAppStream = async function renderAppStream2() {
       const appWriter = appTransformStream.writable.getWriter();
       if (element != null) {
-        const rendered = await extract(element, {
-          decorate(element2) {
-            return /* @__PURE__ */ jsx(
-              ServerContext,
-              {
-                http,
-                html,
-                url: baseUrl,
-                assets: assetsManager,
-                children: element2
-              }
-            );
-          }
-        });
+        const rendered = await renderToStringAsync(
+          /* @__PURE__ */ jsx(ServerContext, { browser: browserResponse, children: element })
+        );
         appWriter.write(rendered);
       }
       appWriter.close();
@@ -104,28 +63,28 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
   }
   const body = await renderToHTMLBody(appStream);
   return new HTMLResponse(body, {
-    status: responseStatus,
-    headers
+    status: browserResponse.status.value,
+    headers: browserResponse.headers
   });
   async function renderToHTMLBody(content) {
     const [synchronousAssets, preloadAssets] = await Promise.all([
       assets?.entry({
         cacheKey,
-        modules: assetsManager.usedModules({ timing: "load" })
+        modules: browserResponse.assets.get({ timing: "load" })
       }),
-      assets?.modules(assetsManager.usedModules({ timing: "preload" }), {
+      assets?.modules(browserResponse.assets.get({ timing: "preload" }), {
         cacheKey
       })
     ]);
     if (synchronousAssets) {
       for (const style of synchronousAssets.styles) {
-        headers.append(
+        browserResponse.headers.append(
           "Link",
           preloadHeader(styleAssetPreloadAttributes(style))
         );
       }
       for (const script of synchronousAssets.scripts) {
-        headers.append(
+        browserResponse.headers.append(
           "Link",
           preloadHeader(scriptAssetPreloadAttributes(script))
         );
@@ -133,8 +92,7 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     }
     if (typeof renderHTML === "function") {
       const body3 = await renderHTML(content, {
-        manager: html,
-        headers,
+        response: browserResponse,
         assets: synchronousAssets,
         preloadAssets
       });
@@ -147,26 +105,34 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
     const renderFullHTML = async function renderFullHTML2() {
       const writer = responseStream.writable.getWriter();
       writer.write(`<!DOCTYPE html>`);
-      const { htmlAttributes, bodyAttributes, ...headProps } = html.state;
       const htmlContent = renderToStaticMarkup(
-        /* @__PURE__ */ jsxs("html", { ...htmlAttributes, children: [
+        /* @__PURE__ */ jsxs("html", { ...browserResponse.htmlAttributes.value, children: [
           /* @__PURE__ */ jsxs("head", { children: [
-            /* @__PURE__ */ jsx(Head, { ...headProps }),
-            synchronousAssets?.scripts.map((script) => /* @__PURE__ */ jsx(Script, { asset: script, baseUrl }, script.source)),
-            synchronousAssets?.styles.map((style) => /* @__PURE__ */ jsx(Style, { asset: style, baseUrl }, style.source)),
+            browserResponse.title.value && /* @__PURE__ */ jsx("title", { children: browserResponse.title.value }),
+            browserResponse.links.value.map((link, index) => /* @__PURE__ */ jsx("link", { ...link }, index)),
+            browserResponse.metas.value.map((meta, index) => /* @__PURE__ */ jsx("meta", { ...meta }, index)),
+            synchronousAssets?.scripts.map((script) => /* @__PURE__ */ jsx(
+              ScriptAsset,
+              {
+                asset: script,
+                baseURL
+              },
+              script.source
+            )),
+            synchronousAssets?.styles.map((style) => /* @__PURE__ */ jsx(StyleAsset, { asset: style, baseURL }, style.source)),
             preloadAssets?.styles.map((style) => /* @__PURE__ */ jsx(
-              StylePreload,
+              StyleAssetPreload,
               {
                 asset: style,
-                baseUrl
+                baseURL
               },
               style.source
             )),
             preloadAssets?.scripts.map((script) => /* @__PURE__ */ jsx(
-              ScriptPreload,
+              ScriptAssetPreload,
               {
                 asset: script,
-                baseUrl
+                baseURL
               },
               script.source
             ))
@@ -174,7 +140,7 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
           /* @__PURE__ */ jsx(
             "body",
             {
-              ...bodyAttributes,
+              ...browserResponse.bodyAttributes.value,
               dangerouslySetInnerHTML: { __html: "%%CONTENT%%" }
             }
           )
@@ -197,9 +163,9 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
       const [newSynchronousAssets, newPreloadAssets] = await Promise.all([
         assets?.entry({
           cacheKey,
-          modules: assetsManager.usedModules({ timing: "load" })
+          modules: browserResponse.assets.get({ timing: "load" })
         }),
-        assets?.modules(assetsManager.usedModules({ timing: "preload" }), {
+        assets?.modules(browserResponse.assets.get({ timing: "preload" }), {
           cacheKey
         })
       ]);
@@ -214,21 +180,28 @@ async function renderToResponse(optionsOrElement, definitelyOptions) {
         );
         const additionalAssetsContent = renderToStaticMarkup(
           /* @__PURE__ */ jsxs(Fragment, { children: [
-            diffedSynchronousAssets.scripts.map((script) => /* @__PURE__ */ jsx(Script, { asset: script, baseUrl }, script.source)),
-            diffedSynchronousAssets.styles.map((style) => /* @__PURE__ */ jsx(Style, { asset: style, baseUrl }, style.source)),
+            diffedSynchronousAssets.scripts.map((script) => /* @__PURE__ */ jsx(
+              ScriptAsset,
+              {
+                asset: script,
+                baseURL
+              },
+              script.source
+            )),
+            diffedSynchronousAssets.styles.map((style) => /* @__PURE__ */ jsx(StyleAsset, { asset: style, baseURL }, style.source)),
             diffedPreloadAssets.styles.map((style) => /* @__PURE__ */ jsx(
-              StylePreload,
+              StyleAssetPreload,
               {
                 asset: style,
-                baseUrl
+                baseURL
               },
               style.source
             )),
             diffedPreloadAssets.scripts.map((script) => /* @__PURE__ */ jsx(
-              ScriptPreload,
+              ScriptAssetPreload,
               {
                 asset: script,
-                baseUrl
+                baseURL
               },
               script.source
             ))

package/build/esnext/server.esnext

@@ -1,9 +1,5 @@
-export { HTMLContext, HTMLManager, SERVER_ACTION_ID as HTML_SERVER_ACTION_ID, Head, Serialize } from '@quilted/react-html/server';
-export { ServerRenderManager, ServerRenderManagerContext, extract } from '@quilted/react-server-render/server';
+export * from '@quilted/react-browser/server';
 export { BrowserAssetsFromManifests, createBrowserAssetsEntryFromManifest, scriptAssetAttributes, scriptAssetPreloadAttributes, styleAssetAttributes, styleAssetPreloadAttributes } from '@quilted/assets';
-export { SERVER_ACTION_ID as ASSETS_SERVER_ACTION_ID, AssetsContext, AssetsManager, useAssetsCacheKey, useModuleAssets } from '@quilted/react-assets/server';
 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 { renderToResponse } from './server/request-router.esnext';

package/build/esnext/signals.esnext

@@ -1,2 +1 @@
-export { Signal, batch, computed, effect, isSignal, resolveSignalOrValue, signal, signalToIterator } from '@quilted/signals';
-export { useComputed, useSignal, useSignalEffect } from '@quilted/react-signals';
+export * from '@quilted/react-signals';