nuxt-seo-utils 7.0.0 → 7.0.2

package/dist/module.d.mts

@@ -1,5 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { UseSeoMetaInput } from '@unhead/schema';
+import { UseSeoMetaInput } from '@unhead/vue/types';
 
 interface ModuleOptions {
     /**

package/dist/module.d.ts

@@ -1,5 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { UseSeoMetaInput } from '@unhead/schema';
+import { UseSeoMetaInput } from '@unhead/vue/types';
 
 interface ModuleOptions {
     /**

package/dist/module.json

@@ -5,7 +5,7 @@
     "nuxt": ">=3.16.0",
     "bridge": false
   },
-  "version": "6.0.12",
+  "version": "7.0.1",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -1,10 +1,9 @@
-import { useNuxt, createResolver, addTemplate, defineNuxtModule, useLogger, resolvePath, addServerHandler, hasNuxtModule, addPlugin, addImports, addVitePlugin } from '@nuxt/kit';
+import { useNuxt, createResolver, addTemplate, defineNuxtModule, useLogger, addServerHandler, hasNuxtModule, addPlugin, addImports, addVitePlugin, resolvePath } from '@nuxt/kit';
 import UnheadVite from '@unhead/addons/vite';
 import { defu } from 'defu';
 import { installNuxtSiteConfig } from 'nuxt-site-config/kit';
-import { relative, resolve, extname, dirname, basename, join } from 'pathe';
-import { readPackageJSON } from 'pkg-types';
-import { gte } from 'semver';
+import { relative, resolve, extname, dirname, basename } from 'pathe';
+import { unpackMeta } from '@unhead/vue/utils';
 import fg from 'fast-glob';
 import fs from 'node:fs';
 import { encodePath, joinURL } from 'ufo';
@@ -12,7 +11,7 @@ import escapeRE from 'escape-string-regexp';
 import { readFile } from 'node:fs/promises';
 import imageSize from 'image-size';
 
-function extendNuxtConfigAppHeadSeoMeta(unpackMeta, nuxt = useNuxt()) {
+function extendNuxtConfigAppHeadSeoMeta(nuxt = useNuxt()) {
   const seoMeta = nuxt.options.app?.seoMeta || nuxt.options.app?.head?.seoMeta || false;
   const configSeoMeta = nuxt.options.seo?.meta || nuxt.options.seo?.seoMeta || false;
   if (!seoMeta && !configSeoMeta)
@@ -188,15 +187,6 @@ function parseSegment(segment) {
   return tokens;
 }
 
-async function resolveUnpackMeta(unheadV2) {
-  try {
-    const unhead = await import(String(unheadV2 ? "@unhead/vue/util" : "@unhead/shared"));
-    return unhead.unpackMeta;
-  } catch {
-    const unhead = await import(String(!unheadV2 ? "@unhead/vue/util" : "@unhead/shared"));
-    return unhead.unpackMeta;
-  }
-}
 function hasLinkRel(input, rel) {
   return input.link?.some((link) => link.rel === rel);
 }
@@ -296,7 +286,7 @@ async function generateTagsFromPageDirImages(nuxt = useNuxt()) {
   });
 }
 
-async function generateTagsFromPublicFiles(unpackMeta, nuxt = useNuxt()) {
+async function generateTagsFromPublicFiles(nuxt = useNuxt()) {
   const publicDirPath = resolve(nuxt.options.rootDir, nuxt.options.dir.public);
   const rootPublicFiles = (await fg(MetaTagFileGlobs, { cwd: publicDirPath, onlyFiles: true, deep: 1 })).map((file) => basename(file));
   const headConfig = defu(nuxt.options.app.head, {
@@ -430,18 +420,9 @@ const module = defineNuxtModule({
     }
     const { resolve } = createResolver(import.meta.url);
     await installNuxtSiteConfig();
-    let isUnheadV2 = false;
-    const unheadPath = await resolvePath("@unhead/vue").catch(() => void 0).then((p) => p?.endsWith("index.mjs") ? dirname(p) : p);
-    if (unheadPath) {
-      const { version: unheadVersion } = await readPackageJSON(join(unheadPath, "package.json"));
-      if (gte(unheadVersion, "2.0.0-rc.1")) {
-        isUnheadV2 = true;
-      }
-    }
     const runtimeDir = resolve("./runtime");
-    const unpackMeta = await resolveUnpackMeta(isUnheadV2);
     if (config.metaDataFiles) {
-      await generateTagsFromPublicFiles(unpackMeta);
+      await generateTagsFromPublicFiles();
       await generateTagsFromPageDirImages();
       if (nuxt.options.dev) {
         addServerHandler({
@@ -513,13 +494,13 @@ const module = defineNuxtModule({
       canonicalLowercase: config.canonicalLowercase
     });
     if (config.extendNuxtConfigAppHeadSeoMeta)
-      extendNuxtConfigAppHeadSeoMeta(unpackMeta);
+      extendNuxtConfigAppHeadSeoMeta();
     if (config.setupNuxtConfigAppHeadWithMoreDefaults)
       setupNuxtConfigAppHeadWithMoreDefaults(nuxt);
     if (config.extendNuxtConfigAppHeadTypes)
       extendNuxtConfigAppHeadTypes();
     extendTypes("nuxt-seo-utils", async () => {
-      const pkg = isUnheadV2 ? "@unhead/vue/types" : "@unhead/schema";
+      const pkg = "@unhead/vue/types";
       let unheadSchemaPath;
       try {
         unheadSchemaPath = relative(resolve(nuxt.options.rootDir, nuxt.options.buildDir, "module"), await resolvePath(pkg));

package/dist/runtime/app/composables/useBreadcrumbItems.js

@@ -9,7 +9,7 @@ import { defu } from "defu";
 import { fixSlashes } from "nuxt-site-config/urls";
 import { useRouter } from "nuxt/app";
 import { withoutTrailingSlash } from "ufo";
-import { computed, inject, onUnmounted, getCurrentInstance, provide, ref, toRaw, toValue } from "vue";
+import { computed, getCurrentInstance, inject, onUnmounted, provide, ref, toRaw, toValue } from "vue";
 import { pathBreadcrumbSegments } from "../../shared/breadcrumbs.js";
 function withoutQuery(path) {
   return path.split("?")[0];
@@ -20,24 +20,23 @@ function titleCase(s) {
 const BreadcrumbCtx = Symbol("BreadcrumbCtx");
 export function useBreadcrumbItems(_options = {}) {
   const vm = getCurrentInstance();
-  let isCreatingState = false;
+  const id = _options.id || "breadcrumb";
+  let stateRef = null;
   if (vm) {
-    let stateRef2 = inject(BreadcrumbCtx, null);
-    if (!stateRef2) {
-      stateRef2 = ref({});
-      provide(BreadcrumbCtx, stateRef2);
-      isCreatingState = false;
+    stateRef = inject(BreadcrumbCtx, null);
+    if (!stateRef) {
+      stateRef = ref({});
+      provide(BreadcrumbCtx, stateRef);
     }
-    const id2 = "breadcrumb";
-    const state = stateRef2.value;
-    if (!state[id2]) {
-      state[id2] = [];
+    const state = stateRef.value;
+    if (!state[id]) {
+      state[id] = [];
     }
-    const idx = state[id2].push(_options) - 1;
-    stateRef2.value = state;
+    const idx = state[id].push(_options) - 1;
+    stateRef.value = state;
     onUnmounted(() => {
-      stateRef2.value = Object.fromEntries(Object.entries(stateRef2.value).map(([k, v]) => {
-        if (k === id2) {
+      stateRef.value = Object.fromEntries(Object.entries(stateRef.value).map(([k, v]) => {
+        if (k === id) {
           return v.filter((_, i) => i !== idx);
         }
         return v;
@@ -52,7 +51,7 @@ export function useBreadcrumbItems(_options = {}) {
   });
   const siteConfig = useSiteConfig();
   const items = computed(() => {
-    const optionStack = stateRef.value?.[id];
+    const optionStack = stateRef?.value?.[id] || [_options];
     const flatOptions = toRaw([...optionStack]).reduce((acc, cur) => {
       acc.rootSegment = acc.rootSegment || cur.rootSegment;
       acc.path = acc.path || cur.path;
@@ -128,10 +127,10 @@ export function useBreadcrumbItems(_options = {}) {
     }).filter(Boolean);
   });
   const schemaOrgEnabled = typeof _options.schemaOrg === "undefined" ? true : _options.schemaOrg;
-  if (isCreatingState && (import.meta.dev || import.meta.server || import.meta.env?.NODE_ENV === "test") && schemaOrgEnabled) {
+  if ((import.meta.dev || import.meta.server || import.meta.env?.NODE_ENV === "test") && schemaOrgEnabled) {
     useSchemaOrg([
       defineBreadcrumb({
-        id: `#${_options.id || "breadcrumb"}`,
+        id: `#${id}`,
         itemListElement: computed(() => items.value.map((item) => ({
           name: item.label || item.ariaLabel,
           item: item.to ? siteResolver(item.to) : void 0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-seo-utils",
   "type": "module",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "SEO utilities to improve your Nuxt sites discoverability and shareability",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -34,7 +34,7 @@
     ]
   },
   "peerDependencies": {
-    "@unhead/vue": "^1 || ^2"
+    "@unhead/vue": "^2.0.0-rc.9"
   },
   "dependencies": {
     "@nuxt/kit": "^3.16.0",
@@ -42,7 +42,7 @@
     "defu": "^6.1.4",
     "escape-string-regexp": "^5.0.0",
     "fast-glob": "^3.3.3",
-    "image-size": "^1.2.0",
+    "image-size": "^2.0.0",
     "nuxt-site-config": "^3.1.4",
     "pathe": "^2.0.3",
     "pkg-types": "^2.1.0",
@@ -56,16 +56,14 @@
     "@nuxt/test-utils": "^3.17.2",
     "@nuxt/ui": "^2.21.1",
     "@nuxtjs/eslint-config-typescript": "^12.1.0",
-    "@nuxtjs/i18n": "^9.3.0",
-    "@unhead/schema": "^1.11.20",
-    "@unhead/shared": "^1.11.20",
+    "@nuxtjs/i18n": "^9.3.1",
     "@unhead/vue": "2.0.0-rc.9",
     "@vue/test-utils": "^2.4.6",
     "bumpp": "^10.0.3",
     "case-police": "^1.0.0",
     "cheerio": "1.0.0",
     "eslint": "^9.22.0",
-    "happy-dom": "^17.4.2",
+    "happy-dom": "^17.4.3",
     "markdownlint-cli": "^0.44.0",
     "nuxt": "^3.16.0",
     "nuxt-content-twoslash": "^0.1.2",