nuxt-og-image 6.7.5 → 6.7.6

package/dist/shared/{nuxt-og-image.D3mV8OQ9.mjs → nuxt-og-image.BIbfn5xQ.mjs}

@@ -3,15 +3,15 @@ import * as fs from 'node:fs';
 import { existsSync, mkdirSync, readdirSync, readFileSync, statSync, rmSync } from 'node:fs';
 import { readdir, readFile, writeFile, mkdir } from 'node:fs/promises';
 import { pathToFileURL } from 'node:url';
-import { resolvePath, useNuxt, addTemplate, updateTemplates, addTypeTemplate, defineNuxtModule, createResolver, addImports, hasNuxtModule, hasNuxtModuleCompatibility, getNuxtModuleVersion, addVitePlugin, addBuildPlugin, addServerHandler, addPlugin, addComponentsDir, getNuxtVersion, addServerPlugin } from '@nuxt/kit';
+import { resolvePath, useNuxt, addTemplate, updateTemplates, directoryToURL, tryResolveModule, addTypeTemplate, defineNuxtModule, createResolver, addImports, hasNuxtModule, hasNuxtModuleCompatibility, getNuxtModuleVersion, addVitePlugin, addBuildPlugin, addServerHandler, addPlugin, addComponentsDir, getNuxtVersion, addServerPlugin } from '@nuxt/kit';
 import { defu } from 'defu';
 import { fnv1a64Base36 } from 'fnv1a-64';
 import { installNuxtSiteConfig } from 'nuxt-site-config/kit';
+import { resolveNitroPreset, renderNitroTypeAugmentations, setupNitroRuntimeCompatibility, getNuxtModuleOptions, isNuxtGenerate } from 'nuxtseo-shared/kit';
 import { basename, join, dirname, relative, isAbsolute, resolve } from 'pathe';
 import { readPackageJSON } from 'pkg-types';
 import { isCI, isAgent, hasTTY } from 'std-env';
 import { parseAndWalk } from 'oxc-walker';
-import { resolveNitroPreset, getNuxtModuleOptions, isNuxtGenerate } from 'nuxtseo-shared/kit';
 import { logger } from '../../dist/runtime/logger.js';
 import { Launcher } from 'chrome-launcher';
 import { detectPackageManager, addDependency } from 'nypm';
@@ -308,23 +308,32 @@ async function setupBuildHandler(config, resolve, getDetectedRenderers, getCompa
   nuxt.options.nitro.storage = nuxt.options.nitro.storage || {};
   if (typeof config.runtimeCacheStorage === "object")
     nuxt.options.nitro.storage["nuxt-og-image"] = config.runtimeCacheStorage;
-  nuxt.hooks.hook("nitro:config", async (nitroConfig) => {
-    const mockCode = `import proxy from 'mocked-exports/proxy';export default proxy;export * from 'mocked-exports/proxy';`;
-    nitroConfig.virtual = nitroConfig.virtual || {};
-    nitroConfig.virtual["playwright-core"] = mockCode;
-    nitroConfig.virtual.electron = mockCode;
-    nitroConfig.virtual["electron/index"] = mockCode;
-    nitroConfig.virtual["electron/index.js"] = mockCode;
-    nitroConfig.virtual.bufferutil = mockCode;
-    nitroConfig.virtual["utf-8-validate"] = mockCode;
-    nitroConfig.virtual["chromium-bidi"] = mockCode;
-    nitroConfig.virtual["chromium-bidi/lib/cjs/bidiMapper/BidiMapper"] = mockCode;
-    nitroConfig.virtual["chromium-bidi/lib/cjs/bidiMapper/BidiMapper.js"] = mockCode;
-    nitroConfig.virtual.queue = mockCode;
+  const nitroConfig = nuxt.options.nitro;
+  const mockCode = `import proxy from 'mocked-exports/proxy';export default proxy;export * from 'mocked-exports/proxy';`;
+  nitroConfig.virtual = nitroConfig.virtual || {};
+  nitroConfig.virtual["playwright-core"] = mockCode;
+  nitroConfig.virtual.electron = mockCode;
+  nitroConfig.virtual["electron/index"] = mockCode;
+  nitroConfig.virtual["electron/index.js"] = mockCode;
+  nitroConfig.virtual.bufferutil = mockCode;
+  nitroConfig.virtual["utf-8-validate"] = mockCode;
+  nitroConfig.virtual["chromium-bidi"] = mockCode;
+  nitroConfig.virtual["chromium-bidi/lib/cjs/bidiMapper/BidiMapper"] = mockCode;
+  nitroConfig.virtual["chromium-bidi/lib/cjs/bidiMapper/BidiMapper.js"] = mockCode;
+  nitroConfig.virtual.queue = mockCode;
+  await applyNitroPresetCompatibility(nitroConfig, {
+    compatibility: config.compatibility?.runtime,
+    resolve,
+    detectedRenderers: getDetectedRenderers(),
+    metadata: getCompatibilityMeta()
   });
   nuxt.hooks.hook("nitro:init", async (nitro) => {
-    const renderers = getDetectedRenderers();
-    await applyNitroPresetCompatibility(nitro.options, { compatibility: config.compatibility?.runtime, resolve, detectedRenderers: renderers, metadata: getCompatibilityMeta() });
+    await applyNitroPresetCompatibility(nitro.options, {
+      compatibility: config.compatibility?.runtime,
+      resolve,
+      detectedRenderers: getDetectedRenderers(),
+      metadata: getCompatibilityMeta()
+    });
     const target = resolveOgImagePreset(nitro.options);
     const normalizedTarget = target.replace(RE_LEGACY_SUFFIX, "");
     const isEdgePreset = ["cloudflare", "cloudflare-pages", "cloudflare-pages-static", "cloudflare-module", "cloudflare-durable", "vercel-edge", "netlify-edge"].includes(normalizedTarget);
@@ -649,10 +658,10 @@ async function validateProviderSetup(renderer, compatibility) {
   return { valid: issues.length === 0, issues };
 }
 
-function setupDevHandler(options, resolve, getDetectedRenderers, getCompatibilityMeta = () => ({}), nuxt = useNuxt()) {
-  nuxt.hooks.hook("nitro:init", async (nitro) => {
+async function setupDevHandler(options, resolve, getDetectedRenderers, getCompatibilityMeta = () => ({}), nuxt = useNuxt()) {
+  const applyCompatibility = async (nitroConfig) => {
     const detectedRenderers = new Set(getDetectedRenderers());
-    const targetCompatibility = getPresetNitroPresetCompatibility(resolveOgImagePreset(nitro.options));
+    const targetCompatibility = getPresetNitroPresetCompatibility(resolveOgImagePreset(nitroConfig));
     for (const renderer of ["satori", "takumi", "browser"]) {
       if (!detectedRenderers.has(renderer)) {
         const binding = getRecommendedBinding(renderer, targetCompatibility);
@@ -661,8 +670,10 @@ function setupDevHandler(options, resolve, getDetectedRenderers, getCompatibilit
           detectedRenderers.add(renderer);
       }
     }
-    await applyNitroPresetCompatibility(nitro.options, { compatibility: options.compatibility?.dev, resolve, detectedRenderers, metadata: getCompatibilityMeta() });
-  });
+    await applyNitroPresetCompatibility(nitroConfig, { compatibility: options.compatibility?.dev, resolve, detectedRenderers, metadata: getCompatibilityMeta() });
+  };
+  await applyCompatibility(nuxt.options.nitro);
+  nuxt.hooks.hook("nitro:init", (nitro) => applyCompatibility(nitro.options));
 }
 
 const RE_TILDE_SLASH = /^~\//;
@@ -2181,7 +2192,7 @@ async function downloadStaticFonts(options) {
       results.push(...familyResults);
     }
   }
-  if (unresolvedFamilies.length > 0) {
+  if (options.warnOnMissingStaticFonts !== false && unresolvedFamilies.length > 0) {
     const providerList = fontlessCtx.providerNames.join(", ") || "none";
     const localFonts = await listLocalPublicFontFiles(options.nuxt).catch(() => []);
     const matchedLocal = unresolvedFamilies.map((family) => {
@@ -2313,7 +2324,8 @@ async function convertWoff2ToTtf(options) {
       families,
       nuxt,
       logger,
-      fontSubsets
+      fontSubsets,
+      warnOnMissingStaticFonts
     });
     for (const font of downloaded) {
       const key = `${font.family}-${font.weight}-${font.style}`;
@@ -2452,6 +2464,34 @@ function setupGenerateHandler(_options, resolve, _getDetectedRenderers, nuxt = u
   });
 }
 
+async function resolveOptionalModulePath(id, rootDir, fallbackPackages = []) {
+  const rootUrl = directoryToURL(rootDir);
+  const direct = await tryResolveModule(id, rootUrl);
+  if (direct)
+    return direct;
+  for (const pkg of fallbackPackages) {
+    const pkgJson = await tryResolveModule(`${pkg}/package.json`, rootUrl);
+    if (!pkgJson)
+      continue;
+    const nested = await tryResolveModule(id, directoryToURL(dirname(pkgJson)));
+    if (nested)
+      return nested;
+  }
+}
+async function importResolvedModule(id, resolvedPath) {
+  return await (resolvedPath ? import(pathToFileURL(resolvedPath).href) : import(id));
+}
+async function importOptionalPeer(id, resolvedPath, usage) {
+  try {
+    return await importResolvedModule(id, resolvedPath);
+  } catch (cause) {
+    throw new Error(
+      `[nuxt-og-image] Missing optional peer dependency "${id}". Install it to use ${usage}.`,
+      { cause }
+    );
+  }
+}
+
 const ONE_WEEK_MS = 7 * 24 * 60 * 60 * 1e3;
 function setupPrerenderHandler(options, resolve, getDetectedRenderers, getCompatibilityMeta = () => ({}), nuxt = useNuxt()) {
   nuxt.hooks.hook("nitro:init", async (nitro) => {
@@ -4431,7 +4471,7 @@ function getComponentTypeExpression(component, nuxt) {
   return `typeof import('${relativeComponentPath}')['default']`;
 }
 function registerTypeTemplates(ctx) {
-  const { nuxt, config, componentCtx } = ctx;
+  const { nuxt, config, componentCtx, nitroCompatibility } = ctx;
   nuxt.hook("prepare:types", ({ tsConfig }) => {
     tsConfig.include = tsConfig.include || [];
     tsConfig.include.push("./module/nuxt-og-image-components.d.ts");
@@ -4482,7 +4522,7 @@ ${lines.join("\n")}
     getContents: (data) => {
       const typesPath = relative(resolve(data.nuxt.options.rootDir, data.nuxt.options.buildDir, "types"), resolve("runtime/types"));
       return `declare module '#og-image-virtual/public-assets.mjs' {
-  import type { H3Event } from 'h3'
+  import type { H3Event } from '#nuxtseo/h3'
   import type { FontConfig } from '${typesPath}'
   export function resolve(event: H3Event, font: FontConfig): Promise<BufferSource>
 }
@@ -4561,7 +4601,7 @@ declare module '#og-image-virtual/tw4-theme.mjs' {
     getContents: (data) => {
       const typesPath = relative(resolve(data.nuxt.options.rootDir, data.nuxt.options.buildDir, "types"), resolve("runtime/types"));
       return `declare module '#og-image/bindings/browser' {
-  import type { H3Event } from 'h3'
+  import type { H3Event } from '#nuxtseo/h3'
   export function createBrowser(event?: H3Event): Promise<any>
 }
 
@@ -4621,61 +4661,34 @@ declare module '#og-image-cache' {
     filename: "types/og-image-augments.d.ts",
     getContents: (data) => {
       const typesPath = relative(resolve(data.nuxt.options.rootDir, data.nuxt.options.buildDir, "types"), resolve("runtime/types"));
+      const nitroAugmentations = renderNitroTypeAugmentations(nitroCompatibility, {
+        nitroInterfaces: {
+          NitroApp: `_ogImageCacheBackendWarned?: boolean
+_ogImageIconsData?: OgImageIconsData`,
+          NitroRuntimeConfig: `'nuxt-og-image': OgImageRuntimeConfig
+ogImage?: {
+  secret?: string
+}`
+        },
+        routeRules: "ogImage?: false | OgImageOptions & Record<string, any>",
+        routeConfig: "ogImage?: false | OgImageOptions & Record<string, any>",
+        runtimeHooks: `'nuxt-og-image:context': (ctx: OgImageRenderEventContext) => void | Promise<void>
+'nuxt-og-image:satori:vnodes': (vnodes: VNode, ctx: OgImageRenderEventContext) => void | Promise<void>`,
+        eventContext: `_nitro?: {
+  routeRules?: import('${nitroCompatibility.nitroTypesModule}').NitroRouteRules
+}
+_ogImagePrerenderPaths?: Map<string, string>`
+      });
       return `/// <reference path="./og-image-virtual.d.ts" />
 /// <reference path="./og-image-bindings.d.ts" />
-import type { OgImageOptions, OgImageRenderEventContext, VNode } from '${typesPath}'
+import type { OgImageIconsData, OgImageOptions, OgImageRenderEventContext, OgImageRuntimeConfig, VNode } from '${typesPath}'
 
-declare module 'nitropack' {
-  interface NitroRuntimeConfig {
-    'nuxt-og-image': OgImageRuntimeConfig
-    ogImage?: {
-      secret?: string
-    }
-  }
-  interface NitroRouteRules {
-    ogImage?: false | OgImageOptions & Record<string, any>
-  }
-  interface NitroRouteConfig {
-    ogImage?: false | OgImageOptions & Record<string, any>
-  }
-  interface NitroRuntimeHooks {
-    'nuxt-og-image:context': (ctx: OgImageRenderEventContext) => void | Promise<void>
-    'nuxt-og-image:satori:vnodes': (vnodes: VNode, ctx: OgImageRenderEventContext) => void | Promise<void>
-  }
-}
-
-declare module 'nitropack/types' {
-  interface NitroRuntimeConfig {
-    'nuxt-og-image': OgImageRuntimeConfig
-    ogImage?: {
-      secret?: string
-    }
-  }
-  interface NitroRouteRules {
-    ogImage?: false | OgImageOptions & Record<string, any>
-  }
-  interface NitroRouteConfig {
-    ogImage?: false | OgImageOptions & Record<string, any>
-  }
-  interface NitroRuntimeHooks {
-    'nuxt-og-image:context': (ctx: OgImageRenderEventContext) => void | Promise<void>
-    'nuxt-og-image:satori:vnodes': (vnodes: VNode, ctx: OgImageRenderEventContext) => void | Promise<void>
-  }
-}
-
-declare module 'h3' {
-  interface H3EventContext {
-    _nitro?: {
-      routeRules?: import('nitropack').NitroRouteRules
-    }
-    _ogImagePrerenderPaths?: Map<string, string>
-  }
-}
+${nitroAugmentations}
 
 export {}
 `;
     }
-  });
+  }, { nitro: true, nuxt: true });
 }
 
 const RE_INLINE_CONFIG = /const\s+inlineConfig\s*=\s*(\{[\s\S]*?\n\})/;
@@ -4790,6 +4803,12 @@ const module$1 = defineNuxtModule({
       });
       return;
     }
+    const nitroCompatibility = setupNitroRuntimeCompatibility(nuxt);
+    const setRuntimeAlias = (id, path) => {
+      nuxt.options.alias[id] = path;
+      nuxt.options.nitro.alias ||= {};
+      nuxt.options.nitro.alias[id] = path;
+    };
     if (config.enabled && !nuxt.options.ssr) {
       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;
@@ -4866,8 +4885,7 @@ Or pin to a specific version in package.json:
         break;
       }
     }
-    nuxt.options.alias["#og-image"] = resolve("./runtime");
-    nuxt.options.alias["#og-image-cache"] = resolve("./runtime/server/og-image/cache/lru");
+    setRuntimeAlias("#og-image-cache", resolve("./runtime/server/og-image/cache/lru"));
     const preset = resolveOgImagePreset(nuxt.options.nitro);
     const targetCompatibility = getPresetNitroPresetCompatibility(preset);
     const runtimeCompatibilityMeta = {};
@@ -4888,11 +4906,11 @@ Or pin to a specific version in package.json:
     let buildEmojiSet;
     if (config.defaults.emojis === false) {
       logger.debug("Emoji support disabled.");
-      nuxt.options.alias["#og-image/emoji-transform"] = resolve("./runtime/server/og-image/core/transforms/emojis/noop");
+      setRuntimeAlias("#og-image/emoji-transform", resolve("./runtime/server/og-image/core/transforms/emojis/noop"));
       buildEmojiSet = void 0;
     } else {
       buildEmojiSet = config.defaults.emojis || "noto";
-      nuxt.options.alias["#og-image/emoji-transform"] = resolve("./runtime/server/og-image/core/transforms/emojis/fetch");
+      setRuntimeAlias("#og-image/emoji-transform", resolve("./runtime/server/og-image/core/transforms/emojis/fetch"));
     }
     const { detectCssProvider } = await Promise.resolve().then(function () { return cssProvider; });
     const cssFramework = detectCssProvider(nuxt);
@@ -4900,6 +4918,10 @@ Or pin to a specific version in package.json:
     if (cssFramework === "unocss") {
       logger.debug("UnoCSS detected, using UnoCSS provider for OG image styling");
       const { setUnoConfig, setUnoRootDir, createUnoProvider } = await import('../chunks/uno.mjs');
+      const [unocssCorePath, unocssConfigPath] = await Promise.all([
+        resolveOptionalModulePath("@unocss/core", nuxt.options.rootDir, ["@unocss/nuxt", "unocss"]),
+        resolveOptionalModulePath("@unocss/config", nuxt.options.rootDir, ["@unocss/nuxt", "unocss"])
+      ]);
       setUnoRootDir(nuxt.options.rootDir);
       nuxt.hook("unocss:config", (config2) => {
         setUnoConfig(config2);
@@ -4911,6 +4933,8 @@ Or pin to a specific version in package.json:
         config2.content.pipeline.exclude.push(...excludePatterns);
       });
       cssProvider$1 = createUnoProvider({
+        unocssCorePath,
+        unocssConfigPath,
         async resolveCssPath() {
           for (const cssEntry of nuxt.options.css) {
             const cssPath = typeof cssEntry === "string" ? cssEntry : cssEntry?.src;
@@ -5114,7 +5138,7 @@ ${familyInfo}`);
       });
       if (!nuxt.options.dev) {
         addBuildPlugin(TreeShakeComposablesPlugin, { server: true, client: true, build: true });
-        nuxt.options.alias["#og-image-cache"] = resolve("./runtime/server/og-image/cache/mock");
+        setRuntimeAlias("#og-image-cache", resolve("./runtime/server/og-image/cache/mock"));
       }
     }
     const basePath = config.zeroRuntime ? "./runtime/server/routes/__zero-runtime" : "./runtime/server/routes";
@@ -5680,7 +5704,8 @@ export const rootDir = ${JSON.stringify(nuxt.options.rootDir)}`;
     registerTypeTemplates({
       nuxt,
       config,
-      componentCtx: ogImageComponentCtx
+      componentCtx: ogImageComponentCtx,
+      nitroCompatibility
     });
     const cacheEnabled = typeof config.runtimeCacheStorage !== "undefined" && config.runtimeCacheStorage !== false;
     const cacheVersion = config.cacheVersion === false ? "" : config.cacheVersion ?? version;
@@ -5784,7 +5809,7 @@ export const rootDir = ${JSON.stringify(nuxt.options.rootDir)}`;
     const getDetectedRenderers = () => ogImageComponentCtx.detectedRenderers;
     const getCompatibilityMeta = () => runtimeCompatibilityMeta;
     if (nuxt.options.dev) {
-      setupDevHandler(config, resolver, getDetectedRenderers, getCompatibilityMeta);
+      await setupDevHandler(config, resolver, getDetectedRenderers, getCompatibilityMeta);
       setupDevToolsUI(config, resolve, nuxt, cssFramework || "none");
       const useNitro = new Promise((resolveNitro) => {
         nuxt.hooks.hook("nitro:init", resolveNitro);
@@ -5820,6 +5845,9 @@ export const rootDir = ${JSON.stringify(nuxt.options.rootDir)}`;
     } else if (nuxt.options.build) {
       await setupBuildHandler(config, resolver, getDetectedRenderers, getCompatibilityMeta);
     }
+    setRuntimeAlias("#og-image/app", resolve("./runtime/app"));
+    setRuntimeAlias("#og-image/shared", resolve("./runtime/shared"));
+    setRuntimeAlias("#og-image/types", resolve("./runtime/types"));
     if (nuxt.options.build)
       addServerPlugin(resolve("./runtime/server/plugins/prerender"));
     setupPrerenderHandler(config, resolver, getDetectedRenderers, getCompatibilityMeta);
@@ -5831,4 +5859,4 @@ export const rootDir = ${JSON.stringify(nuxt.options.rootDir)}`;
   }
 });
 
-export { extractCssVars as a, extractPropertyInitialValues as b, extractUniversalVars as c, extractPerClassVars as d, extractVariantBaseClasses as e, extractClassStyles as f, extractVarsFromCss as g, resolveExtractedVars as h, resolveVarsDeep as i, loadLightningCss as l, module$1 as m, postProcessStyles as p, resolveVariantPrefixes as r, simplifyCss as s };
+export { extractCssVars as a, extractPropertyInitialValues as b, extractUniversalVars as c, extractPerClassVars as d, extractVariantBaseClasses as e, extractClassStyles as f, extractVarsFromCss as g, resolveExtractedVars as h, importOptionalPeer as i, importResolvedModule as j, resolveOptionalModulePath as k, resolveVarsDeep as l, loadLightningCss as m, module$1 as n, postProcessStyles as p, resolveVariantPrefixes as r, simplifyCss as s };