nuxt-og-image 6.7.6 → 6.7.7

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.BIbfn5xQ.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.BMHzg1Vz.mjs';
 import 'node:crypto';
 import 'node:fs';
 import '@nuxt/kit';

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.BIbfn5xQ.mjs';
-export { j as importResolvedModule, k as resolveOptionalModulePath } from '../shared/nuxt-og-image.BIbfn5xQ.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.BMHzg1Vz.mjs';
+export { j as importResolvedModule, k as resolveOptionalModulePath } from '../shared/nuxt-og-image.BMHzg1Vz.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'node:url';

package/dist/module.d.ts

@@ -215,5 +215,5 @@ interface ModuleHooks {
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;
 
-export = _default;
+export { _default as default };
 export type { ModuleHooks, ModuleOptions };

package/dist/module.json

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

package/dist/module.mjs

@@ -10,7 +10,7 @@ import 'nuxtseo-shared/kit';
 import 'pathe';
 import 'pkg-types';
 import 'std-env';
-export { n as default } from './shared/nuxt-og-image.BIbfn5xQ.mjs';
+export { n as default } from './shared/nuxt-og-image.BMHzg1Vz.mjs';
 import '../dist/runtime/logger.js';
 import 'oxc-walker';
 import 'chrome-launcher';

package/dist/runtime/server/og-image/bindings/font-assets/dev-prerender.js

@@ -2,8 +2,8 @@ import { readFile } from "node:fs/promises";
 import { join } from "pathe";
 import { withBase } from "ufo";
 import { getRequestURL } from "#nuxtseo/h3";
-import { useRuntimeConfig } from "#nuxtseo/nitro";
-import { buildDir, rootDir } from "#og-image-virtual/build-dir.mjs";
+import { fetchWithEvent, useRuntimeConfig } from "#nuxtseo/nitro";
+import { buildDir, rootDir, staticFontCacheDir } from "#og-image-virtual/build-dir.mjs";
 import { getSiteConfig } from "#site-config/server/composables";
 import { getFetchTimeout } from "../../../util/fetchTimeout.js";
 import { fetchWithRedirectValidation } from "../../../util/ssrf.js";
@@ -43,7 +43,7 @@ export async function resolve(event, font) {
   if (import.meta.prerender) {
     if (path.startsWith("/_og-static-fonts/")) {
       const filename2 = path.slice("/_og-static-fonts/".length);
-      const cached = await readOptionalFile(join(buildDir, "cache", "og-image", "fonts-ttf", filename2)) || await readOptionalFile(join(rootDir, ".output", "public", "_og-static-fonts", filename2));
+      const cached = await readOptionalFile(join(staticFontCacheDir, filename2)) || await readOptionalFile(join(rootDir, ".output", "public", "_og-static-fonts", filename2));
       if (cached?.length)
         return cached;
     }
@@ -67,7 +67,7 @@ export async function resolve(event, font) {
   }
   if (path.startsWith("/_og-static-fonts/")) {
     const filename = path.slice("/_og-static-fonts/".length);
-    const cached = await readOptionalFile(join(buildDir, "cache", "og-image", "fonts-ttf", filename));
+    const cached = await readOptionalFile(join(staticFontCacheDir, filename));
     if (cached?.length)
       return cached;
   }
@@ -99,8 +99,7 @@ export async function resolve(event, font) {
     }
   }
   const fullPath = withBase(path, app.baseURL);
-  const fetchArrayBuffer = event.$fetch;
-  const arrayBuffer = await fetchArrayBuffer(fullPath, {
+  const arrayBuffer = await fetchWithEvent(event, fullPath, {
     responseType: "arrayBuffer",
     timeout
   });

package/dist/runtime/server/og-image/bindings/font-assets/node.d.ts

@@ -1,3 +1,3 @@
 import type { H3Event } from '#nuxtseo/h3';
 import type { FontConfig } from '../../../../types.js';
-export declare function resolve(event: H3Event, font: FontConfig): Promise<Buffer<ArrayBufferLike>>;
+export declare function resolve(event: H3Event, font: FontConfig): Promise<Buffer<any>>;

package/dist/runtime/server/og-image/bindings/font-assets/node.js

@@ -1,5 +1,5 @@
 import { withBase } from "ufo";
-import { useRuntimeConfig } from "#nuxtseo/nitro";
+import { fetchWithEvent, useRuntimeConfig } from "#nuxtseo/nitro";
 import { getNitroOrigin, getSiteConfig } from "#site-config/server/composables";
 import { getFetchTimeout } from "../../../util/fetchTimeout.js";
 import { fetchWithRedirectValidation } from "../../../util/ssrf.js";
@@ -21,8 +21,7 @@ export async function resolve(event, font) {
   if (ab) {
     return Buffer.from(ab);
   }
-  const fetchArrayBuffer = event.$fetch;
-  const arrayBuffer = await fetchArrayBuffer(fullPath, {
+  const arrayBuffer = await fetchWithEvent(event, fullPath, {
     responseType: "arrayBuffer",
     timeout
   });

package/dist/runtime/server/og-image/browser/screenshot.js

@@ -1,5 +1,6 @@
 import { withQuery } from "ufo";
 import { toValue } from "vue";
+import { fetchWithEvent } from "#nuxtseo/nitro";
 import { getNitroOrigin } from "#site-config/server/composables";
 import { buildOgImageUrl } from "../../../shared.js";
 import { getFetchTimeout } from "../../util/fetchTimeout.js";
@@ -77,7 +78,7 @@ export async function createScreenshot({ basePath, e, options, extension, timing
       logger.warn("The `html` option is deprecated and will be removed in the next major version. Use a Vue component instead.");
     }
     if (import.meta.prerender && !options.html) {
-      options.html = await timings.measure("html-fetch", () => e.$fetch(path, { timeout: getFetchTimeout(runtimeConfig) }).catch((err) => {
+      options.html = await timings.measure("html-fetch", () => fetchWithEvent(e, path, { timeout: getFetchTimeout(runtimeConfig) }).catch((err) => {
         void err;
         return void 0;
       }));

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

@@ -3,24 +3,15 @@ export declare function fontFormat(src: string): FontFormat;
 /**
  * Pick the src to actually load for a parsed font entry.
  *
- * - When `preferStatic` is set (takumi), prefers the full static satoriSrc over a subset WOFF2
- *   primary src. @nuxt/fonts CSS often ships only the latin subset for a family, so using the
- *   subset would hide non-latin glyphs (devanagari, CJK) the static file covers.
- * - Variable fonts (entries carrying `weightRange`) are an exception: the per-weight static
- *   `satoriSrc` would discard the wght axis, leaving the runtime to stair-step requested
- *   weights through whatever weights fontless happened to download (e.g. requested 400 maps
- *   to the closest available static, often 100 or 700, with a hard jump in the middle).
- *   Keep the variable WOFF2 primary src so takumi can vary the axis at render time.
- * - Otherwise, uses the primary src when the renderer can parse its format, falling back to
- *   satoriSrc as a static alternative when the primary format is unsupported (satori + WOFF2).
+ * Uses the primary source when the renderer supports it, preserving WOFF2
+ * subsets and variable axes for Takumi. Otherwise it uses the Satori fallback.
  *
  * Returns null when no src on this entry can be parsed by the renderer.
  */
 export declare function selectFontSource(f: {
     src: string;
     satoriSrc?: string;
-    weightRange?: [number, number];
-}, supportedFormats: Set<FontFormat>, preferStatic: boolean): {
+}, supportedFormats: Set<FontFormat>): {
     src: string;
     isStaticFallback: boolean;
 } | null;

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

@@ -7,12 +7,9 @@ export function fontFormat(src) {
     return "otf";
   return "ttf";
 }
-export function selectFontSource(f, supportedFormats, preferStatic) {
+export function selectFontSource(f, supportedFormats) {
   const primarySupported = supportedFormats.has(fontFormat(f.src));
   const satoriSupported = !!(f.satoriSrc && supportedFormats.has(fontFormat(f.satoriSrc)));
-  const isVariable = !!f.weightRange;
-  if (preferStatic && !isVariable && satoriSupported && f.satoriSrc !== f.src)
-    return { src: f.satoriSrc, isStaticFallback: true };
   if (primarySupported)
     return { src: f.src, isStaticFallback: false };
   if (satoriSupported)

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

@@ -16,13 +16,6 @@ export interface LoadFontsOptions {
     fontFamilyOverride?: string;
     /** Codepoints present in the template — fonts whose unicodeRange doesn't intersect are skipped */
     codepoints?: Set<number>;
-    /**
-     * Prefer the static satoriSrc (full TTF/WOFF from fontless) over the primary src
-     * (subset WOFF2 from @nuxt/fonts) when both are usable. Takumi uses this so non-Latin
-     * glyphs (devanagari, CJK, etc.) render — @nuxt/fonts CSS often only ships latin
-     * subsets for a family, but the fontless static file contains the full glyph set.
-     */
-    preferStatic?: boolean;
 }
 export declare function loadAllFontsDebug(component?: string): {
     component: string | undefined;

package/dist/runtime/server/og-image/fonts.js

@@ -97,7 +97,7 @@ export async function loadAllFonts(event, options) {
   }
   const resolved = [];
   for (const f of fonts) {
-    const selection = selectFontSource(f, options.supportedFormats, options.preferStatic ?? false);
+    const selection = selectFontSource(f, options.supportedFormats);
     if (selection)
       resolved.push({ font: f, ...selection });
   }

package/dist/runtime/server/og-image/takumi/renderer.js

@@ -187,7 +187,7 @@ async function createImage(event, format) {
   const { fontFamilyOverride, defaultFont } = getDefaultFontFamily(options);
   const nodes = await createTakumiNodes(event);
   const codepoints = extractCodepoints(nodes);
-  const fonts = await timings.measure("font-load", () => loadFontsForRenderer(event, { supportedFormats: /* @__PURE__ */ new Set(["ttf", "woff2"]), preferStatic: true, component: options.component, fontFamilyOverride: fontFamilyOverride || defaultFont, codepoints }));
+  const fonts = await timings.measure("font-load", () => loadFontsForRenderer(event, { supportedFormats: /* @__PURE__ */ new Set(["ttf", "woff2"]), component: options.component, fontFamilyOverride: fontFamilyOverride || defaultFont, codepoints }));
   const fontEntries = dedupeFontsByBinary(fonts);
   const hookTimeout = event.runtimeConfig.security?.renderTimeout ?? 15e3;
   await withTimeout(
@@ -293,7 +293,7 @@ const TakumiRenderer = {
   async debug(e) {
     const [vnodes, fonts] = await Promise.all([
       createTakumiNodes(e),
-      loadFontsForRenderer(e, { supportedFormats: /* @__PURE__ */ new Set(["ttf", "woff2"]), preferStatic: true, component: e.options.component })
+      loadFontsForRenderer(e, { supportedFormats: /* @__PURE__ */ new Set(["ttf", "woff2"]), component: e.options.component })
     ]);
     return {
       vnodes,

package/dist/runtime/server/routes/resolve.js

@@ -1,5 +1,6 @@
 import { parseURL, withLeadingSlash, withQuery } from "ufo";
 import { createError, defineEventHandler, getRequestHost, sendRedirect } from "#nuxtseo/h3";
+import { fetchWithEvent } from "#nuxtseo/nitro";
 import { getSiteConfig } from "#site-config/server/composables/getSiteConfig";
 import { isInternalRoute } from "../../shared.js";
 import { getEventQuery } from "../util/query.js";
@@ -98,7 +99,7 @@ export default defineEventHandler(async (event) => {
       forwardQuery[k] = v;
   }
   const fetchPath = withQuery(withLeadingSlash(targetPath), forwardQuery);
-  const html = await event.$fetch(fetchPath, {
+  const html = await fetchWithEvent(event, fetchPath, {
     headers: { accept: "text/html" },
     responseType: "text"
   }).catch((err) => {

package/dist/runtime/server/util/fetchLocalAsset.d.ts

@@ -14,7 +14,7 @@ export interface FetchLocalAssetOptions {
 /**
  * Resolve a same-origin asset path to bytes, trying (in order):
  *   1. Cloudflare Workers ASSETS binding
- *   2. Nitro localFetch (`event.$fetch`) — resolves dynamic routes too
+ *   2. Nitro localFetch through the event-aware bridge, which resolves dynamic routes too
  *   3. External `$fetch` to the Nitro origin (opt-in)
  *
  * All steps share a single `AbortSignal.timeout(fetchTimeout)` so a broken

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

@@ -1,4 +1,5 @@
 import { $fetch } from "ofetch";
+import { fetchWithEvent } from "#nuxtseo/nitro";
 import { getNitroOrigin } from "#site-config/server/composables";
 import { tryCloudflareAssetsFetch } from "./cloudflareAssets.js";
 export async function fetchLocalAsset(event, path, options) {
@@ -18,7 +19,7 @@ export async function fetchLocalAsset(event, path, options) {
   }));
   if (result || expired)
     return result;
-  result = await race(event.$fetch(path, {
+  result = await race(fetchWithEvent(event, path, {
     responseType: "arrayBuffer",
     signal: deadline,
     timeout: fetchTimeout,

package/dist/runtime/types.d.ts

@@ -214,7 +214,7 @@ export interface FontConfig {
     weight: number;
     style: 'normal' | 'italic';
     src: string;
-    /** TTF path for Satori (converted from WOFF2 if needed). Falls back to src if not set. */
+    /** Static source for renderers that cannot use the primary font. Falls back to src if not set. */
     satoriSrc?: string;
     localPath: string;
     /** Absolute filesystem path for statically bundled fonts. */