nuxt-og-image 6.7.7 → 6.8.0

package/dist/chunks/tw4.mjs

@@ -2,7 +2,7 @@ import { readFile } from 'node:fs/promises';
 import { pathToFileURL } from 'node:url';
 import { resolveModulePath } from 'exsolve';
 import { dirname, join } from 'pathe';
-import { e as extractVariantBaseClasses, r as resolveVariantPrefixes, h as resolveExtractedVars, l as resolveVarsDeep, s as simplifyCss, p as postProcessStyles, m as loadLightningCss, a as extractCssVars, c as extractUniversalVars, d as extractPerClassVars, g as extractVarsFromCss, f as extractClassStyles } from '../shared/nuxt-og-image.BMHzg1Vz.mjs';
+import { e as extractVariantBaseClasses, r as resolveVariantPrefixes, h as resolveExtractedVars, l as resolveVarsDeep, s as simplifyCss, p as postProcessStyles, m as loadLightningCss, a as extractCssVars, c as extractUniversalVars, d as extractPerClassVars, g as extractVarsFromCss, f as extractClassStyles } from '../shared/nuxt-og-image.D936Fp6O.mjs';
 import 'node:crypto';
 import 'node:fs';
 import '@nuxt/kit';
@@ -12,6 +12,7 @@ import 'nuxt-site-config/kit';
 import 'nuxtseo-shared/kit';
 import 'pkg-types';
 import 'std-env';
+import 'magic-string';
 import 'oxc-walker';
 import '../../dist/runtime/logger.js';
 import 'chrome-launcher';
@@ -20,7 +21,6 @@ import 'nuxtseo-shared/devtools';
 import 'unstorage';
 import 'unstorage/drivers/fs-lite';
 import '../../dist/runtime/server/og-image/utils/css.js';
-import 'magic-string';
 import 'strip-literal';
 import 'ufo';
 import 'unplugin';

package/dist/chunks/uno.mjs

@@ -1,8 +1,8 @@
 import { readFile } from 'node:fs/promises';
 import { defu } from 'defu';
 import { logger } from '../../dist/runtime/logger.js';
-import { e as extractVariantBaseClasses, s as simplifyCss, a as extractCssVars, b as extractPropertyInitialValues, c as extractUniversalVars, d as extractPerClassVars, f as extractClassStyles, p as postProcessStyles, r as resolveVariantPrefixes, i as importOptionalPeer, g as extractVarsFromCss, h as resolveExtractedVars } from '../shared/nuxt-og-image.BMHzg1Vz.mjs';
-export { j as importResolvedModule, k as resolveOptionalModulePath } from '../shared/nuxt-og-image.BMHzg1Vz.mjs';
+import { e as extractVariantBaseClasses, s as simplifyCss, a as extractCssVars, b as extractPropertyInitialValues, c as extractUniversalVars, d as extractPerClassVars, f as extractClassStyles, p as postProcessStyles, r as resolveVariantPrefixes, i as importOptionalPeer, g as extractVarsFromCss, h as resolveExtractedVars } from '../shared/nuxt-og-image.D936Fp6O.mjs';
+export { j as importResolvedModule, k as resolveOptionalModulePath } from '../shared/nuxt-og-image.D936Fp6O.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'node:url';
@@ -13,14 +13,15 @@ import 'nuxtseo-shared/kit';
 import 'pathe';
 import 'pkg-types';
 import 'std-env';
+import 'magic-string';
 import 'oxc-walker';
+import 'exsolve';
 import 'chrome-launcher';
 import 'nypm';
 import 'nuxtseo-shared/devtools';
 import 'unstorage';
 import 'unstorage/drivers/fs-lite';
 import '../../dist/runtime/server/og-image/utils/css.js';
-import 'magic-string';
 import 'strip-literal';
 import 'ufo';
 import 'unplugin';
@@ -28,7 +29,6 @@ import '@vue/compiler-sfc';
 import 'ofetch';
 import 'ultrahtml';
 import '../../dist/runtime/server/og-image/core/transforms/emojis/emoji-utils.js';
-import 'exsolve';
 import '../shared/nuxt-og-image.CJa2KCie.mjs';
 import 'magicast';
 import 'magicast/helpers';

package/dist/cli.mjs

@@ -1211,7 +1211,7 @@ async function runCreate(name, args2) {
       message: "Add defineOgImage to a page? (relative path from pages/, leave empty to skip)",
       placeholder: "index.vue"
     });
-    if (!p.isCancel(pageInput) && pageInput && pageInput.trim()) {
+    if (typeof pageInput === "string" && pageInput.trim()) {
       let pagePath = pageInput.trim();
       if (!pagePath.endsWith(".vue"))
         pagePath += ".vue";

package/dist/devtools/nuxt.config.ts

@@ -1,6 +1,9 @@
+import { fileURLToPath } from 'node:url'
 import { resolve } from 'pathe'
 
+const currentDir = fileURLToPath(new URL('.', import.meta.url))
+
 // Nuxt SEO devtools panel, shipped as a layer (Model C). Components flat-registered.
 export default defineNuxtConfig({
-  components: [{ path: resolve(__dirname, './components'), pathPrefix: false }],
+  components: [{ path: resolve(currentDir, './components'), pathPrefix: false }],
 })

package/dist/module.d.mts

@@ -118,6 +118,16 @@ interface ModuleOptions {
      * @default 60 * 60 * 24 * 3 (3 days)
      */
     cacheMaxAgeSeconds?: number;
+    /**
+     * Include Twitter card meta tags (`twitter:card`, `twitter:image`, etc)
+     * alongside the Open Graph image tags.
+     *
+     * Set to `false` to only emit `og:image` tags. When unset, the module respects
+     * `seo.automaticTwitterTags` (nuxt-seo-kit) before defaulting to `true`.
+     *
+     * @default true
+     */
+    includeTwitter?: boolean;
     /**
      * Font subsets to download when resolving missing font families via fontless.
      *

package/dist/module.d.ts

@@ -118,6 +118,16 @@ interface ModuleOptions {
      * @default 60 * 60 * 24 * 3 (3 days)
      */
     cacheMaxAgeSeconds?: number;
+    /**
+     * Include Twitter card meta tags (`twitter:card`, `twitter:image`, etc)
+     * alongside the Open Graph image tags.
+     *
+     * Set to `false` to only emit `og:image` tags. When unset, the module respects
+     * `seo.automaticTwitterTags` (nuxt-seo-kit) before defaulting to `true`.
+     *
+     * @default true
+     */
+    includeTwitter?: boolean;
     /**
      * Font subsets to download when resolving missing font families via fontless.
      *

package/dist/module.json

@@ -4,7 +4,7 @@
     "nuxt": ">=3.16.0"
   },
   "configKey": "ogImage",
-  "version": "6.7.7",
+  "version": "6.8.0",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -10,16 +10,17 @@ import 'nuxtseo-shared/kit';
 import 'pathe';
 import 'pkg-types';
 import 'std-env';
-export { n as default } from './shared/nuxt-og-image.BMHzg1Vz.mjs';
+export { n as default } from './shared/nuxt-og-image.D936Fp6O.mjs';
 import '../dist/runtime/logger.js';
+import 'magic-string';
 import 'oxc-walker';
+import 'exsolve';
 import 'chrome-launcher';
 import 'nypm';
 import 'nuxtseo-shared/devtools';
 import 'unstorage';
 import 'unstorage/drivers/fs-lite';
 import '../dist/runtime/server/og-image/utils/css.js';
-import 'magic-string';
 import 'strip-literal';
 import 'ufo';
 import 'unplugin';
@@ -27,7 +28,6 @@ import '@vue/compiler-sfc';
 import 'ofetch';
 import 'ultrahtml';
 import '../dist/runtime/server/og-image/core/transforms/emojis/emoji-utils.js';
-import 'exsolve';
 import './shared/nuxt-og-image.CJa2KCie.mjs';
 import 'magicast';
 import 'magicast/helpers';

package/dist/runtime/app/client-utils.js

@@ -63,6 +63,7 @@ export function clientProcessOgImageOptions(input, route, basePath) {
   const baseURL = rc.app.baseURL;
   const publicCfg = rc.public?.["nuxt-og-image"] || {};
   const defaults = publicCfg.defaults || {};
+  const metaOptions = { includeTwitter: publicCfg.includeTwitter };
   const paths = [];
   for (const rawInput of inputs) {
     const resolved = resolveReactiveOptions(rawInput);
@@ -78,13 +79,13 @@ export function clientProcessOgImageOptions(input, route, basePath) {
     const ogKey = validOptions.key || "og";
     if (validOptions.url) {
       const url = validOptions.url;
-      registerClientOgHead(ogKey, { meta: generateMeta(url, validOptions) }, { tagPriority: "high" });
+      registerClientOgHead(ogKey, { meta: generateMeta(url, validOptions, metaOptions) }, { tagPriority: "high" });
       paths.push(url);
       continue;
     }
     if (publicCfg.hasServerRuntime) {
       const finalUrl2 = buildResolverUrl(baseURL, basePath, ogKey, route.query);
-      registerClientOgHead(ogKey, { meta: generateMeta(finalUrl2, validOptions) }, { tagPriority: 35 });
+      registerClientOgHead(ogKey, { meta: generateMeta(finalUrl2, validOptions, metaOptions) }, { tagPriority: 35 });
       paths.push(finalUrl2);
       continue;
     }
@@ -98,7 +99,7 @@ export function clientProcessOgImageOptions(input, route, basePath) {
     const result = buildOgImageUrl(urlOpts, extension, true, defaults, void 0);
     const resolvedUrl = joinURL("/", baseURL, result.url);
     const finalUrl = opts._query && Object.keys(opts._query).length ? withQuery(resolvedUrl, { _query: opts._query }) : resolvedUrl;
-    registerClientOgHead(ogKey, { meta: generateMeta(finalUrl, opts) }, { processTemplateParams: true, tagPriority: 35 });
+    registerClientOgHead(ogKey, { meta: generateMeta(finalUrl, opts, metaOptions) }, { processTemplateParams: true, tagPriority: 35 });
     paths.push(finalUrl);
   }
   return paths;

package/dist/runtime/app/utils.js

@@ -53,7 +53,8 @@ export function setHeadOgImagePrebuilt(input) {
   const url = input.url;
   if (!url)
     return;
-  const meta = generateMeta(url, input);
+  const { includeTwitter } = useOgImageRuntimeConfig();
+  const meta = generateMeta(url, input, { includeTwitter });
   useHead({ meta }, { tagPriority: "high" });
 }
 export function createOgImageMeta(src, input, ssrContext, pagePath, head) {
@@ -117,7 +118,7 @@ export function createOgImageMeta(src, input, ssrContext, pagePath, head) {
             prerenderPaths.set(ogKey, (finalUrl.split("?")[0] || finalUrl).replace(/,/g, "%2C"));
           }
         }
-        return generateMeta(finalUrl, opts);
+        return generateMeta(finalUrl, opts, { includeTwitter: ogImageConfig.includeTwitter });
       });
     }
   }, {

package/dist/runtime/server/og-image/bindings/satori/harfbuzz.d.ts

@@ -0,0 +1,4 @@
+declare const _default: {
+    readonly then: <TResult1 = unknown, TResult2 = never>(onfulfilled?: ((value: unknown) => TResult1 | PromiseLike<TResult1>) | null | undefined, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null | undefined) => Promise<TResult1 | TResult2>;
+};
+export default _default;

package/dist/runtime/server/og-image/bindings/satori/harfbuzz.js

@@ -0,0 +1,33 @@
+import wrapHarfBuzz from "#og-image/harfbuzz-adapter";
+import callbackModules from "#og-image/harfbuzz-callbacks";
+import createHarfBuzz from "#og-image/harfbuzz-factory";
+function loadHarfBuzz() {
+  return import("#og-image/harfbuzz-wasm").then(async ({ default: importedWasm }) => {
+    const wasm = await importedWasm;
+    const callbacks = callbackModules && Object.fromEntries(await Promise.all(
+      Object.entries(callbackModules).map(async ([signature, module]) => [signature, await module])
+    ));
+    return new Promise((resolve, reject) => {
+      createHarfBuzz({
+        ...callbacks && {
+          convertJsFunctionToWasm(callback, signature) {
+            return new WebAssembly.Instance(callbacks[signature], { e: { f: callback } }).exports.f;
+          }
+        },
+        instantiateWasm(imports, receiveInstance) {
+          Promise.resolve().then(() => typeof wasm === "function" ? wasm(imports) : new WebAssembly.Instance(wasm, imports)).then((result) => {
+            receiveInstance("instance" in result ? result.instance : result);
+          }).catch(reject);
+          return {};
+        }
+      }).then(wrapHarfBuzz).then(resolve, reject);
+    });
+  });
+}
+let runtime;
+export default {
+  get then() {
+    const promise = runtime ||= loadHarfBuzz();
+    return promise.then.bind(promise);
+  }
+};

package/dist/runtime/server/og-image/font-subsets.d.ts

@@ -1,20 +1,12 @@
 import type { RuntimeFontConfig } from '../../types.js';
 /**
- * Rename unicode-range subset fonts so renderers can fall back between them.
- *
- * Both Satori and Takumi pick the first loaded font file for a given family
- * name and don't fall back to other font files for missing glyphs. When CJK
- * fonts like "Noto Sans SC" are split into 100+ unicode-range subsets by
- * fontsource, each covering ~200 characters, this means only one subset's
- * glyphs render while the rest show as .notdef boxes.
- *
- * Fix: rename each subset to "Family__N" and use font-family fallback chains
- * so renderers try each subset in order per character.
+ * Give subsets stable names so renderers can fall back between their glyphs.
+ * Renderers cache registrations by name across renders with different filtered subsets.
  */
 export declare function renameSubsetFonts(fonts: RuntimeFontConfig[]): RuntimeFontConfig[];
 /**
  * Build a mapping from original family names to their renamed subset chain.
- * E.g., "Noto Sans SC" → ["Noto Sans SC__0", "Noto Sans SC__1", ...]
+ * E.g., "Noto Sans SC" → ["Noto Sans SC__<hash-a>", "Noto Sans SC__<hash-b>", ...]
  */
 export declare function buildSubsetFamilyChain(fonts: RuntimeFontConfig[]): Map<string, string[]>;
 /**

package/dist/runtime/server/og-image/font-subsets.js

@@ -1,44 +1,67 @@
+import { fnv1a64Base36 } from "fnv1a-64";
 export function renameSubsetFonts(fonts) {
   const groups = /* @__PURE__ */ new Map();
-  for (const f of fonts) {
-    const key = `${f.family}\0${f.weight}\0${f.style}`;
-    const arr = groups.get(key);
-    if (arr)
-      arr.push(f);
+  for (const font of fonts) {
+    const members = groups.get(font.family);
+    if (members)
+      members.push(font);
     else
-      groups.set(key, [f]);
+      groups.set(font.family, [font]);
   }
-  const result = [];
-  let changed = false;
+  const aliases = /* @__PURE__ */ new Map();
   for (const members of groups.values()) {
-    const needsRename = members.length > 1 && new Set(members.map((f) => f.cacheKey)).size > 1;
-    if (!needsRename) {
-      result.push(...members);
-      continue;
+    const faces = /* @__PURE__ */ new Map();
+    for (const font of members) {
+      const face = `${font.weight}\0${font.style}`;
+      const subsets = faces.get(face);
+      if (subsets)
+        subsets.push(font);
+      else
+        faces.set(face, [font]);
     }
-    changed = true;
-    for (let i = 0; i < members.length; i++) {
-      const f = members[i];
-      result.push({
-        ...f,
-        originalFamily: f.originalFamily || f.family,
-        family: `${f.family}__${i}`
+    const needsRename = members.some((font) => font.unicodeRange) || [...faces.values()].some((subsets) => new Set(subsets.map((font) => font.cacheKey)).size > 1);
+    if (!needsRename)
+      continue;
+    const slots = [];
+    for (const subsets of faces.values()) {
+      const binaries = /* @__PURE__ */ new Map();
+      for (const font of subsets) {
+        const source = font.src || font.localPath || font.cacheKey;
+        const entries = binaries.get(source);
+        if (entries)
+          entries.push(font);
+        else
+          binaries.set(source, [font]);
+      }
+      const ordered = [...binaries.values()].sort((a, b) => {
+        const left = `${a[0].unicodeRange || ""}\0${a[0].src || a[0].localPath || a[0].cacheKey}`;
+        const right = `${b[0].unicodeRange || ""}\0${b[0].src || b[0].localPath || b[0].cacheKey}`;
+        return left < right ? -1 : left > right ? 1 : 0;
       });
+      for (const [index, entries] of ordered.entries())
+        (slots[index] ||= []).push(...entries);
+    }
+    for (const slot of slots) {
+      const identities = [...new Set(slot.map((font) => JSON.stringify([
+        font.weight,
+        font.style,
+        font.src || font.localPath || font.cacheKey
+      ])))].sort();
+      const alias = `${slot[0].family}__${fnv1a64Base36(JSON.stringify(identities))}`;
+      for (const font of slot)
+        aliases.set(font, alias);
     }
   }
-  return changed ? result : fonts;
+  return aliases.size ? fonts.map((font) => aliases.has(font) ? { ...font, originalFamily: font.originalFamily || font.family, family: aliases.get(font) } : font) : fonts;
 }
 export function buildSubsetFamilyChain(fonts) {
   const chains = /* @__PURE__ */ new Map();
   for (const f of fonts) {
-    if (!f.originalFamily)
-      continue;
-    const arr = chains.get(f.originalFamily);
-    if (arr)
-      arr.push(f.family);
-    else
-      chains.set(f.originalFamily, [f.family]);
+    if (f.originalFamily)
+      chains.set(f.originalFamily, []);
   }
+  for (const f of fonts)
+    chains.get(f.originalFamily || f.family)?.push(f.family);
   return chains;
 }
 export function resolveSubsetChain(family, chains) {

package/dist/runtime/server/og-image/fonts.d.ts

@@ -51,7 +51,7 @@ export interface LoadFontsForRendererOptions extends LoadFontsOptions {
  *
  * When a font family has multiple unicode-range subsets loaded (e.g., CJK fonts
  * split into many small chunks), renames each subset to a unique family name
- * (e.g., "Noto Sans SC__0", "Noto Sans SC__1") so renderers use font-family
+ * (e.g., "Noto Sans SC__<stable hash per binary>") so renderers use font-family
  * fallback chains for per-character glyph coverage. Without this, both Satori
  * and Takumi pick the first font file and show .notdef for characters in other subsets.
  */

package/dist/runtime/server/util/eventHandlers.js

@@ -1,4 +1,4 @@
-import { createError, getRequestHost, H3Error, setHeader } from "#nuxtseo/h3";
+import { appendResponseHeader, createError, getRequestHost, H3Error, setHeader } from "#nuxtseo/h3";
 import { getSiteConfig } from "#site-config/server/composables/getSiteConfig";
 import { logger } from "../../logger.js";
 import { getBuildCachedImage, setBuildCachedImage } from "../og-image/cache/buildCache.js";
@@ -22,8 +22,8 @@ export async function imageEventHandler(e) {
   } finally {
     timings.record("total", performance.now() - reqStart);
     const header = timings.header();
-    if (header)
-      setHeader(e, "Server-Timing", header);
+    if (header && !e.node?.res?.headersSent)
+      appendResponseHeader(e, "Server-Timing", header);
   }
 }
 async function renderOgImage(e, ctx) {

package/dist/runtime/shared/urlEncoding.js

@@ -18,6 +18,7 @@ const RE_HASH_SEGMENT = /^o_([a-z0-9]+)$/i;
 const RE_COMMA_PARAM_SEPARATOR = /,(?=\w+_)/;
 const RE_SIGNATURE_SUFFIX = /,s_[^,]+$/;
 const RE_NON_ASCII = /[^\u0000-\u007F]/;
+const RE_WINDOWS_RESERVED_FILENAME_CHARACTERS = /[<>:"/\\|?*\u0000-\u001F]/;
 const PARAM_ALIASES = {
   w: "width",
   h: "height",
@@ -149,7 +150,7 @@ export function encodeOgImageParams(options, defaults) {
       } else {
         const escaped = str.startsWith("~") ? `~${str}` : str;
         const encoded = encodeURIComponent(escaped.replace(RE_UNDERSCORE, "__")).replace(RE_PERCENT20, "+");
-        if (encoded.includes("%")) {
+        if (encoded.includes("%") || RE_WINDOWS_RESERVED_FILENAME_CHARACTERS.test(str)) {
           parts.push(`${alias}_~${b64Encode(str)}`);
         } else {
           parts.push(`${alias}_${encoded}`);

package/dist/runtime/shared.d.ts

@@ -2,7 +2,16 @@ import type { ResolvableMeta } from '@unhead/vue';
 import type { OgImageOptions, OgImagePrebuilt } from './types.js';
 export { extractSocialPreviewTags, toBase64Image } from './pure.js';
 export { buildOgImageUrl, decodeOgImageParams, encodeOgImageParams, extractEncodedSegment, hashOgImageOptions, parseOgImageUrl, signEncodedParams, verifyOgImageSignature } from './shared/urlEncoding.js';
-export declare function generateMeta(url: OgImagePrebuilt['url'] | string, resolvedOptions: OgImageOptions | OgImagePrebuilt): ResolvableMeta[];
+export interface GenerateMetaOptions {
+    /**
+     * Emit Twitter card meta tags (`twitter:card`, `twitter:image`, etc) alongside
+     * the Open Graph image tags.
+     *
+     * @default true
+     */
+    includeTwitter?: boolean;
+}
+export declare function generateMeta(url: OgImagePrebuilt['url'] | string, resolvedOptions: OgImageOptions | OgImagePrebuilt, metaOptions?: GenerateMetaOptions): ResolvableMeta[];
 export declare function isInternalRoute(path: string): boolean;
 export declare function separateProps(options: OgImageOptions | undefined, ignoreKeys?: string[]): OgImageOptions;
 /**

package/dist/runtime/shared.js

@@ -3,10 +3,10 @@ import { toValue } from "vue";
 export { extractSocialPreviewTags, toBase64Image } from "./pure.js";
 export { buildOgImageUrl, decodeOgImageParams, encodeOgImageParams, extractEncodedSegment, hashOgImageOptions, parseOgImageUrl, signEncodedParams, verifyOgImageSignature } from "./shared/urlEncoding.js";
 const RE_KEBAB_CASE = /-([a-z])/g;
-export function generateMeta(url, resolvedOptions) {
+export function generateMeta(url, resolvedOptions, metaOptions = {}) {
   const key = resolvedOptions.key || "og";
   const isTwitterOnly = key === "twitter";
-  const includeTwitter = key === "og" || key === "twitter";
+  const includeTwitter = (key === "og" || key === "twitter") && metaOptions.includeTwitter !== false;
   const meta = [];
   if (includeTwitter) {
     meta.push({ name: "twitter:card", content: "summary_large_image" });

package/dist/runtime/types.d.ts

@@ -37,6 +37,8 @@ export interface OgImageRuntimeConfig {
     publicStoragePath: string;
     defaults: Omit<OgImageOptions, 'component' | 'renderer' | 'props' | 'url' | 'html' | 'key' | 'cacheKey' | '_query' | '_hash' | 'socialPreview'>;
     debug: boolean;
+    /** Whether twitter:* meta tags are emitted alongside og:image tags */
+    includeTwitter: boolean;
     baseCacheKey: string;
     hasNuxtIcon: boolean;
     hasNuxtContent?: boolean;