nuxt-og-image 6.7.4 → 6.7.6

package/dist/chunks/tw4.cjs

@@ -4,17 +4,17 @@ const promises = require('node:fs/promises');
 const node_url = require('node:url');
 const exsolve = require('exsolve');
 const pathe = require('pathe');
-const module$1 = require('../shared/nuxt-og-image.BRBtdkUp.cjs');
+const module$1 = require('../shared/nuxt-og-image.CdpC3njh.cjs');
 require('node:crypto');
 require('node:fs');
 require('@nuxt/kit');
 require('defu');
 require('fnv1a-64');
 require('nuxt-site-config/kit');
+require('nuxtseo-shared/kit');
 require('pkg-types');
 require('std-env');
 require('oxc-walker');
-require('nuxtseo-shared/kit');
 require('../../dist/runtime/logger.js');
 require('chrome-launcher');
 require('nypm');

package/dist/chunks/tw4.mjs

@@ -2,17 +2,17 @@ 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, i as resolveVarsDeep, s as simplifyCss, p as postProcessStyles, l as loadLightningCss, a as extractCssVars, c as extractUniversalVars, d as extractPerClassVars, g as extractVarsFromCss, f as extractClassStyles } from '../shared/nuxt-og-image.Bv8VSGTj.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.BIbfn5xQ.mjs';
 import 'node:crypto';
 import 'node:fs';
 import '@nuxt/kit';
 import 'defu';
 import 'fnv1a-64';
 import 'nuxt-site-config/kit';
+import 'nuxtseo-shared/kit';
 import 'pkg-types';
 import 'std-env';
 import 'oxc-walker';
-import 'nuxtseo-shared/kit';
 import '../../dist/runtime/logger.js';
 import 'chrome-launcher';
 import 'nypm';

package/dist/chunks/uno.cjs

@@ -3,18 +3,18 @@
 const promises = require('node:fs/promises');
 const defu = require('defu');
 const logger_js = require('../../dist/runtime/logger.js');
-const module$1 = require('../shared/nuxt-og-image.BRBtdkUp.cjs');
+const module$1 = require('../shared/nuxt-og-image.CdpC3njh.cjs');
 require('node:crypto');
 require('node:fs');
 require('node:url');
 require('@nuxt/kit');
 require('fnv1a-64');
 require('nuxt-site-config/kit');
+require('nuxtseo-shared/kit');
 require('pathe');
 require('pkg-types');
 require('std-env');
 require('oxc-walker');
-require('nuxtseo-shared/kit');
 require('chrome-launcher');
 require('nypm');
 require('nuxtseo-shared/devtools');
@@ -42,6 +42,8 @@ const RE_HEIGHT_ATTR = /\bheight=['"](\d+)['"]/;
 const RE_SVG_BODY = /<svg[^>]*>([\s\S]*)<\/svg>/;
 let unoConfig = null;
 let rootDir = null;
+let unocssCorePath;
+let unocssConfigPath;
 let generator = null;
 let pendingGenerator = null;
 let cachedExtracted = null;
@@ -60,6 +62,15 @@ function clearUnoCache() {
   pendingGenerator = null;
   cachedExtracted = null;
 }
+function setUnoModulePaths(options) {
+  const nextCorePath = options?.unocssCorePath;
+  const nextConfigPath = options?.unocssConfigPath;
+  if (nextCorePath === unocssCorePath && nextConfigPath === unocssConfigPath)
+    return;
+  unocssCorePath = nextCorePath;
+  unocssConfigPath = nextConfigPath;
+  clearUnoCache();
+}
 async function getGenerator() {
   if (generator)
     return generator;
@@ -68,17 +79,18 @@ async function getGenerator() {
   pendingGenerator = (async () => {
     let loadedConfig;
     try {
-      const { loadConfig } = await import('@unocss/config');
+      const { loadConfig } = await module$1.importOptionalPeer("@unocss/config", unocssConfigPath, "UnoCSS class extraction with OG images");
       const result = await loadConfig(rootDir || process.cwd());
       loadedConfig = result.config;
     } catch (e) {
-      logger_js.logger.warn("[og-image UnoCSS] Failed to load uno.config.ts:", e.message);
+      if (!unoConfig)
+        logger_js.logger.warn("[og-image UnoCSS] Failed to load uno.config.ts:", e.message);
     }
     const finalConfig = loadedConfig ? defu.defu(unoConfig || {}, loadedConfig) : unoConfig;
     if (!finalConfig) {
       throw new Error("UnoCSS config not found. Ensure uno.config.ts exists or @unocss/nuxt is loaded.");
     }
-    const { createGenerator } = await import('@unocss/core');
+    const { createGenerator } = await module$1.importOptionalPeer("@unocss/core", unocssCorePath, "UnoCSS class extraction with OG images");
     generator = await createGenerator(finalConfig);
     return generator;
   })();
@@ -116,6 +128,7 @@ function resolveUserVars(extracted, rootAttrs) {
   return module$1.resolveExtractedVars(extracted, rootAttrs);
 }
 function createUnoProvider(options) {
+  setUnoModulePaths(options);
   return {
     name: "unocss",
     async resolveClassesToStyles(classes, context, rootAttrs) {
@@ -227,6 +240,8 @@ function createUnoProvider(options) {
   };
 }
 
+exports.importResolvedModule = module$1.importResolvedModule;
+exports.resolveOptionalModulePath = module$1.resolveOptionalModulePath;
 exports.clearUnoCache = clearUnoCache;
 exports.clearUnoUserVarsCache = clearUnoUserVarsCache;
 exports.createUnoProvider = createUnoProvider;

package/dist/chunks/uno.mjs

@@ -1,18 +1,19 @@
 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, g as extractVarsFromCss, h as resolveExtractedVars } from '../shared/nuxt-og-image.Bv8VSGTj.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.BIbfn5xQ.mjs';
+export { j as importResolvedModule, k as resolveOptionalModulePath } from '../shared/nuxt-og-image.BIbfn5xQ.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'node:url';
 import '@nuxt/kit';
 import 'fnv1a-64';
 import 'nuxt-site-config/kit';
+import 'nuxtseo-shared/kit';
 import 'pathe';
 import 'pkg-types';
 import 'std-env';
 import 'oxc-walker';
-import 'nuxtseo-shared/kit';
 import 'chrome-launcher';
 import 'nypm';
 import 'nuxtseo-shared/devtools';
@@ -40,6 +41,8 @@ const RE_HEIGHT_ATTR = /\bheight=['"](\d+)['"]/;
 const RE_SVG_BODY = /<svg[^>]*>([\s\S]*)<\/svg>/;
 let unoConfig = null;
 let rootDir = null;
+let unocssCorePath;
+let unocssConfigPath;
 let generator = null;
 let pendingGenerator = null;
 let cachedExtracted = null;
@@ -58,6 +61,15 @@ function clearUnoCache() {
   pendingGenerator = null;
   cachedExtracted = null;
 }
+function setUnoModulePaths(options) {
+  const nextCorePath = options?.unocssCorePath;
+  const nextConfigPath = options?.unocssConfigPath;
+  if (nextCorePath === unocssCorePath && nextConfigPath === unocssConfigPath)
+    return;
+  unocssCorePath = nextCorePath;
+  unocssConfigPath = nextConfigPath;
+  clearUnoCache();
+}
 async function getGenerator() {
   if (generator)
     return generator;
@@ -66,17 +78,18 @@ async function getGenerator() {
   pendingGenerator = (async () => {
     let loadedConfig;
     try {
-      const { loadConfig } = await import('@unocss/config');
+      const { loadConfig } = await importOptionalPeer("@unocss/config", unocssConfigPath, "UnoCSS class extraction with OG images");
       const result = await loadConfig(rootDir || process.cwd());
       loadedConfig = result.config;
     } catch (e) {
-      logger.warn("[og-image UnoCSS] Failed to load uno.config.ts:", e.message);
+      if (!unoConfig)
+        logger.warn("[og-image UnoCSS] Failed to load uno.config.ts:", e.message);
     }
     const finalConfig = loadedConfig ? defu(unoConfig || {}, loadedConfig) : unoConfig;
     if (!finalConfig) {
       throw new Error("UnoCSS config not found. Ensure uno.config.ts exists or @unocss/nuxt is loaded.");
     }
-    const { createGenerator } = await import('@unocss/core');
+    const { createGenerator } = await importOptionalPeer("@unocss/core", unocssCorePath, "UnoCSS class extraction with OG images");
     generator = await createGenerator(finalConfig);
     return generator;
   })();
@@ -114,6 +127,7 @@ function resolveUserVars(extracted, rootAttrs) {
   return resolveExtractedVars(extracted, rootAttrs);
 }
 function createUnoProvider(options) {
+  setUnoModulePaths(options);
   return {
     name: "unocss",
     async resolveClassesToStyles(classes, context, rootAttrs) {

package/dist/cli.cjs

@@ -364,7 +364,10 @@ async function checkNuxtConfig(rootDir) {
     const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
     hasNuxtFontsInPkg = !!(pkg.dependencies?.["@nuxt/fonts"] || pkg.devDependencies?.["@nuxt/fonts"]);
   }
-  const config = await kit.loadNuxtConfig({ cwd: rootDir }).catch(() => null);
+  const config = await kit.loadNuxtConfig({ cwd: rootDir }).catch((error) => {
+    p__namespace.log.warn(`Could not inspect Nuxt config: ${error.message}`);
+    return null;
+  });
   if (!config)
     return { hasDeprecatedFonts: false, hasNuxtFonts: hasNuxtFontsInPkg, hasDefaultsComponent: false, defaultComponentName: null, nitroPreset: null, deprecatedConfigKeys: [] };
   const ogImageConfig = config.ogImage;
@@ -545,7 +548,10 @@ function migrateV6Components(componentsToRename, defaultRenderer, dryRun) {
   }
 }
 async function detectDeploymentTarget(rootDir) {
-  const config = await kit.loadNuxtConfig({ cwd: rootDir }).catch(() => null);
+  const config = await kit.loadNuxtConfig({ cwd: rootDir }).catch((error) => {
+    p__namespace.log.warn(`Could not detect deployment target: ${error.message}`);
+    return null;
+  });
   return config?.nitro?.preset || null;
 }
 async function installRendererDeps(renderers, isEdge) {

package/dist/cli.mjs

@@ -347,7 +347,10 @@ async function checkNuxtConfig(rootDir) {
     const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
     hasNuxtFontsInPkg = !!(pkg.dependencies?.["@nuxt/fonts"] || pkg.devDependencies?.["@nuxt/fonts"]);
   }
-  const config = await loadNuxtConfig({ cwd: rootDir }).catch(() => null);
+  const config = await loadNuxtConfig({ cwd: rootDir }).catch((error) => {
+    p.log.warn(`Could not inspect Nuxt config: ${error.message}`);
+    return null;
+  });
   if (!config)
     return { hasDeprecatedFonts: false, hasNuxtFonts: hasNuxtFontsInPkg, hasDefaultsComponent: false, defaultComponentName: null, nitroPreset: null, deprecatedConfigKeys: [] };
   const ogImageConfig = config.ogImage;
@@ -528,7 +531,10 @@ function migrateV6Components(componentsToRename, defaultRenderer, dryRun) {
   }
 }
 async function detectDeploymentTarget(rootDir) {
-  const config = await loadNuxtConfig({ cwd: rootDir }).catch(() => null);
+  const config = await loadNuxtConfig({ cwd: rootDir }).catch((error) => {
+    p.log.warn(`Could not detect deployment target: ${error.message}`);
+    return null;
+  });
   return config?.nitro?.preset || null;
 }
 async function installRendererDeps(renderers, isEdge) {

package/dist/devtools/lib/og-image/rpc.ts

@@ -17,7 +17,10 @@ export const isFallbackMode = computed(() => connectionState.value === 'fallback
 // Fallback fetch for localhost:3000
 async function tryFallbackConnection() {
   const fallbackUrl = 'http://localhost:3000'
-  const res = await fetch(`${fallbackUrl}/_og/debug.json`).catch(() => null)
+  const res = await fetch(`${fallbackUrl}/_og/debug.json`).catch(() => {
+    // An unreachable fallback host means the devtools connection has failed.
+    return null
+  })
   if (res?.ok) {
     appFetch.value = ((url: string, opts?: any) => fetch(`${fallbackUrl}${url}`, opts).then(r => r.json())) as any
     base.value = '/'

package/dist/module.cjs

@@ -8,11 +8,11 @@ require('@nuxt/kit');
 require('defu');
 require('fnv1a-64');
 require('nuxt-site-config/kit');
+require('nuxtseo-shared/kit');
 require('pathe');
 require('pkg-types');
 require('std-env');
-const module$1 = require('./shared/nuxt-og-image.BRBtdkUp.cjs');
-require('nuxtseo-shared/kit');
+const module$1 = require('./shared/nuxt-og-image.CdpC3njh.cjs');
 require('../dist/runtime/logger.js');
 require('oxc-walker');
 require('chrome-launcher');

package/dist/module.json

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

package/dist/module.mjs

@@ -6,11 +6,11 @@ import '@nuxt/kit';
 import 'defu';
 import 'fnv1a-64';
 import 'nuxt-site-config/kit';
+import 'nuxtseo-shared/kit';
 import 'pathe';
 import 'pkg-types';
 import 'std-env';
-export { m as default } from './shared/nuxt-og-image.Bv8VSGTj.mjs';
-import 'nuxtseo-shared/kit';
+export { n as default } from './shared/nuxt-og-image.BIbfn5xQ.mjs';
 import '../dist/runtime/logger.js';
 import 'oxc-walker';
 import 'chrome-launcher';

package/dist/runtime/app/plugins/og-image-canonical-urls.server.d.ts

@@ -1 +1,2 @@
-export { ogImageCanonicalUrls as default } from '../utils/plugins.js';
+declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
+export default _default;

package/dist/runtime/app/plugins/og-image-canonical-urls.server.js

@@ -1 +1,3 @@
-export { ogImageCanonicalUrls as default } from "../utils/plugins.js";
+import { defineNuxtPlugin } from "#app";
+import { ogImageCanonicalUrls } from "../utils/plugins.js";
+export default defineNuxtPlugin((nuxtApp) => ogImageCanonicalUrls(nuxtApp));

package/dist/runtime/app/plugins/route-rule-og-image.server.d.ts

@@ -1 +1,2 @@
-export { routeRuleOgImage as default } from '../utils/plugins.js';
+declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
+export default _default;

package/dist/runtime/app/plugins/route-rule-og-image.server.js

@@ -1 +1,3 @@
-export { routeRuleOgImage as default } from "../utils/plugins.js";
+import { defineNuxtPlugin } from "#app";
+import { routeRuleOgImage } from "../utils/plugins.js";
+export default defineNuxtPlugin((nuxtApp) => routeRuleOgImage(nuxtApp));

package/dist/runtime/app/utils/plugins.js

@@ -1,7 +1,7 @@
 import { TemplateParamsPlugin } from "@unhead/vue/plugins";
 import { defu } from "defu";
-import { createRouter as createRadixRouter, toRouteMatcher } from "radix3";
-import { parseURL, withoutBase } from "ufo";
+import { createNitroRouteRuleMatcher } from "nuxtseo-shared/server";
+import { parseURL } from "ufo";
 import { toValue } from "vue";
 import { defineNuxtPlugin, useRequestEvent } from "#app";
 import { withSiteUrl } from "#site-config/app/composables";
@@ -60,14 +60,8 @@ export const routeRuleOgImage = defineNuxtPlugin((nuxtApp) => {
     const path = parseURL(e?.path || "").pathname;
     if (isInternalRoute(path))
       return;
-    const _routeRulesMatcher = toRouteMatcher(
-      createRadixRouter({ routes: ssrContext?.runtimeConfig?.nitro?.routeRules })
-    );
-    const matchedRules = _routeRulesMatcher.matchAll(
-      withoutBase(path.split("?")?.[0] || "", ssrContext?.runtimeConfig?.app.baseURL || "")
-    ).reverse();
-    const combinedRules = defu({}, ...matchedRules);
-    let routeRules = combinedRules?.ogImage;
+    const matchRouteRules = createNitroRouteRuleMatcher(ssrContext?.runtimeConfig || {});
+    let routeRules = matchRouteRules(path).ogImage;
     if (typeof routeRules === "undefined")
       return;
     if (routeRules === false) {

package/dist/runtime/logger.js

@@ -1,8 +1,4 @@
-import { createConsola } from "consola";
 import { colorize } from "consola/utils";
-export const logger = createConsola({
-  defaults: {
-    tag: "@nuxtjs/og-image"
-  }
-});
+import { createModuleLogger } from "nuxtseo-shared/utils";
+export const logger = createModuleLogger("@nuxtjs/og-image");
 export const gray = (s) => colorize("gray", s);

package/dist/runtime/pure.d.ts

@@ -3,4 +3,3 @@ export declare function extractSocialPreviewTags(html: string): [Record<string,
 export declare function detectBase64MimeType(data: string): string;
 export declare function toBase64Image(data: string | ArrayBuffer): string;
 export declare function withoutQuery(path: string): string | undefined;
-export declare function getExtension(path: string): string;

package/dist/runtime/pure.js

@@ -65,8 +65,3 @@ export function toBase64Image(data) {
 export function withoutQuery(path) {
   return path.split("?")[0];
 }
-export function getExtension(path) {
-  path = withoutQuery(path);
-  const lastSegment = path.split("/").pop() || path;
-  return lastSegment.split(".").pop() || lastSegment;
-}

package/dist/runtime/server/og-image/bindings/browser/chrome-launcher.d.ts

@@ -1,3 +1,3 @@
-import type { H3Event } from 'h3';
 import type { Browser } from 'playwright-core';
+import type { H3Event } from '#nuxtseo/h3';
 export declare function createBrowser(_event?: H3Event): Promise<Browser | void>;

package/dist/runtime/server/og-image/bindings/browser/cloudflare.d.ts

@@ -1,4 +1,4 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 interface Browser {
     connected: boolean;
     newPage: () => Promise<any>;
@@ -6,5 +6,4 @@ interface Browser {
     on: (event: string, handler: () => void) => void;
 }
 export declare function createBrowser(event?: H3Event): Promise<Browser>;
-export declare function disposeBrowser(): Promise<void>;
 export {};

package/dist/runtime/server/og-image/bindings/browser/cloudflare.js

@@ -1,3 +1,4 @@
+import { getCloudflareEnv } from "../../../util/cloudflare.js";
 import { withTimeout } from "../../../util/withTimeout.js";
 import { useOgImageRuntimeConfig } from "../../../utils.js";
 let puppeteer;
@@ -20,7 +21,7 @@ export async function createBrowser(event) {
       "[Nuxt OG Image] Browser binding name not configured. Set `ogImage.browser.binding` in nuxt.config."
     );
   }
-  const binding = event?.context?.cloudflare?.env?.[bindingName];
+  const binding = getCloudflareEnv(event)?.[bindingName];
   if (!binding) {
     throw new Error(
       `[Nuxt OG Image] Cloudflare browser binding "${bindingName}" not found. Ensure it's configured in wrangler.toml and the request has cloudflare context.`
@@ -45,11 +46,3 @@ export async function createBrowser(event) {
   browserPromise = null;
   return browser;
 }
-export async function disposeBrowser() {
-  if (browser) {
-    await browser.close().catch((err) => {
-      void err;
-    });
-    browser = null;
-  }
-}

package/dist/runtime/server/og-image/bindings/browser/on-demand.d.ts

@@ -1,3 +1,3 @@
-import type { H3Event } from 'h3';
 import type { Browser } from 'playwright-core';
+import type { H3Event } from '#nuxtseo/h3';
 export declare function createBrowser(_event?: H3Event): Promise<Browser | void>;

package/dist/runtime/server/og-image/bindings/browser/playwright.d.ts

@@ -1,3 +1,3 @@
-import type { H3Event } from 'h3';
 import type { Browser } from 'playwright-core';
+import type { H3Event } from '#nuxtseo/h3';
 export declare function createBrowser(_event?: H3Event): Promise<Browser | void>;

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

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

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

@@ -1,5 +1,5 @@
-import { useRuntimeConfig } from "nitropack/runtime";
 import { withBase } from "ufo";
+import { useRuntimeConfig } from "#nuxtseo/nitro";
 import { getSiteConfig } from "#site-config/server/composables";
 import { getCloudflareAssets } from "../../../util/cloudflareAssets.js";
 import { fetchLocalAsset } from "../../../util/fetchLocalAsset.js";

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

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

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

@@ -1,8 +1,8 @@
 import { readFile } from "node:fs/promises";
-import { getRequestURL } from "h3";
-import { useRuntimeConfig } from "nitropack/runtime";
 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 { getSiteConfig } from "#site-config/server/composables";
 import { getFetchTimeout } from "../../../util/fetchTimeout.js";
@@ -10,11 +10,23 @@ import { fetchWithRedirectValidation } from "../../../util/ssrf.js";
 import { useOgImageRuntimeConfig } from "../../../utils.js";
 import { fetchSpecialFontUrl, isDataFontUrl, isExternalFontUrl } from "./external-url.js";
 let fontUrlMapping;
+async function readOptionalFile(path) {
+  return readFile(path).catch((error) => {
+    if (error.code === "ENOENT")
+      return null;
+    throw error;
+  });
+}
+async function fetchOptionalFont(url, timeout) {
+  return fetch(url, { signal: AbortSignal.timeout(timeout) }).catch(() => {
+    return null;
+  });
+}
 async function loadFontUrlMapping() {
   if (fontUrlMapping)
     return fontUrlMapping;
-  const content = await readFile(join(buildDir, "cache", "og-image", "font-urls.json"), "utf-8").catch(() => null);
-  fontUrlMapping = content ? JSON.parse(content) : {};
+  const content = await readOptionalFile(join(buildDir, "cache", "og-image", "font-urls.json"));
+  fontUrlMapping = content ? JSON.parse(content.toString("utf-8")) : {};
   return fontUrlMapping;
 }
 export async function resolve(event, font) {
@@ -22,7 +34,7 @@ export async function resolve(event, font) {
   const runtimeConfig = useOgImageRuntimeConfig();
   const timeout = getFetchTimeout(runtimeConfig);
   if (font.absolutePath) {
-    const data = await readFile(font.absolutePath).catch(() => null);
+    const data = await readOptionalFile(font.absolutePath);
     if (data?.length)
       return data;
   }
@@ -31,31 +43,31 @@ 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 readFile(join(buildDir, "cache", "og-image", "fonts-ttf", filename2)).catch(() => null) || await readFile(join(rootDir, ".output", "public", "_og-static-fonts", filename2)).catch(() => null);
+      const cached = await readOptionalFile(join(buildDir, "cache", "og-image", "fonts-ttf", filename2)) || await readOptionalFile(join(rootDir, ".output", "public", "_og-static-fonts", filename2));
       if (cached?.length)
         return cached;
     }
     if (path.startsWith("/_fonts/")) {
       const filename2 = path.slice("/_fonts/".length);
-      const cached = await readFile(join(rootDir, ".output", "public", "_fonts", filename2)).catch(() => null);
+      const cached = await readOptionalFile(join(rootDir, ".output", "public", "_fonts", filename2));
       if (cached?.length)
         return cached;
       const mapping = await loadFontUrlMapping();
       if (mapping[filename2]) {
-        const res = await fetch(mapping[filename2], { signal: AbortSignal.timeout(timeout) }).catch(() => null);
+        const res = await fetchOptionalFont(mapping[filename2], timeout);
         if (res?.ok)
           return Buffer.from(await res.arrayBuffer());
       }
       throw new Error(`Font ${filename2} not found in mapping or cache`);
     }
     const filename = path.slice(1);
-    const data = await readFile(join(rootDir, "public", filename)).catch(() => null) || await readFile(join(rootDir, ".output", "public", filename)).catch(() => null);
+    const data = await readOptionalFile(join(rootDir, "public", filename)) || await readOptionalFile(join(rootDir, ".output", "public", filename));
     if (data?.length)
       return data;
   }
   if (path.startsWith("/_og-static-fonts/")) {
     const filename = path.slice("/_og-static-fonts/".length);
-    const cached = await readFile(join(buildDir, "cache", "og-image", "fonts-ttf", filename)).catch(() => null);
+    const cached = await readOptionalFile(join(buildDir, "cache", "og-image", "fonts-ttf", filename));
     if (cached?.length)
       return cached;
   }
@@ -63,14 +75,14 @@ export async function resolve(event, font) {
     const filename = path.slice("/_fonts/".length);
     const mapping = await loadFontUrlMapping();
     if (mapping[filename]) {
-      const res = await fetch(mapping[filename], { signal: AbortSignal.timeout(timeout) }).catch(() => null);
+      const res = await fetchOptionalFont(mapping[filename], timeout);
       if (res?.ok)
         return Buffer.from(await res.arrayBuffer());
     }
   }
   if (import.meta.dev) {
     const filename = path.slice(1);
-    const data = await readFile(join(rootDir, "public", filename)).catch(() => null);
+    const data = await readOptionalFile(join(rootDir, "public", filename));
     if (data?.length)
       return data;
   }
@@ -79,7 +91,9 @@ export async function resolve(event, font) {
     const reqUrl = getRequestURL(event);
     const origin = `${reqUrl.protocol}//${reqUrl.host}`;
     const target = new URL(withBase(path, app.baseURL), origin);
-    const ab = await fetchWithRedirectValidation(target.href, { timeout, trustedHost: target.host }).catch(() => null);
+    const ab = await fetchWithRedirectValidation(target.href, { timeout, trustedHost: target.host }).catch(() => {
+      return null;
+    });
     if (ab) {
       return Buffer.from(ab);
     }

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

@@ -32,7 +32,9 @@ export function resolveSameOriginFontUrl(path, siteUrl) {
 }
 export async function fetchSpecialFontUrl(path, siteUrl, timeout) {
   if (isDataFontUrl(path)) {
-    const res = await fetch(path.trimStart(), { signal: AbortSignal.timeout(timeout) }).catch(() => null);
+    const res = await fetch(path.trimStart(), { signal: AbortSignal.timeout(timeout) }).catch(() => {
+      return null;
+    });
     if (res?.ok)
       return Buffer.from(await res.arrayBuffer());
     throw new Error("[Nuxt OG Image] Invalid data: font URL.");

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

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

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

@@ -1,5 +1,5 @@
-import { useRuntimeConfig } from "nitropack/runtime";
 import { withBase } from "ufo";
+import { useRuntimeConfig } from "#nuxtseo/nitro";
 import { getNitroOrigin, getSiteConfig } from "#site-config/server/composables";
 import { getFetchTimeout } from "../../../util/fetchTimeout.js";
 import { fetchWithRedirectValidation } from "../../../util/ssrf.js";
@@ -15,7 +15,9 @@ export async function resolve(event, font) {
   if (path && (isDataFontUrl(path) || isExternalFontUrl(path)))
     return fetchSpecialFontUrl(path, getSiteConfig(event).url, timeout);
   const target = new URL(fullPath, origin);
-  const ab = await fetchWithRedirectValidation(target.href, { timeout, trustedHost: target.host }).catch(() => null);
+  const ab = await fetchWithRedirectValidation(target.href, { timeout, trustedHost: target.host }).catch(() => {
+    return null;
+  });
   if (ab) {
     return Buffer.from(ab);
   }