@unhead/ssr 1.0.21 → 1.1.0

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const SelfClosingTags = ["meta", "link", "base"];
+const shared = require('@unhead/shared');
 
 const propsToString = (props) => {
   const handledAttributes = [];
@@ -15,10 +15,35 @@ const propsToString = (props) => {
   return handledAttributes.length > 0 ? ` ${handledAttributes.join(" ")}` : "";
 };
 
+function encodeInnerHtml(str) {
+  return str.replace(/[&<>"'/]/g, (char) => {
+    switch (char) {
+      case "&":
+        return "&amp;";
+      case "<":
+        return "&lt;";
+      case ">":
+        return "&gt;";
+      case '"':
+        return "&quot;";
+      case "'":
+        return "&#x27;";
+      case "/":
+        return "&#x2F;";
+      default:
+        return char;
+    }
+  });
+}
 const tagToString = (tag) => {
   const attrs = propsToString(tag.props);
   const openTag = `<${tag.tag}${attrs}>`;
-  return SelfClosingTags.includes(tag.tag) ? openTag : `${openTag}${tag.children || ""}</${tag.tag}>`;
+  if (!shared.TagsWithInnerContent.includes(tag.tag))
+    return shared.SelfClosingTags.includes(tag.tag) ? openTag : `${openTag}</${tag.tag}>`;
+  let content = tag.innerHTML || "";
+  if (tag.textContent)
+    content = encodeInnerHtml(tag.textContent);
+  return shared.SelfClosingTags.includes(tag.tag) ? openTag : `${openTag}${content}</${tag.tag}>`;
 };
 
 function ssrRenderTags(tags) {
@@ -52,6 +77,20 @@ async function renderSSRHead(head) {
     };
   }
   const ctx = { tags: await head.resolveTags() };
+  if (head.resolvedOptions.experimentalHashHydration) {
+    ctx.tags.push({
+      tag: "meta",
+      props: {
+        name: "unhead:ssr",
+        content: shared.computeHashes(
+          ctx.tags.filter((t) => {
+            const entry = head.headEntries().find((entry2) => entry2._i === t._e);
+            return entry?._m !== "server";
+          }).map((tag) => tag._h)
+        )
+      }
+    });
+  }
   await head.hooks.callHook("ssr:render", ctx);
   const html = ssrRenderTags(ctx.tags);
   const renderCtx = { tags: ctx.tags, html };
@@ -59,4 +98,8 @@ async function renderSSRHead(head) {
   return renderCtx.html;
 }
 
+exports.encodeInnerHtml = encodeInnerHtml;
+exports.propsToString = propsToString;
 exports.renderSSRHead = renderSSRHead;
+exports.ssrRenderTags = ssrRenderTags;
+exports.tagToString = tagToString;

package/dist/index.d.ts

@@ -1,6 +1,19 @@
-import { Unhead, SSRHeadPayload } from '@unhead/schema';
+import { Unhead, SSRHeadPayload, HeadTag } from '@unhead/schema';
 export { SSRHeadPayload } from '@unhead/schema';
 
 declare function renderSSRHead<T extends {}>(head: Unhead<T>): Promise<SSRHeadPayload>;
 
-export { renderSSRHead };
+declare const propsToString: (props: Record<string, any>) => string;
+
+declare function encodeInnerHtml(str: string): string;
+declare const tagToString: <T extends HeadTag>(tag: T) => string;
+
+declare function ssrRenderTags<T extends HeadTag>(tags: T[]): {
+    headTags: string;
+    bodyTags: string;
+    bodyTagsOpen: string;
+    htmlAttrs: string;
+    bodyAttrs: string;
+};
+
+export { encodeInnerHtml, propsToString, renderSSRHead, ssrRenderTags, tagToString };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-const SelfClosingTags = ["meta", "link", "base"];
+import { TagsWithInnerContent, SelfClosingTags, computeHashes } from '@unhead/shared';
 
 const propsToString = (props) => {
   const handledAttributes = [];
@@ -13,10 +13,35 @@ const propsToString = (props) => {
   return handledAttributes.length > 0 ? ` ${handledAttributes.join(" ")}` : "";
 };
 
+function encodeInnerHtml(str) {
+  return str.replace(/[&<>"'/]/g, (char) => {
+    switch (char) {
+      case "&":
+        return "&amp;";
+      case "<":
+        return "&lt;";
+      case ">":
+        return "&gt;";
+      case '"':
+        return "&quot;";
+      case "'":
+        return "&#x27;";
+      case "/":
+        return "&#x2F;";
+      default:
+        return char;
+    }
+  });
+}
 const tagToString = (tag) => {
   const attrs = propsToString(tag.props);
   const openTag = `<${tag.tag}${attrs}>`;
-  return SelfClosingTags.includes(tag.tag) ? openTag : `${openTag}${tag.children || ""}</${tag.tag}>`;
+  if (!TagsWithInnerContent.includes(tag.tag))
+    return SelfClosingTags.includes(tag.tag) ? openTag : `${openTag}</${tag.tag}>`;
+  let content = tag.innerHTML || "";
+  if (tag.textContent)
+    content = encodeInnerHtml(tag.textContent);
+  return SelfClosingTags.includes(tag.tag) ? openTag : `${openTag}${content}</${tag.tag}>`;
 };
 
 function ssrRenderTags(tags) {
@@ -50,6 +75,20 @@ async function renderSSRHead(head) {
     };
   }
   const ctx = { tags: await head.resolveTags() };
+  if (head.resolvedOptions.experimentalHashHydration) {
+    ctx.tags.push({
+      tag: "meta",
+      props: {
+        name: "unhead:ssr",
+        content: computeHashes(
+          ctx.tags.filter((t) => {
+            const entry = head.headEntries().find((entry2) => entry2._i === t._e);
+            return entry?._m !== "server";
+          }).map((tag) => tag._h)
+        )
+      }
+    });
+  }
   await head.hooks.callHook("ssr:render", ctx);
   const html = ssrRenderTags(ctx.tags);
   const renderCtx = { tags: ctx.tags, html };
@@ -57,4 +96,4 @@ async function renderSSRHead(head) {
   return renderCtx.html;
 }
 
-export { renderSSRHead };
+export { encodeInnerHtml, propsToString, renderSSRHead, ssrRenderTags, tagToString };

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@unhead/ssr",
   "type": "module",
-  "version": "1.0.21",
-  "packageManager": "pnpm@7.25.1",
+  "version": "1.1.0",
+  "packageManager": "pnpm@7.27.1",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
-  "homepage": "https://github.com/harlan-zw/unhead#readme",
+  "homepage": "https://unhead.harlanzw.com",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/harlan-zw/unhead.git",
+    "url": "git+https://github.com/unjs/unhead.git",
     "directory": "packages/ssr"
   },
   "bugs": {
-    "url": "https://github.com/harlan-zw/unhead/issues"
+    "url": "https://github.com/unjs/unhead/issues"
   },
   "sideEffects": false,
   "exports": {
@@ -30,10 +30,8 @@
     "dist"
   ],
   "dependencies": {
-    "@unhead/schema": "1.0.21"
-  },
-  "devDependencies": {
-    "zhead": "^1.1.0"
+    "@unhead/schema": "1.1.0",
+    "@unhead/shared": "1.1.0"
   },
   "scripts": {
     "build": "unbuild .",