nuxt-og-image 6.6.0 → 6.7.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-og-image",
   "type": "module",
-  "version": "6.6.0",
+  "version": "6.7.0",
   "description": "Enlightened OG Image generation for Nuxt.",
   "author": {
     "website": "https://harlanzw.com",
@@ -50,8 +50,8 @@
   "peerDependencies": {
     "@resvg/resvg-js": "^2.6.0",
     "@resvg/resvg-wasm": "^2.6.0",
-    "@takumi-rs/core": "^1.0.0-beta.3",
-    "@takumi-rs/wasm": "^1.0.0-beta.3",
+    "@takumi-rs/core": "^1.0.0-beta.3 || ^2.0.0-beta.6",
+    "@takumi-rs/wasm": "^1.0.0-beta.3 || ^2.0.0-beta.6",
     "@unhead/vue": "^2.0.5 || ^3.0.0",
     "fontless": "^0.2.0",
     "nitropack": "^2.13.4",
@@ -102,27 +102,27 @@
     }
   },
   "dependencies": {
-    "@clack/prompts": "^1.5.1",
+    "@clack/prompts": "^1.6.0",
     "@nuxt/kit": "^4.4.8",
-    "@unocss/config": "^66.7.0",
-    "@unocss/core": "^66.7.0",
-    "@vue/compiler-sfc": "^3.5.35",
+    "@unocss/config": "^66.7.2",
+    "@unocss/core": "^66.7.2",
+    "@vue/compiler-sfc": "^3.5.38",
     "chrome-launcher": "^1.2.1",
     "consola": "^3.4.2",
     "culori": "^4.0.2",
     "defu": "^6.1.7",
     "devalue": "^5.8.1",
-    "exsolve": "^1.0.8",
+    "exsolve": "^1.1.0",
     "lightningcss": "^1.32.0",
     "magic-string": "^0.30.21",
     "magicast": "^0.5.3",
     "mocked-exports": "^0.1.1",
-    "nuxt-site-config": "^4.0.8",
-    "nuxtseo-shared": "^5.2.6",
-    "nypm": "^0.6.6",
+    "nuxt-site-config": "^4.1.0",
+    "nuxtseo-shared": "^5.3.0",
+    "nypm": "^0.6.7",
     "ofetch": "^1.5.1",
     "ohash": "^2.0.11",
-    "oxc-parser": "^0.135.0",
+    "oxc-parser": "^0.137.0",
     "oxc-walker": "^1.0.0",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.1",
@@ -144,7 +144,7 @@
     "@iconify-json/ri": "^1.2.10",
     "@iconify-json/tabler": "^1.2.35",
     "@iconify/types": "^2.0.0",
-    "@img/sharp-linux-x64": "^0.34.5",
+    "@img/sharp-linux-x64": "^0.35.2",
     "@nuxt/content": "^3.14.0",
     "@nuxt/devtools": "4.0.0-alpha.7",
     "@nuxt/devtools-kit": "4.0.0-alpha.7",
@@ -153,55 +153,56 @@
     "@nuxt/image": "^2.0.0",
     "@nuxt/module-builder": "^1.0.2",
     "@nuxt/test-utils": "^4.0.3",
-    "@nuxt/ui": "^4.8.2",
+    "@nuxt/ui": "^4.9.0",
     "@nuxtjs/color-mode": "^4.0.1",
     "@nuxtjs/eslint-config-typescript": "^12.1.0",
     "@nuxtjs/i18n": "^10.4.0",
     "@nuxtjs/tailwindcss": "7.0.0-beta.1",
     "@resvg/resvg-js": "^2.6.2",
     "@resvg/resvg-wasm": "^2.6.2",
-    "@shikijs/langs": "^4.2.0",
-    "@shikijs/themes": "^4.2.0",
-    "@tailwindcss/vite": "^4.3.0",
-    "@takumi-rs/core": "^1.8.1",
-    "@takumi-rs/helpers": "^1.8.1",
-    "@takumi-rs/wasm": "^1.8.1",
-    "@unocss/nuxt": "^66.7.0",
-    "@unocss/preset-icons": "^66.7.0",
-    "@unocss/preset-wind": "^66.7.0",
-    "@unocss/preset-wind4": "^66.7.0",
+    "@tailwindcss/vite": "^4.3.1",
+    "@takumi-rs/core": "^2.0.0-beta.6",
+    "@takumi-rs/core-v1": "npm:@takumi-rs/core@1.8.7",
+    "@takumi-rs/helpers": "^2.0.0-beta.6",
+    "@takumi-rs/helpers-v1": "npm:@takumi-rs/helpers@1.8.7",
+    "@takumi-rs/wasm": "^2.0.0-beta.6",
+    "@takumi-rs/wasm-v1": "npm:@takumi-rs/wasm@1.8.7",
+    "@unocss/nuxt": "^66.7.2",
+    "@unocss/preset-icons": "^66.7.2",
+    "@unocss/preset-wind": "^66.7.2",
+    "@unocss/preset-wind4": "^66.7.2",
     "@vitejs/plugin-vue": "^6.0.7",
-    "@vue/compiler-core": "^3.5.35",
+    "@vue/compiler-core": "^3.5.38",
     "@vueuse/nuxt": "^14.3.0",
     "birpc": "^4.0.0",
     "bumpp": "^11.1.0",
-    "eslint": "^10.4.1",
+    "eslint": "^10.5.0",
     "eslint-plugin-harlanzw": "^0.17.0",
     "fontless": "^0.2.1",
     "get-image-colors": "^4.0.1",
     "globby": "^16.2.0",
-    "happy-dom": "^20.10.2",
+    "happy-dom": "^20.10.6",
     "hookable": "^6.1.1",
     "jest-image-snapshot": "^6.5.2",
     "lightningcss": "^1.32.0",
     "nitropack": "^2.13.4",
     "nuxt": "^4.4.8",
-    "nuxtseo-layer-devtools": "^5.2.6",
-    "playwright": "^1.60.0",
-    "playwright-core": "^1.60.0",
-    "sass": "^1.100.0",
+    "nuxtseo-layer-devtools": "^5.3.0",
+    "playwright": "^1.61.0",
+    "playwright-core": "^1.61.0",
+    "sass": "^1.101.0",
     "satori": "^0.26.0",
-    "sharp": "^0.34.5",
+    "sharp": "^0.35.2",
     "sirv": "^3.0.2",
-    "tailwindcss": "^4.3.0",
+    "tailwindcss": "^4.3.1",
     "typescript": "^6.0.3",
     "unbuild": "^3.6.1",
     "unifont": "^0.7.4",
-    "unocss": "^66.7.0",
-    "vitest": "^4.1.8",
-    "vue": "^3.5.35",
-    "vue-tsc": "^3.3.4",
-    "wrangler": "^4.99.0",
+    "unocss": "^66.7.2",
+    "vitest": "^4.1.9",
+    "vue": "^3.5.38",
+    "vue-tsc": "^3.3.5",
+    "wrangler": "^4.103.0",
     "yoga-wasm-web": "^0.3.3",
     "zod": "^4.4.3"
   },
@@ -220,6 +221,9 @@
     "release": "pnpm build && bumpp -x \"npx changelogen --output=CHANGELOG.md\"",
     "typecheck": "nuxt-module-build prepare && nuxt typecheck",
     "test": "pnpm run prepare:fixtures && vitest",
-    "test:chrome": "HAS_CHROME=true vitest"
+    "test:chrome": "HAS_CHROME=true vitest",
+    "test:takumi:e2e": "node scripts/test-takumi-e2e.mjs",
+    "test:takumi:e2e:matrix": "node scripts/test-takumi-e2e.mjs --matrix",
+    "test:takumi:e2e:compare": "node scripts/test-takumi-e2e.mjs --compare"
   }
 }

package/dist/shared/nuxt-og-image.CJa2KCie.mjs

@@ -1,189 +0,0 @@
-import { existsSync } from 'node:fs';
-import { loadFile, writeFile } from 'magicast';
-import { addNuxtModule } from 'magicast/helpers';
-import { join } from 'pathe';
-import { logger } from '../../dist/runtime/logger.js';
-
-function parseFontString(font) {
-  const parts = font.split(":");
-  if (parts.length === 3) {
-    return {
-      name: parts[0] || font,
-      style: parts[1] === "ital" ? "italic" : "normal",
-      weight: Number.parseInt(parts[2] || "") || 400
-    };
-  }
-  return {
-    name: parts[0] || font,
-    weight: Number.parseInt(parts[1] || "") || 400,
-    style: "normal"
-  };
-}
-function groupFontsByFamily(fonts) {
-  const families = /* @__PURE__ */ new Map();
-  for (const font of fonts) {
-    const parsed = parseFontString(font);
-    const existing = families.get(parsed.name);
-    if (existing) {
-      existing.weights.add(parsed.weight);
-      existing.styles.add(parsed.style);
-    } else {
-      families.set(parsed.name, {
-        weights: /* @__PURE__ */ new Set([parsed.weight]),
-        styles: /* @__PURE__ */ new Set([parsed.style])
-      });
-    }
-  }
-  return Array.from(families.entries(), ([name, { weights, styles }]) => ({
-    name,
-    weights: [...weights].toSorted((a, b) => a - b),
-    styles: [...styles]
-  }));
-}
-async function migrateFontsConfig(rootDir) {
-  const configPaths = [
-    "nuxt.config.ts",
-    "nuxt.config.js",
-    "nuxt.config.mjs"
-  ];
-  let configPath;
-  for (const p of configPaths) {
-    const fullPath = join(rootDir, p);
-    if (existsSync(fullPath)) {
-      configPath = fullPath;
-      break;
-    }
-  }
-  if (!configPath) {
-    return { migrated: false, message: "No nuxt.config found" };
-  }
-  const mod = await loadFile(configPath);
-  const config = mod.exports.default;
-  if (!config?.ogImage?.fonts) {
-    return { migrated: false, message: "No ogImage.fonts config found" };
-  }
-  const oldFonts = config.ogImage.fonts;
-  if (!Array.isArray(oldFonts) || oldFonts.length === 0) {
-    return { migrated: false, message: "ogImage.fonts is empty or invalid" };
-  }
-  const groupedFonts = groupFontsByFamily(oldFonts);
-  if (!config.fonts) {
-    config.fonts = {};
-  }
-  if (!config.fonts.families) {
-    config.fonts.families = [];
-  }
-  const existingFamilies = config.fonts.families;
-  for (const font of groupedFonts) {
-    const existing = existingFamilies.find((f) => f.name === font.name);
-    if (existing) {
-      const existingWeights = new Set(existing.weights || []);
-      for (const w of font.weights) {
-        existingWeights.add(w);
-      }
-      existing.weights = [...existingWeights].toSorted((a, b) => a - b);
-      if (font.styles.includes("italic")) {
-        const existingStyles = new Set(existing.styles || ["normal"]);
-        existingStyles.add("italic");
-        existing.styles = [...existingStyles];
-      }
-      existing.global = true;
-    } else {
-      const family = {
-        name: font.name,
-        weights: font.weights,
-        global: true
-      };
-      if (font.styles.includes("italic")) {
-        family.styles = font.styles;
-      }
-      existingFamilies.push(family);
-    }
-  }
-  addNuxtModule(mod, "@nuxt/fonts");
-  delete config.ogImage.fonts;
-  if (Object.keys(config.ogImage).length === 0) {
-    delete config.ogImage;
-  }
-  await writeFile(mod, configPath);
-  const familyNames = groupedFonts.map((f) => f.name).join(", ");
-  return {
-    migrated: true,
-    message: `Migrated fonts (${familyNames}) from ogImage.fonts to @nuxt/fonts`
-  };
-}
-async function migrateDefaultsComponent(rootDir) {
-  const configPaths = [
-    "nuxt.config.ts",
-    "nuxt.config.js",
-    "nuxt.config.mjs"
-  ];
-  let configPath;
-  for (const cp of configPaths) {
-    const fullPath = join(rootDir, cp);
-    if (existsSync(fullPath)) {
-      configPath = fullPath;
-      break;
-    }
-  }
-  if (!configPath)
-    return { migrated: false, componentName: null, message: "No nuxt.config found" };
-  const mod = await loadFile(configPath);
-  const config = mod.exports.default;
-  if (!config?.ogImage?.defaults?.component)
-    return { migrated: false, componentName: null, message: "No defaults.component found" };
-  const componentName = String(config.ogImage.defaults.component);
-  delete config.ogImage.defaults.component;
-  if (config.ogImage.defaults && Object.keys(config.ogImage.defaults).length === 0)
-    delete config.ogImage.defaults;
-  if (config.ogImage && Object.keys(config.ogImage).length === 0)
-    delete config.ogImage;
-  await writeFile(mod, configPath);
-  return { migrated: true, componentName, message: `Removed defaults.component: '${componentName}'` };
-}
-async function promptFontsMigration(rootDir) {
-  logger.info("");
-  logger.info("Detected deprecated ogImage.fonts configuration.");
-  logger.info("");
-  logger.info("Inter fonts now work out of the box without any configuration.");
-  logger.info("For custom fonts, use @nuxt/fonts:");
-  logger.info("");
-  logger.info("Before:");
-  logger.info("  ogImage: {");
-  logger.info("    fonts: ['Inter:400', 'Inter:700']");
-  logger.info("  }");
-  logger.info("");
-  logger.info("After (Inter only): Remove the config entirely \u2014 it works by default.");
-  logger.info("");
-  logger.info("After (custom fonts):");
-  logger.info("  modules: ['@nuxt/fonts', 'nuxt-og-image'],");
-  logger.info("  fonts: {");
-  logger.info("    families: [");
-  logger.info("      { name: 'Roboto', weights: [400, 700], global: true }");
-  logger.info("    ]");
-  logger.info("  }");
-  logger.info("");
-  const migrate = await logger.prompt("Automatically migrate nuxt.config?", {
-    type: "confirm",
-    initial: true
-  });
-  if (migrate) {
-    const result = await migrateFontsConfig(rootDir).catch((err) => {
-      logger.error(`Migration failed: ${err.message}`);
-      return { migrated: false, message: err.message };
-    });
-    if (result.migrated) {
-      logger.success(result.message);
-      logger.info("");
-      logger.info("Please install @nuxt/fonts:");
-      logger.info("  npm add @nuxt/fonts");
-    } else {
-      logger.warn(`Could not migrate: ${result.message}`);
-      logger.info("Please migrate manually.");
-    }
-  } else {
-    logger.info("Skipping automatic migration. Please migrate manually.");
-  }
-}
-
-export { migrateFontsConfig as a, migrateDefaultsComponent as m, promptFontsMigration as p };

package/dist/shared/nuxt-og-image.CMYbz66P.cjs

@@ -1,193 +0,0 @@
-'use strict';
-
-const fs = require('node:fs');
-const magicast = require('magicast');
-const helpers = require('magicast/helpers');
-const pathe = require('pathe');
-const logger_js = require('../../dist/runtime/logger.js');
-
-function parseFontString(font) {
-  const parts = font.split(":");
-  if (parts.length === 3) {
-    return {
-      name: parts[0] || font,
-      style: parts[1] === "ital" ? "italic" : "normal",
-      weight: Number.parseInt(parts[2] || "") || 400
-    };
-  }
-  return {
-    name: parts[0] || font,
-    weight: Number.parseInt(parts[1] || "") || 400,
-    style: "normal"
-  };
-}
-function groupFontsByFamily(fonts) {
-  const families = /* @__PURE__ */ new Map();
-  for (const font of fonts) {
-    const parsed = parseFontString(font);
-    const existing = families.get(parsed.name);
-    if (existing) {
-      existing.weights.add(parsed.weight);
-      existing.styles.add(parsed.style);
-    } else {
-      families.set(parsed.name, {
-        weights: /* @__PURE__ */ new Set([parsed.weight]),
-        styles: /* @__PURE__ */ new Set([parsed.style])
-      });
-    }
-  }
-  return Array.from(families.entries(), ([name, { weights, styles }]) => ({
-    name,
-    weights: [...weights].toSorted((a, b) => a - b),
-    styles: [...styles]
-  }));
-}
-async function migrateFontsConfig(rootDir) {
-  const configPaths = [
-    "nuxt.config.ts",
-    "nuxt.config.js",
-    "nuxt.config.mjs"
-  ];
-  let configPath;
-  for (const p of configPaths) {
-    const fullPath = pathe.join(rootDir, p);
-    if (fs.existsSync(fullPath)) {
-      configPath = fullPath;
-      break;
-    }
-  }
-  if (!configPath) {
-    return { migrated: false, message: "No nuxt.config found" };
-  }
-  const mod = await magicast.loadFile(configPath);
-  const config = mod.exports.default;
-  if (!config?.ogImage?.fonts) {
-    return { migrated: false, message: "No ogImage.fonts config found" };
-  }
-  const oldFonts = config.ogImage.fonts;
-  if (!Array.isArray(oldFonts) || oldFonts.length === 0) {
-    return { migrated: false, message: "ogImage.fonts is empty or invalid" };
-  }
-  const groupedFonts = groupFontsByFamily(oldFonts);
-  if (!config.fonts) {
-    config.fonts = {};
-  }
-  if (!config.fonts.families) {
-    config.fonts.families = [];
-  }
-  const existingFamilies = config.fonts.families;
-  for (const font of groupedFonts) {
-    const existing = existingFamilies.find((f) => f.name === font.name);
-    if (existing) {
-      const existingWeights = new Set(existing.weights || []);
-      for (const w of font.weights) {
-        existingWeights.add(w);
-      }
-      existing.weights = [...existingWeights].toSorted((a, b) => a - b);
-      if (font.styles.includes("italic")) {
-        const existingStyles = new Set(existing.styles || ["normal"]);
-        existingStyles.add("italic");
-        existing.styles = [...existingStyles];
-      }
-      existing.global = true;
-    } else {
-      const family = {
-        name: font.name,
-        weights: font.weights,
-        global: true
-      };
-      if (font.styles.includes("italic")) {
-        family.styles = font.styles;
-      }
-      existingFamilies.push(family);
-    }
-  }
-  helpers.addNuxtModule(mod, "@nuxt/fonts");
-  delete config.ogImage.fonts;
-  if (Object.keys(config.ogImage).length === 0) {
-    delete config.ogImage;
-  }
-  await magicast.writeFile(mod, configPath);
-  const familyNames = groupedFonts.map((f) => f.name).join(", ");
-  return {
-    migrated: true,
-    message: `Migrated fonts (${familyNames}) from ogImage.fonts to @nuxt/fonts`
-  };
-}
-async function migrateDefaultsComponent(rootDir) {
-  const configPaths = [
-    "nuxt.config.ts",
-    "nuxt.config.js",
-    "nuxt.config.mjs"
-  ];
-  let configPath;
-  for (const cp of configPaths) {
-    const fullPath = pathe.join(rootDir, cp);
-    if (fs.existsSync(fullPath)) {
-      configPath = fullPath;
-      break;
-    }
-  }
-  if (!configPath)
-    return { migrated: false, componentName: null, message: "No nuxt.config found" };
-  const mod = await magicast.loadFile(configPath);
-  const config = mod.exports.default;
-  if (!config?.ogImage?.defaults?.component)
-    return { migrated: false, componentName: null, message: "No defaults.component found" };
-  const componentName = String(config.ogImage.defaults.component);
-  delete config.ogImage.defaults.component;
-  if (config.ogImage.defaults && Object.keys(config.ogImage.defaults).length === 0)
-    delete config.ogImage.defaults;
-  if (config.ogImage && Object.keys(config.ogImage).length === 0)
-    delete config.ogImage;
-  await magicast.writeFile(mod, configPath);
-  return { migrated: true, componentName, message: `Removed defaults.component: '${componentName}'` };
-}
-async function promptFontsMigration(rootDir) {
-  logger_js.logger.info("");
-  logger_js.logger.info("Detected deprecated ogImage.fonts configuration.");
-  logger_js.logger.info("");
-  logger_js.logger.info("Inter fonts now work out of the box without any configuration.");
-  logger_js.logger.info("For custom fonts, use @nuxt/fonts:");
-  logger_js.logger.info("");
-  logger_js.logger.info("Before:");
-  logger_js.logger.info("  ogImage: {");
-  logger_js.logger.info("    fonts: ['Inter:400', 'Inter:700']");
-  logger_js.logger.info("  }");
-  logger_js.logger.info("");
-  logger_js.logger.info("After (Inter only): Remove the config entirely \u2014 it works by default.");
-  logger_js.logger.info("");
-  logger_js.logger.info("After (custom fonts):");
-  logger_js.logger.info("  modules: ['@nuxt/fonts', 'nuxt-og-image'],");
-  logger_js.logger.info("  fonts: {");
-  logger_js.logger.info("    families: [");
-  logger_js.logger.info("      { name: 'Roboto', weights: [400, 700], global: true }");
-  logger_js.logger.info("    ]");
-  logger_js.logger.info("  }");
-  logger_js.logger.info("");
-  const migrate = await logger_js.logger.prompt("Automatically migrate nuxt.config?", {
-    type: "confirm",
-    initial: true
-  });
-  if (migrate) {
-    const result = await migrateFontsConfig(rootDir).catch((err) => {
-      logger_js.logger.error(`Migration failed: ${err.message}`);
-      return { migrated: false, message: err.message };
-    });
-    if (result.migrated) {
-      logger_js.logger.success(result.message);
-      logger_js.logger.info("");
-      logger_js.logger.info("Please install @nuxt/fonts:");
-      logger_js.logger.info("  npm add @nuxt/fonts");
-    } else {
-      logger_js.logger.warn(`Could not migrate: ${result.message}`);
-      logger_js.logger.info("Please migrate manually.");
-    }
-  } else {
-    logger_js.logger.info("Skipping automatic migration. Please migrate manually.");
-  }
-}
-
-exports.migrateDefaultsComponent = migrateDefaultsComponent;
-exports.migrateFontsConfig = migrateFontsConfig;
-exports.promptFontsMigration = promptFontsMigration;