nuxt-og-image 3.0.0-rc.53 → 3.0.0-rc.54

package/dist/module.mjs

@@ -441,7 +441,7 @@ const module = defineNuxtModule({
   meta: {
     name: "nuxt-og-image",
     compatibility: {
-      nuxt: "^3.10.3",
+      nuxt: ">=3.10.3",
       bridge: false
     },
     configKey: "ogImage"
@@ -484,10 +484,12 @@ const module = defineNuxtModule({
     nuxt.options.build.transpile.push(resolve("./runtime"));
     const preset = resolveNitroPreset(nuxt.options.nitro);
     const targetCompatibility = getPresetNitroPresetCompatibility(preset);
-    const hasSharpDependency = !!await tryResolveModule("sharp");
+    let isUsingSharp = false;
     const userConfiguredExtension = config.defaults.extension;
     const hasConfiguredJpegs = userConfiguredExtension && ["jpeg", "jpg"].includes(userConfiguredExtension);
-    if (hasConfiguredJpegs && config.defaults.renderer !== "chromium") {
+    if (!!config.sharpOptions || hasConfiguredJpegs && config.defaults.renderer !== "chromium") {
+      isUsingSharp = true;
+      const hasSharpDependency = !!await tryResolveModule("sharp");
       if (hasSharpDependency && !targetCompatibility.sharp) {
         logger.warn(`Rendering JPEGs requires sharp which does not work with ${preset}. Images will be rendered as PNG at runtime.`);
         config.compatibility = defu(config.compatibility, {
@@ -498,7 +500,8 @@ const module = defineNuxtModule({
         await ensureDependencies(["sharp"]);
         logger.warn("Support for `sharp` is limited so check the compatibility guide.");
       }
-    } else if (!hasSharpDependency) {
+    }
+    if (!isUsingSharp) {
       config.compatibility = defu(config.compatibility, {
         runtime: { sharp: false },
         dev: { sharp: false },
@@ -642,8 +645,9 @@ const module = defineNuxtModule({
       components.forEach((component) => {
         let valid = false;
         config.componentDirs.forEach((dir) => {
-          if (component.pascalName.startsWith(dir) || component.kebabName.startsWith(dir) || component.shortPath.includes(`/${dir}/`))
+          if (component.pascalName.startsWith(dir) || component.kebabName.startsWith(dir) || component.shortPath.includes(`/${dir}/`)) {
             valid = true;
+          }
         });
         if (component.filePath.includes(resolve("./runtime/nuxt/components/Templates")))
           valid = true;
@@ -744,12 +748,14 @@ declare module '#nuxt-og-image/unocss-config' {
         colorPreference = colorModeOptions.fallback;
       if (!colorPreference || colorPreference === "system")
         colorPreference = "light";
+      const publicDirAbs = nuxt.options.alias[nuxt.options.dir.public];
       const runtimeConfig = {
         version,
         // binding options
         satoriOptions: config.satoriOptions || {},
         resvgOptions: config.resvgOptions || {},
-        sharpOptions: config.sharpOptions || {},
+        sharpOptions: config.sharpOptions === true ? {} : config.sharpOptions || {},
+        publicStoragePath: `root${publicDirAbs.replace(nuxt.options.rootDir, "").replaceAll("/", ":")}`,
         defaults: config.defaults,
         debug: config.debug,
         // avoid adding credentials

package/dist/runtime/nitro/og-image/bindings/chromium/{on-demand.mjs → on-demand.js}

@@ -1,5 +1,4 @@
 import { execa } from "execa";
-import terminate from "terminate";
 import { createConsola } from "consola";
 import playwrightCore from "playwright-core";
 let installedChromium = false;
@@ -22,7 +21,7 @@ export async function createBrowser() {
           resolve(true);
         });
       }).then(() => {
-        installChromeProcess.pid && terminate(installChromeProcess.pid);
+        installChromeProcess.kill();
         logger.info("Installed Chromium install for og:image generation.");
         _resolve();
       });

package/dist/runtime/nitro/og-image/bindings/css-inline/{wasm-fs.mjs → wasm-fs.js}

@@ -1,5 +1,5 @@
 import { initWasm, inline } from "@css-inline/css-inline-wasm";
-import { readWasmFile } from "../../../util/wasm.mjs";
+import { readWasmFile } from "../../../util/wasm.js";
 export default {
   initWasmPromise: initWasm(readWasmFile("@css-inline/css-inline-wasm/index_bg.wasm")),
   cssInline: {

package/dist/runtime/nitro/og-image/bindings/resvg/{wasm-fs.mjs → wasm-fs.js}

@@ -1,5 +1,5 @@
 import { Resvg as _Resvg, initWasm } from "@resvg/resvg-wasm";
-import { readWasmFile } from "../../../util/wasm.mjs";
+import { readWasmFile } from "../../../util/wasm.js";
 export default {
   initWasmPromise: initWasm(readWasmFile("@resvg/resvg-wasm/index_bg.wasm")),
   Resvg: _Resvg

package/dist/runtime/nitro/og-image/bindings/satori/{wasm-fs.mjs → wasm-fs.js}

@@ -1,6 +1,6 @@
 import _satori, { init } from "satori/wasm";
 import initYoga from "yoga-wasm-web";
-import { readWasmFile } from "../../../util/wasm.mjs";
+import { readWasmFile } from "../../../util/wasm.js";
 const wasm = readWasmFile("yoga-wasm-web/dist/yoga.wasm").then(async (yoga) => await initYoga(yoga));
 export default {
   initWasmPromise: new Promise((resolve) => {

package/dist/runtime/nitro/og-image/cache.d.ts

@@ -1,5 +1,5 @@
 import type { Storage } from 'unstorage';
-import type { OgImageOptions } from '../../types';
+import type { OgImageOptions } from '../../types.js';
 export declare const htmlPayloadCache: Storage<{
     expiresAt: number;
     value: OgImageOptions;

package/dist/runtime/nitro/og-image/chromium/renderer.d.ts

@@ -1,3 +1,3 @@
-import type { Renderer } from '../../../types';
+import type { Renderer } from '../../../types.js';
 declare const ChromiumRenderer: Renderer;
 export default ChromiumRenderer;

package/dist/runtime/nitro/og-image/chromium/{renderer.mjs → renderer.js}

@@ -1,5 +1,5 @@
 import { createError } from "h3";
-import { createScreenshot } from "./screenshot.mjs";
+import { createScreenshot } from "./screenshot.js";
 import { createBrowser } from "#nuxt-og-image/bindings/chromium";
 const ChromiumRenderer = {
   name: "chromium",

package/dist/runtime/nitro/og-image/chromium/screenshot.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
 import type { Buffer } from 'node:buffer';
 import type { Browser } from 'playwright-core';
-import type { OgImageRenderEventContext } from '../../../types';
+import type { OgImageRenderEventContext } from '../../../types.js';
 export declare function createScreenshot({ basePath, e, options, extension }: OgImageRenderEventContext, browser: Browser): Promise<Buffer>;

package/dist/runtime/nitro/og-image/chromium/{screenshot.mjs → screenshot.js}

@@ -1,5 +1,5 @@
 import { joinURL, withQuery } from "ufo";
-import { useOgImageRuntimeConfig } from "../../../shared.mjs";
+import { useOgImageRuntimeConfig } from "../../../shared.js";
 import { useNitroOrigin } from "#imports";
 export async function createScreenshot({ basePath, e, options, extension }, browser) {
   const { colorPreference } = useOgImageRuntimeConfig();

package/dist/runtime/nitro/og-image/context.d.ts

@@ -1,5 +1,5 @@
 import type { H3Error, H3Event } from 'h3';
-import type { OgImageOptions, OgImageRenderEventContext } from '../../types';
+import type { OgImageOptions, OgImageRenderEventContext } from '../../types.js';
 export declare function resolvePathCacheKey(e: H3Event, path?: string): string;
 export declare function resolveContext(e: H3Event): Promise<H3Error | OgImageRenderEventContext>;
 export declare function extractAndNormaliseOgImageOptions(html: string): OgImageOptions | false;

package/dist/runtime/nitro/og-image/{context.mjs → context.js}

@@ -3,11 +3,11 @@ import { createError, getQuery } from "h3";
 import { defu } from "defu";
 import { normalizeKey } from "unstorage";
 import { hash } from "ohash";
-import { separateProps, useOgImageRuntimeConfig } from "../../shared.mjs";
-import { createNitroRouteRuleMatcher } from "../util/kit.mjs";
-import { decodeObjectHtmlEntities } from "../util/encoding.mjs";
-import { htmlPayloadCache, prerenderOptionsCache } from "./cache.mjs";
-import { useChromiumRenderer, useSatoriRenderer } from "./instances.mjs";
+import { separateProps, useOgImageRuntimeConfig } from "../../shared.js";
+import { createNitroRouteRuleMatcher } from "../util/kit.js";
+import { decodeObjectHtmlEntities } from "../util/encoding.js";
+import { htmlPayloadCache, prerenderOptionsCache } from "./cache.js";
+import { useChromiumRenderer, useSatoriRenderer } from "./instances.js";
 import { useNitroApp } from "#internal/nitro/app";
 export function resolvePathCacheKey(e, path) {
   const siteConfig = e.context.siteConfig.get();
@@ -95,6 +95,7 @@ export async function resolveContext(e) {
     key,
     renderer,
     isDebugJsonPayload,
+    publicStoragePath: runtimeConfig.publicStoragePath,
     extension,
     basePath,
     options,

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

@@ -1,2 +1,2 @@
-import type { OgImageRenderEventContext, ResolvedFontConfig } from '../../../types';
-export declare function loadFont({ e }: OgImageRenderEventContext, font: ResolvedFontConfig): Promise<ResolvedFontConfig>;
+import type { OgImageRenderEventContext, ResolvedFontConfig } from '../../../types.js';
+export declare function loadFont({ e, publicStoragePath }: OgImageRenderEventContext, font: ResolvedFontConfig): Promise<ResolvedFontConfig>;

package/dist/runtime/nitro/og-image/satori/{font.mjs → font.js}

@@ -1,7 +1,7 @@
 import { prefixStorage } from "unstorage";
 import { useNitroOrigin, useStorage } from "#imports";
 const assets = prefixStorage(useStorage(), "/assets");
-export async function loadFont({ e }, font) {
+export async function loadFont({ e, publicStoragePath }, font) {
   const { name, weight } = font;
   if (font.data)
     return font;
@@ -17,7 +17,7 @@ export async function loadFont({ e }, font) {
   let data;
   if (font.path) {
     if (import.meta.dev || import.meta.prerender) {
-      const key = `root:public${font.path.replace("./", ":").replace("/", ":")}`;
+      const key = `${publicStoragePath}${font.path.replace("./", ":").replace("/", ":")}`;
       if (await useStorage().hasItem(key))
         data = await useStorage().getItemRaw(key);
     } else {

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

@@ -1,4 +1,6 @@
+import type _sharp from 'sharp';
 import type _satori from 'satori';
+import type _cssInline from '@css-inline/css-inline';
 export declare function useResvg(): Promise<new (svg: string | Uint8Array, options?: import("@resvg/resvg-wasm").ResvgRenderOptions | undefined) => {
     free(): void;
     render(): {
@@ -36,5 +38,5 @@ export declare function useResvg(): Promise<new (svg: string | Uint8Array, optio
     readonly width: number;
 }>;
 export declare function useSatori(): Promise<typeof _satori>;
-export declare function useSharp(): Promise<any>;
-export declare function useCssInline(): Promise<any>;
+export declare function useSharp(): Promise<typeof _sharp>;
+export declare function useCssInline(): Promise<typeof _cssInline>;

package/dist/runtime/nitro/og-image/satori/plugins/{classes.mjs → classes.js}

@@ -1,4 +1,4 @@
-import { defineSatoriTransformer } from "../utils.mjs";
+import { defineSatoriTransformer } from "../utils.js";
 export default defineSatoriTransformer([
   {
     filter: (node) => !!node.props?.class && !node.props?.tw,

package/dist/runtime/nitro/og-image/satori/plugins/{emojis.mjs → emojis.js}

@@ -1,4 +1,4 @@
-import { defineSatoriTransformer } from "../utils.mjs";
+import { defineSatoriTransformer } from "../utils.js";
 function isEmojiFilter(node) {
   return node.type === "svg" && typeof node.props?.["data-emoji"] !== "undefined";
 }

package/dist/runtime/nitro/og-image/satori/plugins/{encoding.mjs → encoding.js}

@@ -1,5 +1,5 @@
-import { defineSatoriTransformer } from "../utils.mjs";
-import { decodeHtml } from "../../../util/encoding.mjs";
+import { defineSatoriTransformer } from "../utils.js";
+import { decodeHtml } from "../../../util/encoding.js";
 export default defineSatoriTransformer([
   // clean up
   {

package/dist/runtime/nitro/og-image/satori/plugins/{flex.mjs → flex.js}

@@ -1,4 +1,4 @@
-import { defineSatoriTransformer } from "../utils.mjs";
+import { defineSatoriTransformer } from "../utils.js";
 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")),
   transform: (node) => {

package/dist/runtime/nitro/og-image/satori/plugins/{imageSrc.mjs → imageSrc.js}

@@ -1,10 +1,10 @@
 import { withBase } from "ufo";
 import sizeOf from "image-size";
-import { defineSatoriTransformer } from "../utils.mjs";
-import { toBase64Image } from "../../../../pure.mjs";
+import { defineSatoriTransformer } from "../utils.js";
+import { toBase64Image } from "../../../../pure.js";
 import { useNitroOrigin, useStorage } from "#imports";
-async function resolveLocalFilePathImage(src) {
-  const key = `root:public${src.replace("./", ":").replace("/", ":")}`;
+async function resolveLocalFilePathImage(publicStoragePath, src) {
+  const key = `${publicStoragePath}${src.replace("./", ":").replace("/", ":")}`;
   if (await useStorage().hasItem(key))
     return await useStorage().getItemRaw(key);
 }
@@ -12,14 +12,14 @@ export default defineSatoriTransformer([
   // fix <img src="">
   {
     filter: (node) => node.type === "img" && node.props?.src,
-    transform: async (node, { e }) => {
+    transform: async (node, { e, publicStoragePath }) => {
       const src = node.props.src;
       const isRelative = src.startsWith("/");
       let dimensions;
       let imageBuffer;
       if (isRelative) {
         if (import.meta.prerender || import.meta.dev) {
-          imageBuffer = await resolveLocalFilePathImage(src);
+          imageBuffer = await resolveLocalFilePathImage(publicStoragePath, src);
         } else {
           imageBuffer = await e.$fetch(src, {
             baseURL: useNitroOrigin(e),
@@ -65,13 +65,13 @@ export default defineSatoriTransformer([
   // fix style="background-image: url('')"
   {
     filter: (node) => node.props?.style?.backgroundImage?.includes("url("),
-    transform: async (node, { e }) => {
+    transform: async (node, { e, publicStoragePath }) => {
       const backgroundImage = node.props.style.backgroundImage;
       const src = backgroundImage.replace(/^url\(['"]?/, "").replace(/['"]?\)$/, "");
       const isRelative = src?.startsWith("/");
       if (isRelative) {
         if (import.meta.prerender || import.meta.dev) {
-          const imageBuffer = await resolveLocalFilePathImage(src);
+          const imageBuffer = await resolveLocalFilePathImage(publicStoragePath, src);
           if (imageBuffer) {
             const base64 = toBase64Image(Buffer.from(imageBuffer));
             node.props.style.backgroundImage = `url(${base64})`;

package/dist/runtime/nitro/og-image/satori/plugins/{unocss.mjs → unocss.js}

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

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

@@ -1,4 +1,4 @@
-import type { OgImageRenderEventContext, Renderer } from '../../../types';
+import type { OgImageRenderEventContext, Renderer } from '../../../types.js';
 export declare function createSvg(event: OgImageRenderEventContext): Promise<string>;
 declare const SatoriRenderer: Renderer;
 export default SatoriRenderer;

package/dist/runtime/nitro/og-image/satori/{renderer.mjs → renderer.js}

@@ -1,10 +1,10 @@
 import { defu } from "defu";
 import { createStorage } from "unstorage";
 import lruCacheDriver from "unstorage/drivers/lru-cache";
-import { normaliseFontInput, useOgImageRuntimeConfig } from "../../../shared.mjs";
-import { loadFont } from "./font.mjs";
-import { createVNodes } from "./vnodes.mjs";
-import { useResvg, useSatori, useSharp } from "./instances.mjs";
+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";
 const fontPromises = {};
 const fontCache = createStorage({

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

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

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

@@ -1,3 +1,3 @@
 import type { NuxtIslandResponse } from 'nuxt/dist/core/runtime/nitro/renderer';
-import type { OgImageRenderEventContext } from '../../../../types';
+import type { OgImageRenderEventContext } from '../../../../types.js';
 export declare function applyInlineCss({ e }: OgImageRenderEventContext, island: NuxtIslandResponse): Promise<boolean>;

package/dist/runtime/nitro/og-image/satori/transforms/{inlineCss.mjs → inlineCss.js}

@@ -1,4 +1,4 @@
-import { useCssInline } from "../instances.mjs";
+import { useCssInline } from "../instances.js";
 import { useNitroOrigin } from "#imports";
 import cssInline from "#nuxt-og-image/bindings/css-inline";
 export async function applyInlineCss({ e }, island) {
@@ -31,7 +31,7 @@ export async function applyInlineCss({ e }, island) {
       loadRemoteStylesheets: false,
       extraCss: css
     });
-    const classes = css.match(/\.([a-zA-Z0-9-_]+)/g)?.map((c) => c.replace(".", ""));
+    const classes = css.match(/\.([\w-]+)/g)?.map((c) => c.replace(".", ""));
     if (classes)
       html = html.replace(new RegExp(`class="(${classes.join("|")})"`, "g"), "");
     island.html = html;

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

@@ -1,3 +1,3 @@
-import type { OgImageRenderEventContext, SatoriTransformer, VNode } from '../../../types';
+import type { OgImageRenderEventContext, SatoriTransformer, VNode } from '../../../types.js';
 export declare function walkSatoriTree(e: OgImageRenderEventContext, node: VNode, plugins: (SatoriTransformer | SatoriTransformer[])[]): (void | Promise<void>)[];
 export declare function defineSatoriTransformer(transformer: SatoriTransformer | SatoriTransformer[]): SatoriTransformer | SatoriTransformer[];

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

@@ -1,2 +1,2 @@
-import type { OgImageRenderEventContext, VNode } from '../../../types';
+import type { OgImageRenderEventContext, VNode } from '../../../types.js';
 export declare function createVNodes(ctx: OgImageRenderEventContext): Promise<VNode>;

package/dist/runtime/nitro/og-image/satori/{vnodes.mjs → vnodes.js}

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

package/dist/runtime/nitro/og-image/templates/html.d.ts

@@ -1,2 +1,2 @@
-import type { OgImageRenderEventContext } from '../../../types';
+import type { OgImageRenderEventContext } from '../../../types.js';
 export declare function html(ctx: OgImageRenderEventContext): Promise<string>;

package/dist/runtime/nitro/og-image/templates/{html.mjs → html.js}

@@ -1,9 +1,9 @@
 import { createHeadCore } from "@unhead/vue";
 import { renderSSRHead } from "@unhead/ssr";
 import { createError } from "h3";
-import { normaliseFontInput, useOgImageRuntimeConfig } from "../../../shared.mjs";
-import { fetchIsland } from "../../util/kit.mjs";
-import { applyEmojis } from "../satori/transforms/emojis.mjs";
+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;

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

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

package/dist/runtime/nitro/plugins/{nuxt-content.mjs → nuxt-content.js}

@@ -1,6 +1,6 @@
 import { defineNitroPlugin } from "nitropack/dist/runtime/plugin";
 import { defu } from "defu";
-import { getOgImagePath, useOgImageRuntimeConfig } from "../../shared.mjs";
+import { getOgImagePath, useOgImageRuntimeConfig } from "../../shared.js";
 export default defineNitroPlugin((nitroApp) => {
   const { isNuxtContentDocumentDriven, defaults } = useOgImageRuntimeConfig();
   nitroApp.hooks.hook("content:file:afterParse", async (content) => {

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

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

package/dist/runtime/nitro/plugins/{prerender.mjs → prerender.js}

@@ -1,9 +1,9 @@
 import { parseURL } from "ufo";
 import { defineNitroPlugin } from "nitropack/dist/runtime/plugin";
-import { extractAndNormaliseOgImageOptions, resolvePathCacheKey } from "../og-image/context.mjs";
-import { prerenderOptionsCache } from "../og-image/cache.mjs";
-import { isInternalRoute } from "../../pure.mjs";
-import { createNitroRouteRuleMatcher } from "../util/kit.mjs";
+import { extractAndNormaliseOgImageOptions, resolvePathCacheKey } from "../og-image/context.js";
+import { prerenderOptionsCache } from "../og-image/cache.js";
+import { isInternalRoute } from "../../pure.js";
+import { createNitroRouteRuleMatcher } from "../util/kit.js";
 export default defineNitroPlugin(async (nitro) => {
   if (!import.meta.prerender)
     return;

package/dist/runtime/nitro/routes/{debug.json.mjs → debug.json.js}

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

package/dist/runtime/nitro/routes/{font.mjs → font.js}

@@ -1,6 +1,6 @@
 import { createError, defineEventHandler, getQuery, proxyRequest, sendRedirect } from "h3";
 import { parseURL } from "ufo";
-import { normaliseFontInput, useOgImageRuntimeConfig } from "../../shared.mjs";
+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("/");

package/dist/runtime/nitro/routes/{image.mjs → image.js}

@@ -1,8 +1,8 @@
 import { H3Error, createError, defineEventHandler, getQuery, setHeader } from "h3";
-import { useOgImageBufferCache } from "../util/cache.mjs";
-import { useOgImageRuntimeConfig } from "../../shared.mjs";
-import { resolveContext } from "../og-image/context.mjs";
-import { html } from "../og-image/templates/html.mjs";
+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)

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

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

package/dist/runtime/nitro/util/{cache.mjs → cache.js}

@@ -34,8 +34,9 @@ export async function useOgImageBufferCache(ctx, options) {
           modifiedTime: new Date(headers["last-modified"]),
           etag: headers.etag,
           maxAge
-        }))
+        })) {
           return;
+        }
         setHeaders(ctx.e, headers);
       } else {
         await cache.removeItem(key).catch(() => {

package/dist/runtime/nitro/util/{encoding.mjs → encoding.js}

@@ -2,7 +2,7 @@ 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 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(/&#(\d+);/g, (full, int) => {
     return String.fromCharCode(Number.parseInt(int));
   });
 }

package/dist/runtime/nuxt/components/OgImage/OgImage.d.ts

@@ -1,4 +1,4 @@
-import type { OgImageOptions } from '../../../types';
+import type { OgImageOptions } from '../../../types.js';
 declare const _default: import("vue").DefineComponent<OgImageOptions<"NuxtSeo">, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<OgImageOptions<"NuxtSeo">>, {
     props?: any;
 }, {}>;

package/dist/runtime/nuxt/components/OgImage/OgImageScreenshot.d.ts

@@ -1,4 +1,4 @@
-import type { OgImagePageScreenshotOptions } from '../../../types';
+import type { OgImagePageScreenshotOptions } from '../../../types.js';
 declare const _default: import("vue").DefineComponent<OgImagePageScreenshotOptions, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<OgImagePageScreenshotOptions>, {
     props?: any;
 }, {}>;

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

@@ -21,7 +21,7 @@ const props = withDefaults(defineProps<{
   title: 'title',
 })
 
-const HexRegex = /^#([0-9a-f]{3}){1,2}$/i
+const HexRegex = /^#(?:[0-9a-f]{3}){1,2}$/i
 
 const runtimeConfig = useOgImageRuntimeConfig()
 

package/dist/runtime/nuxt/composables/defineOgImage.d.ts

@@ -1,2 +1,2 @@
-import type { DefineOgImageInput } from '../../types';
+import type { DefineOgImageInput } from '../../types.js';
 export declare function defineOgImage(_options?: DefineOgImageInput): void;

package/dist/runtime/nuxt/composables/{defineOgImage.mjs → defineOgImage.js}

@@ -1,8 +1,8 @@
 import { defu } from "defu";
 import { appendHeader } from "h3";
-import { getOgImagePath, separateProps, useOgImageRuntimeConfig } from "../../shared.mjs";
-import { createOgImageMeta, normaliseOptions } from "../utils.mjs";
-import { createNitroRouteRuleMatcher } from "../../nitro/util/kit.mjs";
+import { getOgImagePath, separateProps, useOgImageRuntimeConfig } from "../../shared.js";
+import { createOgImageMeta, normaliseOptions } from "../utils.js";
+import { createNitroRouteRuleMatcher } from "../../nitro/util/kit.js";
 import { useNuxtApp, useRequestEvent, useRoute } from "#imports";
 export function defineOgImage(_options = {}) {
   if (!import.meta.server)

package/dist/runtime/nuxt/composables/defineOgImageComponent.d.ts

@@ -1,3 +1,3 @@
-import type { ExtractComponentProps, OgImageOptions } from '../../types';
+import type { ExtractComponentProps, OgImageOptions } from '../../types.js';
 import type { OgImageComponents } from '#nuxt-og-image/components';
 export declare function defineOgImageComponent<T extends keyof OgImageComponents>(component: T, props?: Partial<ExtractComponentProps<OgImageComponents[T]>>, options?: OgImageOptions): void;

package/dist/runtime/nuxt/composables/{defineOgImageComponent.mjs → defineOgImageComponent.js}

@@ -1,4 +1,4 @@
-import { defineOgImage } from "./defineOgImage.mjs";
+import { defineOgImage } from "./defineOgImage.js";
 export function defineOgImageComponent(component, props = {}, options = {}) {
   return defineOgImage({
     ...options,

package/dist/runtime/nuxt/composables/defineOgImageScreenshot.d.ts

@@ -1,2 +1,2 @@
-import type { OgImagePageScreenshotOptions } from '../../types';
-export declare function defineOgImageScreenshot(options?: OgImagePageScreenshotOptions): any;
+import type { OgImagePageScreenshotOptions } from '../../types.js';
+export declare function defineOgImageScreenshot(options?: OgImagePageScreenshotOptions): void;

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

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
 export default _default;

package/dist/runtime/nuxt/plugins/{og-image-canonical-urls.server.mjs → og-image-canonical-urls.server.js}

@@ -1,7 +1,7 @@
 import { parseURL } from "ufo";
 import { toValue } from "vue";
 import { defu } from "defu";
-import { isInternalRoute, separateProps } from "../../pure.mjs";
+import { isInternalRoute, separateProps } from "../../pure.js";
 import { defineNuxtPlugin, useRequestEvent, withSiteUrl } from "#imports";
 export default defineNuxtPlugin({
   setup(nuxtApp) {

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

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: import("nuxt/app").Plugin<Record<string, unknown>> & import("nuxt/app").ObjectPlugin<Record<string, unknown>>;
 export default _default;