@fy-/fws-vue 1.7.9 → 1.8.3

package/components/ui/DefaultPaging.vue

@@ -123,14 +123,12 @@ useHead({
         href: prevNextSeo.value.next,
         rel: "next",
         key: "next",
-        hid: "next",
       });
     if (prevNextSeo.value.prev)
       result.push({
         href: prevNextSeo.value.prev,
         rel: "prev",
         key: "prev",
-        hid: "prev",
       });
 
     return result;

package/composables/seo.ts

@@ -29,7 +29,7 @@ export interface LazyHead {
 export const useSeo = (seo: Ref<LazyHead>, initial: boolean = false) => {
   const route = useRoute();
   const currentLocale = seo.value.locale || getLocale();
-
+  const url = getURL();
   useHead({
     title: () => seo.value.title || "",
     link: () => {
@@ -45,14 +45,11 @@ export const useSeo = (seo: Ref<LazyHead>, initial: boolean = false) => {
         }
       });
 
-      if (seo.value.canonical) {
-        links.push({
-          rel: "canonical",
-          href: seo.value.canonical,
-          key: "canonical",
-          hid: "canonical",
-        });
-      }
+      links.push({
+        rel: "canonical",
+        href: `${url.Scheme}://${url.Host}${route.fullPath}`,
+        key: "canonical",
+      });
 
       seo.value.alternateLocales?.forEach((locale) => {
         if (locale !== currentLocale) {
@@ -63,7 +60,6 @@ export const useSeo = (seo: Ref<LazyHead>, initial: boolean = false) => {
               getURL().Host
             }/l/${locale}${getURL().Path.replace(getPrefix(), "")}`,
             key: `alternate-${locale}`,
-            hid: `alternate-${locale}`,
           });
         }
       });
@@ -77,7 +73,7 @@ export const useSeo = (seo: Ref<LazyHead>, initial: boolean = false) => {
         { property: "og:locale", content: currentLocale },
         {
           property: "og:url",
-          hid: "og:url",
+          key: "og:url",
           content: seo.value.url
             ? seo.value.url
             : `${getURL().Scheme}://${getURL().Host}${route.fullPath}`,
@@ -85,29 +81,29 @@ export const useSeo = (seo: Ref<LazyHead>, initial: boolean = false) => {
         {
           property: "og:type",
           content: seo.value.type || "website",
-          hid: "og:type",
+          key: "og:type",
         },
         {
           name: "robots",
           content:
             "index, follow, max-image-preview:large, max-snippet:-1, max-video-preview:-1",
-          hid: "robots",
+          key: "robots",
         },
       );
 
       if (seo.value.isAdult) {
         metas.push(
-          { name: "rating", content: "adult", hid: "rating" },
+          { name: "rating", content: "adult", key: "rating" },
           {
             name: "RATING",
             content: "RTA-5042-1996-1400-1577-RTA",
-            hid: "RTA",
+            key: "RTA",
           },
-          { property: "rating", content: "adult", hid: "rating-property" },
+          { property: "rating", content: "adult", key: "rating-property" },
           {
             property: "RATING",
             content: "RTA-5042-1996-1400-1577-RTA",
-            hid: "RTA-property",
+            key: "RTA-property",
           },
         );
       }
@@ -138,13 +134,13 @@ export const useSeo = (seo: Ref<LazyHead>, initial: boolean = false) => {
               metas.push({
                 name: property,
                 content: seoValue,
-                hid: property,
+                key: property,
               });
             } else {
               metas.push({
                 property,
                 content: seoValue as string,
-                hid: property,
+                key: property,
               });
             }
           });
@@ -155,7 +151,7 @@ export const useSeo = (seo: Ref<LazyHead>, initial: boolean = false) => {
         metas.push({
           name: "description",
           content: seo.value.description,
-          hid: "description",
+          key: "description",
         });
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fy-/fws-vue",
-  "version": "1.7.9",
+  "version": "1.8.3",
   "author": "Florian 'Fy' Gasquez <m@fy.to>",
   "license": "MIT",
   "repository": {