nuxt-og-image 6.1.2 → 6.2.0

package/dist/shared/{nuxt-og-image.DuUfHPCI.mjs → nuxt-og-image.Bd7Znc-u.mjs}

@@ -2,7 +2,7 @@ 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, loadNuxtModuleInstance, addTypeTemplate, defineNuxtModule, createResolver, addImports, hasNuxtModule, hasNuxtModuleCompatibility, getNuxtModuleVersion, addVitePlugin, addBuildPlugin, addServerHandler, addPlugin, addComponentsDir, addServerPlugin } from '@nuxt/kit';
+import { resolvePath, useNuxt, addTemplate, updateTemplates, addTypeTemplate, defineNuxtModule, createResolver, addImports, hasNuxtModule, hasNuxtModuleCompatibility, getNuxtModuleVersion, addVitePlugin, addBuildPlugin, addServerHandler, addPlugin, addComponentsDir, addServerPlugin } from '@nuxt/kit';
 import { defu } from 'defu';
 import { installNuxtSiteConfig } from 'nuxt-site-config/kit';
 import { hash } from 'ohash';
@@ -10,11 +10,12 @@ import { basename, join, dirname, relative, isAbsolute, resolve } from 'pathe';
 import { readPackageJSON } from 'pkg-types';
 import { createHash } from 'node:crypto';
 import { parseAndWalk } from 'oxc-walker';
-import { isCI, provider, env } from 'std-env';
+import { resolveNitroPreset, getNuxtModuleOptions, isNuxtGenerate } from 'nuxtseo-shared/kit';
 import { logger } from '../../dist/runtime/logger.js';
 import { Launcher } from 'chrome-launcher';
+import { isCI } from 'std-env';
 import { detectPackageManager, addDependency } from 'nypm';
-import { onDevToolsInitialized, extendServerRpc, addCustomTab } from '@nuxt/devtools-kit';
+import { setupDevToolsUI as setupDevToolsUI$1, setupDevToolsRpc } from 'nuxtseo-shared/devtools';
 import { createStorage } from 'unstorage';
 import fsDriver from 'unstorage/drivers/fs-lite';
 import { resolveColorMix, GRADIENT_COLOR_SPACE_RE, splitCssDeclarations } from '../../dist/runtime/server/og-image/utils/css.js';
@@ -81,19 +82,6 @@ function getRegisteredBaseNames(registeredPascalName) {
   return names;
 }
 
-const autodetectableProviders = {
-  azure_static: "azure",
-  cloudflare_pages: "cloudflare-pages",
-  netlify: "netlify",
-  stormkit: "stormkit",
-  vercel: "vercel",
-  cleavr: "cleavr",
-  stackblitz: "stackblitz"
-};
-const autodetectableStaticProviders = {
-  netlify: "netlify-static",
-  vercel: "vercel-static"
-};
 const NodeRuntime = {
   // node-server runtime
   browser: "on-demand",
@@ -200,23 +188,13 @@ const RuntimeCompatibility = {
   "cloudflare-module": cloudflare,
   "cloudflare-durable": cloudflare
 };
-function detectTarget(options = {}) {
-  return options?.static ? autodetectableStaticProviders[provider] : autodetectableProviders[provider];
-}
-function resolveNitroPreset(nitroConfig) {
-  if (provider === "stackblitz" || provider === "codesandbox")
-    return provider;
+function resolveOgImagePreset(nitroConfig) {
   const nuxt = useNuxt();
   if (nuxt.options.dev)
     return "nitro-dev";
   if (nuxt.options.nitro.static)
     return "nitro-prerender";
-  let preset;
-  if (nitroConfig && nitroConfig?.preset)
-    preset = nitroConfig.preset;
-  if (!preset)
-    preset = env.NITRO_PRESET || env.SERVER_PRESET || detectTarget() || "node-server";
-  return preset.replace("_", "-");
+  return resolveNitroPreset(nitroConfig);
 }
 function getPresetNitroPresetCompatibility(target) {
   const normalizedTarget = target.replace(RE_LEGACY_SUFFIX, "");
@@ -228,7 +206,7 @@ function getPresetNitroPresetCompatibility(target) {
   return compatibility;
 }
 async function applyNitroPresetCompatibility(nitroConfig, options) {
-  const target = resolveNitroPreset(nitroConfig);
+  const target = resolveOgImagePreset(nitroConfig);
   const compatibility = getPresetNitroPresetCompatibility(target);
   const { resolve, detectedRenderers } = options;
   const satoriEnabled = detectedRenderers.has("satori");
@@ -271,7 +249,7 @@ async function applyNitroPresetCompatibility(nitroConfig, options) {
     await applyBinding("sharp"),
     nitroConfig.alias || {}
   );
-  if (Object.values(compatibility).includes("wasm")) {
+  if (Object.values(resolvedCompatibility).includes("wasm")) {
     nitroConfig.experimental = nitroConfig.experimental || {};
     nitroConfig.experimental.wasm = true;
   }
@@ -320,7 +298,7 @@ async function setupBuildHandler(config, resolve, getDetectedRenderers, nuxt = u
   nuxt.hooks.hook("nitro:init", async (nitro) => {
     const renderers = getDetectedRenderers();
     await applyNitroPresetCompatibility(nitro.options, { compatibility: config.compatibility?.runtime, resolve, detectedRenderers: renderers });
-    const target = resolveNitroPreset(nitro.options);
+    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);
     const isCloudflarePreset = normalizedTarget.startsWith("cloudflare");
@@ -353,9 +331,10 @@ async function setupBuildHandler(config, resolve, getDetectedRenderers, nuxt = u
           }
         }
       }
-      const [resvgHash, yogaHash] = await Promise.all([
+      const [resvgHash, yogaHash, takumiHash] = await Promise.all([
         resolveFilePathSha1("@resvg/resvg-wasm/index_bg.wasm"),
-        resolveFilePathSha1("satori/yoga.wasm")
+        resolveFilePathSha1("satori/yoga.wasm"),
+        resolveFilePathSha1("@takumi-rs/wasm/takumi_wasm_bg.wasm")
       ]);
       for (const entry of wasmEntries) {
         if (!existsSync(entry))
@@ -373,7 +352,7 @@ async function setupBuildHandler(config, resolve, getDetectedRenderers, nuxt = u
         if (compatibility.wasm?.esmImport) {
           const postfix = normalizedTarget === "vercel-edge" ? "?module" : "";
           const wasmPath = isCloudflarePagesOrModule ? `../wasm/` : `./wasm/`;
-          contents = contents.replaceAll('"@resvg/resvg-wasm/index_bg.wasm?module"', `"${wasmPath}index_bg-${resvgHash}.wasm${postfix}"`).replaceAll('"satori/yoga.wasm?module"', `"${wasmPath}yoga-${yogaHash}.wasm${postfix}"`).replaceAll('"yoga-wasm-web/dist/yoga.wasm?module"', `"${wasmPath}yoga-${yogaHash}.wasm${postfix}"`);
+          contents = contents.replaceAll('"@resvg/resvg-wasm/index_bg.wasm?module"', `"${wasmPath}index_bg-${resvgHash}.wasm${postfix}"`).replaceAll('"satori/yoga.wasm?module"', `"${wasmPath}yoga-${yogaHash}.wasm${postfix}"`).replaceAll('"@takumi-rs/wasm/takumi_wasm_bg.wasm?module"', `"${wasmPath}takumi_wasm_bg-${takumiHash}.wasm${postfix}"`).replaceAll('"yoga-wasm-web/dist/yoga.wasm?module"', `"${wasmPath}yoga-${yogaHash}.wasm${postfix}"`);
           if (postfix) {
             contents = contents.replaceAll(RE_WASM_IMPORT, `import("$1${postfix}")`);
           }
@@ -387,7 +366,7 @@ async function setupBuildHandler(config, resolve, getDetectedRenderers, nuxt = u
   });
 }
 async function resolveFilePathSha1(path) {
-  const _path = await resolvePath(path);
+  const _path = await resolvePath(path).catch(() => path);
   return sha1(existsSync(_path) ? await readFile(_path) : Buffer.from(path));
 }
 function sha1(source) {
@@ -538,7 +517,7 @@ function getProviderDependencies(provider, binding = "node") {
   return deps.map((d) => d.name);
 }
 function getRecommendedBindingFromPreset(provider) {
-  const preset = resolveNitroPreset();
+  const preset = resolveOgImagePreset();
   const compatibility = getPresetNitroPresetCompatibility(preset);
   return getRecommendedBinding(provider, compatibility);
 }
@@ -621,7 +600,7 @@ async function validateProviderSetup(renderer, compatibility) {
 function setupDevHandler(options, resolve, getDetectedRenderers, nuxt = useNuxt()) {
   nuxt.hooks.hook("nitro:init", async (nitro) => {
     const detectedRenderers = new Set(getDetectedRenderers());
-    const targetCompatibility = getPresetNitroPresetCompatibility(resolveNitroPreset(nitro.options));
+    const targetCompatibility = getPresetNitroPresetCompatibility(resolveOgImagePreset(nitro.options));
     for (const renderer of ["satori", "takumi", "browser"]) {
       if (!detectedRenderers.has(renderer)) {
         const binding = getRecommendedBinding(renderer, targetCompatibility);
@@ -634,8 +613,6 @@ function setupDevHandler(options, resolve, getDetectedRenderers, nuxt = useNuxt(
   });
 }
 
-const DEVTOOLS_UI_ROUTE = "/__nuxt-og-image";
-const DEVTOOLS_UI_LOCAL_PORT = 3030;
 const RE_TILDE_SLASH = /^~\//;
 const RE_WORD_CHARS_ONLY = /^\w+$/;
 const RE_SCRIPT_SETUP = /<script\s+setup[^>]*>\n?/;
@@ -718,31 +695,13 @@ p {
 `;
 }
 function setupDevToolsUI(options, resolve$1, nuxt = useNuxt(), cssFramework = "none") {
-  const clientPath = resolve$1("./client");
+  setupDevToolsUI$1({
+    route: "/__nuxt-og-image",
+    name: "nuxt-og-image",
+    title: "OG Image",
+    icon: "carbon:image-search"
+  }, resolve$1, nuxt);
   const communityTemplatesDir = resolve$1("./runtime/app/components/Templates/Community");
-  const isProductionBuild = existsSync(clientPath);
-  if (isProductionBuild) {
-    nuxt.hook("vite:serverCreated", async (server) => {
-      const sirv = await import('sirv').then((r) => r.default || r);
-      server.middlewares.use(
-        DEVTOOLS_UI_ROUTE,
-        sirv(clientPath, { dev: true, single: true })
-      );
-    });
-  } else {
-    nuxt.hook("vite:extendConfig", (config) => {
-      if (!config.server) {
-        config.server = {};
-      }
-      config.server.proxy ||= {};
-      config.server.proxy[DEVTOOLS_UI_ROUTE] = {
-        target: `http://localhost:${DEVTOOLS_UI_LOCAL_PORT}${DEVTOOLS_UI_ROUTE}`,
-        changeOrigin: true,
-        followRedirects: true,
-        rewrite: (path) => path.replace(DEVTOOLS_UI_ROUTE, "")
-      };
-    });
-  }
   const useNitro = new Promise((resolve2) => {
     nuxt.hooks.hook("nitro:init", resolve2);
   });
@@ -768,61 +727,60 @@ ${content}`, "utf-8");
     }
     return true;
   }
-  onDevToolsInitialized(async () => {
-    const rpc = extendServerRpc("nuxt-og-image", {
-      async ejectCommunityTemplate(path) {
-        const [dirName, componentName] = path.split("/");
-        const nameWithoutExt = componentName?.replace(".vue", "") || "";
-        let dotNotationName;
-        if (nameWithoutExt.includes(".")) {
-          dotNotationName = `${nameWithoutExt}.vue`;
-        } else {
-          const rendererMatch = nameWithoutExt.match(RE_RENDERER_SUFFIX);
-          const renderer = rendererMatch?.[1]?.toLowerCase() || "satori";
-          const baseName = nameWithoutExt.replace(RE_RENDERER_SUFFIX, "");
-          dotNotationName = `${baseName}.${renderer}.vue`;
-        }
-        const dir = join(nuxt.options.srcDir, "components", dirName || "");
-        if (!existsSync(dir)) {
-          mkdirSync(dir, { recursive: true });
-        }
-        const newPath = join(dir, dotNotationName);
-        const templatePath = join(communityTemplatesDir, dotNotationName);
-        const template = (await readFile(templatePath, "utf-8")).replace("{{ title }}", `{{ title }} - Ejected!`);
-        await writeFile(newPath, template, { encoding: "utf-8" });
-        await updateTemplates({ filter: (t) => t.filename.includes("nuxt-og-image/components.mjs") });
-        const nitro = await useNitro;
-        await nitro.hooks.callHook("rollup:reload");
-        return newPath;
-      },
-      async createComponent({ name, renderer, pageFile }) {
-        const validRenderers = ["satori", "browser", "takumi"];
-        if (!validRenderers.includes(renderer))
-          throw new Error(`Invalid renderer: ${renderer}`);
-        if (!RE_WORD_CHARS_ONLY.test(name))
-          throw new Error(`Invalid component name: ${name}`);
-        const baseDir = existsSync(join(nuxt.options.srcDir, "app")) ? join(nuxt.options.srcDir, "app") : nuxt.options.srcDir;
-        const outputDir = join(baseDir, "components", "OgImage");
-        if (!existsSync(outputDir))
-          mkdirSync(outputDir, { recursive: true });
-        const filename = `${name}.${renderer}.vue`;
-        const outputPath = join(outputDir, filename);
-        if (existsSync(outputPath))
-          throw new Error(`File already exists: ${relative(nuxt.options.rootDir, outputPath)}`);
-        const template = getStarterTemplate(renderer, cssFramework);
-        await writeFile(outputPath, template, { encoding: "utf-8" });
-        await insertDefineOgImage(name, pageFile);
-        await updateTemplates({ filter: (t) => t.filename.includes("nuxt-og-image/components.mjs") });
-        const nitro = await useNitro;
-        await nitro.hooks.callHook("rollup:reload");
-        return outputPath;
-      },
-      async addOgImageToPage(componentName, pageFile) {
-        if (!RE_WORD_CHARS_ONLY.test(componentName))
-          throw new Error(`Invalid component name: ${componentName}`);
-        return insertDefineOgImage(componentName, pageFile);
+  setupDevToolsRpc("nuxt-og-image", {
+    async ejectCommunityTemplate(path) {
+      const [dirName, componentName] = path.split("/");
+      const nameWithoutExt = componentName?.replace(".vue", "") || "";
+      let dotNotationName;
+      if (nameWithoutExt.includes(".")) {
+        dotNotationName = `${nameWithoutExt}.vue`;
+      } else {
+        const rendererMatch = nameWithoutExt.match(RE_RENDERER_SUFFIX);
+        const renderer = rendererMatch?.[1]?.toLowerCase() || "satori";
+        const baseName = nameWithoutExt.replace(RE_RENDERER_SUFFIX, "");
+        dotNotationName = `${baseName}.${renderer}.vue`;
       }
-    });
+      const dir = join(nuxt.options.srcDir, "components", dirName || "");
+      if (!existsSync(dir)) {
+        mkdirSync(dir, { recursive: true });
+      }
+      const newPath = join(dir, dotNotationName);
+      const templatePath = join(communityTemplatesDir, dotNotationName);
+      const template = (await readFile(templatePath, "utf-8")).replace("{{ title }}", `{{ title }} - Ejected!`);
+      await writeFile(newPath, template, { encoding: "utf-8" });
+      await updateTemplates({ filter: (t) => t.filename.includes("nuxt-og-image/components.mjs") });
+      const nitro = await useNitro;
+      await nitro.hooks.callHook("rollup:reload");
+      return newPath;
+    },
+    async createComponent({ name, renderer, pageFile }) {
+      const validRenderers = ["satori", "browser", "takumi"];
+      if (!validRenderers.includes(renderer))
+        throw new Error(`Invalid renderer: ${renderer}`);
+      if (!RE_WORD_CHARS_ONLY.test(name))
+        throw new Error(`Invalid component name: ${name}`);
+      const baseDir = existsSync(join(nuxt.options.srcDir, "app")) ? join(nuxt.options.srcDir, "app") : nuxt.options.srcDir;
+      const outputDir = join(baseDir, "components", "OgImage");
+      if (!existsSync(outputDir))
+        mkdirSync(outputDir, { recursive: true });
+      const filename = `${name}.${renderer}.vue`;
+      const outputPath = join(outputDir, filename);
+      if (existsSync(outputPath))
+        throw new Error(`File already exists: ${relative(nuxt.options.rootDir, outputPath)}`);
+      const template = getStarterTemplate(renderer, cssFramework);
+      await writeFile(outputPath, template, { encoding: "utf-8" });
+      await insertDefineOgImage(name, pageFile);
+      await updateTemplates({ filter: (t) => t.filename.includes("nuxt-og-image/components.mjs") });
+      const nitro = await useNitro;
+      await nitro.hooks.callHook("rollup:reload");
+      return outputPath;
+    },
+    async addOgImageToPage(componentName, pageFile) {
+      if (!RE_WORD_CHARS_ONLY.test(componentName))
+        throw new Error(`Invalid component name: ${componentName}`);
+      return insertDefineOgImage(componentName, pageFile);
+    }
+  }, nuxt).then((rpc) => {
     let cssRefreshTimer;
     nuxt.hook("builder:watch", (e, watchPath) => {
       if (!e || !watchPath)
@@ -856,15 +814,6 @@ ${content}`, "utf-8");
       }
     });
   });
-  addCustomTab({
-    name: "nuxt-og-image",
-    title: "OG Image",
-    icon: "carbon:image-search",
-    view: {
-      type: "iframe",
-      src: DEVTOOLS_UI_ROUTE
-    }
-  });
 }
 
 const _warnedVars = /* @__PURE__ */ new Set();
@@ -3483,29 +3432,6 @@ ${importStatements}
   };
 });
 
-async function getNuxtModuleOptions(module, nuxt = useNuxt()) {
-  const moduleMeta = ({ name: module } ) || {};
-  const { nuxtModule } = await loadNuxtModuleInstance(module, nuxt);
-  let moduleEntry;
-  for (const m of nuxt.options.modules) {
-    if (Array.isArray(m) && m.length >= 2) {
-      const _module = m[0];
-      const _moduleEntryName = typeof _module === "string" ? _module : (await _module.getMeta?.())?.name || "";
-      if (_moduleEntryName === moduleMeta.name)
-        moduleEntry = m;
-    }
-  }
-  let inlineOptions = {};
-  if (moduleEntry)
-    inlineOptions = moduleEntry[1];
-  if (nuxtModule.getOptions)
-    return nuxtModule.getOptions(inlineOptions, nuxt);
-  return inlineOptions;
-}
-function isNuxtGenerate(nuxt = useNuxt()) {
-  return nuxt.options.nitro.static || nuxt.options.nitro.preset === "static";
-}
-
 const warnings = [];
 const counts = {
   config: /* @__PURE__ */ new Map(),
@@ -3841,7 +3767,7 @@ async function onUpgrade(nuxt, _options, previousVersion) {
   }
   if (detectedRenderers.size === 0)
     detectedRenderers.add("satori");
-  const preset = resolveNitroPreset();
+  const preset = resolveOgImagePreset();
   const compatibility = getPresetNitroPresetCompatibility(preset);
   for (const renderer of detectedRenderers) {
     const validation = await validateProviderSetup(renderer, compatibility);
@@ -4131,6 +4057,9 @@ const module$1 = defineNuxtModule({
     },
     "@nuxt/fonts": {
       optional: true
+    },
+    "nuxt-site-config": {
+      version: ">=3.2"
     }
   },
   defaults() {
@@ -4222,7 +4151,7 @@ Or pin to a specific version in package.json:
     }
     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 preset = resolveOgImagePreset(nuxt.options.nitro);
     const targetCompatibility = getPresetNitroPresetCompatibility(preset);
     const normalizedPreset = preset.replace(RE_LEGACY_SUFFIX, "");
     const isCloudflareWorkers = ["cloudflare", "cloudflare-module", "cloudflare-durable"].includes(normalizedPreset);
@@ -4866,7 +4795,7 @@ export const resolve = (import.meta.dev || import.meta.prerender) ? devResolve :
       if (hasNuxtFonts && fontContext) {
         persistFontUrlMapping({ fontContext, buildDir: nuxt.options.buildDir, logger });
       }
-      if (!fontProcessingDone && convertedWoff2Files.size === 0 && (hasSatoriRenderer() || hasTakumiRenderer()) && hasNuxtFonts) {
+      if (!fontProcessingDone && convertedWoff2Files.size === 0 && hasSatoriRenderer() && hasNuxtFonts) {
         if (pendingFontRequirements.length > 0)
           await Promise.all(pendingFontRequirements);
         await convertWoff2ToTtf({
@@ -4935,7 +4864,7 @@ export const rootDir = ${JSON.stringify(nuxt.options.rootDir)}`;
       });
       nuxt.hook("vite:compiled", async () => {
         persistFontUrlMapping({ fontContext, buildDir: nuxt.options.buildDir, logger });
-        if (fontProcessingDone || !hasSatoriRenderer() && !hasTakumiRenderer())
+        if (fontProcessingDone || !hasSatoriRenderer())
           return;
         if (pendingFontRequirements.length === 0)
           return;
@@ -4991,11 +4920,6 @@ export const rootDir = ${JSON.stringify(nuxt.options.rootDir)}`;
     const buildCachePath = typeof config.buildCache === "object" && config.buildCache.base ? config.buildCache.base : "node_modules/.cache/nuxt-seo/og-image";
     const buildCacheDir = config.buildCache ? join(nuxt.options.rootDir, buildCachePath) : void 0;
     nuxt.hooks.hook("modules:done", async () => {
-      if (!isNuxtGenerate() && nuxt.options.build) {
-        nuxt.options.nitro = nuxt.options.nitro || {};
-        nuxt.options.nitro.prerender = nuxt.options.nitro.prerender || {};
-        nuxt.options.nitro.prerender.routes = nuxt.options.nitro.prerender.routes || [];
-      }
       const hasColorModeModule = hasNuxtModule("@nuxtjs/color-mode");
       const colorModeOptions = hasColorModeModule ? await getNuxtModuleOptions("@nuxtjs/color-mode") : {};
       let colorPreference = colorModeOptions.preference;