unhead 0.2.7 → 0.3.1

package/dist/index.cjs

@@ -311,8 +311,11 @@ const DedupesTagsPlugin = (options) => {
             if (strategy === "merge") {
               const oldProps = dupedTag.props;
               ["class", "style"].forEach((key) => {
-                if (tag.props[key] && oldProps[key])
+                if (tag.props[key] && oldProps[key]) {
+                  if (key === "style" && !oldProps[key].endsWith(";"))
+                    oldProps[key] += ";";
                   tag.props[key] = `${oldProps[key]} ${tag.props[key]}`;
+                }
               });
               deduping[dedupeKey].props = {
                 ...oldProps,
@@ -327,8 +330,6 @@ const DedupesTagsPlugin = (options) => {
                 tag.props[tag._s] = "";
               }
               tag._d = dedupeKey;
-            } else {
-              tag._p = dupedTag._p;
             }
             if (Object.keys(tag.props).length === 0 && !tag.children) {
               delete deduping[dedupeKey];
@@ -406,18 +407,13 @@ const HydratesStatePlugin = () => {
           return;
         if (typeof tag._d === "undefined" && entry._m === "server")
           return;
-        const hasChildren = tag.children && tag.children.length > 0;
-        tag._s = `data-h-${hashCode(tag._d || tag.tag + (hasChildren ? tag.children : JSON.stringify(tag.props)))}`;
+        tag._s = `data-h-${hashCode(tag._d || JSON.stringify({ tag: tag.tag, props: tag.props, children: tag.children }))}`;
         tag.props[tag._s] = "";
       }
     }
   });
 };
 
-function defineHeadPlugin(plugin) {
-  return plugin;
-}
-
 const PatchDomOnEntryUpdatesPlugin = (options) => {
   return defineHeadPlugin({
     hooks: {
@@ -550,12 +546,10 @@ function createHead(options = {}) {
   plugins.forEach((plugin) => hooks.addHooks(plugin.hooks || {}));
   const triggerUpdate = () => hooks.callHook("entries:updated", head);
   const head = {
-    _removeQueuedSideEffect(key) {
-      delete _sde[key];
-    },
-    _flushQueuedSideEffects() {
-      Object.values(_sde).forEach((fn) => fn());
+    _popSideEffectQueue() {
+      const sde = { ..._sde };
       _sde = {};
+      return sde;
     },
     headEntries() {
       return entries;
@@ -616,6 +610,10 @@ function createHead(options = {}) {
   return head;
 }
 
+function defineHeadPlugin(plugin) {
+  return plugin;
+}
+
 exports.DedupesTagsPlugin = DedupesTagsPlugin;
 exports.DeprecatedTagAttrPlugin = DeprecatedTagAttrPlugin;
 exports.HydratesStatePlugin = HydratesStatePlugin;

package/dist/index.mjs

@@ -309,8 +309,11 @@ const DedupesTagsPlugin = (options) => {
             if (strategy === "merge") {
               const oldProps = dupedTag.props;
               ["class", "style"].forEach((key) => {
-                if (tag.props[key] && oldProps[key])
+                if (tag.props[key] && oldProps[key]) {
+                  if (key === "style" && !oldProps[key].endsWith(";"))
+                    oldProps[key] += ";";
                   tag.props[key] = `${oldProps[key]} ${tag.props[key]}`;
+                }
               });
               deduping[dedupeKey].props = {
                 ...oldProps,
@@ -325,8 +328,6 @@ const DedupesTagsPlugin = (options) => {
                 tag.props[tag._s] = "";
               }
               tag._d = dedupeKey;
-            } else {
-              tag._p = dupedTag._p;
             }
             if (Object.keys(tag.props).length === 0 && !tag.children) {
               delete deduping[dedupeKey];
@@ -404,18 +405,13 @@ const HydratesStatePlugin = () => {
           return;
         if (typeof tag._d === "undefined" && entry._m === "server")
           return;
-        const hasChildren = tag.children && tag.children.length > 0;
-        tag._s = `data-h-${hashCode(tag._d || tag.tag + (hasChildren ? tag.children : JSON.stringify(tag.props)))}`;
+        tag._s = `data-h-${hashCode(tag._d || JSON.stringify({ tag: tag.tag, props: tag.props, children: tag.children }))}`;
         tag.props[tag._s] = "";
       }
     }
   });
 };
 
-function defineHeadPlugin(plugin) {
-  return plugin;
-}
-
 const PatchDomOnEntryUpdatesPlugin = (options) => {
   return defineHeadPlugin({
     hooks: {
@@ -548,12 +544,10 @@ function createHead(options = {}) {
   plugins.forEach((plugin) => hooks.addHooks(plugin.hooks || {}));
   const triggerUpdate = () => hooks.callHook("entries:updated", head);
   const head = {
-    _removeQueuedSideEffect(key) {
-      delete _sde[key];
-    },
-    _flushQueuedSideEffects() {
-      Object.values(_sde).forEach((fn) => fn());
+    _popSideEffectQueue() {
+      const sde = { ..._sde };
       _sde = {};
+      return sde;
     },
     headEntries() {
       return entries;
@@ -614,4 +608,8 @@ function createHead(options = {}) {
   return head;
 }
 
+function defineHeadPlugin(plugin) {
+  return plugin;
+}
+
 export { DedupesTagsPlugin, DeprecatedTagAttrPlugin, HydratesStatePlugin, PatchDomOnEntryUpdatesPlugin, SortTagsPlugin, TitleTemplatePlugin, activeHead, asArray, createHead, defineHeadPlugin, getActiveHead, normaliseEntryTags, setActiveHead, useBodyAttrs, useHead, useHtmlAttrs, useServerBodyAttrs, useServerHead, useServerHtmlAttrs, useServerTagBase, useServerTagLink, useServerTagMeta, useServerTagMetaFlat, useServerTagNoscript, useServerTagScript, useServerTagStyle, useServerTagTitle, useServerTitleTemplate, useTagBase, useTagLink, useTagMeta, useTagMetaFlat, useTagNoscript, useTagScript, useTagStyle, useTagTitle, useTitleTemplate };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unhead",
   "type": "module",
-  "version": "0.2.7",
+  "version": "0.3.1",
   "packageManager": "pnpm@7.14.0",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -30,7 +30,8 @@
     "dist"
   ],
   "dependencies": {
-    "@unhead/schema": "0.2.7",
+    "@unhead/dom": "0.3.1",
+    "@unhead/schema": "0.3.1",
     "hookable": "^5.4.1"
   },
   "devDependencies": {