nuxt-og-image 6.9.0 → 6.9.1

package/dist/chunks/tw4.mjs

@@ -2,7 +2,7 @@ import { readFile } from 'node:fs/promises';
 import { pathToFileURL } from 'node:url';
 import { resolveModulePath } from 'exsolve';
 import { dirname, join } from 'pathe';
-import { e as extractVariantBaseClasses, r as resolveVariantPrefixes, h as resolveExtractedVars, l as resolveVarsDeep, s as simplifyCss, p as postProcessStyles, m as loadLightningCss, a as extractCssVars, c as extractUniversalVars, d as extractPerClassVars, g as extractVarsFromCss, f as extractClassStyles } from '../shared/nuxt-og-image.CTD0ZPNd.mjs';
+import { e as extractVariantBaseClasses, r as resolveVariantPrefixes, h as resolveExtractedVars, l as resolveVarsDeep, s as simplifyCss, p as postProcessStyles, m as loadLightningCss, a as extractCssVars, c as extractUniversalVars, d as extractPerClassVars, g as extractVarsFromCss, f as extractClassStyles } from '../shared/nuxt-og-image.CNS1IVAi.mjs';
 import 'node:crypto';
 import 'node:fs';
 import '@nuxt/kit';

package/dist/chunks/uno.mjs

@@ -1,8 +1,8 @@
 import { readFile } from 'node:fs/promises';
 import { defu } from 'defu';
 import { logger } from '../../dist/runtime/logger.js';
-import { e as extractVariantBaseClasses, s as simplifyCss, a as extractCssVars, b as extractPropertyInitialValues, c as extractUniversalVars, d as extractPerClassVars, f as extractClassStyles, p as postProcessStyles, r as resolveVariantPrefixes, i as importOptionalPeer, g as extractVarsFromCss, h as resolveExtractedVars } from '../shared/nuxt-og-image.CTD0ZPNd.mjs';
-export { j as importResolvedModule, k as resolveOptionalModulePath } from '../shared/nuxt-og-image.CTD0ZPNd.mjs';
+import { e as extractVariantBaseClasses, s as simplifyCss, a as extractCssVars, b as extractPropertyInitialValues, c as extractUniversalVars, d as extractPerClassVars, f as extractClassStyles, p as postProcessStyles, r as resolveVariantPrefixes, i as importOptionalPeer, g as extractVarsFromCss, h as resolveExtractedVars } from '../shared/nuxt-og-image.CNS1IVAi.mjs';
+export { j as importResolvedModule, k as resolveOptionalModulePath } from '../shared/nuxt-og-image.CNS1IVAi.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'node:url';

package/dist/module.d.mts

@@ -142,7 +142,7 @@ interface ModuleOptions {
     /**
      * Browser renderer configuration.
      *
-     * When using browser-based rendering (screenshots), configure the browser provider.
+     * Set to true to enable defineOgImageScreenshot(), or configure a browser provider.
      * For Cloudflare deployments, specify the browser binding name.
      *
      * @example { provider: 'cloudflare', binding: 'BROWSER' }

package/dist/module.d.ts

@@ -142,7 +142,7 @@ interface ModuleOptions {
     /**
      * Browser renderer configuration.
      *
-     * When using browser-based rendering (screenshots), configure the browser provider.
+     * Set to true to enable defineOgImageScreenshot(), or configure a browser provider.
      * For Cloudflare deployments, specify the browser binding name.
      *
      * @example { provider: 'cloudflare', binding: 'BROWSER' }

package/dist/module.json

@@ -4,7 +4,7 @@
     "nuxt": ">=3.16.0"
   },
   "configKey": "ogImage",
-  "version": "6.9.0",
+  "version": "6.9.1",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -10,7 +10,7 @@ import 'nuxtseo-shared/kit';
 import 'pathe';
 import 'pkg-types';
 import 'std-env';
-export { n as default } from './shared/nuxt-og-image.CTD0ZPNd.mjs';
+export { n as default } from './shared/nuxt-og-image.CNS1IVAi.mjs';
 import '../dist/runtime/logger.js';
 import 'magic-string';
 import 'oxc-walker';

package/dist/runtime/app/composables/defineOgImageScreenshot.js

@@ -1,6 +1,9 @@
-import { useRouter } from "#app";
+import { createError, useRouter } from "#app";
+import { useOgImageRuntimeConfig } from "../utils.js";
 import { defineOgImageRaw } from "./_defineOgImageRaw.js";
 export function defineOgImageScreenshot(options = {}) {
+  if (!useOgImageRuntimeConfig().browserEnabled)
+    throw createError({ statusCode: 500, statusMessage: "[nuxt-og-image] Screenshots require browser opt-in. Set ogImage.browser to true or a browser provider in nuxt.config.ts." });
   const router = useRouter();
   const route = router.currentRoute.value?.path || "/";
   const { delay, mask, selector, colorScheme, ...rest } = options;

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

@@ -1,7 +1,7 @@
 import { parse } from "devalue";
-import { parseURL } from "ufo";
+import { parseURL, withoutBase } from "ufo";
 import { appendResponseHeader } from "#nuxtseo/h3";
-import { defineNitroPlugin } from "#nuxtseo/nitro";
+import { defineNitroPlugin, useRuntimeConfig } from "#nuxtseo/nitro";
 import { prerenderOptionsCache } from "#og-image-cache";
 import { createSitePathResolver } from "#site-config/server/composables/utils";
 import { isInternalRoute } from "../../shared.js";
@@ -37,9 +37,10 @@ export default defineNitroPlugin(async (nitro) => {
     });
     const key = resolvePathCacheKey(ctx.event, resolvePathWithBase(path));
     await prerenderOptionsCache.setItem(key, payloads);
+    const pagePath = withoutBase(path, useRuntimeConfig().app.baseURL);
     for (const [_ogKey, opt] of payloads) {
       if (opt._hash) {
-        await prerenderOptionsCache.setItem(`hash:${opt._hash}`, opt);
+        await prerenderOptionsCache.setItem(`hash:${opt._hash}`, { ...opt, _path: pagePath });
       }
     }
     const prerenderPaths = ctx.event.context._ogImagePrerenderPaths;

package/dist/runtime/shared/urlEncoding.d.ts

@@ -1,7 +1,12 @@
 /**
  * Generate a deterministic hash from options object
- * Excludes _path so images with same options can be cached across pages
+ * Excludes _path so images with same options can be cached across pages,
+ * except for PageScreenshot, which renders the page itself.
  * Optionally includes componentHash and version for cache busting
+ *
+ * Uses the first 64 bits of a SHA-256 digest over a canonical (key-sorted)
+ * serialization. The previous 32-bit rolling hash collided on large sites,
+ * silently overwriting other pages' prerendered images.
  */
 export declare function hashOgImageOptions(options: Record<string, any>, componentHash?: string, version?: string): string;
 /**
@@ -25,7 +30,8 @@ export interface BuildOgImageUrlResult {
 /**
  * Build full OG image URL
  *
- * When encoded params exceed MAX_PATH_LENGTH, falls back to hash mode:
+ * Static URLs fall back to hash mode when encoded params exceed MAX_PATH_LENGTH
+ * or hold a character outside [A-Za-z0-9_.~-]:
  * - Returns short path: /_og/s/o_<hash>.png
  * - Returns hash in result for cache storage
  *
@@ -34,7 +40,7 @@ export interface BuildOgImageUrlResult {
  * @param isStatic - Whether this is a static/prerendered image
  * @param defaults - Optional defaults to skip from URL (keeps URLs shorter)
  * @example buildOgImageUrl({ width: 1200, props: { title: 'Hello' } }, 'png', true)
- * // Returns: { url: "/_og/s/w_1200,title_Hello.png" }
+ * // Returns: { url: "/_og/s/o_<hash>.png", hash: "<hash>" }
  */
 export declare function buildOgImageUrl(options: Record<string, any>, extension?: string, isStatic?: boolean, defaults?: Record<string, any>, secret?: string): BuildOgImageUrlResult;
 /**

package/dist/runtime/shared/urlEncoding.js

@@ -19,6 +19,7 @@ const RE_COMMA_PARAM_SEPARATOR = /,(?=\w+_)/;
 const RE_SIGNATURE_SUFFIX = /,s_[^,]+$/;
 const RE_NON_ASCII = /[^\u0000-\u007F]/;
 const RE_WINDOWS_RESERVED_FILENAME_CHARACTERS = /[<>:"/\\|?*\u0000-\u001F]/;
+const RE_NOT_UNRESERVED = /[^\w.~-]/;
 const PARAM_ALIASES = {
   w: "width",
   h: "height",
@@ -85,19 +86,35 @@ function b64Decode(str) {
   }
   return Buffer.from(padded, "base64").toString("utf8");
 }
-function simpleHash(str) {
-  let hash = 0;
-  for (let i = 0; i < str.length; i++) {
-    const char = str.charCodeAt(i);
-    hash = (hash << 5) - hash + char;
-    hash = hash & hash;
+function canonicalJson(value) {
+  if (value === null || typeof value !== "object")
+    return JSON.stringify(value) ?? "null";
+  if (Array.isArray(value))
+    return `[${value.map((item) => canonicalJson(item)).join(",")}]`;
+  const record = value;
+  const entries = Object.keys(record).sort().filter((key) => record[key] !== void 0).map((key) => `${JSON.stringify(key)}:${canonicalJson(record[key])}`);
+  return `{${entries.join(",")}}`;
+}
+const B64URL_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+function base64UrlToHex(input) {
+  let hex = "";
+  let buffer = 0;
+  let bits = 0;
+  for (const char of input) {
+    buffer = buffer << 6 | B64URL_ALPHABET.indexOf(char);
+    bits += 6;
+    if (bits >= 8) {
+      bits -= 8;
+      hex += (buffer >> bits & 255).toString(16).padStart(2, "0");
+    }
   }
-  return Math.abs(hash).toString(36);
+  return hex;
 }
 export function hashOgImageOptions(options, componentHash, version) {
-  const { _path, _hash, ...hashableOptions } = options;
+  const { _path, _hash, ...rest } = options;
+  const hashableOptions = rest.component === "PageScreenshot" ? { ...rest, _path } : rest;
   const hashInput = componentHash || version ? [hashableOptions, componentHash || "", version || ""] : hashableOptions;
-  return simpleHash(JSON.stringify(hashInput));
+  return base64UrlToHex(digest(canonicalJson(hashInput))).slice(0, 16);
 }
 export function encodeOgImageParams(options, defaults) {
   const parts = [];
@@ -233,7 +250,7 @@ export function decodeOgImageParams(encoded) {
 export function buildOgImageUrl(options, extension = "png", isStatic = false, defaults, secret) {
   const encoded = encodeOgImageParams(options, defaults);
   const prefix = isStatic ? "/_og/s" : "/_og/d";
-  if (isStatic && (encoded.length > MAX_PATH_LENGTH || encoded.includes("%"))) {
+  if (isStatic && (encoded.length > MAX_PATH_LENGTH || RE_NOT_UNRESERVED.test(encoded))) {
     const hash = hashOgImageOptions(options);
     return {
       url: `${prefix}/o_${hash}.${extension}`,

package/dist/runtime/types.d.ts

@@ -31,6 +31,7 @@ export interface OgImageIconsData {
     height: number;
 }
 export interface OgImageRuntimeConfig {
+    browserEnabled: boolean;
     version: string;
     satoriOptions: SatoriOptions;
     resvgOptions: ResvgRenderOptions;
@@ -77,7 +78,7 @@ export interface OgImageRuntimeConfig {
 }
 export type RendererType = 'satori' | 'browser' | 'takumi';
 export type BrowserProvider = 'playwright' | 'chrome-launcher' | 'on-demand' | 'cloudflare';
-export type BrowserConfig = false | {
+export type BrowserConfig = boolean | {
     provider: BrowserProvider;
     /** Required when provider is 'cloudflare' - the wrangler binding name */
     binding?: string;

package/dist/shared/{nuxt-og-image.CTD0ZPNd.mjs → nuxt-og-image.CNS1IVAi.mjs}

@@ -446,6 +446,12 @@ async function setupBuildHandler(config, resolve, getDetectedRenderers, getCompa
     metadata: getCompatibilityMeta()
   });
   nuxt.hooks.hook("nitro:init", async (nitro) => {
+    nitro.hooks.hook("prerender:config", (prerenderConfig) => {
+      if (prerenderConfig.virtual?.["playwright-core"]) {
+        const { "playwright-core": _, ...virtual } = prerenderConfig.virtual;
+        prerenderConfig.virtual = virtual;
+      }
+    });
     await applyNitroPresetCompatibility(nitro.options, {
       compatibility: config.compatibility?.runtime,
       resolve,
@@ -651,6 +657,14 @@ const PROVIDER_DEPENDENCIES = [
     }
   }
 ];
+function resolveAutoDetectedProvider(input) {
+  if (input.hasUserComponents)
+    return { preferred: null, fallbackToDefault: false };
+  const preferred = input.installedProviders.find((p) => p === "takumi") ?? input.installedProviders[0] ?? null;
+  if (preferred)
+    return { preferred, fallbackToDefault: false };
+  return { preferred: null, fallbackToDefault: true };
+}
 async function getInstalledProviders() {
   const installed = [];
   for (const provider of PROVIDER_DEPENDENCIES) {
@@ -5657,19 +5671,25 @@ ${familyInfo}`);
         }
       }
     }
+    if (config.browser)
+      ogImageComponentCtx.detectedRenderers.add("browser");
     if (!nuxt.options._prepare && !hasUserComponents) {
-      const installedProviders = await getInstalledProviders();
-      const preferred = installedProviders.find((p) => p.provider === "takumi") || installedProviders[0];
+      const { preferred, fallbackToDefault } = resolveAutoDetectedProvider({
+        hasUserComponents,
+        installedProviders: (await getInstalledProviders()).map((p) => p.provider)
+      });
       if (preferred) {
-        ogImageComponentCtx.detectedRenderers.add(preferred.provider);
-        logger.debug(`Using ${preferred.provider} renderer`);
-      } else if (nuxt.options.dev && !nuxt.options._prepare && canPromptInteractively()) {
-        const renderer = await promptForRendererSelection();
-        ogImageComponentCtx.detectedRenderers.add(renderer);
-        logger.debug(`Using ${renderer} renderer`);
-      } else {
-        ogImageComponentCtx.detectedRenderers.add("takumi");
-        logger.warn(`No OG image renderer dependency detected. Defaulting to \`takumi\` (non-interactive environment). Install \`${TAKUMI_CORE_PACKAGE}\`, or add a renderer component (e.g. components/OgImage/Default.satori.vue) to choose explicitly.`);
+        ogImageComponentCtx.detectedRenderers.add(preferred);
+        logger.debug(`Using ${preferred} renderer`);
+      } else if (fallbackToDefault) {
+        if (nuxt.options.dev && !nuxt.options._prepare && canPromptInteractively()) {
+          const renderer = await promptForRendererSelection();
+          ogImageComponentCtx.detectedRenderers.add(renderer);
+          logger.debug(`Using ${renderer} renderer`);
+        } else {
+          ogImageComponentCtx.detectedRenderers.add("takumi");
+          logger.warn(`No OG image renderer dependency detected. Defaulting to \`takumi\` (non-interactive environment). Install \`${TAKUMI_CORE_PACKAGE}\`, or add a renderer component (e.g. components/OgImage/Default.satori.vue) to choose explicitly.`);
+        }
       }
     }
     const availableRenderers = /* @__PURE__ */ new Set();
@@ -6075,6 +6095,7 @@ export const staticFontCacheDir = ${JSON.stringify(getStaticFontCacheDir(nuxt.op
         // @ts-expect-error runtime type
         isNuxtContentDocumentDriven: !!nuxt.options.content?.documentDriven,
         cssFramework: cssFramework || "none",
+        browserEnabled: !!config.browser,
         // Browser renderer config for cloudflare binding access
         browser: typeof config.browser === "object" ? {
           provider: config.browser.provider,
@@ -6109,6 +6130,7 @@ export const staticFontCacheDir = ${JSON.stringify(getStaticFontCacheDir(nuxt.op
         "nuxt-og-image": {
           defaults: runtimeConfig.defaults,
           includeTwitter: runtimeConfig.includeTwitter,
+          browserEnabled: runtimeConfig.browserEnabled,
           hasServerRuntime: !nuxt.options._generate && !nuxt.options.nitro?.static
         }
       };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-og-image",
   "type": "module",
-  "version": "6.9.0",
+  "version": "6.9.1",
   "description": "Enlightened OG Image generation for Nuxt.",
   "author": {
     "website": "https://harlanzw.com",