nuxt-seo-utils 8.4.1 → 8.4.3

package/dist/cli.mjs

@@ -9,7 +9,7 @@ import { p as pngToIco } from './shared/nuxt-seo-utils.NAV2YNQn.mjs';
 import 'node:buffer';
 
 const name = "nuxt-seo-utils";
-const version = "8.4.1";
+const version = "8.4.3";
 const description = "SEO utilities to improve your Nuxt sites discoverability and shareability";
 
 const ICON_SIZES = [

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.16.0"
   },
-  "version": "8.4.1",
+  "version": "8.4.3",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -13,10 +13,9 @@ import { encodePath, joinURL } from 'ufo';
 import { c as classifyIconFilename, g as getIconRel, n as normalizeIconSizes, a as partitionColorModeIconLinks } from './shared/nuxt-seo-utils.NAV2YNQn.mjs';
 import escapeRE from 'escape-string-regexp';
 import { readFile, readdir } from 'node:fs/promises';
-import imageSize from 'image-size';
+import { Buffer } from 'node:buffer';
 import { JSON_TYPES, SKIP_JS_TYPES } from '../dist/runtime/shared/minify.js';
 import { setupDevToolsUI as setupDevToolsUI$1 } from 'nuxtseo-shared/devtools';
-import 'node:buffer';
 
 function extendNuxtConfigAppHeadSeoMeta(nuxt = useNuxt()) {
   const seoMeta = nuxt.options.app?.seoMeta || nuxt.options.app?.head?.seoMeta || {};
@@ -28,9 +27,10 @@ function extendNuxtConfigAppHeadSeoMeta(nuxt = useNuxt()) {
     ...nuxt.options.app.head,
     meta: [
       ...nuxt.options.app.head.meta || [],
-      // @ts-expect-error untyped
       ...unpackMeta(seoMeta),
       ...unpackMeta(configSeoMeta || {})
+      // Unhead accepts null and array content.
+      // Nuxt's static head type remains narrower.
     ]
   };
   delete nuxt.options.app.seoMeta;
@@ -187,6 +187,134 @@ function parseSegment(segment) {
   return tokens;
 }
 
+const PNG_SIGNATURE = Buffer.from("89504e470d0a1a0a", "hex");
+const SVG_ROOT_RE = /<svg(?:\s|>)/i;
+const SVG_LENGTH_RE = /^((?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?)(cm|em|ex|in|m|mm|pc|pt|px)?$/i;
+const SVG_UNIT_PIXELS = {
+  cm: 96 / 2.54,
+  em: 16,
+  ex: 8,
+  in: 96,
+  m: 96 / 2.54 * 100,
+  mm: 96 / 2.54 / 10,
+  pc: 96 / 72 / 12,
+  pt: 96 / 72,
+  px: 1
+};
+function validDimensions(width, height) {
+  if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0)
+    return void 0;
+  return { width, height };
+}
+function parsePng(buffer) {
+  if (buffer.length < 24 || !buffer.subarray(0, 8).equals(PNG_SIGNATURE))
+    return void 0;
+  if (buffer.readUInt32BE(8) !== 13 || buffer.toString("ascii", 12, 16) !== "IHDR")
+    return void 0;
+  return validDimensions(buffer.readUInt32BE(16), buffer.readUInt32BE(20));
+}
+function parseGif(buffer) {
+  if (buffer.length < 10 || !["GIF87a", "GIF89a"].includes(buffer.toString("ascii", 0, 6)))
+    return void 0;
+  return validDimensions(buffer.readUInt16LE(6), buffer.readUInt16LE(8));
+}
+function isJpegSizeMarker(marker) {
+  return marker >= 192 && marker <= 207 && ![196, 200, 204].includes(marker);
+}
+function parseJpeg(buffer) {
+  if (buffer.length < 4 || buffer[0] !== 255 || buffer[1] !== 216)
+    return void 0;
+  let offset = 2;
+  while (offset < buffer.length) {
+    while (offset < buffer.length && buffer[offset] !== 255)
+      offset++;
+    while (offset < buffer.length && buffer[offset] === 255)
+      offset++;
+    if (offset >= buffer.length)
+      return void 0;
+    const marker = buffer[offset++];
+    if (marker === 217 || marker === 218)
+      return void 0;
+    if (marker >= 208 && marker <= 215 || marker === 1)
+      continue;
+    if (offset + 2 > buffer.length)
+      return void 0;
+    const segmentLength = buffer.readUInt16BE(offset);
+    if (segmentLength < 2 || offset + segmentLength > buffer.length)
+      return void 0;
+    if (isJpegSizeMarker(marker)) {
+      if (segmentLength < 11)
+        return void 0;
+      const componentCount = buffer[offset + 7];
+      if (componentCount === 0 || segmentLength !== 8 + componentCount * 3)
+        return void 0;
+      return validDimensions(buffer.readUInt16BE(offset + 5), buffer.readUInt16BE(offset + 3));
+    }
+    offset += segmentLength;
+  }
+  return void 0;
+}
+function parseIco(buffer) {
+  if (buffer.length < 6 || buffer.readUInt16LE(0) !== 0 || buffer.readUInt16LE(2) !== 1)
+    return void 0;
+  const count = buffer.readUInt16LE(4);
+  const directoryEnd = 6 + count * 16;
+  if (count === 0 || directoryEnd > buffer.length)
+    return void 0;
+  const images = Array.from({ length: count }, (_, index) => {
+    const offset = 6 + index * 16;
+    const payloadSize = buffer.readUInt32LE(offset + 8);
+    const payloadOffset = buffer.readUInt32LE(offset + 12);
+    if (payloadSize === 0 || payloadOffset < directoryEnd || payloadOffset > buffer.length - payloadSize)
+      return void 0;
+    return {
+      width: buffer[offset] || 256,
+      height: buffer[offset + 1] || 256
+    };
+  });
+  if (images.includes(void 0))
+    return void 0;
+  const validImages = images;
+  const largestImage = validImages.reduce((largest, image) => image.width * image.height > largest.width * largest.height ? image : largest);
+  return { ...largestImage, images: validImages };
+}
+function parseSvgLength(root, name) {
+  const value = root.match(new RegExp(`(?:^|\\s)${name}\\s*=\\s*["']([^"']+)["']`, "i"))?.[1]?.trim();
+  if (!value)
+    return void 0;
+  const match = SVG_LENGTH_RE.exec(value);
+  if (!match)
+    return void 0;
+  const parsed = Number(match[1]) * (SVG_UNIT_PIXELS[match[2]?.toLowerCase() || "px"] || 1);
+  return Number.isFinite(parsed) && parsed > 0 ? Math.round(parsed) : void 0;
+}
+function parseSvg(buffer) {
+  const source = buffer.toString("utf8", 0, Math.min(buffer.length, 4096));
+  const rootStart = source.search(SVG_ROOT_RE);
+  const rootEnd = source.indexOf(">", rootStart);
+  if (rootStart < 0 || rootEnd < 0)
+    return void 0;
+  const root = source.slice(rootStart, rootEnd + 1);
+  const width = parseSvgLength(root, "width");
+  const height = parseSvgLength(root, "height");
+  if (width && height)
+    return { width, height };
+  const viewBox = root.match(/(?:^|\s)viewBox\s*=\s*["']([^"']+)["']/i)?.[1]?.trim().split(/[\s,]+/).map(Number);
+  if (!viewBox || viewBox.length !== 4 || !viewBox.every((value) => Number.isFinite(value)))
+    return void 0;
+  const viewBoxDimensions = validDimensions(Math.round(viewBox[2]), Math.round(viewBox[3]));
+  if (!viewBoxDimensions)
+    return void 0;
+  if (width)
+    return { width, height: Math.floor(width * viewBoxDimensions.height / viewBoxDimensions.width) };
+  if (height)
+    return { width: Math.floor(height * viewBoxDimensions.width / viewBoxDimensions.height), height };
+  return viewBoxDimensions;
+}
+function parseImageDimensions(buffer) {
+  return parsePng(buffer) || parseGif(buffer) || parseJpeg(buffer) || parseIco(buffer) || parseSvg(buffer);
+}
+
 function hasMetaProperty(input, property) {
   return input.meta?.some((meta) => meta.property === property);
 }
@@ -227,7 +355,14 @@ async function getImageMeta(base, path, isIcon = false) {
 }
 async function getImageDimensions(absolutePath) {
   const buffer = await readFile(absolutePath);
-  return imageSize(buffer);
+  const dimensions = parseImageDimensions(buffer);
+  if (!dimensions)
+    throw new TypeError(`Unsupported image format: ${absolutePath}`);
+  return {
+    width: dimensions.width,
+    height: dimensions.height,
+    images: dimensions.images
+  };
 }
 
 const DIR_SUFFIX_RE = /\/_dir$/;

package/dist/runtime/app/plugins/1.absoluteImageUrls.server.js

@@ -16,7 +16,7 @@ export default defineNuxtPlugin({
     head.use({
       key: "absoluteImageUrls",
       hooks: {
-        "tags:resolve": async ({ tags }) => {
+        "tags:resolve": ({ tags }) => {
           for (const tag of tags) {
             if (tag.tag !== "meta")
               continue;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-seo-utils",
   "type": "module",
-  "version": "8.4.1",
+  "version": "8.4.3",
   "description": "SEO utilities to improve your Nuxt sites discoverability and shareability",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -68,8 +68,7 @@
     "defu": "^6.1.7",
     "escape-string-regexp": "^5.0.0",
     "exsolve": "^1.1.1",
-    "image-size": "^2.0.2",
-    "nuxt-site-config": "^4.2.1",
+    "nuxt-site-config": "^4.2.2",
     "nuxtseo-shared": "^5.3.12",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.1",
@@ -95,7 +94,7 @@
     "case-police": "^2.2.1",
     "cheerio": "^1.2.0",
     "eslint": "^10.8.1",
-    "eslint-plugin-harlanzw": "^0.17.1",
+    "eslint-plugin-harlanzw": "^0.19.2",
     "happy-dom": "^20.11.2",
     "lint-staged": "^17.3.0",
     "markdownlint-cli": "^0.49.1",