@solidjs/web 2.0.0-beta.30 → 2.0.0-beta.32

package/dist/server.cjs

@@ -101,9 +101,144 @@ function getLocalHeaderScript(id) {
 }
 seroval.Feature.RegExp;
 
+const ENVELOPE = Symbol.for("solid.ResponseEnvelope");
+class ResponseEnvelope {
+  constructor(response, value) {
+    this.response = response;
+    this.value = value;
+  }
+}
+ResponseEnvelope.prototype[ENVELOPE] = true;
+function isResponseEnvelope(value) {
+  return !!(value && typeof value === "object" && value[ENVELOPE]);
+}
+const HREF = Symbol.for("solid.Href");
+function isHref(value) {
+  return !!(value && (typeof value === "object" || typeof value === "function") && value[HREF]);
+}
+const SAFE_ERROR = Symbol.for("solid.SafeError");
+function markSafeError(error) {
+  if (error && (typeof error === "object" || typeof error === "function")) {
+    Object.defineProperty(error, SAFE_ERROR, {
+      value: true,
+      enumerable: false,
+      configurable: true
+    });
+  }
+  return error;
+}
+function isSafeError(value) {
+  return !!(value && (typeof value === "object" || typeof value === "function") && value[SAFE_ERROR]);
+}
+const REVALIDATE_HEADER = "X-Revalidate";
+function initWithRevalidate(init) {
+  const {
+    revalidate,
+    ...responseInit
+  } = init;
+  let headers;
+  if (responseInit.headers && responseInit.headers.getSetCookie) {
+    headers = new Headers();
+    responseInit.headers.forEach((value, key) => {
+      if (key !== "set-cookie") headers.append(key, value);
+    });
+    for (const cookie of responseInit.headers.getSetCookie()) {
+      headers.append("Set-Cookie", cookie);
+    }
+  } else {
+    headers = new Headers(responseInit.headers);
+  }
+  revalidate !== undefined && headers.set(REVALIDATE_HEADER, revalidate.toString());
+  return {
+    responseInit,
+    headers
+  };
+}
+function redirect(url, init = 302) {
+  if (typeof url !== "string" && !isHref(url)) {
+    throw new TypeError("redirect() expects a string URL or an Href-branded value (Symbol.for('solid.Href')).");
+  }
+  const {
+    responseInit,
+    headers
+  } = initWithRevalidate(typeof init === "number" ? {
+    status: init
+  } : init);
+  if (responseInit.status === undefined) {
+    responseInit.status = 302;
+  }
+  headers.set("Location", String(url));
+  return new Response(null, {
+    ...responseInit,
+    headers
+  });
+}
+function reload(init = {}) {
+  const {
+    responseInit,
+    headers
+  } = initWithRevalidate(init);
+  return new Response(null, {
+    ...responseInit,
+    headers
+  });
+}
+function respond(value, init = {}) {
+  const {
+    responseInit,
+    headers
+  } = initWithRevalidate(init);
+  headers.set("Content-Type", "application/json");
+  return new ResponseEnvelope(new Response(JSON.stringify(value), {
+    ...responseInit,
+    headers
+  }), value);
+}
+
+const ERROR_HEADER = "X-Server-Function-Error";
+const BODY_FORMAT_HEADER = "X-Server-Function-Format";
+const SINGLE_FLIGHT_HEADER = "X-Single-Flight";
+
+function parseCookieHeader(header) {
+  const cookies = {};
+  if (!header) return cookies;
+  for (const part of header.split(";")) {
+    const eq = part.indexOf("=");
+    if (eq < 0) continue;
+    const name = decodeSafe(part.slice(0, eq).trim());
+    let value = part.slice(eq + 1).trim();
+    if (value.length > 1 && value[0] === '"' && value[value.length - 1] === '"') {
+      value = value.slice(1, -1);
+    }
+    cookies[name] = decodeSafe(value);
+  }
+  return cookies;
+}
+function decodeSafe(text) {
+  try {
+    return decodeURIComponent(text);
+  } catch {
+    return text;
+  }
+}
+function serializeCookie(name, value, options = {}) {
+  let cookie = `${encodeURIComponent(name)}=${encodeURIComponent(value)}`;
+  cookie += `; Path=${options.path === undefined ? "/" : options.path}`;
+  if (options.domain) cookie += `; Domain=${options.domain}`;
+  if (options.maxAge !== undefined) cookie += `; Max-Age=${Math.trunc(options.maxAge)}`;
+  if (options.expires) cookie += `; Expires=${options.expires.toUTCString()}`;
+  if (options.httpOnly) cookie += "; HttpOnly";
+  if (options.secure) cookie += "; Secure";
+  if (options.sameSite) {
+    const sameSite = options.sameSite.toLowerCase();
+    cookie += `; SameSite=${sameSite === "none" ? "None" : sameSite === "strict" ? "Strict" : "Lax"}`;
+  }
+  return cookie;
+}
+
 const HEAD_ELIGIBLE_TAGS = new Set(["title", "meta", "link", "style", "script", "base"]);
 const HEAD_ATTR_NAME = /^[a-zA-Z_][a-zA-Z0-9_:.-]*$/;
-const RESOURCE_LINK_RELS = new Set(["preload", "modulepreload", "prefetch", "preconnect", "dns-prefetch", "icon", "stylesheet"]);
+const RESOURCE_LINK_RELS = new Set(["preload", "modulepreload", "prefetch", "preconnect", "dns-prefetch", "stylesheet"]);
 const RESOURCE_QUALIFIERS = ["as", "crossorigin", "type", "media", "imagesrcset", "imagesizes"];
 const STYLESHEET_FETCH_META = new Set(["crossorigin", "integrity", "referrerpolicy", "fetchpriority"]);
 function evalHeadValue(v) {
@@ -147,12 +282,14 @@ function replaceableIdentity(tag, props, key, unique) {
   if (tag === "meta" && props.charset != null) return "charset";
   if (key != null) return tag + ":key:" + key;
   if (tag === "meta") {
-    if (props.name != null) return "meta:name:" + props.name;
-    if (props.property != null) return "meta:property:" + props.property;
-    if (props["http-equiv"] != null) return "meta:http-equiv:" + props["http-equiv"];
+    for (const ns of ["name", "property", "http-equiv"]) if (props[ns] != null) return "meta:" + ns + ":" + props[ns] + (props.media != null ? ":media=" + props.media : "");
     return unique;
   }
-  if (tag === "link") return "link:" + (props.rel || "") + ":" + (props.href || "");
+  if (tag === "link") {
+    const rel = props.rel || "";
+    if (rel === "icon" || rel === "apple-touch-icon") return "link:" + rel + (props.sizes != null ? ":sizes=" + props.sizes : "") + (props.type != null ? ":type=" + props.type : "");
+    return "link:" + rel + ":" + (props.href || "");
+  }
   return unique;
 }
 function resolveHead(groups) {
@@ -339,11 +476,22 @@ function createHeadRegistry() {
     resources: new Set(),
     eagerHtml: "",
     flushed: null,
-    shellFlushed: false
+    shellFlushed: false,
+    parkedResources: []
   };
 }
 function registerHeadTags(registry, context, tracking, emitResource, nonce, tags) {
   const boundary = context._currentBoundaryId || "";
+  if (typeof tags === "function") {
+    registry.pending.push({
+      boundary,
+      list: tags,
+      resource: (desc, rel) => emitHeadResource(registry, context, tracking, emitResource, nonce, desc, rel)
+    });
+    return;
+  }
+  if (!Array.isArray(tags)) tags = [tags];
+  const probe = solidJs.sharedConfig.context && solidJs.sharedConfig.context._loadingPhase;
   let replaceable = null;
   for (let i = 0; i < tags.length; i++) {
     const desc = tags[i];
@@ -352,6 +500,16 @@ function registerHeadTags(registry, context, tracking, emitResource, nonce, tags
       continue;
     }
     const cls = classifyHeadTag(desc);
+    if (probe && !cls.resource) {
+      try {
+        evalHeadProps(desc.props || {}, cls.rel !== undefined ? {
+          rel: cls.rel
+        } : undefined);
+        evalHeadValue(desc.key);
+      } catch (err) {
+        if (solidJs.ssrHandleError(err)) throw err;
+      }
+    }
     if (cls.resource) {
       emitHeadResource(registry, context, tracking, emitResource, nonce, desc, cls.rel);
     } else {
@@ -368,6 +526,52 @@ function registerHeadTags(registry, context, tracking, emitResource, nonce, tags
     tags: replaceable
   });
 }
+function headShellReady(registry, block) {
+  let ready = true;
+  const pends = err => {
+    const source = solidJs.ssrHandleError(err, true);
+    if (!source) return false;
+    block(source);
+    ready = false;
+    return true;
+  };
+  const parked = registry.parkedResources;
+  for (let i = parked.length - 1; i >= 0; i--) {
+    const {
+      desc,
+      rel,
+      emit
+    } = parked[i];
+    try {
+      evalHeadProps(desc.props || {}, rel !== undefined ? {
+        rel
+      } : undefined);
+    } catch (err) {
+      if (pends(err)) continue;
+      console.warn(`useHead: error evaluating resource tag props`, err);
+      parked.splice(i, 1);
+      continue;
+    }
+    parked.splice(i, 1);
+    emit();
+  }
+  for (let i = 0; i < registry.pending.length; i++) {
+    const reg = registry.pending[i];
+    if (reg.boundary !== "" || reg.list) continue;
+    for (let j = 0; j < reg.tags.length; j++) {
+      const desc = reg.tags[j];
+      try {
+        evalHeadProps(desc.props || {}, desc.rel !== undefined ? {
+          rel: desc.rel
+        } : undefined);
+        evalHeadValue(desc.key);
+      } catch (err) {
+        pends(err);
+      }
+    }
+  }
+  return ready;
+}
 function emitHeadResource(registry, context, tracking, emitResource, nonce, desc, rel) {
   let props;
   try {
@@ -375,6 +579,16 @@ function emitHeadResource(registry, context, tracking, emitResource, nonce, desc
       rel
     } : undefined);
   } catch (err) {
+    const loadingPhase = solidJs.sharedConfig.context && solidJs.sharedConfig.context._loadingPhase;
+    if (loadingPhase && solidJs.ssrHandleError(err)) throw err;
+    if (!loadingPhase && !context._currentBoundaryId && !registry.shellFlushed && typeof context.block === "function" && solidJs.ssrHandleError(err, true)) {
+      registry.parkedResources.push({
+        desc,
+        rel,
+        emit: () => emitHeadResource(registry, context, tracking, emitResource, nonce, desc, rel)
+      });
+      return;
+    }
     console.warn(`useHead: error evaluating resource tag props`, err);
     return;
   }
@@ -431,9 +645,39 @@ function commitHeadBoundary(registry, boundary, isPendingFragment) {
       keep.push(reg);
       continue;
     }
+    let descs = reg.tags;
+    if (reg.list) {
+      let resolved;
+      try {
+        resolved = reg.list();
+      } catch (err) {
+        console.warn(`useHead: error evaluating head group membership`, err);
+        continue;
+      }
+      if (!Array.isArray(resolved)) resolved = [resolved];
+      descs = [];
+      for (let j = 0; j < resolved.length; j++) {
+        const desc = resolved[j];
+        if (!desc || !HEAD_ELIGIBLE_TAGS.has(desc.tag)) {
+          console.warn(`useHead: ignoring non-head tag`, desc);
+          continue;
+        }
+        const cls = classifyHeadTag(desc);
+        if (cls.resource) {
+          reg.resource(desc, cls.rel);
+        } else {
+          descs.push(cls.rel !== undefined ? {
+            tag: desc.tag,
+            props: desc.props,
+            key: desc.key,
+            rel: cls.rel
+          } : desc);
+        }
+      }
+    }
     const tags = [];
-    for (let j = 0; j < reg.tags.length; j++) {
-      const desc = reg.tags[j];
+    for (let j = 0; j < descs.length; j++) {
+      const desc = descs[j];
       let props, key;
       try {
         props = evalHeadProps(desc.props || {}, desc.rel !== undefined ? {
@@ -582,10 +826,10 @@ function useHead(tags) {
     console.warn("useHead() called outside of a server render; registration ignored.");
     return;
   }
-  ctx.registerHeadTags(Array.isArray(tags) ? tags : [tags]);
+  ctx.registerHeadTags(tags);
 }
 const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)$/i;
-const REPLACE_SCRIPT = `function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById("pl-"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!=="pl-"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById("pl-"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue==="pl-"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}`;
+const REPLACE_SCRIPT = `function $df(e){return _$HY.f?_$HY.f(e):$dfr(e)}function $dfr(e,n,o,t){if(!(n=document.getElementById(e)))return 0;if(!(o=document.getElementById("pl-"+e)))return(_$HY.dq=_$HY.dq||{})[e]=1,0;for(;o&&(8!==o.nodeType||o.nodeValue!=="pl-"+e);)t=o.nextSibling,o.remove(),o=t;t=o.parentNode,o.replaceWith(n.content),n.remove(),(_$HY.v=_$HY.v||{})[e]=1,_$HY.fe(e,t),_$HY.hp&&_$HY.hp[e]&&($dh(_$HY.hp[e]),delete _$HY.hp[e]),$dfd();return 1}function $dfl(e,o,n){if(!(o=document.getElementById("pl-"+e)))return(_$HY.dlq=_$HY.dlq||{})[e]=1,0;if(o._$fl)return 1;for(n=o.nextSibling;n;){if(8===n.nodeType&&n.nodeValue==="pl-"+e){o.parentNode&&o.parentNode.insertBefore(o.content.cloneNode(!0),n),o._$fl=1,$dfd();return 1}n=n.nextSibling}return 0}function $dflj(e,i){for(i=0;i<e.length;i++)$dfl(e[i])}function $dfd(e,i){if(e=_$HY.dq){_$HY.dq=0;for(i in e)$df(i)}if(e=_$HY.dlq){_$HY.dlq=0;for(i in e)$dfl(i)}}function $dfs(e,c,d){(_$HY.sc=_$HY.sc||{})[e]=c,d&&((_$HY.sd=_$HY.sd||{})[e]=1)}function $dfg(e,g,i,k){if(!(g=_$HY.sg&&_$HY.sg[e]))return;for(i=0;i<g.length;i++)if(_$HY.sc&&_$HY.sc[g[i]]>0)return;for(i=0;i<g.length;i++)k=g[i],delete _$HY.sg[k],$df(k)}function $dfc(e){if(--_$HY.sc[e]<=0){delete _$HY.sc[e],_$HY.sg&&_$HY.sg[e]?$dfg(e):!(_$HY.sd&&_$HY.sd[e])&&$df(e);_$HY.sd&&delete _$HY.sd[e]}}function $dfj(e,i,n){for(i=0;i<e.length;i++)if(_$HY.sc&&_$HY.sc[e[i]]>0){for(n=0;n<e.length;n++)(_$HY.sg=_$HY.sg||{})[e[n]]=e;return}for(i=0;i<e.length;i++)$df(e[i])}`;
 const HEAD_SCRIPT = `function $dha(o,i,e,n){for(i=0;i<o.length;i++)e=o[i],"t"==e[0]?((n=document.querySelector("title"))||(n=document.createElement("title"),document.head.appendChild(n)),n.textContent=e[1],n.setAttribute("data-dh","title")):"r"==e[0]?$dhr(e[1]):(n=document.createElement(e[2]),Object.keys(e[3]).forEach(function(a){n.setAttribute(a,e[3][a])}),null!=e[4]&&(n.textContent=e[4]),n.setAttribute("data-dh",e[1]),document.head.appendChild(n))}function $dhr(v,l,i){for(l=document.head.querySelectorAll("[data-dh]"),i=0;i<l.length;i++)l[i].getAttribute("data-dh")==v&&l[i].remove()}function $dh(o){_$HY.h?_$HY.h(o):$dha(o)}`;
 function renderToString(code, options = {}) {
   const {
@@ -611,7 +855,6 @@ function renderToString(code, options = {}) {
   const tracking = createAssetTracking();
   const headRegistry = createHeadRegistry();
   solidJs.sharedConfig.context = {
-    assets: [],
     nonce,
     escape: escape,
     resolve: resolveSSRNode,
@@ -653,9 +896,8 @@ function renderToString(code, options = {}) {
   serializeFragmentAssets("", tracking.boundaryModules, solidJs.sharedConfig.context);
   solidJs.sharedConfig.context.noHydrate = true;
   serializer.close();
-  const assetsHtml = resolveAssetsHtml(solidJs.sharedConfig.context.assets);
   const head = renderShellHead(headRegistry, nonce, null);
-  return assembleDocument(html, assetsHtml, tracking.emittedAssets, tracking.inlineStyles, scripts.length ? scripts : "", nonce, head, onHead);
+  return assembleDocument(html, tracking.emittedAssets, tracking.inlineStyles, scripts.length ? scripts : "", nonce, head, onHead);
 }
 function renderToStream(code, options = {}) {
   let {
@@ -668,6 +910,41 @@ function renderToStream(code, options = {}) {
     onHead
   } = options;
   let dispose;
+  let dead = false;
+  const abandon = () => {
+    if (dead) return;
+    dead = true;
+    completed = true;
+    buffer = {
+      write() {}
+    };
+    writable = {
+      end() {}
+    };
+    if (dispose) {
+      const d = dispose;
+      dispose = () => {};
+      d();
+    }
+  };
+  const guardSink = w => ({
+    write(payload) {
+      if (dead) return;
+      try {
+        w.write(payload);
+      } catch (_) {
+        abandon();
+      }
+    },
+    end() {
+      if (dead) return;
+      try {
+        w.end();
+      } catch (_) {
+        abandon();
+      }
+    }
+  });
   const blockingPromises = new Set();
   let headerEmitted = false;
   const pushTask = task => {
@@ -731,7 +1008,7 @@ function renderToStream(code, options = {}) {
       }
     },
     shell(shellHtml, meta) {
-      buffer.write(assembleDocument(shellHtml, meta.assets, meta.preloads, meta.inlineStyles, meta.tasks.length ? meta.tasks : "", nonce, meta.head, onHead));
+      buffer.write(assembleDocument(shellHtml, meta.preloads, meta.inlineStyles, meta.tasks.length ? meta.tasks : "", nonce, meta.head, onHead));
     },
     ...options.sink
   };
@@ -811,7 +1088,6 @@ function renderToStream(code, options = {}) {
   };
   solidJs.sharedConfig.context = context = {
     async: true,
-    assets: [],
     nonce,
     registerHeadTags(tags) {
       registerHeadTags(headRegistry, context, tracking,
@@ -1011,9 +1287,9 @@ function renderToStream(code, options = {}) {
   }
   function doShell() {
     if (shellCompleted) return;
-    if (!resolveRootHoles()) return;
     solidJs.sharedConfig.context = context;
-    const assetsHtml = resolveAssetsHtml(context.assets);
+    if (!resolveRootHoles()) return;
+    if (!headShellReady(headRegistry, p => blockingPromises.add(p))) return;
     headStyles = new Set();
     for (const url of tracking.emittedAssets) {
       if (isCssUrl(url)) headStyles.add(url);
@@ -1021,7 +1297,6 @@ function renderToStream(code, options = {}) {
     serializeRootAssets();
     const head = renderShellHead(headRegistry, nonce, k => registry.has(k));
     sink.shell(html, {
-      assets: assetsHtml,
       preloads: tracking.emittedAssets,
       inlineStyles: tracking.inlineStyles,
       tasks,
@@ -1069,14 +1344,24 @@ function renderToStream(code, options = {}) {
     function flush() {
       allSettled(blockingPromises).then(() => {
         scheduleFlush(() => {
+          if (dead) return resolve();
           doShell();
           if (!shellCompleted) return flush();
           const encoder = new TextEncoder();
           const writer = w.getWriter();
           let pendingWrites = Promise.resolve();
+          let ended = false;
+          const failed = () => {
+            if (!ended) {
+              abandon();
+              resolve();
+            }
+          };
+          writer.closed && writer.closed.catch(failed);
           writable = {
             end() {
               pendingWrites.then(() => {
+                ended = true;
                 writer.releaseLock();
                 w.close().catch(() => {});
                 resolve();
@@ -1085,7 +1370,7 @@ function renderToStream(code, options = {}) {
           };
           buffer = {
             write(payload) {
-              pendingWrites = pendingWrites.then(() => writer.write(encoder.encode(payload))).catch(() => {});
+              pendingWrites = pendingWrites.then(() => writer.write(encoder.encode(payload))).catch(failed);
             }
           };
           buffer.write(tmp);
@@ -1101,36 +1386,40 @@ function renderToStream(code, options = {}) {
     return p;
   };
   return {
-    then(fn) {
-      function complete() {
-        dispose();
-        fn(tmp);
-      }
-      if (onCompleteAll) {
-        let ogComplete = onCompleteAll;
-        onCompleteAll = options => {
-          ogComplete(options);
-          complete();
-        };
-      } else onCompleteAll = complete;
-      function flush() {
-        allSettled(blockingPromises).then(() => {
-          scheduleFlush(() => {
-            if (!resolveRootHoles()) return flush();
-            queue(flushEnd);
+    then(onFulfilled, onRejected) {
+      const p = new Promise(resolve => {
+        function complete() {
+          dispose();
+          resolve(tmp);
+        }
+        if (onCompleteAll) {
+          let ogComplete = onCompleteAll;
+          onCompleteAll = options => {
+            ogComplete(options);
+            complete();
+          };
+        } else onCompleteAll = complete;
+        function flush() {
+          allSettled(blockingPromises).then(() => {
+            scheduleFlush(() => {
+              if (!resolveRootHoles() || !headShellReady(headRegistry, p => blockingPromises.add(p))) return flush();
+              queue(flushEnd);
+            });
           });
-        });
-      }
-      flush();
+        }
+        flush();
+      });
+      return p.then(onFulfilled, onRejected);
     },
     pipe(w) {
       claimConsumer("pipe");
       function flush() {
         allSettled(blockingPromises).then(() => {
           scheduleFlush(() => {
+            if (dead) return;
             doShell();
             if (!shellCompleted) return flush();
-            buffer = writable = w;
+            buffer = writable = guardSink(w);
             buffer.write(tmp);
             firstFlushed = true;
             if (completed) {
@@ -1491,18 +1780,6 @@ function getHydrationKey() {
 function applyRef(r, element) {
   Array.isArray(r) ? r.flat(Infinity).forEach(f => f && f(element)) : r(element);
 }
-function useAssets(fn) {
-  solidJs.sharedConfig.context.assets.push(() => resolveSSRSync(escape(fn())));
-}
-function getAssets() {
-  const assets = solidJs.sharedConfig.context.assets;
-  let out = "";
-  for (let i = 0, len = assets.length; i < len; i++) out += assets[i]();
-  return out;
-}
-function Assets(props) {
-  useAssets(() => props.children);
-}
 function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
@@ -1519,17 +1796,11 @@ function allSettled(promises) {
     return;
   });
 }
-function resolveAssetsHtml(assets) {
-  if (!assets || !assets.length) return "";
-  let out = "";
-  for (let i = 0, len = assets.length; i < len; i++) out += assets[i]();
-  return out;
-}
-function assembleDocument(html, assetsHtml, emittedAssets, inlineStyles, scripts, nonce, headTags, onHead) {
+function assembleDocument(html, emittedAssets, inlineStyles, scripts, nonce, headTags, onHead) {
   const scriptTag = scripts ? `<script${nonce ? ` nonce="${nonce}"` : ""}>${scripts}</script>` : "";
   const headTagsHtml = headTags ? headTags.html : "";
   const headPrelude = headTags ? headTags.prelude : "";
-  if (!onHead && !assetsHtml && !headTagsHtml && !headPrelude && !(emittedAssets && emittedAssets.size) && !(inlineStyles && inlineStyles.size)) {
+  if (!onHead && !headTagsHtml && !headPrelude && !(emittedAssets && emittedAssets.size) && !(inlineStyles && inlineStyles.size)) {
     if (!scriptTag) return html;
     const xs = html.indexOf("<!--xs-->");
     return xs === -1 ? html + scriptTag : html.slice(0, xs) + scriptTag + html.slice(xs);
@@ -1544,13 +1815,13 @@ function assembleDocument(html, assetsHtml, emittedAssets, inlineStyles, scripts
   const headIdx = html.indexOf("</head>");
   if (headIdx === -1) {
     if (onHead) {
-      onHead(headPrelude + headTagsHtml + (assetsHtml || "") + renderHeadAssets(emittedAssets, inlineStyles, nonce));
+      onHead(headPrelude + headTagsHtml + renderHeadAssets(emittedAssets, inlineStyles, nonce));
     }
     if (!scriptTag) return html;
     const xs = html.indexOf("<!--xs-->");
     return xs === -1 ? html + scriptTag : html.slice(0, xs) + scriptTag + html.slice(xs);
   }
-  const head = headTagsHtml + (assetsHtml || "") + renderHeadAssets(emittedAssets, inlineStyles, nonce);
+  const head = headTagsHtml + renderHeadAssets(emittedAssets, inlineStyles, nonce);
   if (!scriptTag) return html.slice(0, headIdx) + head + html.slice(headIdx);
   const xsIdx = html.indexOf("<!--xs-->");
   if (xsIdx === -1) return html.slice(0, headIdx) + head + html.slice(headIdx) + scriptTag;
@@ -1750,90 +2021,226 @@ const RequestContext = Symbol.for("solid.RequestContext");
 function getRequestEvent() {
   return globalThis[RequestContext] ? globalThis[RequestContext].getStore() || solidJs.sharedConfig.context && solidJs.sharedConfig.context.event || console.warn("RequestEvent is missing. This is most likely due to accessing `getRequestEvent` non-managed async scope in a partially polyfilled environment. Try moving it above all `await` calls.") : undefined;
 }
-function renderToStringAsync(code, options = {}) {
-  return new Promise(resolve => renderToStream(code, options).then(resolve));
-}
-function registerElementClaim() {
-  return noopCleanup;
-}
-function noopCleanup() {}
-function claimElement(node) {
-  return node;
+function createResponseStub() {
+  return {
+    status: undefined,
+    statusText: undefined,
+    headers: new Headers(),
+    committed: false
+  };
 }
-function claimElementTree(root) {
-  return root;
+function createRequestEvent(request, init) {
+  return {
+    request,
+    locals: {},
+    response: createResponseStub(),
+    ...init
+  };
 }
-function notSup() {
-  throw new Error("Client-only API called on the server side. Run client-only code in onMount, or conditionally run client-only component with <Show>.");
+function reportLostHeaderWrite(method, name) {
+  const message = `Response header write dropped: headers.${method}(${JSON.stringify(String(name))}) ` + "ran after the response head was sent. Write headers before the shell flushes " + "(or before the handler returns).";
+  throw new Error(message);
 }
-
-const ENVELOPE = Symbol.for("solid.ResponseEnvelope");
-class ResponseEnvelope {
-  constructor(response, value) {
-    this.response = response;
-    this.value = value;
+function commitResponseStub(stub, {
+  allowLateLocation = false
+} = {}) {
+  if (!stub || stub.committed) return stub;
+  stub.committed = true;
+  const headers = stub.headers;
+  if (!headers || typeof headers.set !== "function") return stub;
+  for (const method of ["set", "append", "delete"]) {
+    const original = headers[method].bind(headers);
+    headers[method] = function (name, ...rest) {
+      if (allowLateLocation && method === "set" && String(name).toLowerCase() === "location") {
+        return original(name, ...rest);
+      }
+      reportLostHeaderWrite(method, name);
+    };
   }
+  return stub;
 }
-ResponseEnvelope.prototype[ENVELOPE] = true;
-function isResponseEnvelope(value) {
-  return !!(value && typeof value === "object" && value[ENVELOPE]);
+const validRedirectStatuses = /*#__PURE__*/new Set([301, 302, 303, 307, 308]);
+function getExpectedRedirectStatus(response) {
+  if (response.status && validRedirectStatuses.has(response.status)) return response.status;
+  return 302;
 }
-const HREF = Symbol.for("solid.Href");
-function isHref(value) {
-  return !!(value && (typeof value === "object" || typeof value === "function") && value[HREF]);
+function mergeStubHeaders(target, stub) {
+  if (!stub) return target;
+  stub.headers.forEach((value, key) => {
+    if (key !== "set-cookie") target.set(key, value);
+  });
+  const setCookies = stub.headers.getSetCookie ? stub.headers.getSetCookie() : [];
+  for (const cookie of setCookies) target.append("set-cookie", cookie);
+  return target;
+}
+function copyInitHeaders(init) {
+  if (!init || !init.getSetCookie) return new Headers(init);
+  const headers = new Headers();
+  init.forEach((value, key) => {
+    if (key !== "set-cookie") headers.append(key, value);
+  });
+  for (const cookie of init.getSetCookie()) headers.append("Set-Cookie", cookie);
+  return headers;
+}
+const STUB_GAP_FILL_EXCLUDED = /*#__PURE__*/new Set([ERROR_HEADER, BODY_FORMAT_HEADER, SINGLE_FLIGHT_HEADER, REVALIDATE_HEADER, "Location"].map(header => header.toLowerCase()));
+function fillsStubGap(key, headers, response) {
+  if (key === "set-cookie" || STUB_GAP_FILL_EXCLUDED.has(key)) return false;
+  if (response.body === null && (key === "content-type" || key === "content-length")) return false;
+  return !headers.has(key);
+}
+function commitEventResponse(response, event = getRequestEvent()) {
+  const stub = event && event.response;
+  if (!stub || !stub.headers || stub.committed) return response;
+  const cookies = stub.headers.getSetCookie ? stub.headers.getSetCookie() : [];
+  commitResponseStub(stub);
+  let hasGaps = false;
+  stub.headers.forEach((value, key) => {
+    if (fillsStubGap(key, response.headers, response)) hasGaps = true;
+  });
+  if (!cookies.length && !hasGaps) return response;
+  try {
+    for (const cookie of cookies) response.headers.append("Set-Cookie", cookie);
+    stub.headers.forEach((value, key) => {
+      if (fillsStubGap(key, response.headers, response)) response.headers.set(key, value);
+    });
+    return response;
+  } catch {
+    const headers = copyInitHeaders(response.headers);
+    for (const cookie of cookies) headers.append("Set-Cookie", cookie);
+    stub.headers.forEach((value, key) => {
+      if (fillsStubGap(key, headers, response)) headers.set(key, value);
+    });
+    return new Response(response.body, {
+      status: response.status,
+      statusText: response.statusText,
+      headers
+    });
+  }
 }
-const REVALIDATE_HEADER = "X-Revalidate";
-function initWithRevalidate(init) {
-  const {
-    revalidate,
-    ...responseInit
-  } = init;
-  const headers = new Headers(responseInit.headers);
-  revalidate !== undefined && headers.set(REVALIDATE_HEADER, revalidate.toString());
+function deriveHead(stub, responseInit = {}) {
+  const headers = mergeStubHeaders(copyInitHeaders(responseInit.headers), stub);
+  const status = stub && stub.status || responseInit.status || 200;
+  const statusText = stub && stub.statusText || responseInit.statusText || undefined;
   return {
-    responseInit,
+    status,
+    statusText,
     headers
   };
 }
-function redirect(url, init = 302) {
-  if (typeof url !== "string" && !isHref(url)) {
-    throw new TypeError("redirect() expects a string URL or an Href-branded value (Symbol.for('solid.Href')).");
-  }
+function escapeAttribute(value) {
+  return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+}
+function createSSRResponse(result, event, options = {}) {
+  const stub = event && event.response;
   const {
     responseInit,
-    headers
-  } = initWithRevalidate(typeof init === "number" ? {
-    status: init
-  } : init);
-  if (responseInit.status === undefined) {
-    responseInit.status = 302;
+    nonce,
+    transformChunk
+  } = options;
+  if (typeof result === "string") {
+    if (stub) commitResponseStub(stub);
+    const head = deriveHead(stub, responseInit);
+    if (stub && stub.headers.get("Location")) {
+      return new Response(null, {
+        status: getExpectedRedirectStatus(stub),
+        headers: head.headers
+      });
+    }
+    if (!head.headers.has("content-type")) {
+      head.headers.set("content-type", "text/html; charset=utf-8");
+    }
+    return new Response(transformChunk ? transformChunk(result) : result, {
+      status: head.status,
+      statusText: head.statusText,
+      headers: head.headers
+    });
   }
-  headers.set("Location", String(url));
-  return new Response(null, {
-    ...responseInit,
-    headers
+  const encoder = new TextEncoder();
+  return new Promise(resolve => {
+    let controller;
+    let closed = false;
+    let flushed = false;
+    const enqueue = value => {
+      if (closed || !controller) return;
+      try {
+        controller.enqueue(encoder.encode(value));
+      } catch {
+        closed = true;
+      }
+    };
+    result.pipe({
+      write(chunk) {
+        if (!flushed) {
+          flushed = true;
+          if (stub) commitResponseStub(stub, {
+            allowLateLocation: true
+          });
+          const head = deriveHead(stub, responseInit);
+          if (stub && stub.headers.get("Location")) {
+            closed = true;
+            resolve(new Response(null, {
+              status: getExpectedRedirectStatus(stub),
+              headers: head.headers
+            }));
+            return;
+          }
+          if (!head.headers.has("content-type")) {
+            head.headers.set("content-type", "text/html; charset=utf-8");
+          }
+          resolve(new Response(new ReadableStream({
+            start(c) {
+              controller = c;
+            },
+            cancel() {
+              closed = true;
+            }
+          }), {
+            status: head.status,
+            statusText: head.statusText,
+            headers: head.headers
+          }));
+        }
+        enqueue(transformChunk ? transformChunk(chunk) : chunk);
+      },
+      end() {
+        if (closed || !controller) return;
+        const location = stub && stub.headers.get("Location");
+        if (location) {
+          const attr = nonce ? ` nonce="${escapeAttribute(nonce)}"` : "";
+          enqueue(`<script${attr}>window.location=${JSON.stringify(location).replace(/</g, "\\u003c")}</script>`);
+        }
+        closed = true;
+        try {
+          controller.close();
+        } catch {}
+      }
+    });
   });
 }
-function reload(init = {}) {
-  const {
-    responseInit,
-    headers
-  } = initWithRevalidate(init);
-  return new Response(null, {
-    ...responseInit,
-    headers
-  });
+function composeMiddleware(middlewares) {
+  return function run(request, next) {
+    let index = -1;
+    function dispatch(i, req) {
+      if (i <= index) return Promise.reject(new Error("next() called multiple times"));
+      index = i;
+      if (i === middlewares.length) return Promise.resolve(next(req));
+      return Promise.resolve(middlewares[i](req, override => dispatch(i + 1, override || req)));
+    }
+    return dispatch(0, request);
+  };
 }
-function respond(value, init = {}) {
-  const {
-    responseInit,
-    headers
-  } = initWithRevalidate(init);
-  headers.set("Content-Type", "application/json");
-  return new ResponseEnvelope(new Response(JSON.stringify(value), {
-    ...responseInit,
-    headers
-  }), value);
+function registerElementClaim() {
+  return noopCleanup;
+}
+function noopCleanup() {}
+function claimElement(node) {
+  return node;
+}
+function claimElementTree(root) {
+  return root;
+}
+function notSup() {
+  throw new Error("Client-only API called on the server side. Run client-only code in onMount, or conditionally run client-only component with <Show>.");
 }
 
 const isServer = true;
@@ -1921,11 +2328,16 @@ function httpHeader(name, value, options) {
   const response = event && event.response;
   if (response && !response.committed) {
     const headers = response.headers;
-    const prev = headers.get(name);
+    const setCookie = name.toLowerCase() === "set-cookie";
+    const prevCookies = setCookie ? headers.getSetCookie() : undefined;
+    const prev = setCookie ? null : headers.get(name);
     if (options && options.append) headers.append(name, value);else headers.set(name, value);
     solidJs.onCleanup(() => {
       if (response.committed) return;
-      if (prev === null) headers.delete(name);else headers.set(name, prev);
+      if (setCookie) {
+        headers.delete(name);
+        for (const cookie of prevCookies) headers.append(name, cookie);
+      } else if (prev === null) headers.delete(name);else headers.set(name, prev);
     });
   }
 }
@@ -1990,7 +2402,6 @@ Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return solidJs.untrack; }
 });
-exports.Assets = Assets;
 exports.ChildProperties = ChildProperties;
 exports.DOMElements = DOMElements;
 exports.DOMWithState = DOMWithState;
@@ -2005,6 +2416,7 @@ exports.REVALIDATE_HEADER = REVALIDATE_HEADER;
 exports.RawTextElements = RawTextElements;
 exports.RequestContext = RequestContext;
 exports.ResponseEnvelope = ResponseEnvelope;
+exports.SAFE_ERROR = SAFE_ERROR;
 exports.SVGElements = SVGElements;
 exports.VoidElements = VoidElements;
 exports.acquireAsset = notSup;
@@ -2015,14 +2427,20 @@ exports.claimElement = claimElement;
 exports.claimElementTree = claimElementTree;
 exports.className = notSup;
 exports.clientOnly = clientOnly;
+exports.commitEventResponse = commitEventResponse;
+exports.commitResponseStub = commitResponseStub;
+exports.composeMiddleware = composeMiddleware;
+exports.createRequestEvent = createRequestEvent;
+exports.createResponseStub = createResponseStub;
+exports.createSSRResponse = createSSRResponse;
 exports.delegateEvents = notSup;
 exports.dynamic = dynamic;
 exports.dynamicProperty = notSup;
 exports.effect = effect;
 exports.escape = escape;
 exports.generateHydrationScript = generateHydrationScript;
-exports.getAssets = getAssets;
 exports.getDelegatedRoot = notSup;
+exports.getExpectedRedirectStatus = getExpectedRedirectStatus;
 exports.getHydrationKey = getHydrationKey;
 exports.getNextElement = notSup;
 exports.getNextMarker = notSup;
@@ -2035,8 +2453,11 @@ exports.insert = notSup;
 exports.isDev = isDev;
 exports.isHref = isHref;
 exports.isResponseEnvelope = isResponseEnvelope;
+exports.isSafeError = isSafeError;
 exports.isServer = isServer;
+exports.markSafeError = markSafeError;
 exports.memo = memo;
+exports.parseCookieHeader = parseCookieHeader;
 exports.redirect = redirect;
 exports.ref = notSup;
 exports.registerDelegatedContainer = notSup;
@@ -2046,9 +2467,9 @@ exports.reload = reload;
 exports.render = notSup;
 exports.renderToStream = renderToStream;
 exports.renderToString = renderToString;
-exports.renderToStringAsync = renderToStringAsync;
 exports.respond = respond;
 exports.runHydrationEvents = notSup;
+exports.serializeCookie = serializeCookie;
 exports.setAttribute = notSup;
 exports.setAttributeNS = notSup;
 exports.setProperty = notSup;
@@ -2066,5 +2487,4 @@ exports.style = notSup;
 exports.template = notSup;
 exports.unregisterDelegatedContainer = notSup;
 exports.unregisterDelegatedRoot = notSup;
-exports.useAssets = useAssets;
 exports.useHead = useHead;