@unhead/vue 1.0.3 → 1.0.5

package/dist/index.cjs

@@ -44,6 +44,8 @@ const setAttrs = (ctx, markSideEffect) => {
     value = String(value);
     const attrSdeKey = `attr:${k}`;
     if (k === "class") {
+      if (!value)
+        return;
       for (const c of value.split(" ")) {
         const classSdeKey = `${attrSdeKey}:${c}`;
         if (markSideEffect)
@@ -582,7 +584,7 @@ const TagEntityBits = 10;
 
 async function normaliseEntryTags(e) {
   const tagPromises = [];
-  Object.entries(e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).forEach(([k, value]) => {
+  Object.entries(e.resolvedInput || e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).forEach(([k, value]) => {
     const v = asArray$1(value);
     tagPromises.push(...v.map((props) => normaliseTag(k, props)).flat());
   });
@@ -798,7 +800,7 @@ const VueReactiveUseHeadPlugin = () => {
     hooks: {
       "entries:resolve": function(ctx) {
         for (const entry of ctx.entries)
-          entry.input = resolveUnrefHeadInput(entry.input);
+          entry.resolvedInput = resolveUnrefHeadInput(entry.input);
       }
     }
   });
@@ -966,18 +968,18 @@ function changeKeyCasingDeep(input) {
 
 function clientUseHead(input, options = {}) {
   const head = injectHead();
-  const vm = vue.getCurrentInstance();
-  if (!vm)
-    return head.push(input, options);
   const resolvedInput = vue.ref({});
   vue.watchEffect(() => {
     resolvedInput.value = resolveUnrefHeadInput(input);
   });
   const entry = head.push(resolvedInput.value, options);
   vue.watch(resolvedInput, (e) => entry.patch(e));
-  vue.onBeforeUnmount(() => {
-    entry.dispose();
-  });
+  const vm = vue.getCurrentInstance();
+  if (vm) {
+    vue.onBeforeUnmount(() => {
+      entry.dispose();
+    });
+  }
   return entry;
 }
 
@@ -1009,10 +1011,10 @@ const useServerBodyAttrs = (attrs) => useHead({ bodyAttrs: attrs });
 
 function useHead(input, options = {}) {
   const head = injectHead();
-  const isBrowser = IsBrowser || head.resolvedOptions?.document;
+  const isBrowser = IsBrowser || !!head.resolvedOptions?.document;
   if (options.mode === "server" && isBrowser || options.mode === "client" && !isBrowser)
     return;
-  return IsBrowser ? clientUseHead(input, options) : serverUseHead(input, options);
+  return isBrowser ? clientUseHead(input, options) : serverUseHead(input, options);
 }
 const useTagTitle = (title) => useHead({ title });
 const useTitleTemplate = (titleTemplate) => useHead({ titleTemplate });

package/dist/index.mjs

@@ -42,6 +42,8 @@ const setAttrs = (ctx, markSideEffect) => {
     value = String(value);
     const attrSdeKey = `attr:${k}`;
     if (k === "class") {
+      if (!value)
+        return;
       for (const c of value.split(" ")) {
         const classSdeKey = `${attrSdeKey}:${c}`;
         if (markSideEffect)
@@ -580,7 +582,7 @@ const TagEntityBits = 10;
 
 async function normaliseEntryTags(e) {
   const tagPromises = [];
-  Object.entries(e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).forEach(([k, value]) => {
+  Object.entries(e.resolvedInput || e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).forEach(([k, value]) => {
     const v = asArray$1(value);
     tagPromises.push(...v.map((props) => normaliseTag(k, props)).flat());
   });
@@ -796,7 +798,7 @@ const VueReactiveUseHeadPlugin = () => {
     hooks: {
       "entries:resolve": function(ctx) {
         for (const entry of ctx.entries)
-          entry.input = resolveUnrefHeadInput(entry.input);
+          entry.resolvedInput = resolveUnrefHeadInput(entry.input);
       }
     }
   });
@@ -964,18 +966,18 @@ function changeKeyCasingDeep(input) {
 
 function clientUseHead(input, options = {}) {
   const head = injectHead();
-  const vm = getCurrentInstance();
-  if (!vm)
-    return head.push(input, options);
   const resolvedInput = ref({});
   watchEffect(() => {
     resolvedInput.value = resolveUnrefHeadInput(input);
   });
   const entry = head.push(resolvedInput.value, options);
   watch(resolvedInput, (e) => entry.patch(e));
-  onBeforeUnmount(() => {
-    entry.dispose();
-  });
+  const vm = getCurrentInstance();
+  if (vm) {
+    onBeforeUnmount(() => {
+      entry.dispose();
+    });
+  }
   return entry;
 }
 
@@ -1007,10 +1009,10 @@ const useServerBodyAttrs = (attrs) => useHead({ bodyAttrs: attrs });
 
 function useHead(input, options = {}) {
   const head = injectHead();
-  const isBrowser = IsBrowser || head.resolvedOptions?.document;
+  const isBrowser = IsBrowser || !!head.resolvedOptions?.document;
   if (options.mode === "server" && isBrowser || options.mode === "client" && !isBrowser)
     return;
-  return IsBrowser ? clientUseHead(input, options) : serverUseHead(input, options);
+  return isBrowser ? clientUseHead(input, options) : serverUseHead(input, options);
 }
 const useTagTitle = (title) => useHead({ title });
 const useTitleTemplate = (titleTemplate) => useHead({ titleTemplate });

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@unhead/vue",
   "type": "module",
-  "version": "1.0.3",
-  "packageManager": "pnpm@7.17.0",
+  "version": "1.0.5",
+  "packageManager": "pnpm@7.17.1",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -34,11 +34,11 @@
   },
   "dependencies": {
     "hookable": "^5.4.2",
-    "@unhead/schema": "1.0.3"
+    "@unhead/schema": "1.0.5"
   },
   "devDependencies": {
     "vue": "^3.2.45",
-    "unhead": "1.0.3"
+    "unhead": "1.0.5"
   },
   "scripts": {
     "build": "unbuild .",