nuxt-og-image 3.0.0-rc.66 → 3.0.0-rc.68

package/dist/runtime/nitro/og-image/satori/plugins/flex.js

@@ -1,10 +1,35 @@
 import { defineSatoriTransformer } from "../utils.js";
+const BLOCK_ELEMENTS = [
+  "div",
+  "p",
+  "ul",
+  "ol",
+  "li",
+  "blockquote",
+  "pre",
+  "hr",
+  "table",
+  "dl"
+];
 export default defineSatoriTransformer({
-  filter: (node) => node.type === "div" && (Array.isArray(node.props?.children) && node.props?.children.length >= 1) && (!node.props.style?.display && !node.props?.class?.includes("hidden")),
+  filter: (node) => node.type === "div" && (Array.isArray(node.props?.children) && node.props?.children.length >= 1) && !node.props?.class?.includes("hidden"),
   transform: (node) => {
     node.props.style = node.props.style || {};
+    if (node.props.style?.display && node.props.style?.display !== "flex") {
+      return;
+    }
     node.props.style.display = "flex";
-    if (!node.props?.class?.includes("flex-"))
+    if (!node.props?.class?.includes("flex-") && node.props.children.some((child) => BLOCK_ELEMENTS.includes(child.type))) {
       node.props.style.flexDirection = "column";
+      return;
+    }
+    let flexWrap = node.props?.class?.includes("flex-wrap");
+    if (!node.props?.class?.includes("flex-")) {
+      node.props.style.flexWrap = "wrap";
+      flexWrap = true;
+    }
+    if (flexWrap && !node.props?.class?.includes("gap")) {
+      node.props.style.gap = "0.2em";
+    }
   }
 });

package/dist/runtime/nitro/og-image/satori/plugins/imageSrc.js

@@ -1,9 +1,9 @@
-import { withBase } from "ufo";
+import { useNitroOrigin, useStorage } from "#imports";
 import sizeOf from "image-size";
-import { defineSatoriTransformer } from "../utils.js";
+import { withBase } from "ufo";
 import { toBase64Image } from "../../../../pure.js";
 import { logger } from "../../../util/logger.js";
-import { useNitroOrigin, useStorage } from "#imports";
+import { defineSatoriTransformer } from "../utils.js";
 async function resolveLocalFilePathImage(publicStoragePath, src) {
   const key = `${publicStoragePath}${src.replace("./", ":").replace("/", ":")}`;
   if (await useStorage().hasItem(key))

package/dist/runtime/nitro/og-image/satori/plugins/unocss.js

@@ -1,7 +1,7 @@
+import { theme } from "#nuxt-og-image/unocss-config.mjs";
 import { createGenerator } from "@unocss/core";
 import presetWind from "@unocss/preset-wind";
 import { defineSatoriTransformer } from "../utils.js";
-import { theme } from "#nuxt-og-image/unocss-config.mjs";
 const uno = createGenerator({ theme }, {
   presets: [
     presetWind()

package/dist/runtime/nitro/og-image/satori/renderer.js

@@ -1,15 +1,11 @@
+import { theme } from "#nuxt-og-image/unocss-config.mjs";
+import { fontCache } from "#nuxt-og-image-cache";
 import { defu } from "defu";
-import { createStorage } from "unstorage";
-import lruCacheDriver from "unstorage/drivers/lru-cache";
 import { normaliseFontInput, useOgImageRuntimeConfig } from "../../../shared.js";
 import { loadFont } from "./font.js";
-import { createVNodes } from "./vnodes.js";
 import { useResvg, useSatori, useSharp } from "./instances.js";
-import { theme } from "#nuxt-og-image/unocss-config.mjs";
+import { createVNodes } from "./vnodes.js";
 const fontPromises = {};
-const fontCache = createStorage({
-  driver: lruCacheDriver({ max: 10 })
-});
 async function resolveFonts(event) {
   const { fonts } = useOgImageRuntimeConfig();
   const normalisedFonts = normaliseFontInput([...event.options.fonts || [], ...fonts]);

package/dist/runtime/nitro/og-image/satori/transforms/emojis.d.ts

@@ -1,5 +1,3 @@
 import type { NuxtIslandResponse } from 'nuxt/dist/core/runtime/nitro/renderer';
-import type { Storage } from 'unstorage';
 import type { OgImageRenderEventContext } from '../../../../types.js';
-export declare const emojiCache: Storage<string>;
 export declare function applyEmojis(ctx: OgImageRenderEventContext, island: NuxtIslandResponse): Promise<any>;

package/dist/runtime/nitro/og-image/satori/transforms/emojis.js

@@ -1,5 +1,4 @@
-import { createStorage } from "unstorage";
-import lruCacheDriver from "unstorage/drivers/lru-cache";
+import { emojiCache } from "#nuxt-og-image-cache";
 const charMap = {
   "2049": "exclamation-question-mark",
   "2122": "trade-mark",
@@ -3557,9 +3556,6 @@ const charMap = {
   "1f9df": "zombie",
   "1f4a4": "zzz"
 };
-export const emojiCache = createStorage({
-  driver: lruCacheDriver({ max: 1e3 })
-});
 const RE_MATCH_EMOJIS = /[#*0-9]\uFE0F?\u20E3|[\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23ED-\u23EF\u23F1\u23F2\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB\u25FC\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692\u2694-\u2697\u2699\u269B\u269C\u26A0\u26A7\u26AA\u26B0\u26B1\u26BD\u26BE\u26C4\u26C8\u26CF\u26D1\u26E9\u26F0-\u26F5\u26F7\u26F8\u26FA\u2702\u2708\u2709\u270F\u2712\u2714\u2716\u271D\u2721\u2733\u2734\u2744\u2747\u2757\u2763\u27A1\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B55\u3030\u303D\u3297\u3299]\uFE0F?|[\u261D\u270C\u270D](?:\uFE0F|\uD83C[\uDFFB-\uDFFF])?|[\u270A\u270B](?:\uD83C[\uDFFB-\uDFFF])?|[\u23E9-\u23EC\u23F0\u23F3\u25FD\u2693\u26A1\u26AB\u26C5\u26CE\u26D4\u26EA\u26FD\u2705\u2728\u274C\u274E\u2753-\u2755\u2795-\u2797\u27B0\u27BF\u2B50]|\u26D3\uFE0F?(?:\u200D\uD83D\uDCA5)?|\u26F9(?:\uFE0F|\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|\u2764\uFE0F?(?:\u200D(?:\uD83D\uDD25|\uD83E\uDE79))?|\uD83C(?:[\uDC04\uDD70\uDD71\uDD7E\uDD7F\uDE02\uDE37\uDF21\uDF24-\uDF2C\uDF36\uDF7D\uDF96\uDF97\uDF99-\uDF9B\uDF9E\uDF9F\uDFCD\uDFCE\uDFD4-\uDFDF\uDFF5\uDFF7]\uFE0F?|[\uDF85\uDFC2\uDFC7](?:\uD83C[\uDFFB-\uDFFF])?|[\uDFC4\uDFCA](?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDFCB\uDFCC](?:\uFE0F|\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDCCF\uDD8E\uDD91-\uDD9A\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF43\uDF45-\uDF4A\uDF4C-\uDF7C\uDF7E-\uDF84\uDF86-\uDF93\uDFA0-\uDFC1\uDFC5\uDFC6\uDFC8\uDFC9\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF8-\uDFFF]|\uDDE6\uD83C[\uDDE8-\uDDEC\uDDEE\uDDF1\uDDF2\uDDF4\uDDF6-\uDDFA\uDDFC\uDDFD\uDDFF]|\uDDE7\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEF\uDDF1-\uDDF4\uDDF6-\uDDF9\uDDFB\uDDFC\uDDFE\uDDFF]|\uDDE8\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDEE\uDDF0-\uDDF5\uDDF7\uDDFA-\uDDFF]|\uDDE9\uD83C[\uDDEA\uDDEC\uDDEF\uDDF0\uDDF2\uDDF4\uDDFF]|\uDDEA\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDED\uDDF7-\uDDFA]|\uDDEB\uD83C[\uDDEE-\uDDF0\uDDF2\uDDF4\uDDF7]|\uDDEC\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEE\uDDF1-\uDDF3\uDDF5-\uDDFA\uDDFC\uDDFE]|\uDDED\uD83C[\uDDF0\uDDF2\uDDF3\uDDF7\uDDF9\uDDFA]|\uDDEE\uD83C[\uDDE8-\uDDEA\uDDF1-\uDDF4\uDDF6-\uDDF9]|\uDDEF\uD83C[\uDDEA\uDDF2\uDDF4\uDDF5]|\uDDF0\uD83C[\uDDEA\uDDEC-\uDDEE\uDDF2\uDDF3\uDDF5\uDDF7\uDDFC\uDDFE\uDDFF]|\uDDF1\uD83C[\uDDE6-\uDDE8\uDDEE\uDDF0\uDDF7-\uDDFB\uDDFE]|\uDDF2\uD83C[\uDDE6\uDDE8-\uDDED\uDDF0-\uDDFF]|\uDDF3\uD83C[\uDDE6\uDDE8\uDDEA-\uDDEC\uDDEE\uDDF1\uDDF4\uDDF5\uDDF7\uDDFA\uDDFF]|\uDDF4\uD83C\uDDF2|\uDDF5\uD83C[\uDDE6\uDDEA-\uDDED\uDDF0-\uDDF3\uDDF7-\uDDF9\uDDFC\uDDFE]|\uDDF6\uD83C\uDDE6|\uDDF7\uD83C[\uDDEA\uDDF4\uDDF8\uDDFA\uDDFC]|\uDDF8\uD83C[\uDDE6-\uDDEA\uDDEC-\uDDF4\uDDF7-\uDDF9\uDDFB\uDDFD-\uDDFF]|\uDDF9\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDED\uDDEF-\uDDF4\uDDF7\uDDF9\uDDFB\uDDFC\uDDFF]|\uDDFA\uD83C[\uDDE6\uDDEC\uDDF2\uDDF3\uDDF8\uDDFE\uDDFF]|\uDDFB\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDEE\uDDF3\uDDFA]|\uDDFC\uD83C[\uDDEB\uDDF8]|\uDDFD\uD83C\uDDF0|\uDDFE\uD83C[\uDDEA\uDDF9]|\uDDFF\uD83C[\uDDE6\uDDF2\uDDFC]|\uDF44(?:\u200D\uD83D\uDFEB)?|\uDF4B(?:\u200D\uD83D\uDFE9)?|\uDFC3(?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D(?:[\u2640\u2642]\uFE0F?(?:\u200D\u27A1\uFE0F?)?|\u27A1\uFE0F?))?|\uDFF3\uFE0F?(?:\u200D(?:\u26A7\uFE0F?|\uD83C\uDF08))?|\uDFF4(?:\u200D\u2620\uFE0F?|\uDB40\uDC67\uDB40\uDC62\uDB40(?:\uDC65\uDB40\uDC6E\uDB40\uDC67|\uDC73\uDB40\uDC63\uDB40\uDC74|\uDC77\uDB40\uDC6C\uDB40\uDC73)\uDB40\uDC7F)?)|\uD83D(?:[\uDC3F\uDCFD\uDD49\uDD4A\uDD6F\uDD70\uDD73\uDD76-\uDD79\uDD87\uDD8A-\uDD8D\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA\uDECB\uDECD-\uDECF\uDEE0-\uDEE5\uDEE9\uDEF0\uDEF3]\uFE0F?|[\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDC8F\uDC91\uDCAA\uDD7A\uDD95\uDD96\uDE4C\uDE4F\uDEC0\uDECC](?:\uD83C[\uDFFB-\uDFFF])?|[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4\uDEB5](?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDD74\uDD90](?:\uFE0F|\uD83C[\uDFFB-\uDFFF])?|[\uDC00-\uDC07\uDC09-\uDC14\uDC16-\uDC25\uDC27-\uDC3A\uDC3C-\uDC3E\uDC40\uDC44\uDC45\uDC51-\uDC65\uDC6A\uDC79-\uDC7B\uDC7D-\uDC80\uDC84\uDC88-\uDC8E\uDC90\uDC92-\uDCA9\uDCAB-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDDA4\uDDFB-\uDE2D\uDE2F-\uDE34\uDE37-\uDE41\uDE43\uDE44\uDE48-\uDE4A\uDE80-\uDEA2\uDEA4-\uDEB3\uDEB7-\uDEBF\uDEC1-\uDEC5\uDED0-\uDED2\uDED5-\uDED7\uDEDC-\uDEDF\uDEEB\uDEEC\uDEF4-\uDEFC\uDFE0-\uDFEB\uDFF0]|\uDC08(?:\u200D\u2B1B)?|\uDC15(?:\u200D\uD83E\uDDBA)?|\uDC26(?:\u200D(?:\u2B1B|\uD83D\uDD25))?|\uDC3B(?:\u200D\u2744\uFE0F?)?|\uDC41\uFE0F?(?:\u200D\uD83D\uDDE8\uFE0F?)?|\uDC68(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDC68\uDC69]\u200D\uD83D(?:\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?)|[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?)|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]))|\uD83C(?:\uDFFB(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D\uDC68\uD83C[\uDFFC-\uDFFF])))?|\uDFFC(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D\uDC68\uD83C[\uDFFB\uDFFD-\uDFFF])))?|\uDFFD(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D\uDC68\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])))?|\uDFFE(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D\uDC68\uD83C[\uDFFB-\uDFFD\uDFFF])))?|\uDFFF(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?\uDC68\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D\uDC68\uD83C[\uDFFB-\uDFFE])))?))?|\uDC69(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:\uDC8B\u200D\uD83D)?[\uDC68\uDC69]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D(?:[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?|\uDC69\u200D\uD83D(?:\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?))|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]))|\uD83C(?:\uDFFB(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFC-\uDFFF])))?|\uDFFC(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB\uDFFD-\uDFFF])))?|\uDFFD(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])))?|\uDFFE(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB-\uDFFD\uDFFF])))?|\uDFFF(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D\uD83D(?:[\uDC68\uDC69]|\uDC8B\u200D\uD83D[\uDC68\uDC69])\uD83C[\uDFFB-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83D[\uDC68\uDC69]\uD83C[\uDFFB-\uDFFE])))?))?|\uDC6F(?:\u200D[\u2640\u2642]\uFE0F?)?|\uDD75(?:\uFE0F|\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|\uDE2E(?:\u200D\uD83D\uDCA8)?|\uDE35(?:\u200D\uD83D\uDCAB)?|\uDE36(?:\u200D\uD83C\uDF2B\uFE0F?)?|\uDE42(?:\u200D[\u2194\u2195]\uFE0F?)?|\uDEB6(?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D(?:[\u2640\u2642]\uFE0F?(?:\u200D\u27A1\uFE0F?)?|\u27A1\uFE0F?))?)|\uD83E(?:[\uDD0C\uDD0F\uDD18-\uDD1F\uDD30-\uDD34\uDD36\uDD77\uDDB5\uDDB6\uDDBB\uDDD2\uDDD3\uDDD5\uDEC3-\uDEC5\uDEF0\uDEF2-\uDEF8](?:\uD83C[\uDFFB-\uDFFF])?|[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD\uDDCF\uDDD4\uDDD6-\uDDDD](?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDDDE\uDDDF](?:\u200D[\u2640\u2642]\uFE0F?)?|[\uDD0D\uDD0E\uDD10-\uDD17\uDD20-\uDD25\uDD27-\uDD2F\uDD3A\uDD3F-\uDD45\uDD47-\uDD76\uDD78-\uDDB4\uDDB7\uDDBA\uDDBC-\uDDCC\uDDD0\uDDE0-\uDDFF\uDE70-\uDE7C\uDE80-\uDE88\uDE90-\uDEBD\uDEBF-\uDEC2\uDECE-\uDEDB\uDEE0-\uDEE8]|\uDD3C(?:\u200D[\u2640\u2642]\uFE0F?|\uD83C[\uDFFB-\uDFFF])?|\uDDCE(?:\uD83C[\uDFFB-\uDFFF])?(?:\u200D(?:[\u2640\u2642]\uFE0F?(?:\u200D\u27A1\uFE0F?)?|\u27A1\uFE0F?))?|\uDDD1(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83E\uDDD1|\uDDD1\u200D\uD83E\uDDD2(?:\u200D\uD83E\uDDD2)?|\uDDD2(?:\u200D\uD83E\uDDD2)?))|\uD83C(?:\uDFFB(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFC-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF])))?|\uDFFC(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB\uDFFD-\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF])))?|\uDFFD(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF])))?|\uDFFE(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB-\uDFFD\uDFFF]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF])))?|\uDFFF(?:\u200D(?:[\u2695\u2696\u2708]\uFE0F?|\u2764\uFE0F?\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1\uD83C[\uDFFB-\uDFFE]|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E(?:[\uDDAF\uDDBC\uDDBD](?:\u200D\u27A1\uFE0F?)?|[\uDDB0-\uDDB3]|\uDD1D\u200D\uD83E\uDDD1\uD83C[\uDFFB-\uDFFF])))?))?|\uDEF1(?:\uD83C(?:\uDFFB(?:\u200D\uD83E\uDEF2\uD83C[\uDFFC-\uDFFF])?|\uDFFC(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB\uDFFD-\uDFFF])?|\uDFFD(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])?|\uDFFE(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB-\uDFFD\uDFFF])?|\uDFFF(?:\u200D\uD83E\uDEF2\uD83C[\uDFFB-\uDFFE])?))?)/g;
 export async function applyEmojis(ctx, island) {
   const html = island.html;

package/dist/runtime/nitro/og-image/satori/transforms/inlineCss.js

@@ -1,6 +1,6 @@
+import { useNitroOrigin } from "#imports";
 import { createConsola } from "consola";
 import { useCssInline } from "../instances.js";
-import { useNitroOrigin } from "#imports";
 export async function applyInlineCss(ctx, island) {
   const { e } = ctx;
   let html = island.html;

package/dist/runtime/nitro/og-image/satori/vnodes.js

@@ -1,15 +1,15 @@
 import { html as convertHtmlToSatori } from "satori-html";
-import { fetchIsland } from "../../util/kit.js";
 import { htmlDecodeQuotes } from "../../util/encoding.js";
-import { applyInlineCss } from "./transforms/inlineCss.js";
-import { applyEmojis } from "./transforms/emojis.js";
-import { walkSatoriTree } from "./utils.js";
-import unocss from "./plugins/unocss.js";
-import emojis from "./plugins/emojis.js";
+import { fetchIsland } from "../../util/kit.js";
 import classes from "./plugins/classes.js";
-import imageSrc from "./plugins/imageSrc.js";
-import flex from "./plugins/flex.js";
+import emojis from "./plugins/emojis.js";
 import encoding from "./plugins/encoding.js";
+import flex from "./plugins/flex.js";
+import imageSrc from "./plugins/imageSrc.js";
+import unocss from "./plugins/unocss.js";
+import { applyEmojis } from "./transforms/emojis.js";
+import { applyInlineCss } from "./transforms/inlineCss.js";
+import { walkSatoriTree } from "./utils.js";
 export async function createVNodes(ctx) {
   let html = ctx.options.html;
   if (!html) {

package/dist/runtime/nitro/og-image/templates/html.js

@@ -1,10 +1,10 @@
-import { createHeadCore } from "@unhead/vue";
+import { theme } from "#nuxt-og-image/unocss-config.mjs";
 import { renderSSRHead } from "@unhead/ssr";
+import { createHeadCore } from "@unhead/vue";
 import { createError } from "h3";
 import { normaliseFontInput, useOgImageRuntimeConfig } from "../../../shared.js";
 import { fetchIsland } from "../../util/kit.js";
 import { applyEmojis } from "../satori/transforms/emojis.js";
-import { theme } from "#nuxt-og-image/unocss-config.mjs";
 export async function html(ctx) {
   const { options } = ctx;
   const { fonts } = useOgImageRuntimeConfig();
@@ -24,12 +24,6 @@ export async function html(ctx) {
     defaultFontFamily = firstFont.name;
   await applyEmojis(ctx, island);
   let html2 = island.html;
-  const googleFonts = {};
-  fonts.filter((font) => !font.path).forEach((font) => {
-    if (!googleFonts[font.name])
-      googleFonts[font.name] = [];
-    googleFonts[font.name].push(font);
-  });
   head.push({
     style: [
       {
@@ -38,31 +32,40 @@ export async function html(ctx) {
       },
       {
         innerHTML: `body {
-    transform: scale(${options.props.scale || 1});
+    transform: scale(${options.props?.scale || 1});
     transform-origin: top left;
     max-height: 100vh;
     position: relative;
     width: ${options.width}px;
     height: ${options.height}px;
     overflow: hidden;
-    background-color: ${options.props.colorMode === "dark" ? "#1b1b1b" : "#fff"};
+    background-color: ${options.props?.colorMode === "dark" ? "#1b1b1b" : "#fff"};
 }
 div {
   display: flex;
+}
+div:has(div, p, ul, ol, li, blockquote, pre, hr, table, dl) {
+  display: flex;
   flex-direction: column;
 }
+div:not(:has(div, p, ul, ol, li, blockquote, pre, hr, table, dl)) {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+}
+
 svg[data-emoji] {
   display: inline-block;
 }
 `
       },
-      ...fonts.filter((font) => font.path).map((font) => {
+      ...fonts.map((font) => {
         return `
           @font-face {
             font-family: '${font.name}';
             font-style: normal;
             font-weight: ${font.weight};
-            src: url('${font.path}') format('truetype');
+            src: url('/__og-image__/font/${font.key}') format('truetype');
           }
           `;
       })
@@ -95,15 +98,7 @@ svg[data-emoji] {
         // reset css to match svg output
         href: "https://cdn.jsdelivr.net/npm/gardevoir",
         rel: "stylesheet"
-      },
-      // have to add each weight as their own stylesheet
-      // we should use the local font file no?
-      ...Object.entries(googleFonts).map(([name, fonts2]) => {
-        return {
-          href: `https://fonts.googleapis.com/css2?family=${name}:wght@${fonts2.map((f) => f.weight).join(";")}&display=swap`,
-          rel: "stylesheet"
-        };
-      })
+      }
     ]
   });
   html2 = html2.replaceAll(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, "");

package/dist/runtime/nitro/plugins/__zero-runtime/nuxt-content.d.ts

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

package/dist/runtime/nitro/plugins/__zero-runtime/nuxt-content.js

@@ -0,0 +1,9 @@
+import { defineNitroPlugin } from "nitropack/dist/runtime/plugin";
+import { nuxtContentPlugin } from "../../util/plugins.js";
+export default defineNitroPlugin((nitroApp) => {
+  if (import.meta.dev || import.meta.prerender) {
+    nuxtContentPlugin(nitroApp);
+    return;
+  }
+  throw new Error("Not supported in zeroRuntime mode.");
+});

package/dist/runtime/nitro/plugins/nuxt-content.js

@@ -1,55 +1,5 @@
 import { defineNitroPlugin } from "nitropack/dist/runtime/plugin";
-import { defu } from "defu";
-import { stringify } from "devalue";
-import { getOgImagePath, useOgImageRuntimeConfig } from "../../shared.js";
+import { nuxtContentPlugin } from "../util/plugins.js";
 export default defineNitroPlugin((nitroApp) => {
-  const { isNuxtContentDocumentDriven, defaults } = useOgImageRuntimeConfig();
-  nitroApp.hooks.hook("content:file:afterParse", async (content) => {
-    if (content._draft || content._extension !== "md" || content._partial || content.indexable === false || content.index === false)
-      return;
-    let path = content.path;
-    if (isNuxtContentDocumentDriven)
-      path = content._path;
-    if (path && content.ogImage) {
-      const ogImageConfig = typeof content.ogImage === "object" ? content.ogImage : {};
-      const optionsWithDefault = defu(ogImageConfig, defaults);
-      const src = getOgImagePath(path, optionsWithDefault);
-      const payload = {
-        title: content.title,
-        excerpt: content.description || content.excerpt,
-        ...content.ogImage
-      };
-      Object.entries(ogImageConfig).forEach(([key, val]) => {
-        payload[key.replace(/-([a-z])/g, (g) => g[1].toUpperCase())] = val;
-      });
-      content.head = defu({
-        script: [
-          {
-            id: "nuxt-og-image-overrides",
-            type: "application/json",
-            processTemplateParams: true,
-            innerHTML: stringify(payload),
-            // we want this to be last in our head
-            tagPosition: "bodyClose",
-            tagPriority: 30
-            // slighty higher priority
-          }
-        ],
-        meta: [
-          { property: "og:image", content: src },
-          { property: "og:image:width", content: optionsWithDefault.width },
-          { property: "og:image:height", content: optionsWithDefault.height },
-          { property: "og:image:type", content: `image/${optionsWithDefault.extension}` },
-          { property: "og:image:alt", content: optionsWithDefault.alt },
-          // twitter
-          { name: "twitter:card", content: "summary_large_image" },
-          { name: "twitter:image:src", content: src },
-          { name: "twitter:image:width", content: optionsWithDefault.width },
-          { name: "twitter:image:height", content: optionsWithDefault.height },
-          { name: "twitter:image:alt", content: optionsWithDefault.alt }
-        ]
-      });
-    }
-    return content;
-  });
+  nuxtContentPlugin(nitroApp);
 });

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

@@ -1,18 +1,18 @@
-import { parseURL } from "ufo";
+import { prerenderOptionsCache } from "#nuxt-og-image-cache";
 import { defineNitroPlugin } from "nitropack/dist/runtime/plugin";
-import { extractAndNormaliseOgImageOptions, resolvePathCacheKey } from "../og-image/context.js";
-import { prerenderOptionsCache } from "../og-image/cache.js";
+import { parseURL } from "ufo";
 import { isInternalRoute } from "../../pure.js";
+import { extractAndNormaliseOgImageOptions, resolvePathCacheKey } from "../og-image/context.js";
 import { createNitroRouteRuleMatcher } from "../util/kit.js";
 export default defineNitroPlugin(async (nitro) => {
   if (!import.meta.prerender)
     return;
+  const routeRuleMatcher = createNitroRouteRuleMatcher();
   nitro.hooks.hook("render:html", async (html, ctx) => {
     const { head, bodyAppend } = html;
     const path = parseURL(ctx.event.path).pathname;
     if (isInternalRoute(path))
       return;
-    const routeRuleMatcher = createNitroRouteRuleMatcher();
     const routeRules = routeRuleMatcher(path);
     if (routeRules.ogImage === false)
       return;
@@ -24,5 +24,10 @@ export default defineNitroPlugin(async (nitro) => {
       return;
     const key = resolvePathCacheKey(ctx.event);
     await prerenderOptionsCache.setItem(key, options);
+    const index = html.bodyAppend.findIndex((script) => script.includes('id="nuxt-og-image-options"'));
+    if (index !== -1) {
+      html.bodyAppend[index] = html.bodyAppend[index].replace(/<script id="nuxt-og-image-options" type="application\/json">[\s\S]*?<\/script>/, "");
+      html.bodyAppend[index] = html.bodyAppend[index].replace(/<script id="nuxt-og-image-overrides" type="application\/json">[\s\S]*?<\/script>/, "");
+    }
   });
 });

package/dist/runtime/nitro/routes/__zero-runtime/font.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<any>>;
+export default _default;

package/dist/runtime/nitro/routes/__zero-runtime/font.js

@@ -0,0 +1,8 @@
+import { defineEventHandler } from "h3";
+import { fontEventHandler } from "../../util/eventHandlers.js";
+export default defineEventHandler(async (e) => {
+  if (import.meta.dev || import.meta.prerender) {
+    return await fontEventHandler(e);
+  }
+  throw new Error("Not supported in zeroRuntime mode.");
+});

package/dist/runtime/nitro/routes/__zero-runtime/image.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<any>>;
+export default _default;

package/dist/runtime/nitro/routes/__zero-runtime/image.js

@@ -0,0 +1,8 @@
+import { defineEventHandler } from "h3";
+import { imageEventHandler } from "../../util/eventHandlers.js";
+export default defineEventHandler(async (e) => {
+  if (import.meta.dev || import.meta.prerender) {
+    return await imageEventHandler(e);
+  }
+  throw new Error("Not supported in zeroRuntime mode.");
+});

package/dist/runtime/nitro/routes/debug.json.js

@@ -1,7 +1,7 @@
-import { defineEventHandler, setHeader } from "h3";
-import { useOgImageRuntimeConfig } from "../../shared.js";
 import compatibility from "#nuxt-og-image/compatibility";
 import { componentNames } from "#nuxt-og-image/component-names.mjs";
+import { defineEventHandler, setHeader } from "h3";
+import { useOgImageRuntimeConfig } from "../../shared.js";
 export default defineEventHandler(async (e) => {
   setHeader(e, "Content-Type", "application/json");
   const runtimeConfig = useOgImageRuntimeConfig();

package/dist/runtime/nitro/routes/font.js

@@ -1,49 +1,3 @@
-import { createError, defineEventHandler, getQuery, proxyRequest, sendRedirect } from "h3";
-import { parseURL } from "ufo";
-import { normaliseFontInput, useOgImageRuntimeConfig } from "../../shared.js";
-export default defineEventHandler(async (e) => {
-  const path = parseURL(e.path).pathname;
-  const [_name, _weight] = path.split("/font/")[1].split(".")[0].split("/");
-  if (!_name || !_weight)
-    return "Provide a font name and weight";
-  const name = _name[0].toUpperCase() + _name.slice(1);
-  const weight = Math.round(Number.parseInt(_weight) / 100) * 100;
-  const config = useOgImageRuntimeConfig();
-  const normalisedFonts = normaliseFontInput(config.fonts);
-  let font;
-  if (typeof getQuery(e).font === "string")
-    font = JSON.parse(getQuery(e).font);
-  if (!font) {
-    font = normalisedFonts.find((font2) => {
-      return font2.name.toLowerCase() === name.toLowerCase() && weight === Number(font2.weight);
-    });
-  }
-  if (!font) {
-    return createError({
-      statusCode: 404,
-      statusMessage: `[Nuxt OG Image] Font ${name}:${weight} not found`
-    });
-  }
-  const css = await globalThis.$fetch(`https://fonts.googleapis.com/css2?family=${name}:wght@${weight}`, {
-    headers: {
-      // Make sure it returns TTF.
-      "User-Agent": "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1"
-    }
-  });
-  if (!css) {
-    return createError({
-      statusCode: 500,
-      statusMessage: `[Nuxt OG Image] Invalid Google Font ${name}:${weight}`
-    });
-  }
-  const ttfResource = css.match(/src: url\((.+)\) format\('(opentype|truetype)'\)/);
-  if (ttfResource?.[1])
-    return proxyRequest(e, ttfResource[1], {});
-  const woff2Resource = css.match(/src: url\((.+)\) format\('woff2'\)/);
-  if (woff2Resource?.[1])
-    return sendRedirect(e, woff2Resource[1]);
-  return createError({
-    statusCode: 500,
-    statusMessage: `[Nuxt OG Image] Malformed Google Font CSS ${css}`
-  });
-});
+import { defineEventHandler } from "h3";
+import { fontEventHandler } from "../util/eventHandlers.js";
+export default defineEventHandler(fontEventHandler);

package/dist/runtime/nitro/routes/image.js

@@ -1,87 +1,3 @@
-import { H3Error, createError, defineEventHandler, getQuery, setHeader } from "h3";
-import { useOgImageBufferCache } from "../util/cache.js";
-import { useOgImageRuntimeConfig } from "../../shared.js";
-import { resolveContext } from "../og-image/context.js";
-import { html } from "../og-image/templates/html.js";
-export default defineEventHandler(async (e) => {
-  const ctx = await resolveContext(e);
-  if (ctx instanceof H3Error)
-    return ctx;
-  const { isDebugJsonPayload, extension, options, renderer } = ctx;
-  const { debug, baseCacheKey } = useOgImageRuntimeConfig();
-  const compatibilityHints = [];
-  if (isDebugJsonPayload) {
-    const queryExtension = getQuery(e).extension || ctx.options.extension;
-    if (["jpeg", "jpg"].includes(queryExtension) && options.renderer === "satori")
-      compatibilityHints.push("Converting PNGs to JPEGs requires Sharp which only runs on Node based systems.");
-    if (options.renderer === "chromium")
-      compatibilityHints.push("Using Chromium to generate images is only supported in Node based environments. It's recommended to only use this if you're prerendering");
-    setHeader(e, "Content-Type", "application/json");
-    return {
-      siteConfig: {
-        url: e.context.siteConfig.get().url
-      },
-      compatibilityHints,
-      cacheKey: ctx.key,
-      options: ctx.options,
-      ...options.renderer === "satori" ? await renderer.debug(ctx) : void 0
-    };
-  }
-  switch (extension) {
-    case "html":
-      setHeader(e, "Content-Type", `text/html`);
-      return html(ctx);
-    case "svg":
-      if (!debug && !import.meta.dev) {
-        return createError({
-          statusCode: 404
-        });
-      }
-      if (ctx.renderer.name !== "satori") {
-        return createError({
-          statusCode: 400,
-          statusMessage: `[Nuxt OG Image] Generating ${extension}'s with ${renderer.name} is not supported.`
-        });
-      }
-      setHeader(e, "Content-Type", `image/svg+xml`);
-      return (await ctx.renderer.debug(ctx)).svg;
-    case "png":
-    case "jpeg":
-    case "jpg":
-      if (!renderer.supportedFormats.includes(extension)) {
-        return createError({
-          statusCode: 400,
-          statusMessage: `[Nuxt OG Image] Generating ${extension}'s with ${renderer.name} is not supported.`
-        });
-      }
-      setHeader(e, "Content-Type", `image/${extension === "jpg" ? "jpeg" : extension}`);
-      break;
-    default:
-      return createError({
-        statusCode: 400,
-        statusMessage: `[Nuxt OG Image] Invalid request for og.${extension}.`
-      });
-  }
-  const cacheApi = await useOgImageBufferCache(ctx, {
-    cacheMaxAgeSeconds: ctx.options.cacheMaxAgeSeconds,
-    baseCacheKey
-  });
-  if (typeof cacheApi === "undefined")
-    return;
-  if (cacheApi instanceof H3Error)
-    return cacheApi;
-  let image = cacheApi.cachedItem;
-  if (!image) {
-    image = await renderer.createImage(ctx);
-    if (image instanceof H3Error)
-      return image;
-    if (!image) {
-      return createError({
-        statusCode: 500,
-        statusMessage: `Failed to generate og.${extension}.`
-      });
-    }
-    await cacheApi.update(image);
-  }
-  return image;
-});
+import { defineEventHandler } from "h3";
+import { imageEventHandler } from "../util/eventHandlers.js";
+export default defineEventHandler(imageEventHandler);

package/dist/runtime/nitro/util/cache.js

@@ -1,8 +1,8 @@
-import { prefixStorage } from "unstorage";
+import { useStorage } from "#imports";
 import { createError, getQuery, handleCacheHeaders, setHeader, setHeaders } from "h3";
-import { withTrailingSlash } from "ufo";
 import { hash } from "ohash";
-import { useStorage } from "#imports";
+import { withTrailingSlash } from "ufo";
+import { prefixStorage } from "unstorage";
 export async function useOgImageBufferCache(ctx, options) {
   const maxAge = Number(options.cacheMaxAgeSeconds);
   let enabled = !import.meta.dev && import.meta.env.MODE !== "test" && maxAge > 0;

package/dist/runtime/nitro/util/eventHandlers.d.ts

@@ -0,0 +1,3 @@
+import type { H3Event } from 'h3';
+export declare function fontEventHandler(e: H3Event): Promise<any>;
+export declare function imageEventHandler(e: H3Event): Promise<any>;