nuxt-og-image 4.1.5 → 4.2.0

package/dist/client/_nuxt/builds/latest.json

@@ -1 +1 @@
-{"id":"03f87ee4-d949-4449-809e-3cf9919c9be8","timestamp":1740816812278}
+{"id":"f64bec49-7895-4c1f-a389-207010cde98d","timestamp":1741171906781}

package/dist/client/_nuxt/builds/meta/f64bec49-7895-4c1f-a389-207010cde98d.json

@@ -0,0 +1 @@
+{"id":"f64bec49-7895-4c1f-a389-207010cde98d","timestamp":1741171906781,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

package/dist/client/_nuxt/error-404.E0OmbL_g.css

@@ -0,0 +1 @@
+.spotlight[data-v-ae1408d5]{background:linear-gradient(45deg,#00dc82,#36e4da 50%,#0047e1);bottom:-30vh;filter:blur(20vh);height:40vh}.gradient-border[data-v-ae1408d5]{-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px);border-radius:.5rem;position:relative}@media (prefers-color-scheme:light){.gradient-border[data-v-ae1408d5]{background-color:#ffffff4d}.gradient-border[data-v-ae1408d5]:before{background:linear-gradient(90deg,#e2e2e2,#e2e2e2 25%,#00dc82,#36e4da 75%,#0047e1)}}@media (prefers-color-scheme:dark){.gradient-border[data-v-ae1408d5]{background-color:#1414144d}.gradient-border[data-v-ae1408d5]:before{background:linear-gradient(90deg,#303030,#303030 25%,#00dc82,#36e4da 75%,#0047e1)}}.gradient-border[data-v-ae1408d5]:before{background-size:400% auto;border-radius:.5rem;bottom:0;content:"";left:0;-webkit-mask:linear-gradient(#fff 0 0) content-box,linear-gradient(#fff 0 0);mask:linear-gradient(#fff 0 0) content-box,linear-gradient(#fff 0 0);-webkit-mask-composite:xor;mask-composite:exclude;opacity:.5;padding:2px;position:absolute;right:0;top:0;transition:background-position .3s ease-in-out,opacity .2s ease-in-out;width:100%}.gradient-border[data-v-ae1408d5]:hover:before{background-position:-50% 0;opacity:1}.fixed[data-v-ae1408d5]{position:fixed}.left-0[data-v-ae1408d5]{left:0}.right-0[data-v-ae1408d5]{right:0}.z-10[data-v-ae1408d5]{z-index:10}.z-20[data-v-ae1408d5]{z-index:20}.grid[data-v-ae1408d5]{display:grid}.mb-16[data-v-ae1408d5]{margin-bottom:4rem}.mb-8[data-v-ae1408d5]{margin-bottom:2rem}.max-w-520px[data-v-ae1408d5]{max-width:520px}.min-h-screen[data-v-ae1408d5]{min-height:100vh}.w-full[data-v-ae1408d5]{width:100%}.flex[data-v-ae1408d5]{display:flex}.cursor-pointer[data-v-ae1408d5]{cursor:pointer}.place-content-center[data-v-ae1408d5]{place-content:center}.items-center[data-v-ae1408d5]{align-items:center}.justify-center[data-v-ae1408d5]{justify-content:center}.overflow-hidden[data-v-ae1408d5]{overflow:hidden}.bg-white[data-v-ae1408d5]{--un-bg-opacity:1;background-color:rgb(255 255 255/var(--un-bg-opacity))}.px-4[data-v-ae1408d5]{padding-left:1rem;padding-right:1rem}.px-8[data-v-ae1408d5]{padding-left:2rem;padding-right:2rem}.py-2[data-v-ae1408d5]{padding-bottom:.5rem;padding-top:.5rem}.text-center[data-v-ae1408d5]{text-align:center}.text-8xl[data-v-ae1408d5]{font-size:6rem;line-height:1}.text-xl[data-v-ae1408d5]{font-size:1.25rem;line-height:1.75rem}.text-black[data-v-ae1408d5]{--un-text-opacity:1;color:rgb(0 0 0/var(--un-text-opacity))}.font-light[data-v-ae1408d5]{font-weight:300}.font-medium[data-v-ae1408d5]{font-weight:500}.leading-tight[data-v-ae1408d5]{line-height:1.25}.font-sans[data-v-ae1408d5]{font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji}.antialiased[data-v-ae1408d5]{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media (prefers-color-scheme:dark){.dark\:bg-black[data-v-ae1408d5]{--un-bg-opacity:1;background-color:rgb(0 0 0/var(--un-bg-opacity))}.dark\:text-white[data-v-ae1408d5]{--un-text-opacity:1;color:rgb(255 255 255/var(--un-text-opacity))}}@media (min-width:640px){.sm\:px-0[data-v-ae1408d5]{padding-left:0;padding-right:0}.sm\:px-6[data-v-ae1408d5]{padding-left:1.5rem;padding-right:1.5rem}.sm\:py-3[data-v-ae1408d5]{padding-bottom:.75rem;padding-top:.75rem}.sm\:text-4xl[data-v-ae1408d5]{font-size:2.25rem;line-height:2.5rem}.sm\:text-xl[data-v-ae1408d5]{font-size:1.25rem;line-height:1.75rem}}

package/dist/client/_nuxt/error-500.CzRA7ALL.css

@@ -0,0 +1 @@
+.spotlight[data-v-d4af572a]{background:linear-gradient(45deg,#00dc82,#36e4da 50%,#0047e1);filter:blur(20vh)}.fixed[data-v-d4af572a]{position:fixed}.-bottom-1\/2[data-v-d4af572a]{bottom:-50%}.left-0[data-v-d4af572a]{left:0}.right-0[data-v-d4af572a]{right:0}.grid[data-v-d4af572a]{display:grid}.mb-16[data-v-d4af572a]{margin-bottom:4rem}.mb-8[data-v-d4af572a]{margin-bottom:2rem}.h-1\/2[data-v-d4af572a]{height:50%}.max-w-520px[data-v-d4af572a]{max-width:520px}.min-h-screen[data-v-d4af572a]{min-height:100vh}.place-content-center[data-v-d4af572a]{place-content:center}.overflow-hidden[data-v-d4af572a]{overflow:hidden}.bg-white[data-v-d4af572a]{--un-bg-opacity:1;background-color:rgb(255 255 255/var(--un-bg-opacity))}.px-8[data-v-d4af572a]{padding-left:2rem;padding-right:2rem}.text-center[data-v-d4af572a]{text-align:center}.text-8xl[data-v-d4af572a]{font-size:6rem;line-height:1}.text-xl[data-v-d4af572a]{font-size:1.25rem;line-height:1.75rem}.text-black[data-v-d4af572a]{--un-text-opacity:1;color:rgb(0 0 0/var(--un-text-opacity))}.font-light[data-v-d4af572a]{font-weight:300}.font-medium[data-v-d4af572a]{font-weight:500}.leading-tight[data-v-d4af572a]{line-height:1.25}.font-sans[data-v-d4af572a]{font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji}.antialiased[data-v-d4af572a]{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media (prefers-color-scheme:dark){.dark\:bg-black[data-v-d4af572a]{--un-bg-opacity:1;background-color:rgb(0 0 0/var(--un-bg-opacity))}.dark\:text-white[data-v-d4af572a]{--un-text-opacity:1;color:rgb(255 255 255/var(--un-text-opacity))}}@media (min-width:640px){.sm\:px-0[data-v-d4af572a]{padding-left:0;padding-right:0}.sm\:text-4xl[data-v-d4af572a]{font-size:2.25rem;line-height:2.5rem}}

package/dist/client/index.html

@@ -1,15 +1,15 @@
 <!DOCTYPE html><html  data-capo=""><head><meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="stylesheet" href="/__nuxt-og-image/_nuxt/entry.BZSHFM_J.css" crossorigin>
-<link rel="modulepreload" as="script" crossorigin href="/__nuxt-og-image/_nuxt/Da4II6Ro.js">
+<link rel="modulepreload" as="script" crossorigin href="/__nuxt-og-image/_nuxt/DB-eawxJ.js">
 <link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/CVO1_9PV.js">
 <link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/D0r3Knsf.js">
 <link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/DGRTSKzu.js">
 <link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/DTAJTTim.js">
 <link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/B6E6ObS_.js">
-<link rel="prefetch" as="style" crossorigin href="/__nuxt-og-image/_nuxt/error-404.Cg-uDbSf.css">
-<link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/-KRqNZ6N.js">
-<link rel="prefetch" as="style" crossorigin href="/__nuxt-og-image/_nuxt/error-500.CWOGVHgV.css">
-<link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/CCJtj6wL.js">
-<script type="module" src="/__nuxt-og-image/_nuxt/Da4II6Ro.js" crossorigin></script></head><body><div id="__nuxt"></div><div id="teleports"></div><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},1740816822146,false]</script>
-<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-og-image",buildId:"03f87ee4-d949-4449-809e-3cf9919c9be8",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>
+<link rel="prefetch" as="style" crossorigin href="/__nuxt-og-image/_nuxt/error-404.E0OmbL_g.css">
+<link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/B1rU9qc9.js">
+<link rel="prefetch" as="style" crossorigin href="/__nuxt-og-image/_nuxt/error-500.CzRA7ALL.css">
+<link rel="prefetch" as="script" crossorigin href="/__nuxt-og-image/_nuxt/CR6b29do.js">
+<script type="module" src="/__nuxt-og-image/_nuxt/DB-eawxJ.js" crossorigin></script></head><body><div id="__nuxt"></div><div id="teleports"></div><script type="application/json" data-nuxt-data="nuxt-app" data-ssr="false" id="__NUXT_DATA__">[{"prerenderedAt":1,"serverRendered":2},1741171916542,false]</script>
+<script>window.__NUXT__={};window.__NUXT__.config={public:{},app:{baseURL:"/__nuxt-og-image",buildId:"f64bec49-7895-4c1f-a389-207010cde98d",buildAssetsDir:"/_nuxt/",cdnURL:""}}</script></body></html>

package/dist/module.json

@@ -5,7 +5,7 @@
     "bridge": false
   },
   "configKey": "ogImage",
-  "version": "4.1.4",
+  "version": "4.1.6",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/runtime/server/og-image/context.js

@@ -1,5 +1,6 @@
 import { htmlPayloadCache, prerenderOptionsCache } from "#og-image-cache";
 import { theme } from "#og-image-virtual/unocss-config.mjs";
+import { useSiteConfig } from "#site-config/server/composables/useSiteConfig";
 import { createSitePathResolver } from "#site-config/server/composables/utils";
 import { createGenerator } from "@unocss/core";
 import presetWind from "@unocss/preset-wind3";
@@ -17,13 +18,15 @@ import { logger } from "../util/logger.js";
 import { normaliseOptions } from "../util/options.js";
 import { useChromiumRenderer, useSatoriRenderer } from "./instances.js";
 export function resolvePathCacheKey(e, path) {
-  const siteConfig = e.context.siteConfig.get();
+  const siteConfig = useSiteConfig(e, {
+    resolveRefs: true
+  });
   const basePath = withoutTrailingSlash(withoutLeadingSlash(normalizeKey(path)));
   return [
     !basePath || basePath === "/" ? "index" : basePath,
     hash([
       basePath,
-      siteConfig.url,
+      import.meta.prerender ? "" : siteConfig.url,
       hash(getQuery(e))
     ])
   ].join(":");
@@ -136,7 +139,7 @@ export function extractAndNormaliseOgImageOptions(html) {
   try {
     const payload2 = parse(_payload);
     Object.entries(payload2).forEach(([key, value]) => {
-      if (!value)
+      if (!value && value !== 0)
         delete payload2[key];
     });
     options = payload2;
@@ -188,7 +191,7 @@ async function doFetchWithErrorHandling(fetch, path) {
       return await doFetchWithErrorHandling(fetch, res.headers.get("location") || "");
     }
     errorDescription = `${res.status} redirected to ${res.headers.get("location") || "unknown"}`;
-  } else if (res.status >= 400) {
+  } else if (res.status >= 500) {
     errorDescription = `${res.status} error: ${res.statusText}`;
   }
   if (errorDescription) {
@@ -197,7 +200,12 @@ async function doFetchWithErrorHandling(fetch, path) {
       statusMessage: `[Nuxt OG Image] Failed to parse \`${path}\` for og-image extraction. ${errorDescription}`
     })];
   }
-  return [res._data || await res.text(), null];
+  if (res._data) {
+    return [res._data, null];
+  } else if (res.text) {
+    return [await res.text(), null];
+  }
+  return ["", null];
 }
 async function fetchPathHtmlAndExtractOptions(e, path, key) {
   const cachedHtmlPayload = await htmlPayloadCache.getItem(key);
@@ -229,7 +237,7 @@ async function fetchPathHtmlAndExtractOptions(e, path, key) {
   if (!_payload) {
     return createError({
       statusCode: 500,
-      statusMessage: `[Nuxt OG Image] HTML response from ${path} is missing the #nuxt-og-image-options script tag. Check you have used defined an og image for this page.`
+      statusMessage: `[Nuxt OG Image] HTML response from ${path} is missing the #nuxt-og-image-options script tag. Make sure you have defined an og image for this page.`
     });
   }
   const payload = extractAndNormaliseOgImageOptions(html);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-og-image",
   "type": "module",
-  "version": "4.1.5",
+  "version": "4.2.0",
   "description": "Enlightened OG Image generation for Nuxt.",
   "author": {
     "website": "https://harlanzw.com",
@@ -52,7 +52,7 @@
     "unstorage": "^1.0.0"
   },
   "dependencies": {
-    "@nuxt/devtools-kit": "2.1.1",
+    "@nuxt/devtools-kit": "2.1.3",
     "@nuxt/kit": "^3.15.4",
     "@resvg/resvg-js": "^2.6.2",
     "@resvg/resvg-wasm": "^2.6.2",
@@ -65,18 +65,18 @@
     "execa": "^9.5.2",
     "image-size": "^2.0.0",
     "magic-string": "^0.30.17",
-    "nuxt-site-config": "^3.1.1",
+    "nuxt-site-config": "^3.1.3",
     "nypm": "^0.6.0",
     "ofetch": "^1.4.1",
-    "ohash": "^2.0.7",
+    "ohash": "^2.0.11",
     "pathe": "^2.0.3",
-    "pkg-types": "^2.0.0",
+    "pkg-types": "^2.1.0",
     "playwright-core": "^1.50.1",
     "radix3": "^1.1.2",
     "satori": "^0.12.1",
     "satori-html": "^0.3.2",
     "sirv": "^3.0.1",
-    "std-env": "^3.8.0",
+    "std-env": "^3.8.1",
     "strip-literal": "^3.0.0",
     "ufo": "^1.5.4",
     "unplugin": "^2.2.0",
@@ -84,7 +84,7 @@
     "yoga-wasm-web": "^0.3.3"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.3.0",
+    "@antfu/eslint-config": "^4.5.1",
     "@css-inline/css-inline": "^0.14.3",
     "@headlessui/vue": "^1.7.23",
     "@iconify-json/carbon": "^1.2.8",
@@ -94,12 +94,12 @@
     "@iconify-json/tabler": "^1.2.16",
     "@img/sharp-linux-x64": "0.33.5",
     "@nuxt/content": "^3.2.2",
-    "@nuxt/devtools": "2.1.1",
-    "@nuxt/devtools-ui-kit": "2.1.1",
+    "@nuxt/devtools": "2.1.3",
+    "@nuxt/devtools-ui-kit": "2.1.3",
     "@nuxt/icon": "^1.10.3",
     "@nuxt/image": "^1.9.0",
     "@nuxt/module-builder": "^0.8.4",
-    "@nuxt/test-utils": "3.17.0",
+    "@nuxt/test-utils": "3.17.1",
     "@nuxt/ui": "^2.21.0",
     "@nuxtjs/color-mode": "^3.5.2",
     "@nuxtjs/eslint-config-typescript": "^12.1.0",
@@ -108,7 +108,7 @@
     "@unocss/nuxt": "^66.0.0",
     "@unocss/preset-icons": "^66.0.0",
     "@unocss/runtime": "^66.0.0",
-    "@vueuse/nuxt": "^12.7.0",
+    "@vueuse/nuxt": "^12.8.0",
     "bumpp": "^10.0.3",
     "eslint": "9.21.0",
     "jest-image-snapshot": "^6.4.0",