nuxt-og-image 3.0.0-rc.1 → 3.0.0-rc.10

package/dist/client/_nuxt/{error-404.1b7ec865.js → error-404.b9a11c8e.js}

@@ -1 +1 @@
-import{_ as a,u as n,o as r,c as l,a as e,t as s,b as d,w as c,d as p,e as f,p as x,f as h}from"./entry.f2e056ce.js";const m=t=>(x("data-v-05a2b8a3"),t=t(),h(),t),u={class:"font-sans antialiased bg-white dark:bg-black text-black dark:text-white grid min-h-screen place-content-center overflow-hidden"},g=m(()=>e("div",{class:"fixed left-0 right-0 spotlight z-10"},null,-1)),b={class:"max-w-520px text-center z-20"},_=["textContent"],w=["textContent"],y={class:"w-full flex items-center justify-center"},S={__name:"error-404",props:{appName:{type:String,default:"Nuxt"},version:{type:String,default:""},statusCode:{type:Number,default:404},statusMessage:{type:String,default:"Not Found"},description:{type:String,default:"Sorry, the page you are looking for could not be found."},backHome:{type:String,default:"Go back home"}},setup(t){const o=t;return n({title:`${o.statusCode} - ${o.statusMessage} | ${o.appName}`,script:[],style:[{children:'*,:before,:after{-webkit-box-sizing:border-box;box-sizing:border-box;border-width:0;border-style:solid;border-color:#e0e0e0}*{--tw-ring-inset:var(--tw-empty, );--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(14, 165, 233, .5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000}:root{-moz-tab-size:4;-o-tab-size:4;tab-size:4}a{color:inherit;text-decoration:inherit}body{margin:0;font-family:inherit;line-height:inherit}html{-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";line-height:1.5}h1,p{margin:0}h1{font-size:inherit;font-weight:inherit}'}]}),(k,v)=>{const i=f;return r(),l("div",u,[g,e("div",b,[e("h1",{class:"text-8xl sm:text-10xl font-medium mb-8",textContent:s(t.statusCode)},null,8,_),e("p",{class:"text-xl px-8 sm:px-0 sm:text-4xl font-light mb-16 leading-tight",textContent:s(t.description)},null,8,w),e("div",y,[d(i,{to:"/",class:"gradient-border text-md sm:text-xl py-2 px-4 sm:py-3 sm:px-6 cursor-pointer"},{default:c(()=>[p(s(t.backHome),1)]),_:1})])])])}}},z=a(S,[["__scopeId","data-v-05a2b8a3"]]);export{z as default};
+import{_ as a,u as n,o as r,c as l,a as e,t as s,b as d,w as c,d as p,e as f,p as x,f as h}from"./entry.ecf0d33f.js";const m=t=>(x("data-v-05a2b8a3"),t=t(),h(),t),u={class:"font-sans antialiased bg-white dark:bg-black text-black dark:text-white grid min-h-screen place-content-center overflow-hidden"},g=m(()=>e("div",{class:"fixed left-0 right-0 spotlight z-10"},null,-1)),b={class:"max-w-520px text-center z-20"},_=["textContent"],w=["textContent"],y={class:"w-full flex items-center justify-center"},S={__name:"error-404",props:{appName:{type:String,default:"Nuxt"},version:{type:String,default:""},statusCode:{type:Number,default:404},statusMessage:{type:String,default:"Not Found"},description:{type:String,default:"Sorry, the page you are looking for could not be found."},backHome:{type:String,default:"Go back home"}},setup(t){const o=t;return n({title:`${o.statusCode} - ${o.statusMessage} | ${o.appName}`,script:[],style:[{children:'*,:before,:after{-webkit-box-sizing:border-box;box-sizing:border-box;border-width:0;border-style:solid;border-color:#e0e0e0}*{--tw-ring-inset:var(--tw-empty, );--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(14, 165, 233, .5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000}:root{-moz-tab-size:4;-o-tab-size:4;tab-size:4}a{color:inherit;text-decoration:inherit}body{margin:0;font-family:inherit;line-height:inherit}html{-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";line-height:1.5}h1,p{margin:0}h1{font-size:inherit;font-weight:inherit}'}]}),(k,v)=>{const i=f;return r(),l("div",u,[g,e("div",b,[e("h1",{class:"text-8xl sm:text-10xl font-medium mb-8",textContent:s(t.statusCode)},null,8,_),e("p",{class:"text-xl px-8 sm:px-0 sm:text-4xl font-light mb-16 leading-tight",textContent:s(t.description)},null,8,w),e("div",y,[d(i,{to:"/",class:"gradient-border text-md sm:text-xl py-2 px-4 sm:py-3 sm:px-6 cursor-pointer"},{default:c(()=>[p(s(t.backHome),1)]),_:1})])])])}}},z=a(S,[["__scopeId","data-v-05a2b8a3"]]);export{z as default};

package/dist/client/_nuxt/{error-500.1f097e6f.js → error-500.eb8225d3.js}

@@ -1 +1 @@
-import{_ as i,u as a,o as r,c as n,a as e,t as s,p as l,f as d}from"./entry.f2e056ce.js";const c=t=>(l("data-v-c967d9a9"),t=t(),d(),t),p={class:"font-sans antialiased bg-white dark:bg-black text-black dark:text-white grid min-h-screen place-content-center overflow-hidden"},h=c(()=>e("div",{class:"fixed -bottom-1/2 left-0 right-0 h-1/2 spotlight"},null,-1)),f={class:"max-w-520px text-center"},g=["textContent"],m=["textContent"],x={__name:"error-500",props:{appName:{type:String,default:"Nuxt"},version:{type:String,default:""},statusCode:{type:Number,default:500},statusMessage:{type:String,default:"Server error"},description:{type:String,default:"This page is temporarily unavailable."}},setup(t){const o=t;return a({title:`${o.statusCode} - ${o.statusMessage} | ${o.appName}`,script:[],style:[{children:'*,:before,:after{-webkit-box-sizing:border-box;box-sizing:border-box;border-width:0;border-style:solid;border-color:#e0e0e0}*{--tw-ring-inset:var(--tw-empty, );--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(14, 165, 233, .5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000}:root{-moz-tab-size:4;-o-tab-size:4;tab-size:4}body{margin:0;font-family:inherit;line-height:inherit}html{-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";line-height:1.5}h1,p{margin:0}h1{font-size:inherit;font-weight:inherit}'}]}),(u,b)=>(r(),n("div",p,[h,e("div",f,[e("h1",{class:"text-8xl sm:text-10xl font-medium mb-8",textContent:s(t.statusCode)},null,8,g),e("p",{class:"text-xl px-8 sm:px-0 sm:text-4xl font-light mb-16 leading-tight",textContent:s(t.description)},null,8,m)])]))}},w=i(x,[["__scopeId","data-v-c967d9a9"]]);export{w as default};
+import{_ as i,u as a,o as r,c as n,a as e,t as s,p as l,f as d}from"./entry.ecf0d33f.js";const c=t=>(l("data-v-c967d9a9"),t=t(),d(),t),p={class:"font-sans antialiased bg-white dark:bg-black text-black dark:text-white grid min-h-screen place-content-center overflow-hidden"},h=c(()=>e("div",{class:"fixed -bottom-1/2 left-0 right-0 h-1/2 spotlight"},null,-1)),f={class:"max-w-520px text-center"},g=["textContent"],m=["textContent"],x={__name:"error-500",props:{appName:{type:String,default:"Nuxt"},version:{type:String,default:""},statusCode:{type:Number,default:500},statusMessage:{type:String,default:"Server error"},description:{type:String,default:"This page is temporarily unavailable."}},setup(t){const o=t;return a({title:`${o.statusCode} - ${o.statusMessage} | ${o.appName}`,script:[],style:[{children:'*,:before,:after{-webkit-box-sizing:border-box;box-sizing:border-box;border-width:0;border-style:solid;border-color:#e0e0e0}*{--tw-ring-inset:var(--tw-empty, );--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(14, 165, 233, .5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000}:root{-moz-tab-size:4;-o-tab-size:4;tab-size:4}body{margin:0;font-family:inherit;line-height:inherit}html{-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";line-height:1.5}h1,p{margin:0}h1{font-size:inherit;font-weight:inherit}'}]}),(u,b)=>(r(),n("div",p,[h,e("div",f,[e("h1",{class:"text-8xl sm:text-10xl font-medium mb-8",textContent:s(t.statusCode)},null,8,g),e("p",{class:"text-xl px-8 sm:px-0 sm:text-4xl font-light mb-16 leading-tight",textContent:s(t.description)},null,8,m)])]))}},w=i(x,[["__scopeId","data-v-c967d9a9"]]);export{w as default};

package/dist/client/index.html

@@ -2,14 +2,14 @@
 <html >
 <head><meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="stylesheet" href="/__nuxt-og-image/_nuxt/entry.a30f63d0.css">
-<link rel="modulepreload" as="script" crossorigin href="/__nuxt-og-image/_nuxt/entry.f2e056ce.js">
+<link rel="stylesheet" href="/__nuxt-og-image/_nuxt/entry.47125dcd.css">
+<link rel="modulepreload" as="script" crossorigin href="/__nuxt-og-image/_nuxt/entry.ecf0d33f.js">
 <link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/vanilla-picker-NKbIFE8h.23409a58.js">
 <link rel="prefetch" as="style" href="/__nuxt-og-image/_nuxt/error-404.b751fa02.css">
-<link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/error-404.1b7ec865.js">
+<link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/error-404.b9a11c8e.js">
 <link rel="prefetch" as="style" href="/__nuxt-og-image/_nuxt/error-500.69009e70.css">
-<link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/error-500.1f097e6f.js">
-<script type="module" src="/__nuxt-og-image/_nuxt/entry.f2e056ce.js" crossorigin></script><script>"use strict";(()=>{const a=window,e=document.documentElement,m=["dark","light"],c=window&&window.localStorage&&window.localStorage.getItem&&window.localStorage.getItem("nuxt-color-mode")||"system";let n=c==="system"?d():c;const l=e.getAttribute("data-color-mode-forced");l&&(n=l),i(n),a["__NUXT_COLOR_MODE__"]={preference:c,value:n,getColorScheme:d,addColorScheme:i,removeColorScheme:f};function i(o){const t=""+o+"",s="";e.classList?e.classList.add(t):e.className+=" "+t,s&&e.setAttribute("data-"+s,o)}function f(o){const t=""+o+"",s="";e.classList?e.classList.remove(t):e.className=e.className.replace(new RegExp(t,"g"),""),s&&e.removeAttribute("data-"+s)}function r(o){return a.matchMedia("(prefers-color-scheme"+o+")")}function d(){if(a.matchMedia&&r("").media!=="not all"){for(const o of m)if(r(":"+o).matches)return o}return"light"}})();
+<link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/error-500.eb8225d3.js">
+<script type="module" src="/__nuxt-og-image/_nuxt/entry.ecf0d33f.js" crossorigin></script><script>"use strict";(()=>{const a=window,e=document.documentElement,m=["dark","light"],c=window&&window.localStorage&&window.localStorage.getItem&&window.localStorage.getItem("nuxt-color-mode")||"system";let n=c==="system"?d():c;const l=e.getAttribute("data-color-mode-forced");l&&(n=l),i(n),a["__NUXT_COLOR_MODE__"]={preference:c,value:n,getColorScheme:d,addColorScheme:i,removeColorScheme:f};function i(o){const t=""+o+"",s="";e.classList?e.classList.add(t):e.className+=" "+t,s&&e.setAttribute("data-"+s,o)}function f(o){const t=""+o+"",s="";e.classList?e.classList.remove(t):e.className=e.className.replace(new RegExp(t,"g"),""),s&&e.removeAttribute("data-"+s)}function r(o){return a.matchMedia("(prefers-color-scheme"+o+")")}function d(){if(a.matchMedia&&r("").media!=="not all"){for(const o of m)if(r(":"+o).matches)return o}return"light"}})();
 </script></head>
 <body ><div id="__nuxt"></div><script type="application/json" id="__NUXT_DATA__" data-ssr="false">[{"_errors":1,"serverRendered":2,"data":3,"state":4},{},false,{},{}]</script>
 <script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-og-image",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body>

package/dist/module.d.mts

@@ -80,9 +80,14 @@ interface OgImageOptions<T extends keyof OgImageComponents = 'NuxtSeo'> {
     sharp?: SharpOptions;
     fonts?: InputFontConfig[];
     cacheMaxAgeSeconds?: number;
+    /**
+     * @internal
+     */
+    _query?: Record<string, any>;
 }
 interface FontConfig {
     name: string;
+    style?: string;
     weight?: string | number;
     path?: string;
     key?: string;

package/dist/module.d.ts

@@ -80,9 +80,14 @@ interface OgImageOptions<T extends keyof OgImageComponents = 'NuxtSeo'> {
     sharp?: SharpOptions;
     fonts?: InputFontConfig[];
     cacheMaxAgeSeconds?: number;
+    /**
+     * @internal
+     */
+    _query?: Record<string, any>;
 }
 interface FontConfig {
     name: string;
+    style?: string;
     weight?: string | number;
     path?: string;
     key?: string;

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "configKey": "ogImage",
-  "version": "3.0.0-rc.1"
+  "version": "3.0.0-rc.9"
 }

package/dist/module.mjs

@@ -14,7 +14,7 @@ import { createHash } from 'node:crypto';
 import { execa } from 'execa';
 import terminate from 'terminate';
 
-const version = "3.0.0-rc.1";
+const version = "3.0.0-rc.9";
 
 const autodetectableProviders = {
   azure_static: "azure",
@@ -205,6 +205,9 @@ export {}
     references.push({ path: resolve(nuxt.options.buildDir, `module/${module}.d.ts`) });
   });
 }
+function isNuxtGenerate(nuxt = useNuxt()) {
+  return nuxt.options._generate || nuxt.options.nitro.static || nuxt.options.nitro.preset === "static";
+}
 
 const DEVTOOLS_UI_ROUTE = "/__nuxt-og-image";
 const DEVTOOLS_UI_LOCAL_PORT = 3030;
@@ -295,7 +298,9 @@ function setupGenerateHandler(options, resolve, nuxt = useNuxt()) {
 function setupPrerenderHandler(options, resolve, nuxt = useNuxt()) {
   nuxt.hooks.hook("nitro:init", async (nitro) => {
     nitro.hooks.hook("prerender:config", async (nitroConfig) => {
-      applyNitroPresetCompatibility(nitroConfig, { compatibility: options.compatibility.prerender, resolve });
+      nitroConfig.serverAssets = nitroConfig.serverAssets || [];
+      nitroConfig.serverAssets.push({ baseName: "nuxt-og-image:fonts", dir: resolve("./runtime/server/assets") });
+      applyNitroPresetCompatibility(nitroConfig, { compatibility: options.compatibility?.prerender, resolve });
       nitroConfig.wasm = nitroConfig.wasm || {};
       nitroConfig.wasm.esmImport = false;
       const prerenderingPages = (nuxt.options.nitro.prerender?.routes || []).some((r) => r && (!r.includes(".") || r.includes("*")));
@@ -365,7 +370,7 @@ function normaliseFontInput(fonts) {
       return {
         cacheKey: f,
         name,
-        weight: weight || "400",
+        weight: weight || 400,
         style: "normal",
         path: void 0
       };
@@ -395,6 +400,7 @@ const module = defineNuxtModule({
         emojis: "noto",
         renderer: "satori",
         component: "NuxtSeo",
+        extension: "png",
         width: 1200,
         height: 600,
         // default is to cache the image for 3 day (72 hours)
@@ -423,7 +429,6 @@ const module = defineNuxtModule({
     const hasSharpDependency = !!await tryResolveModule("sharp");
     const userConfiguredExtension = config.defaults.extension;
     const hasConfiguredJpegs = userConfiguredExtension && ["jpeg", "jpg"].includes(userConfiguredExtension);
-    config.defaults.extension = userConfiguredExtension || (hasSharpDependency && targetCompatibility.sharp ? "jpg" : "png");
     if (hasConfiguredJpegs && config.defaults.renderer !== "chromium") {
       if (hasSharpDependency && !targetCompatibility.sharp) {
         logger.warn(`Rendering JPEGs requires sharp which does not work with ${preset}. Images will be rendered as PNG at runtime.`);
@@ -474,6 +479,11 @@ const module = defineNuxtModule({
         dev: { resvg: "wasm-fs" },
         prerender: { resvg: "wasm-fs" }
       });
+      if (targetCompatibility.resvg === "node") {
+        config.compatibility = defu(config.compatibility, {
+          runtime: { resvg: "wasm" }
+        });
+      }
     });
     await installNuxtSiteConfig();
     if (hasNuxtModule("@nuxt/content"))
@@ -623,7 +633,7 @@ declare module 'nitropack' {
   }
   interface NitroRuntimeHooks {
     'nuxt-og-image:context': (ctx: import('${typesPath}').OgImageRenderEventContext) => void | Promise<void>
-    'nuxt-og-image:satori:vnodes': (vnodes: import('${typesPath}').VNode, ctx: ctx: import('${typesPath}').OgImageRenderEventContext) => void | Promise<void>
+    'nuxt-og-image:satori:vnodes': (vnodes: import('${typesPath}').VNode, ctx: import('${typesPath}').OgImageRenderEventContext) => void | Promise<void>
   }
 }
 
@@ -636,16 +646,26 @@ ${componentImports}
     });
     const cacheEnabled = typeof config.runtimeCacheStorage !== "undefined" && config.runtimeCacheStorage !== false;
     const runtimeCacheStorage = typeof config.runtimeCacheStorage === "boolean" ? "default" : config.runtimeCacheStorage.driver;
-    let baseCacheKey = runtimeCacheStorage === "default" ? `/cache/nuxt-og-image@${version}` : `/nuxt-og-image@${version}`;
+    let baseCacheKey = runtimeCacheStorage === "default" ? `/cache/nuxt-og-image@${version}` : `/nuxt-og-image/${version}`;
     if (!cacheEnabled)
       baseCacheKey = false;
+    if (!nuxt.options.dev && config.runtimeCacheStorage && typeof config.runtimeCacheStorage === "object") {
+      nuxt.options.nitro.storage = nuxt.options.nitro.storage || {};
+      nuxt.options.nitro.storage["nuxt-og-image"] = config.runtimeCacheStorage;
+    }
     nuxt.hooks.hook("modules:done", async () => {
       const normalisedFonts = normaliseFontInput(config.fonts);
-      if (!nuxt.options._generate && nuxt.options.build) {
+      if (!isNuxtGenerate() && nuxt.options.build) {
+        nuxt.options.nitro = nuxt.options.nitro || {};
         nuxt.options.nitro.prerender = nuxt.options.nitro.prerender || {};
         nuxt.options.nitro.prerender.routes = nuxt.options.nitro.prerender.routes || [];
-        normalisedFonts.filter((f) => !f.path && !f.key).forEach(({ name, weight }) => {
-          nuxt.options.nitro.prerender.routes.push(`/__og-image__/font/${name}/${weight}.ttf`);
+        normalisedFonts.filter((f) => !f.path && !f.key).forEach((entry, key) => {
+          const { name, weight } = entry;
+          entry.path = `/__og-image__/font/${name}/${weight}.ttf`;
+          nuxt.options.nitro.prerender.routes.unshift(entry.path);
+          if (name === "Inter" && [400, 700].includes(Number(weight)))
+            entry.key = `nuxt-og-image:fonts:inter-latin-ext-${weight}-normal.woff`;
+          normalisedFonts[key] = entry;
         });
       }
       const hasColorModeModule = hasNuxtModule("@nuxtjs/color-mode");
@@ -676,7 +696,7 @@ ${componentImports}
     if (nuxt.options.dev) {
       setupDevHandler(config, resolve);
       setupDevToolsUI(config, resolve);
-    } else if (nuxt.options._generate) {
+    } else if (isNuxtGenerate()) {
       setupGenerateHandler(config, resolve);
     } else if (nuxt.options.build) {
       await setupBuildHandler(config, resolve);

package/dist/runtime/cache.d.ts

@@ -1,8 +1,9 @@
+import { type H3Error } from 'h3';
 import type { OgImageRenderEventContext } from './types';
 export declare function useOgImageBufferCache(ctx: OgImageRenderEventContext, options: {
     baseCacheKey: string | false;
     cacheMaxAgeSeconds?: number;
-}): Promise<void | {
+}): Promise<void | H3Error | {
     cachedItem: false | BufferSource;
     enabled: boolean;
     update: (image: BufferSource) => Promise<void>;

package/dist/runtime/cache.mjs

@@ -1,31 +1,46 @@
 import { prefixStorage } from "unstorage";
-import { getQuery, handleCacheHeaders, setHeader, setHeaders } from "h3";
+import { createError, getQuery, handleCacheHeaders, setHeader, setHeaders } from "h3";
 import { withTrailingSlash } from "ufo";
 import { hash } from "ohash";
 import { useStorage } from "#imports";
 export async function useOgImageBufferCache(ctx, options) {
   const maxAge = Number(options.cacheMaxAgeSeconds);
-  const enabled = !import.meta.dev && import.meta.env.MODE !== "test" && maxAge > 0;
+  let enabled = !import.meta.dev && import.meta.env.MODE !== "test" && maxAge > 0;
   const cache = prefixStorage(useStorage(), withTrailingSlash(options.baseCacheKey || "/"));
   const key = ctx.key;
   let cachedItem = false;
-  if (enabled && await cache.hasItem(key).catch(() => false)) {
-    const { value, expiresAt, headers } = await cache.getItem(key).catch(() => ({ value: null, expiresAt: Date.now() }));
-    if (typeof getQuery(ctx.e).purge !== "undefined") {
-      await cache.removeItem(key).catch(() => {
-      });
-    } else if (expiresAt > Date.now()) {
-      cachedItem = Buffer.from(value, "base64");
-      if (handleCacheHeaders(ctx.e, {
-        modifiedTime: new Date(headers["last-modified"]),
-        etag: headers.etag,
-        maxAge
-      }))
-        return;
-      setHeaders(ctx.e, headers);
-    } else {
-      await cache.removeItem(key).catch(() => {
+  if (enabled) {
+    const hasItem = await cache.hasItem(key).catch((e) => {
+      enabled = false;
+      return createError({
+        cause: e,
+        statusCode: 500,
+        statusMessage: `[Nuxt OG Image] Failed to connect to cache ${options.baseCacheKey}. Response from cache: ${e.message}`
       });
+    });
+    if (hasItem instanceof Error)
+      return hasItem;
+    if (hasItem) {
+      const { value, expiresAt, headers } = await cache.getItem(key).catch(() => ({
+        value: null,
+        expiresAt: Date.now()
+      }));
+      if (typeof getQuery(ctx.e).purge !== "undefined") {
+        await cache.removeItem(key).catch(() => {
+        });
+      } else if (expiresAt > Date.now()) {
+        cachedItem = Buffer.from(value, "base64");
+        if (handleCacheHeaders(ctx.e, {
+          modifiedTime: new Date(headers["last-modified"]),
+          etag: headers.etag,
+          maxAge
+        }))
+          return;
+        setHeaders(ctx.e, headers);
+      } else {
+        await cache.removeItem(key).catch(() => {
+        });
+      }
     }
   }
   if (!enabled) {

package/dist/runtime/components/Templates/Community/NuxtSeo.vue

@@ -117,7 +117,7 @@ if (typeof props.icon === 'string' && !runtimeConfig.hasNuxtIcon && process.dev)
             {{ description }}
           </p>
         </div>
-        <div v-if="icon" style="width: 30%;" class="flex justify-end">
+        <div v-if="Boolean(icon)" style="width: 30%;" class="flex justify-end">
           <IconComponent :name="icon" size="250px" style="margin: 0 auto; opacity: 0.7;" />
         </div>
       </div>

package/dist/runtime/composables/defineOgImage.mjs

@@ -1,22 +1,18 @@
 import { defu } from "defu";
 import { appendHeader } from "h3";
-import { createRouter as createRadixRouter, toRouteMatcher } from "radix3";
-import { withoutBase } from "ufo";
 import { getOgImagePath, separateProps, useOgImageRuntimeConfig } from "../utils.mjs";
 import { createOgImageMeta, normaliseOptions } from "../nuxt/utils.mjs";
-import { useNuxtApp, useRequestEvent, useRouter, useRuntimeConfig } from "#imports";
+import { createNitroRouteRuleMatcher } from "../nitro/kit.mjs";
+import { useNuxtApp, useRequestEvent, useRoute } from "#imports";
 export function defineOgImage(_options = {}) {
   if (!import.meta.server)
     return;
   const nuxtApp = useNuxtApp();
   const ogImageInstances = nuxtApp.ssrContext._ogImageInstances || [];
-  const basePath = useRouter().currentRoute.value?.path || "/";
-  const _routeRulesMatcher = toRouteMatcher(
-    createRadixRouter({ routes: useRuntimeConfig().nitro?.routeRules })
-  );
-  const routeRules = defu({}, ..._routeRulesMatcher.matchAll(
-    withoutBase(basePath.split("?")[0], useRuntimeConfig().app.baseURL)
-  ).reverse()).ogImage;
+  const route = useRoute();
+  const basePath = route.path || "/";
+  const routeRuleMatcher = createNitroRouteRuleMatcher();
+  const routeRules = routeRuleMatcher(basePath).ogImage;
   if (!_options || nuxtApp.ssrContext?.event.context._nitro?.routeRules?.ogImage === false || typeof routeRules !== "undefined" && routeRules === false) {
     ogImageInstances.forEach((e) => {
       e.dispose();
@@ -27,6 +23,8 @@ export function defineOgImage(_options = {}) {
   const options = normaliseOptions({
     ..._options
   });
+  if (route.query)
+    options._query = route.query;
   const { defaults } = useOgImageRuntimeConfig();
   const resolvedOptions = normaliseOptions(defu(separateProps(_options), separateProps(routeRules), defaults));
   if (_options.url) {

package/dist/runtime/core/font/fetch.mjs

@@ -27,7 +27,10 @@ export async function loadFont({ e }, font) {
       }
     } else {
       data = await e.$fetch(`/__og-image__/font/${name}/${weight}.ttf`, {
-        responseType: "arrayBuffer"
+        responseType: "arrayBuffer",
+        query: {
+          font
+        }
       });
     }
   }

package/dist/runtime/core/html/devIframeTemplate.mjs

@@ -1,6 +1,6 @@
 import { createHeadCore } from "@unhead/vue";
 import { renderSSRHead } from "@unhead/ssr";
-import { useOgImageRuntimeConfig } from "../../utils.mjs";
+import { normaliseFontInput, useOgImageRuntimeConfig } from "../../utils.mjs";
 import { applyEmojis } from "./applyEmojis.mjs";
 import { fetchIsland } from "./fetchIsland.mjs";
 import { theme } from "#nuxt-og-image/unocss-config.mjs";
@@ -11,7 +11,8 @@ export async function devIframeTemplate(ctx) {
   const head = createHeadCore();
   head.push(island.head);
   let defaultFontFamily = "sans-serif";
-  const firstFont = fonts[0];
+  const normalisedFonts = normaliseFontInput([...options.fonts || [], ...fonts]);
+  const firstFont = normalisedFonts[0];
   if (firstFont)
     defaultFontFamily = firstFont.name;
   await applyEmojis(ctx, island);

package/dist/runtime/core/html/fetchIsland.mjs

@@ -4,7 +4,7 @@ export function fetchIsland({ options, e }) {
   if (!options.component) {
     throw createError({
       statusCode: 500,
-      statusMessage: `Nuxt OG Image trying to render an invalid component. Received options ${JSON.stringify(options)}`
+      statusMessage: `[Nuxt OG Image] Rendering an invalid component. Received options: ${JSON.stringify(options)}.`
     });
   }
   const hashId = hash([options.component, options]);

package/dist/runtime/core/options/extract.d.ts

@@ -1,3 +1,4 @@
 import type { OgImageOptions } from '../../types';
+export declare function htmlDecodeQuotes(html: string): string;
 export declare function decodeHtml(html: string): string;
 export declare function extractAndNormaliseOgImageOptions(html: string): OgImageOptions | false;

package/dist/runtime/core/options/extract.mjs

@@ -1,3 +1,6 @@
+export function htmlDecodeQuotes(html) {
+  return html.replace(/"/g, '"').replace(/'/g, "'").replace(/'/g, "'");
+}
 export function decodeHtml(html) {
   return html.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&cent;/g, "\xA2").replace(/&pound;/g, "\xA3").replace(/&yen;/g, "\xA5").replace(/&euro;/g, "\u20AC").replace(/&copy;/g, "\xA9").replace(/&reg;/g, "\xAE").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&#x27;/g, "'").replace(/&#x2F;/g, "/").replace(/&#([0-9]+);/g, (full, int) => {
     return String.fromCharCode(Number.parseInt(int));

package/dist/runtime/core/options/fetch.mjs

@@ -11,7 +11,13 @@ export async function fetchPathHtmlAndExtractOptions(e, path, key) {
   } catch (err) {
     return createError({
       statusCode: 500,
-      statusMessage: `Failed to read the path ${path} for og-image extraction. ${err.message}.`
+      statusMessage: `[Nuxt OG Image] Failed to read the path ${path} for og-image extraction. ${err.message}.`
+    });
+  }
+  if (typeof html !== "string") {
+    return createError({
+      statusCode: 500,
+      statusMessage: `[Nuxt OG Image] Got invalid response from ${path} for og-image extraction.`
     });
   }
   const payload = extractAndNormaliseOgImageOptions(html);

package/dist/runtime/core/renderers/chromium/index.mjs

@@ -14,7 +14,8 @@ const ChromiumRenderer = {
     if (screenshot instanceof Error) {
       return createError({
         statusCode: 400,
-        statusMessage: `Failed to create screenshot ${screenshot.message}.`
+        cause: screenshot,
+        statusMessage: `[Nuxt OG Image] Failed to create screenshot ${screenshot.message}.`
       });
     }
     return screenshot;

package/dist/runtime/core/renderers/satori/index.mjs

@@ -7,10 +7,10 @@ import { useResvg, useSatori, useSharp } from "./instances.mjs";
 import { theme } from "#nuxt-og-image/unocss-config.mjs";
 export async function createSvg(event) {
   const { options } = event;
-  const { fonts, satoriOptions } = useOgImageRuntimeConfig();
+  const { fonts, satoriOptions: _satoriOptions } = useOgImageRuntimeConfig();
   const vnodes = await createVNodes(event);
   await event._nitro.hooks.callHook("nuxt-og-image:satori:vnodes", vnodes, event);
-  const normalisedFonts = normaliseFontInput([...fonts, ...event.options.fonts || []]);
+  const normalisedFonts = normaliseFontInput([...event.options.fonts || [], ...fonts]);
   const localFontPromises = [];
   const preloadedFonts = [];
   for (const font of normalisedFonts) {
@@ -30,15 +30,16 @@ export async function createSvg(event) {
   }
   const awaitedFonts = await Promise.all(localFontPromises);
   const satori = await useSatori();
-  return satori(vnodes, defu(options.satori, satoriOptions, {
+  const satoriOptions = defu(options.satori, _satoriOptions, {
     fonts: [...preloadedFonts, ...awaitedFonts].map((_f) => {
-      return { ..._f, weight: Number(_f.weight) };
+      return { name: _f.name, data: _f.data, style: _f.style, weight: Number(_f.weight) };
     }),
     tailwindConfig: { theme },
     embedFont: true,
     width: options.width,
     height: options.height
-  }));
+  });
+  return satori(vnodes, satoriOptions);
 }
 async function createPng(event) {
   const { resvgOptions } = useOgImageRuntimeConfig();

package/dist/runtime/core/renderers/satori/vnodes.mjs

@@ -2,6 +2,7 @@ import { html as convertHtmlToSatori } from "satori-html";
 import { fetchIsland } from "../../html/fetchIsland.mjs";
 import { applyInlineCss } from "../../html/applyInlineCss.mjs";
 import { applyEmojis } from "../../html/applyEmojis.mjs";
+import { htmlDecodeQuotes } from "../../options/extract.mjs";
 import { walkSatoriTree } from "./utils.mjs";
 import unocss from "./plugins/unocss.mjs";
 import emojis from "./plugins/emojis.mjs";
@@ -13,6 +14,7 @@ export async function createVNodes(ctx) {
   let html = ctx.options.html;
   if (!html) {
     const island = await fetchIsland(ctx);
+    island.html = htmlDecodeQuotes(island.html);
     await applyInlineCss(ctx, island);
     await applyEmojis(ctx, island);
     html = island.html;

package/dist/runtime/core/utils/resolveRendererContext.mjs

@@ -1,13 +1,13 @@
-import { parseURL, withoutBase, withoutTrailingSlash } from "ufo";
+import { parseURL, withQuery, withoutTrailingSlash } from "ufo";
 import { createError, getQuery } from "h3";
 import { defu } from "defu";
-import { createRouter as createRadixRouter, toRouteMatcher } from "radix3";
 import { fetchPathHtmlAndExtractOptions } from "../options/fetch.mjs";
 import { prerenderOptionsCache } from "../cache/prerender.mjs";
 import { useChromiumRenderer, useSatoriRenderer } from "../renderers/satori/instances.mjs";
 import { separateProps, useOgImageRuntimeConfig } from "../../utils.mjs";
 import { resolvePathCacheKey } from "../../nitro/utils.mjs";
-import { useNitroApp, useRuntimeConfig } from "#internal/nitro";
+import { createNitroRouteRuleMatcher } from "../../nitro/kit.mjs";
+import { useNitroApp } from "#internal/nitro/app";
 export async function resolveRendererContext(e) {
   const runtimeConfig = useOgImageRuntimeConfig();
   const path = parseURL(e.path).pathname;
@@ -15,21 +15,23 @@ export async function resolveRendererContext(e) {
   if (!extension) {
     return createError({
       statusCode: 400,
-      statusMessage: `Missing OG Image type.`
+      statusMessage: `[Nuxt OG Image] Missing OG Image type.`
     });
   }
   if (!["png", "jpeg", "jpg", "svg", "html", "json"].includes(extension)) {
     return createError({
       statusCode: 400,
-      statusMessage: `Unknown OG Image type ${extension}.`
+      statusMessage: `[Nuxt OG Image] Unknown OG Image type ${extension}.`
     });
   }
-  const basePath = withoutTrailingSlash(
-    path.replace(`/__og-image__/image`, "").replace(`/og.${extension}`, "")
-  );
   let queryParams = { ...getQuery(e) };
   queryParams.props = JSON.parse(queryParams.props || "{}");
   queryParams = separateProps(queryParams);
+  let basePath = withoutTrailingSlash(
+    path.replace(`/__og-image__/image`, "").replace(`/og.${extension}`, "")
+  );
+  if (queryParams._query)
+    basePath = withQuery(basePath, JSON.parse(queryParams._query));
   const isDebugJsonPayload = extension === "json" && runtimeConfig.debug;
   const key = resolvePathCacheKey(e, basePath);
   let options = queryParams.options;
@@ -44,12 +46,8 @@ export async function resolveRendererContext(e) {
     }
   }
   delete queryParams.options;
-  const _routeRulesMatcher = toRouteMatcher(
-    createRadixRouter({ routes: useRuntimeConfig().nitro?.routeRules })
-  );
-  const routeRules = defu({}, ..._routeRulesMatcher.matchAll(
-    withoutBase(basePath.split("?")[0], useRuntimeConfig().app.baseURL)
-  ).reverse());
+  const routeRuleMatcher = createNitroRouteRuleMatcher();
+  const routeRules = routeRuleMatcher(basePath);
   if (typeof routeRules.ogImage === "undefined" && !options) {
     return createError({
       statusCode: 400,
@@ -61,7 +59,7 @@ export async function resolveRendererContext(e) {
   if (!options) {
     return createError({
       statusCode: 404,
-      statusMessage: "OG Image not found."
+      statusMessage: "[Nuxt OG Image] OG Image not found."
     });
   }
   let renderer;
@@ -76,7 +74,7 @@ export async function resolveRendererContext(e) {
   if (!renderer || renderer.__unenv__) {
     throw createError({
       statusCode: 400,
-      statusMessage: `Renderer ${options.renderer} is missing.`
+      statusMessage: `[Nuxt OG Image] Renderer ${options.renderer} is missing.`
     });
   }
   const ctx = {

package/dist/runtime/nitro/kit.d.ts

@@ -0,0 +1,3 @@
+import type { NitroRouteRules } from 'nitropack';
+export declare function withoutQuery(path: string): string;
+export declare function createNitroRouteRuleMatcher(): (path: string) => NitroRouteRules;

package/dist/runtime/nitro/kit.mjs

@@ -0,0 +1,23 @@
+import { createRouter as createRadixRouter, toRouteMatcher } from "radix3";
+import { defu } from "defu";
+import { withoutBase, withoutTrailingSlash } from "ufo";
+import { useRuntimeConfig } from "#imports";
+export function withoutQuery(path) {
+  return path.split("?")[0];
+}
+export function createNitroRouteRuleMatcher() {
+  const { nitro, app } = useRuntimeConfig();
+  const _routeRulesMatcher = toRouteMatcher(
+    createRadixRouter({
+      routes: Object.fromEntries(
+        Object.entries(nitro?.routeRules || {}).map(([path, rules]) => [withoutTrailingSlash(path), rules])
+      )
+    })
+  );
+  return (path) => {
+    return defu({}, ..._routeRulesMatcher.matchAll(
+      // radix3 does not support trailing slashes
+      withoutBase(withoutTrailingSlash(withoutQuery(path)), app.baseURL)
+    ).reverse());
+  };
+}

package/dist/runtime/nitro/plugins/prerender.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("nitropack").NitroAppPlugin;
+declare const _default: import("nitropack/dist/runtime/plugin").NitroAppPlugin;
 export default _default;

package/dist/runtime/nitro/plugins/prerender.mjs

@@ -1,12 +1,10 @@
-import { parseURL, withoutBase } from "ufo";
+import { parseURL } from "ufo";
 import { defineNitroPlugin } from "nitropack/dist/runtime/plugin";
-import { createRouter as createRadixRouter, toRouteMatcher } from "radix3";
-import { defu } from "defu";
 import { extractAndNormaliseOgImageOptions } from "../../core/options/extract.mjs";
 import { prerenderOptionsCache } from "../../core/cache/prerender.mjs";
 import { isInternalRoute } from "../../utils.pure.mjs";
 import { resolvePathCacheKey } from "../utils.mjs";
-import { useRuntimeConfig } from "#internal/nitro";
+import { createNitroRouteRuleMatcher } from "../kit.mjs";
 export default defineNitroPlugin(async (nitro) => {
   if (!import.meta.prerender)
     return;
@@ -15,14 +13,9 @@ export default defineNitroPlugin(async (nitro) => {
     const path = parseURL(ctx.event.path).pathname;
     if (isInternalRoute(path))
       return;
-    const runtimeConfig = useRuntimeConfig();
-    const _routeRulesMatcher = toRouteMatcher(
-      createRadixRouter({ routes: runtimeConfig.nitro?.routeRules })
-    );
-    const routeRules = defu({}, ..._routeRulesMatcher.matchAll(
-      withoutBase(path.split("?")[0], runtimeConfig.app.baseURL)
-    ).reverse()).ogImage;
-    if (routeRules === false)
+    const routeRuleMatcher = createNitroRouteRuleMatcher();
+    const routeRules = routeRuleMatcher(path);
+    if (routeRules.ogImage === false)
       return;
     const options = extractAndNormaliseOgImageOptions([
       head.join("\n"),

package/dist/runtime/nitro/utils.mjs

@@ -2,12 +2,11 @@ import { withoutLeadingSlash, withoutTrailingSlash } from "ufo";
 import { hash } from "ohash";
 import { normalizeKey } from "unstorage";
 import { getQuery } from "h3";
-import { useSiteConfig } from "#imports";
 export function resolvePathCacheKey(e, path) {
-  const siteConfig = useSiteConfig(e);
+  const siteConfig = e.context.siteConfig.get();
   const basePath = withoutTrailingSlash(withoutLeadingSlash(normalizeKey(path || e.path)));
   return [
-    !basePath ? "index" : basePath,
+    !basePath || basePath === "/" ? "index" : basePath,
     hash([
       basePath,
       siteConfig.url,