nuxt-og-image 3.0.8 → 3.1.0

package/dist/module.mjs

@@ -143,8 +143,8 @@ async function applyNitroPresetCompatibility(nitroConfig, options) {
   const { resolve } = options;
   const satoriEnabled = typeof options.compatibility?.satori !== "undefined" ? !!options.compatibility.satori : !!compatibility.satori;
   const chromiumEnabled = typeof options.compatibility?.chromium !== "undefined" ? !!options.compatibility.chromium : !!compatibility.chromium;
-  nitroConfig.alias["#nuxt-og-image/renderers/satori"] = satoriEnabled ? resolve("./runtime/nitro/og-image/satori/renderer") : "unenv/runtime/mock/empty";
-  nitroConfig.alias["#nuxt-og-image/renderers/chromium"] = chromiumEnabled ? resolve("./runtime/nitro/og-image/chromium/renderer") : "unenv/runtime/mock/empty";
+  nitroConfig.alias["#og-image/renderers/satori"] = satoriEnabled ? resolve("./runtime/server/og-image/satori/renderer") : "unenv/runtime/mock/empty";
+  nitroConfig.alias["#og-image/renderers/chromium"] = chromiumEnabled ? resolve("./runtime/server/og-image/chromium/renderer") : "unenv/runtime/mock/empty";
   const resolvedCompatibility = {};
   function applyBinding(key) {
     let binding = options.compatibility?.[key];
@@ -159,7 +159,7 @@ async function applyNitroPresetCompatibility(nitroConfig, options) {
     }
     resolvedCompatibility[key] = binding;
     return {
-      [`#nuxt-og-image/bindings/${key}`]: binding === false ? "unenv/runtime/mock/empty" : resolve(`./runtime/nitro/og-image/bindings/${key}/${binding}`)
+      [`#og-image/bindings/${key}`]: binding === false ? "unenv/runtime/mock/empty" : resolve(`./runtime/server/og-image/bindings/${key}/${binding}`)
     };
   }
   nitroConfig.alias = defu(
@@ -176,7 +176,7 @@ async function applyNitroPresetCompatibility(nitroConfig, options) {
   }
   nitroConfig.rollupConfig = nitroConfig.rollupConfig || {};
   nitroConfig.wasm = defu(compatibility.wasm, nitroConfig.wasm);
-  nitroConfig.virtual["#nuxt-og-image/compatibility"] = () => `export default ${JSON.stringify(resolvedCompatibility)}`;
+  nitroConfig.virtual["#og-image/compatibility"] = () => `export default ${JSON.stringify(resolvedCompatibility)}`;
   addTemplate({
     filename: "nuxt-og-image/compatibility.mjs",
     getContents() {
@@ -285,7 +285,7 @@ function setupDevToolsUI(options, resolve, nuxt = useNuxt()) {
     const rpc = extendServerRpc("nuxt-og-image", {});
     nuxt.hook("builder:watch", (e, path) => {
       path = relative(nuxt.options.srcDir, resolve(nuxt.options.srcDir, path));
-      if ((e === "change" || e.includes("link")) && path.startsWith("pages")) {
+      if ((e === "change" || e.includes("link")) && (path.startsWith("pages") || path.startsWith("content"))) {
         rpc.broadcast.refreshRouteData(path).catch(() => {
         });
       }
@@ -563,7 +563,7 @@ const module = defineNuxtModule({
     if (config.enabled === false) {
       logger.debug("The module is disabled, skipping setup.");
       ["defineOgImage", "defineOgImageComponent", "defineOgImageScreenshot"].forEach((name2) => {
-        addImports({ name: name2, from: resolve(`./runtime/nuxt/composables/mock`) });
+        addImports({ name: name2, from: resolve(`./runtime/app/composables/mock`) });
       });
       return;
     }
@@ -571,8 +571,8 @@ const module = defineNuxtModule({
       logger.warn("Nuxt OG Image is enabled but SSR is disabled.\n\nYou should enable SSR (`ssr: true`) or disable the module (`ogImage: { enabled: false }`).");
       return;
     }
-    nuxt.options.alias["#nuxt-og-image-utils"] = resolve("./runtime/shared");
-    nuxt.options.alias["#nuxt-og-image-cache"] = resolve("./runtime/nitro/og-image/cache/lru");
+    nuxt.options.alias["#og-image"] = resolve("./runtime");
+    nuxt.options.alias["#og-image-cache"] = resolve("./runtime/server/og-image/cache/lru");
     const preset = resolveNitroPreset(nuxt.options.nitro);
     const targetCompatibility = getPresetNitroPresetCompatibility(preset);
     if (config.zeroRuntime) {
@@ -585,7 +585,7 @@ const module = defineNuxtModule({
       });
       if (!nuxt.options.dev) {
         addBuildPlugin(TreeShakeComposablesPlugin, { server: true, client: true, build: true });
-        nuxt.options.alias["#nuxt-og-image-cache"] = resolve("./runtime/nitro/og-image/cache/mock");
+        nuxt.options.alias["#og-image-cache"] = resolve("./runtime/server/og-image/cache/mock");
       }
     }
     let isUsingSharp = false;
@@ -652,7 +652,7 @@ const module = defineNuxtModule({
     });
     await installNuxtSiteConfig();
     if (hasNuxtModule("@nuxt/content")) {
-      addServerPlugin(resolve("./runtime/nitro/plugins/nuxt-content"));
+      addServerPlugin(resolve("./runtime/server/plugins/nuxt-content"));
     }
     if (!config.fonts.length) {
       config.fonts = [
@@ -713,7 +713,7 @@ const module = defineNuxtModule({
       nuxt.options.nitro.serverAssets.push({ baseName: "nuxt-og-image:fonts", dir: serverFontsDir });
     }
     nuxt.options.experimental.componentIslands ||= true;
-    const basePath = config.zeroRuntime ? "./runtime/nitro/routes/__zero-runtime" : "./runtime/nitro/routes";
+    const basePath = config.zeroRuntime ? "./runtime/server/routes/__zero-runtime" : "./runtime/server/routes";
     addServerHandler({
       lazy: true,
       route: "/__og-image__/font/**",
@@ -723,7 +723,7 @@ const module = defineNuxtModule({
       addServerHandler({
         lazy: true,
         route: "/__og-image__/debug.json",
-        handler: resolve("./runtime/nitro/routes/debug.json")
+        handler: resolve("./runtime/server/routes/debug.json")
       });
     }
     addServerHandler({
@@ -740,13 +740,13 @@ const module = defineNuxtModule({
     ["defineOgImage", "defineOgImageComponent", "defineOgImageScreenshot"].forEach((name2) => {
       addImports({
         name: name2,
-        from: resolve(`./runtime/nuxt/composables/${name2}`)
+        from: resolve(`./runtime/app/composables/${name2}`)
       });
       nuxt.options.optimization.treeShake.composables.client["nuxt-og-image"].push(name2);
     });
     if (!config.zeroRuntime || nuxt.options.dev) {
       await addComponentsDir({
-        path: resolve("./runtime/nuxt/components/Templates/Community"),
+        path: resolve("./runtime/app/components/Templates/Community"),
         island: true
         // watch: true,
       });
@@ -758,11 +758,11 @@ const module = defineNuxtModule({
     ].forEach((name2) => {
       addComponent({
         name: name2,
-        filePath: resolve(`./runtime/nuxt/components/OgImage/${name2}`),
+        filePath: resolve(`./runtime/app/components/OgImage/${name2}`),
         ...config.componentOptions
       });
     });
-    const basePluginPath = `./runtime/nuxt/plugins${config.zeroRuntime ? "/__zero-runtime" : ""}`;
+    const basePluginPath = `./runtime/app/plugins${config.zeroRuntime ? "/__zero-runtime" : ""}`;
     addPlugin({ mode: "server", src: resolve(`${basePluginPath}/route-rule-og-image.server`) });
     addPlugin({ mode: "server", src: resolve(`${basePluginPath}/og-image-canonical-urls.server`) });
     const ogImageComponentCtx = { components: [] };
@@ -775,13 +775,13 @@ const module = defineNuxtModule({
             valid = true;
           }
         });
-        if (component.filePath.includes(resolve("./runtime/nuxt/components/Templates")))
+        if (component.filePath.includes(resolve("./runtime/app/components/Templates")))
           valid = true;
         if (valid && fs.existsSync(component.filePath)) {
           component.island = true;
           component.mode = "server";
           let category = "app";
-          if (component.filePath.includes(resolve("./runtime/nuxt/components/Templates/Community")))
+          if (component.filePath.includes(resolve("./runtime/app/components/Templates/Community")))
             category = "community";
           const componentFile = fs.readFileSync(component.filePath, "utf-8");
           const credits = componentFile.split("\n").find((line) => line.startsWith(" * @credits"))?.replace("* @credits", "").trim();
@@ -806,7 +806,7 @@ const module = defineNuxtModule({
       options: { mode: "server" }
     });
     nuxt.options.nitro.virtual = nuxt.options.nitro.virtual || {};
-    nuxt.options.nitro.virtual["#nuxt-og-image/component-names.mjs"] = () => {
+    nuxt.options.nitro.virtual["#og-image-virtual/component-names.mjs"] = () => {
       return `export const componentNames = ${JSON.stringify(ogImageComponentCtx.components)}`;
     };
     let unoCssConfig = {};
@@ -816,7 +816,7 @@ const module = defineNuxtModule({
     nuxt.hook("unocss:config", (_unoCssConfig) => {
       unoCssConfig = { ..._unoCssConfig.theme };
     });
-    nuxt.options.nitro.virtual["#nuxt-og-image/unocss-config.mjs"] = () => {
+    nuxt.options.nitro.virtual["#og-image-virtual/unocss-config.mjs"] = () => {
       return `export const theme = ${JSON.stringify(unoCssConfig)}`;
     };
     extendTypes("nuxt-og-image", ({ typesPath }) => {
@@ -841,12 +841,12 @@ declare module 'nitropack' {
   }
 }
 
-declare module '#nuxt-og-image/components' {
+declare module '#og-image/components' {
   export interface OgImageComponents {
 ${componentImports}
   }
 }
-declare module '#nuxt-og-image/unocss-config' {
+declare module '#og-image/unocss-config' {
   export type theme = any
 }
 `;
@@ -889,6 +889,8 @@ declare module '#nuxt-og-image/unocss-config' {
         fonts: normalisedFonts,
         hasNuxtIcon: hasNuxtModule("nuxt-icon") || hasNuxtModule("@nuxt/icon"),
         colorPreference,
+        hasNuxtContent: hasNuxtModule("@nuxt/content"),
+        strictNuxtContentPaths: config.strictNuxtContentPaths,
         // @ts-expect-error runtime type
         isNuxtContentDocumentDriven: config.strictNuxtContentPaths || !!nuxt.options.content?.documentDriven
       };
@@ -904,7 +906,7 @@ declare module '#nuxt-og-image/unocss-config' {
       await setupBuildHandler(config, resolve);
     }
     if (nuxt.options.build)
-      addServerPlugin(resolve("./runtime/nitro/plugins/prerender"));
+      addServerPlugin(resolve("./runtime/server/plugins/prerender"));
     setupPrerenderHandler(config, resolve);
   }
 });

package/dist/runtime/{nuxt → app}/components/Templates/Community/NuxtSeo.vue

@@ -4,7 +4,7 @@
  */
 
 import { useSiteConfig } from '#imports'
-import { useOgImageRuntimeConfig } from '#nuxt-og-image-utils'
+import { useOgImageRuntimeConfig } from '#og-image/shared'
 import { computed, defineComponent, h, resolveComponent } from 'vue'
 
 // convert to typescript props

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

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

package/dist/runtime/{nuxt → app}/composables/defineOgImageComponent.d.ts

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

package/dist/runtime/{nuxt → app}/composables/mock.d.ts

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

package/dist/runtime/{nuxt → app}/utils/plugins.js

@@ -4,7 +4,7 @@ import { parse, stringify } from "devalue";
 import { createRouter as createRadixRouter, toRouteMatcher } from "radix3";
 import { parseURL, withoutBase } from "ufo";
 import { toValue } from "vue";
-import { createOgImageMeta, normaliseOptions } from "../../nuxt/utils.js";
+import { createOgImageMeta, normaliseOptions } from "../../app/utils.js";
 import { isInternalRoute, separateProps } from "../../pure.js";
 import { getOgImagePath, useOgImageRuntimeConfig } from "../../shared.js";
 export function ogImageCanonicalUrls(nuxtApp) {

package/dist/runtime/{nuxt → app}/utils.js

@@ -1,10 +1,10 @@
 import { componentNames } from "#build/nuxt-og-image/components.mjs";
-import { unref, useServerHead } from "#imports";
-import { resolveUnrefHeadInput } from "@unhead/vue";
+import { resolveUnrefHeadInput, useServerHead } from "@unhead/vue";
 import { defu } from "defu";
 import { stringify } from "devalue";
 import { withQuery } from "ufo";
-import { getExtension, separateProps } from "../shared.js";
+import { unref } from "vue";
+import { generateMeta, separateProps } from "../shared.js";
 export function createOgImageMeta(src, input, resolvedOptions, ssrContext) {
   const _input = separateProps(defu(input, ssrContext._ogImagePayload));
   let url = src || input.url || resolvedOptions.url;
@@ -12,29 +12,7 @@ export function createOgImageMeta(src, input, resolvedOptions, ssrContext) {
     return;
   if (input._query && Object.keys(input._query).length && url)
     url = withQuery(url, { _query: input._query });
-  let urlExtension = getExtension(url) || resolvedOptions.extension;
-  if (urlExtension === "jpg")
-    urlExtension = "jpeg";
-  const meta = [
-    { property: "og:image", content: url },
-    { property: "og:image:type", content: `image/${urlExtension}` },
-    { name: "twitter:card", content: "summary_large_image" },
-    // we don't need this but avoids issue when using useSeoMeta({ twitterImage })
-    { name: "twitter:image", content: url },
-    { name: "twitter:image:src", content: url }
-  ];
-  if (resolvedOptions.width) {
-    meta.push({ property: "og:image:width", content: resolvedOptions.width });
-    meta.push({ name: "twitter:image:width", content: resolvedOptions.width });
-  }
-  if (resolvedOptions.height) {
-    meta.push({ property: "og:image:height", content: resolvedOptions.height });
-    meta.push({ name: "twitter:image:height", content: resolvedOptions.height });
-  }
-  if (resolvedOptions.alt) {
-    meta.push({ property: "og:image:alt", content: resolvedOptions.alt });
-    meta.push({ name: "twitter:image:alt", content: resolvedOptions.alt });
-  }
+  const meta = generateMeta(url, resolvedOptions);
   ssrContext._ogImageInstances = ssrContext._ogImageInstances || [];
   const script = [];
   if (src) {

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

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

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

@@ -1,8 +1,8 @@
-import { htmlPayloadCache, prerenderOptionsCache } from "#nuxt-og-image-cache";
+import { useNitroApp } from "#imports";
+import { htmlPayloadCache, prerenderOptionsCache } from "#og-image-cache";
 import { defu } from "defu";
 import { parse } from "devalue";
 import { createError, getQuery } from "h3";
-import { useNitroApp } from "nitropack/runtime/app";
 import { hash } from "ohash";
 import { parseURL, withoutLeadingSlash, withoutTrailingSlash, withQuery } from "ufo";
 import { normalizeKey } from "unstorage";

package/dist/runtime/{nitro → server}/og-image/instances.js

@@ -1,10 +1,10 @@
 const satoriRendererInstance = { instance: void 0 };
 const chromiumRendererInstance = { instance: void 0 };
 export async function useSatoriRenderer() {
-  satoriRendererInstance.instance = satoriRendererInstance.instance || await import("#nuxt-og-image/renderers/satori").then((m) => m.default);
+  satoriRendererInstance.instance = satoriRendererInstance.instance || await import("#og-image/renderers/satori").then((m) => m.default);
   return satoriRendererInstance.instance;
 }
 export async function useChromiumRenderer() {
-  chromiumRendererInstance.instance = chromiumRendererInstance.instance || await import("#nuxt-og-image/renderers/chromium").then((m) => m.default);
+  chromiumRendererInstance.instance = chromiumRendererInstance.instance || await import("#og-image/renderers/chromium").then((m) => m.default);
   return chromiumRendererInstance.instance;
 }

package/dist/runtime/{nitro → server}/og-image/satori/instances.js

@@ -3,21 +3,21 @@ const sharpInstance = { instance: void 0 };
 const resvgInstance = { instance: void 0 };
 const satoriInstance = { instance: void 0 };
 export async function useResvg() {
-  resvgInstance.instance = resvgInstance.instance || await import("#nuxt-og-image/bindings/resvg").then((m) => m.default);
+  resvgInstance.instance = resvgInstance.instance || await import("#og-image/bindings/resvg").then((m) => m.default);
   await resvgInstance.instance.initWasmPromise;
   return resvgInstance.instance.Resvg;
 }
 export async function useSatori() {
-  satoriInstance.instance = satoriInstance.instance || await import("#nuxt-og-image/bindings/satori").then((m) => m.default);
+  satoriInstance.instance = satoriInstance.instance || await import("#og-image/bindings/satori").then((m) => m.default);
   await satoriInstance.instance.initWasmPromise;
   return satoriInstance.instance.satori;
 }
 export async function useSharp() {
-  sharpInstance.instance = sharpInstance.instance || await import("#nuxt-og-image/bindings/sharp").then((m) => m.default);
+  sharpInstance.instance = sharpInstance.instance || await import("#og-image/bindings/sharp").then((m) => m.default);
   return sharpInstance.instance;
 }
 export async function useCssInline() {
-  cssInlineInstance.instance = cssInlineInstance.instance || await import("#nuxt-og-image/bindings/css-inline").then((m) => m.default);
+  cssInlineInstance.instance = cssInlineInstance.instance || await import("#og-image/bindings/css-inline").then((m) => m.default);
   await cssInlineInstance.instance.initWasmPromise;
   return cssInlineInstance.instance.cssInline;
 }

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

@@ -1,4 +1,4 @@
-import { theme } from "#nuxt-og-image/unocss-config.mjs";
+import { theme } from "#og-image-virtual/unocss-config.mjs";
 import { createGenerator } from "@unocss/core";
 import presetWind from "@unocss/preset-wind";
 import { defineSatoriTransformer } from "../utils.js";

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

@@ -1,5 +1,5 @@
-import { theme } from "#nuxt-og-image/unocss-config.mjs";
-import { fontCache } from "#nuxt-og-image-cache";
+import { fontCache } from "#og-image-cache";
+import { theme } from "#og-image-virtual/unocss-config.mjs";
 import { defu } from "defu";
 import { normaliseFontInput, useOgImageRuntimeConfig } from "../../../shared.js";
 import { loadFont } from "./font.js";
@@ -11,19 +11,21 @@ async function resolveFonts(event) {
   const normalisedFonts = normaliseFontInput([...event.options.fonts || [], ...fonts]);
   const localFontPromises = [];
   const preloadedFonts = [];
-  for (const font of normalisedFonts) {
-    if (await fontCache.hasItem(font.cacheKey)) {
-      font.data = await fontCache.getItemRaw(font.cacheKey);
-      preloadedFonts.push(font);
-    } else {
-      if (!fontPromises[font.cacheKey]) {
-        fontPromises[font.cacheKey] = loadFont(event, font).then(async (_font) => {
-          if (_font?.data)
-            await fontCache.setItemRaw(_font.cacheKey, _font.data);
-          return _font;
-        });
+  if (fontCache) {
+    for (const font of normalisedFonts) {
+      if (await fontCache.hasItem(font.cacheKey)) {
+        font.data = await fontCache.getItemRaw(font.cacheKey);
+        preloadedFonts.push(font);
+      } else {
+        if (!fontPromises[font.cacheKey]) {
+          fontPromises[font.cacheKey] = loadFont(event, font).then(async (_font) => {
+            if (_font?.data)
+              await fontCache?.setItemRaw(_font.cacheKey, _font.data);
+            return _font;
+          });
+        }
+        localFontPromises.push(fontPromises[font.cacheKey]);
       }
-      localFontPromises.push(fontPromises[font.cacheKey]);
     }
   }
   const awaitedFonts = await Promise.all(localFontPromises);

package/dist/runtime/{nitro → server}/og-image/satori/transforms/emojis.js

@@ -1,4 +1,4 @@
-import { emojiCache } from "#nuxt-og-image-cache";
+import { emojiCache } from "#og-image-cache";
 const charMap = {
   "2049": "exclamation-question-mark",
   "2122": "trade-mark",

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

@@ -1,4 +1,4 @@
-import { theme } from "#nuxt-og-image/unocss-config.mjs";
+import { theme } from "#og-image-virtual/unocss-config.mjs";
 import { renderSSRHead } from "@unhead/ssr";
 import { createHeadCore } from "@unhead/vue";
 import { createError } from "h3";

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

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

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

@@ -1,4 +1,4 @@
-import { defineNitroPlugin } from "nitropack/dist/runtime/plugin";
+import { defineNitroPlugin } from "#imports";
 import { nuxtContentPlugin } from "../../util/plugins.js";
 export default defineNitroPlugin((nitroApp) => {
   if (import.meta.dev || import.meta.prerender) {

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

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

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

@@ -1,4 +1,4 @@
-import { defineNitroPlugin } from "nitropack/dist/runtime/plugin";
+import { defineNitroPlugin } from "#imports";
 import { nuxtContentPlugin } from "../util/plugins.js";
 export default defineNitroPlugin((nitroApp) => {
   nuxtContentPlugin(nitroApp);

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

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

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

@@ -1,5 +1,5 @@
-import { prerenderOptionsCache } from "#nuxt-og-image-cache";
-import { defineNitroPlugin } from "nitropack/dist/runtime/plugin";
+import { defineNitroPlugin } from "#imports";
+import { prerenderOptionsCache } from "#og-image-cache";
 import { parseURL } from "ufo";
 import { isInternalRoute } from "../../pure.js";
 import { extractAndNormaliseOgImageOptions, resolvePathCacheKey } from "../og-image/context.js";

package/dist/runtime/{nitro → server}/routes/debug.json.d.ts

@@ -1,4 +1,5 @@
 declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<{
+    siteConfigUrl: string;
     componentNames: any;
     runtimeConfig: import("../../types").OgImageRuntimeConfig;
     compatibility: any;

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

@@ -1,11 +1,13 @@
-import compatibility from "#nuxt-og-image/compatibility";
-import { componentNames } from "#nuxt-og-image/component-names.mjs";
+import { useSiteConfig } from "#imports";
+import compatibility from "#og-image/compatibility";
+import { componentNames } from "#og-image-virtual/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();
   return {
+    siteConfigUrl: useSiteConfig(e).url,
     componentNames,
     runtimeConfig,
     compatibility

package/dist/runtime/{nitro → server}/util/options.js

@@ -1,4 +1,4 @@
-import { componentNames } from "#nuxt-og-image/component-names.mjs";
+import { componentNames } from "#og-image-virtual/component-names.mjs";
 export function normaliseOptions(_options) {
   const options = { ..._options };
   if (!options)

package/dist/runtime/{nitro → server}/util/plugins.d.ts

@@ -1,2 +1,2 @@
-import type { NitroApp } from 'nitropack';
+import type { NitroApp } from 'nitropack/runtime/app';
 export declare function nuxtContentPlugin(nitroApp: NitroApp): void;

package/dist/runtime/{nitro → server}/util/plugins.js

@@ -1,19 +1,31 @@
 import { defu } from "defu";
 import { stringify } from "devalue";
-import { getOgImagePath, useOgImageRuntimeConfig } from "../../shared.js";
+import { withQuery } from "ufo";
+import { generateMeta, getOgImagePath, useOgImageRuntimeConfig } from "../../shared.js";
 import { normaliseOptions } from "./options.js";
 export function nuxtContentPlugin(nitroApp) {
-  const { isNuxtContentDocumentDriven, defaults } = useOgImageRuntimeConfig();
+  const { isNuxtContentDocumentDriven, strictNuxtContentPaths, 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 && content.path)
+    if (isNuxtContentDocumentDriven && !path)
       path = content._path;
-    if (path && content.ogImage) {
-      const ogImageConfig = typeof content.ogImage === "object" ? content.ogImage : {};
+    let shouldRenderOgImage = !!content.ogImage;
+    if (typeof content.ogImage === "undefined" && (strictNuxtContentPaths || typeof content.path !== "undefined")) {
+      shouldRenderOgImage = true;
+    }
+    if (path && shouldRenderOgImage) {
+      const ogImageConfig = (typeof content.ogImage === "object" ? content.ogImage : {}) || {};
       const optionsWithDefault = defu(ogImageConfig, defaults);
-      const src = getOgImagePath(path, optionsWithDefault);
+      let src = optionsWithDefault.url || getOgImagePath(path, optionsWithDefault);
+      if (optionsWithDefault._query && Object.keys(optionsWithDefault._query).length)
+        src = withQuery(src, { _query: optionsWithDefault._query });
+      const meta = generateMeta(src, optionsWithDefault);
+      if (optionsWithDefault.url) {
+        content.head = defu({ meta }, content.head);
+        return content;
+      }
       const payload = {
         title: content.title,
         excerpt: content.description || content.excerpt,
@@ -48,7 +60,7 @@ export function nuxtContentPlugin(nitroApp) {
           { name: "twitter:image:height", content: optionsWithDefault.height },
           { name: "twitter:image:alt", content: optionsWithDefault.alt }
         ]
-      });
+      }, content.head);
     }
     return content;
   });

package/dist/runtime/shared.d.ts

@@ -1,4 +1,5 @@
 import type { OgImageOptions, OgImageRuntimeConfig } from './types.js';
 export * from './pure.js';
+export declare function generateMeta(url: string, resolvedOptions: OgImageOptions): import("@unhead/schema").Meta<import("@unhead/schema").UserTagConfigWithoutInnerContent>[];
 export declare function getOgImagePath(pagePath: string, _options?: Partial<OgImageOptions>): string;
 export declare function useOgImageRuntimeConfig(): OgImageRuntimeConfig;

package/dist/runtime/shared.js

@@ -1,7 +1,34 @@
 import { useRuntimeConfig } from "#imports";
 import { defu } from "defu";
 import { joinURL } from "ufo";
+import { getExtension } from "./pure.js";
 export * from "./pure.js";
+export function generateMeta(url, resolvedOptions) {
+  let urlExtension = getExtension(url) || resolvedOptions.extension;
+  if (urlExtension === "jpg")
+    urlExtension = "jpeg";
+  const meta = [
+    { property: "og:image", content: url },
+    { property: "og:image:type", content: `image/${urlExtension}` },
+    { name: "twitter:card", content: "summary_large_image" },
+    // we don't need this but avoids issue when using useSeoMeta({ twitterImage })
+    { name: "twitter:image", content: url },
+    { name: "twitter:image:src", content: url }
+  ];
+  if (resolvedOptions.width) {
+    meta.push({ property: "og:image:width", content: resolvedOptions.width });
+    meta.push({ name: "twitter:image:width", content: resolvedOptions.width });
+  }
+  if (resolvedOptions.height) {
+    meta.push({ property: "og:image:height", content: resolvedOptions.height });
+    meta.push({ name: "twitter:image:height", content: resolvedOptions.height });
+  }
+  if (resolvedOptions.alt) {
+    meta.push({ property: "og:image:alt", content: resolvedOptions.alt });
+    meta.push({ name: "twitter:image:alt", content: resolvedOptions.alt });
+  }
+  return meta;
+}
 export function getOgImagePath(pagePath, _options) {
   const baseURL = useRuntimeConfig().app.baseURL;
   const options = defu(_options, useOgImageRuntimeConfig().defaults);

package/dist/runtime/types.d.ts

@@ -1,4 +1,4 @@
-import type { OgImageComponents } from '#nuxt-og-image/components';
+import type { OgImageComponents } from '#og-image/components';
 import type { ResvgRenderOptions } from '@resvg/resvg-js';
 import type { AllowedComponentProps, Component, ComponentCustomProps, VNodeProps } from '@vue/runtime-core';
 import type { H3Error, H3Event } from 'h3';
@@ -30,7 +30,9 @@ export interface OgImageRuntimeConfig {
     fonts: FontConfig[];
     hasNuxtIcon: boolean;
     colorPreference: 'light' | 'dark';
+    hasNuxtContent: boolean;
     isNuxtContentDocumentDriven: boolean;
+    strictNuxtContentPaths: boolean;
     zeroRuntime: boolean;
 }
 export interface OgImageComponent {