nuxt-og-image 6.3.2 → 6.3.3

package/dist/shared/{nuxt-og-image.PUNoqZDW.cjs → nuxt-og-image.CW0bAY2T.cjs}

@@ -460,7 +460,7 @@ function patchWebAssemblyInstantiate(code) {
 const PROVIDER_DEPENDENCIES = [
   {
     name: "satori",
-    description: "SVG-based renderer using Satori (default)",
+    description: "SVG-based renderer using Satori",
     bindings: {
       "node": [
         { name: "satori", description: "HTML to SVG renderer" },
@@ -478,7 +478,7 @@ const PROVIDER_DEPENDENCIES = [
   },
   {
     name: "takumi",
-    description: "Rust-based high-performance renderer",
+    description: "Rust-based high-performance renderer (recommended)",
     bindings: {
       "node": [
         { name: "@takumi-rs/core", description: "Native Takumi renderer" }
@@ -597,9 +597,9 @@ async function promptForRendererSelection() {
   const renderer = await logger_js.logger.prompt("Which renderer would you like to use?", {
     type: "select",
     options: PROVIDER_DEPENDENCIES.map((p) => p.name),
-    initial: "satori"
+    initial: "takumi"
   });
-  return renderer || "satori";
+  return renderer || "takumi";
 }
 async function validateProviderSetup(renderer, compatibility) {
   const issues = [];
@@ -1620,9 +1620,11 @@ async function extractFontFacesSimple(css) {
   return fonts.map((font) => {
     const urlSource = font.sources.find((s) => s.type === "url");
     let weight;
+    let weightRange;
     if (Array.isArray(font.weight)) {
       const [min, max] = font.weight;
       weight = min <= 400 && max >= 400 ? 400 : min;
+      weightRange = [min, max];
     } else {
       weight = font.weight;
     }
@@ -1633,7 +1635,8 @@ async function extractFontFacesSimple(css) {
       weight,
       style: font.style,
       unicodeRange: font.unicodeRange,
-      isWoff2: src.endsWith(".woff2")
+      isWoff2: src.endsWith(".woff2"),
+      weightRange
     };
   }).filter((f) => f.src);
 }
@@ -1743,7 +1746,8 @@ async function parseAppCssFontFaces(nuxt) {
   return results;
 }
 async function parseFontsFromTemplate(nuxt, options) {
-  const cacheKey = `${options.convertedWoff2Files.size}:${[...options.convertedWoff2Files.keys()].toSorted().join(",")}`;
+  const weightsKey = options.requiredWeights?.toSorted((a, b) => a - b).join(",") || "";
+  const cacheKey = `${options.convertedWoff2Files.size}:${[...options.convertedWoff2Files.keys()].toSorted().join(",")}:${weightsKey}`;
   const cache = nuxt._ogImageParsedFontsCache ||= /* @__PURE__ */ new Map();
   const cached = cache.get(cacheKey);
   if (cached)
@@ -1783,6 +1787,25 @@ async function parseFontsFromTemplate(nuxt, options) {
       expandedFonts.push({ ...template, weight });
     existingKeys.add(key);
   }
+  if (options.requiredWeights && options.requiredWeights.length > 0) {
+    const variableFonts = expandedFonts.filter((f) => f.weightRange);
+    for (const varFont of variableFonts) {
+      const [min, max] = varFont.weightRange;
+      for (const w of options.requiredWeights) {
+        if (w < min || w > max)
+          continue;
+        const expandKey = `${varFont.family}-${w}-${varFont.style}`;
+        if (existingKeys.has(expandKey))
+          continue;
+        const templates2 = expandedFonts.filter(
+          (f) => f.family === varFont.family && f.style === varFont.style
+        );
+        for (const template of templates2)
+          expandedFonts.push({ ...template, weight: w });
+        existingKeys.add(expandKey);
+      }
+    }
+  }
   const defaultUnicodeRange = "U+0-FF, U+131, U+152-153, U+2BB-2BC, U+2C6, U+2DA, U+2DC, U+304, U+308, U+329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD";
   const result = expandedFonts.map((font) => {
     const fKey = `${font.family}-${font.weight}-${font.style}`;
@@ -2108,7 +2131,7 @@ async function resolveMissingFontFamilies(options) {
 async function resolveOgImageFonts(options) {
   const { nuxt, hasNuxtFonts, hasSatoriRenderer, hasTakumiRenderer, convertedWoff2Files, fontSubsets, fontRequirements, tw4FontVars, logger, ogFontsDir } = options;
   const staticInterFonts = getStaticInterFonts(ogFontsDir);
-  const allFonts = hasNuxtFonts ? await parseFontsFromTemplate(nuxt, { convertedWoff2Files }) : [];
+  const allFonts = hasNuxtFonts ? await parseFontsFromTemplate(nuxt, { convertedWoff2Files, requiredWeights: fontRequirements.weights }) : [];
   const detectedSubsets = extractSubsetNames(allFonts);
   const effectiveSubsets = detectedSubsets.length > 0 ? detectedSubsets : fontSubsets || ["latin"];
   const appCssFonts = await parseAppCssFontFaces(nuxt).catch(() => []);
@@ -2148,7 +2171,7 @@ async function resolveOgImageFonts(options) {
     }
   }
   const nuxtFontFamilies = new Set(
-    hasNuxtFonts ? (await parseFontsFromTemplate(nuxt, { convertedWoff2Files })).map((f) => f.family) : []
+    hasNuxtFonts ? (await parseFontsFromTemplate(nuxt, { convertedWoff2Files, requiredWeights: fontRequirements.weights })).map((f) => f.family) : []
   );
   const fonts = !fontRequirements.hasDynamicBindings ? allFonts.filter(
     (f) => nuxtFontFamilies.has(f.family) ? fontRequirements.styles.includes(f.style) : matchesFontRequirements(f, fontRequirements)
@@ -3652,7 +3675,7 @@ async function onInstall(nuxt) {
     const installedProviders2 = await getInstalledProviders();
     if (installedProviders2.length === 0) {
       throw new Error(
-        "[nuxt-og-image] No OG image provider dependencies found. Install a provider before running in CI:\n  npm add @resvg/resvg-js satori yoga-wasm-web  # for satori\n  npm add @playwright/core                      # for browser\nSee: https://nuxtseo.com/og-image/getting-started"
+        "[nuxt-og-image] No OG image provider dependencies found. Install a provider before running in CI:\n  npm add @resvg/resvg-js satori yoga-wasm-web  # for satori\n  npm add playwright-core                       # for browser\nSee: https://nuxtseo.com/og-image/getting-started"
       );
     }
     return;
@@ -4143,7 +4166,7 @@ const module$1 = kit.defineNuxtModule({
     await onUpgrade(nuxt, options, previousVersion);
   },
   async setup(config, nuxt) {
-    const _resolver = kit.createResolver((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/nuxt-og-image.PUNoqZDW.cjs', document.baseURI).href)));
+    const _resolver = kit.createResolver((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/nuxt-og-image.CW0bAY2T.cjs', document.baseURI).href)));
     const fixSharedPath = (p) => {
       if (p.includes("/shared/runtime/"))
         return p.replace("/shared/runtime/", "/runtime/");
@@ -4465,7 +4488,8 @@ ${familyInfo}`);
         runtime: {
           browser: false,
           // should already be false
-          satori: false
+          satori: false,
+          takumi: false
         }
       });
       if (!nuxt.options.dev) {
@@ -4723,7 +4747,7 @@ ${familyInfo}`);
       }
     }
     await loadSfcCompiler();
-    nuxt.hook("components:extend", (components) => {
+    nuxt.hook("components:extend", async (components) => {
       allNuxtComponents = components;
       ogImageComponentCtx.components = [];
       const invalidComponents = [];
@@ -4825,7 +4849,7 @@ Run: npx nuxt-og-image migrate v6`;
           throw new Error(message);
         }
       }
-      nuxt.hooks.hook("nuxt-og-image:components", ogImageComponentCtx);
+      await nuxt.hooks.callHook("nuxt-og-image:components", ogImageComponentCtx);
     });
     kit.addTemplate({
       filename: "nuxt-og-image/components.mjs",
@@ -4905,7 +4929,7 @@ export const resolve = (import.meta.dev || import.meta.prerender) ? devResolve :
       return `export default ${JSON.stringify(fonts)}`;
     };
     nuxt.options.nitro.virtual["#og-image/fonts-available"] = async () => {
-      const fonts = hasNuxtFonts ? await parseFontsFromTemplate(nuxt, { convertedWoff2Files }) : [];
+      const fonts = hasNuxtFonts ? await parseFontsFromTemplate(nuxt, { convertedWoff2Files, requiredWeights: fontRequirementsState.weights }) : [];
       return `export default ${JSON.stringify(fonts)}`;
     };
     nuxt.options.nitro.virtual["#og-image/font-requirements"] = async () => {

package/dist/shared/{nuxt-og-image.CYm-mAcA.mjs → nuxt-og-image.JSCwEibR.mjs}

@@ -440,7 +440,7 @@ function patchWebAssemblyInstantiate(code) {
 const PROVIDER_DEPENDENCIES = [
   {
     name: "satori",
-    description: "SVG-based renderer using Satori (default)",
+    description: "SVG-based renderer using Satori",
     bindings: {
       "node": [
         { name: "satori", description: "HTML to SVG renderer" },
@@ -458,7 +458,7 @@ const PROVIDER_DEPENDENCIES = [
   },
   {
     name: "takumi",
-    description: "Rust-based high-performance renderer",
+    description: "Rust-based high-performance renderer (recommended)",
     bindings: {
       "node": [
         { name: "@takumi-rs/core", description: "Native Takumi renderer" }
@@ -577,9 +577,9 @@ async function promptForRendererSelection() {
   const renderer = await logger.prompt("Which renderer would you like to use?", {
     type: "select",
     options: PROVIDER_DEPENDENCIES.map((p) => p.name),
-    initial: "satori"
+    initial: "takumi"
   });
-  return renderer || "satori";
+  return renderer || "takumi";
 }
 async function validateProviderSetup(renderer, compatibility) {
   const issues = [];
@@ -1600,9 +1600,11 @@ async function extractFontFacesSimple(css) {
   return fonts.map((font) => {
     const urlSource = font.sources.find((s) => s.type === "url");
     let weight;
+    let weightRange;
     if (Array.isArray(font.weight)) {
       const [min, max] = font.weight;
       weight = min <= 400 && max >= 400 ? 400 : min;
+      weightRange = [min, max];
     } else {
       weight = font.weight;
     }
@@ -1613,7 +1615,8 @@ async function extractFontFacesSimple(css) {
       weight,
       style: font.style,
       unicodeRange: font.unicodeRange,
-      isWoff2: src.endsWith(".woff2")
+      isWoff2: src.endsWith(".woff2"),
+      weightRange
     };
   }).filter((f) => f.src);
 }
@@ -1723,7 +1726,8 @@ async function parseAppCssFontFaces(nuxt) {
   return results;
 }
 async function parseFontsFromTemplate(nuxt, options) {
-  const cacheKey = `${options.convertedWoff2Files.size}:${[...options.convertedWoff2Files.keys()].toSorted().join(",")}`;
+  const weightsKey = options.requiredWeights?.toSorted((a, b) => a - b).join(",") || "";
+  const cacheKey = `${options.convertedWoff2Files.size}:${[...options.convertedWoff2Files.keys()].toSorted().join(",")}:${weightsKey}`;
   const cache = nuxt._ogImageParsedFontsCache ||= /* @__PURE__ */ new Map();
   const cached = cache.get(cacheKey);
   if (cached)
@@ -1763,6 +1767,25 @@ async function parseFontsFromTemplate(nuxt, options) {
       expandedFonts.push({ ...template, weight });
     existingKeys.add(key);
   }
+  if (options.requiredWeights && options.requiredWeights.length > 0) {
+    const variableFonts = expandedFonts.filter((f) => f.weightRange);
+    for (const varFont of variableFonts) {
+      const [min, max] = varFont.weightRange;
+      for (const w of options.requiredWeights) {
+        if (w < min || w > max)
+          continue;
+        const expandKey = `${varFont.family}-${w}-${varFont.style}`;
+        if (existingKeys.has(expandKey))
+          continue;
+        const templates2 = expandedFonts.filter(
+          (f) => f.family === varFont.family && f.style === varFont.style
+        );
+        for (const template of templates2)
+          expandedFonts.push({ ...template, weight: w });
+        existingKeys.add(expandKey);
+      }
+    }
+  }
   const defaultUnicodeRange = "U+0-FF, U+131, U+152-153, U+2BB-2BC, U+2C6, U+2DA, U+2DC, U+304, U+308, U+329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD";
   const result = expandedFonts.map((font) => {
     const fKey = `${font.family}-${font.weight}-${font.style}`;
@@ -2088,7 +2111,7 @@ async function resolveMissingFontFamilies(options) {
 async function resolveOgImageFonts(options) {
   const { nuxt, hasNuxtFonts, hasSatoriRenderer, hasTakumiRenderer, convertedWoff2Files, fontSubsets, fontRequirements, tw4FontVars, logger, ogFontsDir } = options;
   const staticInterFonts = getStaticInterFonts(ogFontsDir);
-  const allFonts = hasNuxtFonts ? await parseFontsFromTemplate(nuxt, { convertedWoff2Files }) : [];
+  const allFonts = hasNuxtFonts ? await parseFontsFromTemplate(nuxt, { convertedWoff2Files, requiredWeights: fontRequirements.weights }) : [];
   const detectedSubsets = extractSubsetNames(allFonts);
   const effectiveSubsets = detectedSubsets.length > 0 ? detectedSubsets : fontSubsets || ["latin"];
   const appCssFonts = await parseAppCssFontFaces(nuxt).catch(() => []);
@@ -2128,7 +2151,7 @@ async function resolveOgImageFonts(options) {
     }
   }
   const nuxtFontFamilies = new Set(
-    hasNuxtFonts ? (await parseFontsFromTemplate(nuxt, { convertedWoff2Files })).map((f) => f.family) : []
+    hasNuxtFonts ? (await parseFontsFromTemplate(nuxt, { convertedWoff2Files, requiredWeights: fontRequirements.weights })).map((f) => f.family) : []
   );
   const fonts = !fontRequirements.hasDynamicBindings ? allFonts.filter(
     (f) => nuxtFontFamilies.has(f.family) ? fontRequirements.styles.includes(f.style) : matchesFontRequirements(f, fontRequirements)
@@ -3632,7 +3655,7 @@ async function onInstall(nuxt) {
     const installedProviders2 = await getInstalledProviders();
     if (installedProviders2.length === 0) {
       throw new Error(
-        "[nuxt-og-image] No OG image provider dependencies found. Install a provider before running in CI:\n  npm add @resvg/resvg-js satori yoga-wasm-web  # for satori\n  npm add @playwright/core                      # for browser\nSee: https://nuxtseo.com/og-image/getting-started"
+        "[nuxt-og-image] No OG image provider dependencies found. Install a provider before running in CI:\n  npm add @resvg/resvg-js satori yoga-wasm-web  # for satori\n  npm add playwright-core                       # for browser\nSee: https://nuxtseo.com/og-image/getting-started"
       );
     }
     return;
@@ -4445,7 +4468,8 @@ ${familyInfo}`);
         runtime: {
           browser: false,
           // should already be false
-          satori: false
+          satori: false,
+          takumi: false
         }
       });
       if (!nuxt.options.dev) {
@@ -4703,7 +4727,7 @@ ${familyInfo}`);
       }
     }
     await loadSfcCompiler();
-    nuxt.hook("components:extend", (components) => {
+    nuxt.hook("components:extend", async (components) => {
       allNuxtComponents = components;
       ogImageComponentCtx.components = [];
       const invalidComponents = [];
@@ -4805,7 +4829,7 @@ Run: npx nuxt-og-image migrate v6`;
           throw new Error(message);
         }
       }
-      nuxt.hooks.hook("nuxt-og-image:components", ogImageComponentCtx);
+      await nuxt.hooks.callHook("nuxt-og-image:components", ogImageComponentCtx);
     });
     addTemplate({
       filename: "nuxt-og-image/components.mjs",
@@ -4885,7 +4909,7 @@ export const resolve = (import.meta.dev || import.meta.prerender) ? devResolve :
       return `export default ${JSON.stringify(fonts)}`;
     };
     nuxt.options.nitro.virtual["#og-image/fonts-available"] = async () => {
-      const fonts = hasNuxtFonts ? await parseFontsFromTemplate(nuxt, { convertedWoff2Files }) : [];
+      const fonts = hasNuxtFonts ? await parseFontsFromTemplate(nuxt, { convertedWoff2Files, requiredWeights: fontRequirementsState.weights }) : [];
       return `export default ${JSON.stringify(fonts)}`;
     };
     nuxt.options.nitro.virtual["#og-image/font-requirements"] = async () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-og-image",
   "type": "module",
-  "version": "6.3.2",
+  "version": "6.3.3",
   "description": "Enlightened OG Image generation for Nuxt.",
   "author": {
     "website": "https://harlanzw.com",
@@ -94,42 +94,40 @@
     }
   },
   "dependencies": {
-    "@clack/prompts": "^1.1.0",
-    "@nuxt/devtools-kit": "^3.2.4",
+    "@clack/prompts": "^1.2.0",
     "@nuxt/kit": "^4.4.2",
-    "@vue/compiler-sfc": "^3.5.31",
+    "@vue/compiler-sfc": "^3.5.32",
     "chrome-launcher": "^1.2.1",
     "consola": "^3.4.2",
     "culori": "^4.0.2",
-    "defu": "^6.1.4",
-    "devalue": "^5.6.4",
+    "defu": "^6.1.7",
+    "devalue": "^5.7.0",
     "exsolve": "^1.0.8",
     "lightningcss": "^1.32.0",
     "magic-string": "^0.30.21",
     "magicast": "^0.5.2",
     "mocked-exports": "^0.1.1",
     "nuxt-site-config": "^4.0.7",
-    "nuxtseo-layer-devtools": "^5.0.2",
-    "nuxtseo-shared": "^5.0.2",
+    "nuxtseo-shared": "^5.1.1",
     "nypm": "^0.6.5",
     "ofetch": "^1.5.1",
     "ohash": "^2.0.11",
-    "oxc-parser": "^0.121.0",
+    "oxc-parser": "^0.124.0",
     "oxc-walker": "^0.7.0",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.0",
     "radix3": "^1.1.2",
-    "sirv": "^3.0.2",
     "std-env": "^4.0.0",
     "strip-literal": "^3.1.0",
-    "tinyexec": "^1.0.4",
+    "tinyexec": "^1.1.1",
     "tinyglobby": "^0.2.15",
     "ufo": "^1.6.3",
     "ultrahtml": "^1.6.0",
     "unplugin": "^3.0.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^7.7.3",
+    "@antfu/eslint-config": "^8.0.0",
+    "@fontsource/noto-sans-sc": "^5.2.9",
     "@iconify-json/carbon": "^1.2.20",
     "@iconify-json/logos": "^1.2.11",
     "@iconify-json/noto": "^1.2.7",
@@ -138,12 +136,13 @@
     "@img/sharp-linux-x64": "^0.34.5",
     "@nuxt/content": "^3.12.0",
     "@nuxt/devtools": "^3.2.4",
+    "@nuxt/devtools-kit": "^3.2.4",
     "@nuxt/fonts": "^0.14.0",
     "@nuxt/icon": "^2.2.1",
     "@nuxt/image": "^2.0.0",
     "@nuxt/module-builder": "^1.0.2",
     "@nuxt/test-utils": "^4.0.0",
-    "@nuxt/ui": "^4.6.0",
+    "@nuxt/ui": "^4.6.1",
     "@nuxtjs/color-mode": "^4.0.0",
     "@nuxtjs/eslint-config-typescript": "^12.1.0",
     "@nuxtjs/i18n": "^10.2.4",
@@ -160,7 +159,7 @@
     "@vueuse/nuxt": "^14.2.1",
     "birpc": "^4.0.0",
     "bumpp": "^11.0.1",
-    "eslint": "^10.1.0",
+    "eslint": "^10.2.0",
     "eslint-plugin-harlanzw": "^0.12.0",
     "fontless": "^0.2.1",
     "get-image-colors": "^4.0.1",
@@ -169,18 +168,20 @@
     "jest-image-snapshot": "^6.5.2",
     "lightningcss": "^1.32.0",
     "nuxt": "^4.4.2",
-    "playwright": "^1.58.2",
-    "playwright-core": "^1.58.2",
-    "sass": "^1.98.0",
+    "nuxtseo-layer-devtools": "^5.1.1",
+    "playwright": "^1.59.1",
+    "playwright-core": "^1.59.1",
+    "sass": "^1.99.0",
     "satori": "^0.26.0",
     "sharp": "^0.34.5",
+    "sirv": "^3.0.2",
     "tailwindcss": "^4.2.2",
     "typescript": "^6.0.2",
     "unifont": "^0.7.4",
     "unocss": "^66.6.7",
-    "vitest": "^4.1.2",
+    "vitest": "^4.1.3",
     "vue-tsc": "^3.2.6",
-    "wrangler": "^4.78.0",
+    "wrangler": "^4.80.0",
     "yoga-wasm-web": "^0.3.3"
   },
   "scripts": {