nuxt-seo-utils 8.3.3 → 8.4.1

package/dist/runtime/shared/breadcrumbs.js

@@ -1,4 +1,14 @@
+import { localePath } from "nuxtseo-shared/i18n-runtime";
 import { hasTrailingSlash, parseURL, stringifyParsedURL, withTrailingSlash } from "ufo";
+export function resolveBreadcrumbRoot(rootNode, context) {
+  if (!context.locale || !context.strategy)
+    return rootNode;
+  return localePath(rootNode, context.locale, {
+    defaultLocale: context.defaultLocale || context.locale,
+    strategy: context.strategy,
+    locales: []
+  });
+}
 export function pathBreadcrumbSegments(path, rootNode = "/") {
   const startNode = parseURL(path);
   const appendsTrailingSlash = hasTrailingSlash(startNode.pathname);

package/dist/runtime/shared/minify.js

@@ -1,23 +1,32 @@
 export const JSON_TYPES = /* @__PURE__ */ new Set(["application/json", "application/ld+json"]);
 export const SKIP_JS_TYPES = /* @__PURE__ */ new Set(["application/json", "application/ld+json", "speculationrules", "importmap"]);
+const JS_MINIFY_CANDIDATE_RE = /[\s/]/;
+const CSS_MINIFY_CANDIDATE_RE = /[\s/]|;\}|0\.\d/;
 export function minifyJS(code) {
+  if (!JS_MINIFY_CANDIDATE_RE.test(code))
+    return code;
   let result = "";
+  let last = "";
   let i = 0;
   const len = code.length;
+  const append = (value) => {
+    result += value;
+    last = value;
+  };
   while (i < len) {
     const ch = code[i];
     if (ch === "'" || ch === '"' || ch === "`") {
       const quote = ch;
-      result += ch;
+      append(ch);
       i++;
       while (i < len && code[i] !== quote) {
         if (code[i] === "\\") {
-          result += code[i++];
+          append(code[i++]);
         }
-        result += code[i++];
+        append(code[i++]);
       }
       if (i < len)
-        result += code[i++];
+        append(code[i++]);
     } else if (ch === "/" && code[i + 1] === "/") {
       i += 2;
       while (i < len && code[i] !== "\n")
@@ -34,65 +43,70 @@ export function minifyJS(code) {
           hasNewline = true;
         i++;
       }
-      const prev = result.at(-1);
       const next = code[i];
-      if (hasNewline && prev && next && prev !== "{" && prev !== "}" && prev !== ";" && next !== "}" && next !== ";")
-        result += "\n";
-      else if (prev && next && isIdentChar(prev) && isIdentChar(next))
-        result += " ";
-      else if (prev && next && (prev === "+" && next === "+" || prev === "-" && next === "-"))
-        result += " ";
+      if (hasNewline && last && next && last !== "{" && last !== "}" && last !== ";" && next !== "}" && next !== ";")
+        append("\n");
+      else if (last && next && isIdentChar(last) && isIdentChar(next))
+        append(" ");
+      else if (last && next && (last === "+" && next === "+" || last === "-" && next === "-"))
+        append(" ");
     } else {
-      result += ch;
+      append(ch);
       i++;
     }
   }
   return result.trim();
 }
 export function minifyCSS(code) {
+  if (!CSS_MINIFY_CANDIDATE_RE.test(code))
+    return code;
   let result = "";
+  let last = "";
   let i = 0;
   const parenStack = [];
   const len = code.length;
+  const append = (value) => {
+    result += value;
+    last = value;
+  };
   while (i < len) {
     const ch = code[i];
     if (ch === "'" || ch === '"') {
       const quote = ch;
-      result += ch;
+      append(ch);
       i++;
       while (i < len && code[i] !== quote) {
         if (code[i] === "\\")
-          result += code[i++];
-        result += code[i++];
+          append(code[i++]);
+        append(code[i++]);
       }
       if (i < len)
-        result += code[i++];
+        append(code[i++]);
     } else if (ch === "/" && code[i + 1] === "*") {
       i += 2;
       while (i < len && !(code[i] === "*" && code[i + 1] === "/"))
         i++;
       i += 2;
     } else if (ch === "(") {
-      parenStack.push(isSelectorFunctionParen(result));
-      result += ch;
+      parenStack.push(isSelectorFunctionParen(code, i));
+      append(ch);
       i++;
     } else if (ch === ")") {
       parenStack.pop();
-      result += ch;
+      append(ch);
       i++;
     } else if (ch === " " || ch === "	" || ch === "\n" || ch === "\r") {
       while (i < len && (code[i] === " " || code[i] === "	" || code[i] === "\n" || code[i] === "\r"))
         i++;
-      const prev = result.at(-1);
       const next = code[i];
       if (next === "!")
         continue;
       if (parenStack.length > 0) {
         const isPunct = parenStack[parenStack.length - 1] ? isCSSPunctuation : isCSSCalcPunctuation;
-        if (prev && next && !isPunct(prev) && !isPunct(next))
-          result += " ";
-      } else if (prev && next && !isCSSPunctuation(prev) && !isCSSPunctuation(next)) {
-        result += " ";
+        if (last && next && !isPunct(last) && !isPunct(next))
+          append(" ");
+      } else if (last && next && !isCSSPunctuation(last) && !isCSSPunctuation(next)) {
+        append(" ");
       }
     } else if (ch === ";") {
       let j = i + 1;
@@ -101,19 +115,18 @@ export function minifyCSS(code) {
       if (code[j] === "}") {
         i++;
       } else {
-        result += ch;
+        append(ch);
         i++;
       }
     } else if (ch === "0" && code[i + 1] === "." && (code[i + 2] ?? "") >= "0" && (code[i + 2] ?? "") <= "9") {
-      const prev = result.at(-1);
-      if (prev && prev >= "0" && prev <= "9") {
-        result += ch;
+      if (last && last >= "0" && last <= "9") {
+        append(ch);
         i++;
       } else {
         i++;
       }
     } else {
-      result += ch;
+      append(ch);
       i++;
     }
   }
@@ -134,13 +147,13 @@ function isCSSCalcPunctuation(ch) {
 function isCSSNameChar(ch) {
   return ch >= "a" && ch <= "z" || ch >= "A" && ch <= "Z" || ch === "-";
 }
-function isSelectorFunctionParen(result) {
-  let j = result.length - 1;
-  while (j >= 0 && isCSSNameChar(result[j]))
+function isSelectorFunctionParen(code, parenIndex) {
+  let j = parenIndex - 1;
+  while (j >= 0 && isCSSNameChar(code[j]))
     j--;
-  if (result[j] !== ":")
+  if (code[j] !== ":")
     return false;
-  const name = result.slice(j + 1).toLowerCase();
+  const name = code.slice(j + 1, parenIndex).toLowerCase();
   return name === "is" || name === "where" || name === "not" || name === "has" || name === "matches" || name === "host" || name === "host-context" || name === "slotted";
 }
 export function minifyJSON(code) {

package/dist/runtime/types.d.ts

@@ -1,4 +1,8 @@
-import type { Head, MetaFlat, RawInput } from '@unhead/vue/types';
+import type { Head, Link, MetaFlat, RawInput } from '@unhead/vue/types';
+export interface ColorModeIconLinks {
+    dark: Link[];
+    light: Link[];
+}
 export type MetaFlatSerializable = MetaFlat & {
     title?: RawInput<'title'>;
     titleTemplate?: RawInput<'titleTemplate'>;

package/dist/shared/nuxt-seo-utils.NAV2YNQn.mjs

@@ -0,0 +1,94 @@
+import { Buffer } from 'node:buffer';
+
+const APPLE_ICON_RE = /^(?:[^.]+\.)?apple-(?:icon|touch(?:-icon)?)(?:[.-][^.]+)?\.(?:jpe?g|png)$/i;
+const ICON_RE = /^(?:favicon(?:[.-][^.]+)?\.(?:ico|jpe?g|png|svg)|(?:[^.]+\.)?icon(?:[.-][^.]+)?\.(?:ico|jpe?g|png|svg))$/i;
+const SIZE_RE = /^\d+x\d+$/;
+const COLOR_SCHEME_MEDIA_RE = /^\(\s*prefers-color-scheme\s*:\s*(dark|light)\s*\)$/i;
+function classifyIconFilename(filename) {
+  if (APPLE_ICON_RE.test(filename))
+    return "apple-touch-icon";
+  if (ICON_RE.test(filename))
+    return "icon";
+}
+function getIconRel(rel) {
+  if (typeof rel !== "string")
+    return;
+  const tokens = rel.toLowerCase().split(/\s+/);
+  if (tokens.includes("apple-touch-icon"))
+    return "apple-touch-icon";
+  if (tokens.includes("icon"))
+    return "icon";
+}
+function getIconColorMode(media) {
+  if (typeof media !== "string")
+    return;
+  return COLOR_SCHEME_MEDIA_RE.exec(media.trim())?.[1]?.toLowerCase();
+}
+function partitionColorModeIconLinks(links) {
+  const candidates = links.map((link, index) => {
+    const iconLink = link;
+    return {
+      index,
+      link: iconLink,
+      mode: getIconColorMode(iconLink.media),
+      rel: getIconRel(iconLink.rel)
+    };
+  });
+  const reactiveRels = /* @__PURE__ */ new Set();
+  for (const rel of ["icon", "apple-touch-icon"]) {
+    const modes = new Set(candidates.filter((candidate) => candidate.rel === rel).map((candidate) => candidate.mode));
+    if (modes.has("dark") && modes.has("light"))
+      reactiveRels.add(rel);
+  }
+  if (reactiveRels.size === 0)
+    return { _tag: "StaticIconLinks", links };
+  const icons = { dark: [], light: [] };
+  const reactiveIndexes = /* @__PURE__ */ new Set();
+  for (const candidate of candidates) {
+    if (!candidate.rel || !candidate.mode || !reactiveRels.has(candidate.rel))
+      continue;
+    const { media: _, ...link } = candidate.link;
+    icons[candidate.mode].push(link);
+    reactiveIndexes.add(candidate.index);
+  }
+  return {
+    _tag: "ReactiveIconLinks",
+    links: links.filter((_, index) => !reactiveIndexes.has(index)),
+    icons
+  };
+}
+function normalizeIconSizes(configured, resolved) {
+  if (typeof configured !== "string" || !configured.trim())
+    return { sizes: resolved, normalized: false };
+  if (resolved === "any")
+    return { sizes: configured, normalized: false };
+  const resolvedSizes = new Set(resolved.split(/\s+/));
+  const configuredSizes = configured.toLowerCase().trim().split(/\s+/);
+  const isValidSubset = configuredSizes.every((size) => SIZE_RE.test(size) && resolvedSizes.has(size));
+  return isValidSubset ? { sizes: configured, normalized: false } : { sizes: resolved, normalized: true };
+}
+function pngToIco(images) {
+  const headerSize = 6;
+  const directoryEntrySize = 16;
+  const header = Buffer.alloc(headerSize);
+  header.writeUInt16LE(0, 0);
+  header.writeUInt16LE(1, 2);
+  header.writeUInt16LE(images.length, 4);
+  let offset = headerSize + directoryEntrySize * images.length;
+  const directoryEntries = images.map(({ buffer, width, height }) => {
+    const entry = Buffer.alloc(directoryEntrySize);
+    entry.writeUInt8(width === 256 ? 0 : width, 0);
+    entry.writeUInt8(height === 256 ? 0 : height, 1);
+    entry.writeUInt8(0, 2);
+    entry.writeUInt8(0, 3);
+    entry.writeUInt16LE(1, 4);
+    entry.writeUInt16LE(32, 6);
+    entry.writeUInt32LE(buffer.length, 8);
+    entry.writeUInt32LE(offset, 12);
+    offset += buffer.length;
+    return entry;
+  });
+  return Buffer.concat([header, ...directoryEntries, ...images.map((image) => image.buffer)]);
+}
+
+export { partitionColorModeIconLinks as a, classifyIconFilename as c, getIconRel as g, normalizeIconSizes as n, pngToIco as p };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-seo-utils",
   "type": "module",
-  "version": "8.3.3",
+  "version": "8.4.1",
   "description": "SEO utilities to improve your Nuxt sites discoverability and shareability",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -37,18 +37,14 @@
     ]
   },
   "peerDependencies": {
-    "@unhead/bundler": "^3.2.1",
     "@unhead/vue": "^2.0.7 || ^3.0.0",
     "esbuild": ">=0.17.0",
     "lightningcss": ">=1.20.0",
-    "nuxt": "^3.0.0 || ^4.0.0",
+    "nuxt": "^3.0.0 || ^4.0.0 || ^5.0.0",
     "rolldown": ">=1.0.0-beta.0",
     "unhead": "^2.0.7 || ^3.0.0"
   },
   "peerDependenciesMeta": {
-    "@unhead/bundler": {
-      "optional": true
-    },
     "@unhead/vue": {
       "optional": true
     },
@@ -66,15 +62,15 @@
     }
   },
   "dependencies": {
-    "@nuxt/kit": "^4.5.1",
+    "@nuxt/kit": "^4.5.2",
     "citty": "^0.2.2",
     "consola": "^3.4.2",
     "defu": "^6.1.7",
     "escape-string-regexp": "^5.0.0",
     "exsolve": "^1.1.1",
     "image-size": "^2.0.2",
-    "nuxt-site-config": "^4.1.2",
-    "nuxtseo-shared": "^5.3.6",
+    "nuxt-site-config": "^4.2.1",
+    "nuxtseo-shared": "^5.3.12",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.1",
     "scule": "^1.3.0",
@@ -85,37 +81,36 @@
     "sharp": "^0.35.3"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^9.2.0",
+    "@antfu/eslint-config": "^9.3.0",
     "@nuxt/devtools-kit": "4.0.0-alpha.9",
     "@nuxt/module-builder": "^1.0.3",
-    "@nuxt/schema": "^4.5.1",
+    "@nuxt/schema": "^4.5.2",
     "@nuxt/test-utils": "^4.1.0",
     "@nuxt/ui": "^4.10.0",
-    "@nuxtjs/i18n": "^10.5.0",
-    "@types/node": "^26.1.2",
-    "@unhead/bundler": "^3.2.3",
+    "@nuxtjs/i18n": "^10.6.0",
+    "@types/node": "^26.2.0",
     "@unhead/vue": "3.2.3",
     "@vue/test-utils": "^2.4.11",
-    "bumpp": "^12.0.0",
+    "bumpp": "^12.2.0",
     "case-police": "^2.2.1",
     "cheerio": "^1.2.0",
-    "eslint": "^10.8.0",
+    "eslint": "^10.8.1",
     "eslint-plugin-harlanzw": "^0.17.1",
-    "happy-dom": "^20.11.1",
-    "lint-staged": "^17.2.0",
+    "happy-dom": "^20.11.2",
+    "lint-staged": "^17.3.0",
     "markdownlint-cli": "^0.49.1",
-    "nuxt": "^4.5.1",
+    "nuxt": "^4.5.2",
     "nuxt-security": "^2.6.0",
-    "nuxtseo-layer-devtools": "^5.3.6",
-    "playwright-core": "^1.62.0",
+    "nuxtseo-layer-devtools": "^5.3.12",
+    "playwright-core": "^1.62.1",
     "sass": "^1.102.0",
     "typescript": "6.0.3",
     "ultrahtml": "^1.7.0",
     "unbuild": "^3.6.1",
     "unhead": "3.2.3",
     "vitest": "^4.1.10",
-    "vue": "^3.5.40",
-    "vue-tsc": "^3.3.8"
+    "vue": "^3.5.41",
+    "vue-tsc": "^3.3.9"
   },
   "scripts": {
     "client:build": "node -e \"require('fs').cpSync('devtools','dist/devtools',{recursive:true})\"",
@@ -127,9 +122,10 @@
     "lint:fix": "eslint . --fix",
     "typecheck": "nuxt typecheck",
     "prepare:fixtures": "nuxt prepare test/fixtures/basic && nuxt prepare test/fixtures/i18n && nuxt prepare test/fixtures/csp",
-    "test": "vitest",
+    "test": "vitest && pnpm test:nuxt5",
     "test:run": "vitest run --exclude '**/\\_\\_runtime\\_\\_/**'",
     "test:runtime": "cd test/fixtures/basic && vitest --run",
+    "test:nuxt5": "pnpm pack --out test/fixtures/nuxt5/module.tgz && node test/fixtures/nuxt5/run.mjs",
     "release": "pnpm build && bumpp -x \"npx changelogen --output=CHANGELOG.md\"",
     "lint:docs": "markdownlint ./docs/content && case-police 'docs/content/**/*.md' *.md",
     "lint:docs:fix": "markdownlint ./docs/content --fix && case-police 'docs/content/**/*.md' *.md --fix",