nuxt-og-image 3.0.0-rc.4 → 3.0.0-rc.41

package/dist/module.json

@@ -1,9 +1,9 @@
 {
   "name": "nuxt-og-image",
   "compatibility": {
-    "nuxt": "^3.8.2",
+    "nuxt": "^3.9.0",
     "bridge": false
   },
   "configKey": "ogImage",
-  "version": "3.0.0-rc.4"
+  "version": "3.0.0-rc.40"
 }

package/dist/module.mjs

@@ -1,20 +1,21 @@
 import * as fs from 'node:fs';
 import { existsSync } from 'node:fs';
-import { useNuxt, addTemplate, loadNuxtModuleInstance, createResolver, resolvePath, defineNuxtModule, useLogger, tryResolveModule, hasNuxtModule, addServerPlugin, addServerHandler, addImports, addComponentsDir, addComponent, addPlugin } from '@nuxt/kit';
+import { readFile, writeFile } from 'node:fs/promises';
+import { useNuxt, addTemplate, loadNuxtModuleInstance, createResolver, resolvePath, tryResolveModule, defineNuxtModule, useLogger, addImports, hasNuxtModule, addServerPlugin, addServerHandler, addComponentsDir, addComponent, addPlugin } from '@nuxt/kit';
 import { assertSiteConfig, installNuxtSiteConfig } from 'nuxt-site-config-kit';
-import { provider, env, isDevelopment, isCI } from 'std-env';
+import { provider, env, isCI, isDevelopment } from 'std-env';
 import { hash } from 'ohash';
-import { relative, dirname } from 'pathe';
+import { relative, dirname, basename, join } from 'pathe';
 import { defu } from 'defu';
-import { Launcher } from 'chrome-launcher';
+import { readPackageJSON } from 'pkg-types';
+import { createStorage } from 'unstorage';
+import fsDriver from 'unstorage/drivers/fs';
+import { withoutLeadingSlash } from 'ufo';
 import { ensureDependencyInstalled } from 'nypm';
 import { onDevToolsInitialized, extendServerRpc } from '@nuxt/devtools-kit';
-import { readFile, writeFile } from 'node:fs/promises';
 import { createHash } from 'node:crypto';
-import { execa } from 'execa';
-import terminate from 'terminate';
-
-const version = "3.0.0-rc.4";
+import { Launcher } from 'chrome-launcher';
+import { $fetch } from 'ofetch';
 
 const autodetectableProviders = {
   azure_static: "azure",
@@ -31,7 +32,8 @@ const autodetectableStaticProviders = {
 };
 const NodeRuntime = {
   // node-server runtime
-  "chromium": "node",
+  "chromium": "on-demand",
+  // this gets changed build start
   "css-inline": "node",
   "resvg": "node",
   "satori": "node",
@@ -56,22 +58,24 @@ const awsLambda = {
   "sharp": false
   // 0.33.x has issues
 };
+const WebContainer = {
+  "chromium": false,
+  "css-inline": "wasm-fs",
+  "resvg": "wasm-fs",
+  "satori": "wasm-fs",
+  "sharp": false
+};
 const RuntimeCompatibility = {
   "nitro-dev": NodeRuntime,
   "nitro-prerender": NodeRuntime,
   "node-server": NodeRuntime,
-  "stackblitz": {
-    "chromium": false,
-    "css-inline": false,
-    "resvg": "wasm-fs",
-    "satori": "wasm-fs",
-    "sharp": false
-  },
+  "stackblitz": WebContainer,
+  "codesandbox": WebContainer,
   "aws-lambda": awsLambda,
   "netlify": awsLambda,
   "netlify-edge": {
     "chromium": false,
-    "css-inline": false,
+    "css-inline": "wasm",
     "resvg": "wasm",
     "satori": "node",
     "sharp": false,
@@ -87,6 +91,7 @@ const RuntimeCompatibility = {
   "vercel-edge": {
     "chromium": false,
     "css-inline": false,
+    // size constraint (2mb is max)
     "resvg": "wasm",
     "satori": "node",
     "sharp": false,
@@ -96,14 +101,15 @@ const RuntimeCompatibility = {
     }
   },
   "cloudflare-pages": cloudflare,
-  "cloudflare": cloudflare
+  "cloudflare": cloudflare,
+  "cloudflare-module": cloudflare
 };
 function detectTarget(options = {}) {
   return options?.static ? autodetectableStaticProviders[provider] : autodetectableProviders[provider];
 }
 function resolveNitroPreset(nitroConfig) {
-  if (provider === "stackblitz")
-    return "stackblitz";
+  if (provider === "stackblitz" || provider === "codesandbox")
+    return provider;
   let preset;
   if (nitroConfig && nitroConfig?.preset)
     preset = nitroConfig.preset;
@@ -123,16 +129,18 @@ 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/core/renderers/satori") : "unenv/runtime/mock/empty";
-  nitroConfig.alias["#nuxt-og-image/renderers/chromium"] = chromiumEnabled ? resolve("./runtime/core/renderers/chromium") : "unenv/runtime/mock/empty";
+  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";
   const resolvedCompatibility = {};
   function applyBinding(key) {
     let binding = options.compatibility?.[key];
     if (typeof binding === "undefined")
       binding = compatibility[key];
+    if (key === "chromium" && binding === "node")
+      binding = "playwright";
     resolvedCompatibility[key] = binding;
     return {
-      [`#nuxt-og-image/bindings/${key}`]: binding === false ? "unenv/runtime/mock/empty" : resolve(`./runtime/core/bindings/${key}/${binding}`)
+      [`#nuxt-og-image/bindings/${key}`]: binding === false ? "unenv/runtime/mock/empty" : resolve(`./runtime/nitro/og-image/bindings/${key}/${binding}`)
     };
   }
   nitroConfig.alias = defu(
@@ -204,6 +212,15 @@ export {}
   nuxt.hooks.hook("prepare:types", ({ references }) => {
     references.push({ path: resolve(nuxt.options.buildDir, `module/${module}.d.ts`) });
   });
+  nuxt.hooks.hook("nitro:config", (config) => {
+    config.typescript = config.typescript || {};
+    config.typescript.tsConfig = config.typescript.tsConfig || {};
+    config.typescript.tsConfig.include = config.typescript.tsConfig.include || [];
+    config.typescript.tsConfig.include.push(`./module/${module}.d.ts`);
+  });
+}
+function isNuxtGenerate(nuxt = useNuxt()) {
+  return nuxt.options._generate || nuxt.options.nitro.static || nuxt.options.nitro.preset === "static";
 }
 
 const DEVTOOLS_UI_ROUTE = "/__nuxt-og-image";
@@ -295,7 +312,7 @@ function setupGenerateHandler(options, resolve, nuxt = useNuxt()) {
 function setupPrerenderHandler(options, resolve, nuxt = useNuxt()) {
   nuxt.hooks.hook("nitro:init", async (nitro) => {
     nitro.hooks.hook("prerender:config", async (nitroConfig) => {
-      applyNitroPresetCompatibility(nitroConfig, { compatibility: options.compatibility.prerender, resolve });
+      applyNitroPresetCompatibility(nitroConfig, { compatibility: options.compatibility?.prerender, resolve });
       nitroConfig.wasm = nitroConfig.wasm || {};
       nitroConfig.wasm.esmImport = false;
       const prerenderingPages = (nuxt.options.nitro.prerender?.routes || []).some((r) => r && (!r.includes(".") || r.includes("*")));
@@ -327,14 +344,20 @@ async function setupBuildHandler(config, resolve, nuxt = useNuxt()) {
         return;
       const configuredEntry = nitro.options.rollupConfig?.output.entryFileNames;
       let serverEntry = resolve(_nitro.options.output.serverDir, typeof configuredEntry === "string" ? configuredEntry : "index.mjs");
-      if (target === "cloudflare-pages")
-        serverEntry = resolve(dirname(serverEntry), "./chunks/wasm.mjs");
+      const isCloudflarePagesOrModule = target === "cloudflare-pages" || target === "cloudflare-module";
+      if (isCloudflarePagesOrModule) {
+        serverEntry = [
+          resolve(dirname(serverEntry), "./chunks/wasm.mjs"),
+          resolve(dirname(serverEntry), "./chunks/_/wasm.mjs")
+        ].filter(existsSync)[0] || serverEntry;
+      }
       const contents = await readFile(serverEntry, "utf-8");
       const resvgHash = sha1(await readFile(await resolvePath("@resvg/resvg-wasm/index_bg.wasm")));
       const yogaHash = sha1(await readFile(await resolvePath("yoga-wasm-web/dist/yoga.wasm")));
+      const cssInlineHash = sha1(await readFile(await resolvePath("@css-inline/css-inline-wasm/index_bg.wasm")));
       const postfix = target === "vercel-edge" ? "?module" : "";
-      const path = target === "cloudflare-pages" ? `../wasm/` : `./wasm/`;
-      await writeFile(serverEntry, contents.replaceAll('"@resvg/resvg-wasm/index_bg.wasm"', `"${path}index_bg-${resvgHash}.wasm${postfix}"`).replaceAll('"yoga-wasm-web/dist/yoga.wasm"', `"${path}yoga-${yogaHash}.wasm${postfix}"`), { encoding: "utf-8" });
+      const path = isCloudflarePagesOrModule ? `../wasm/` : `./wasm/`;
+      await writeFile(serverEntry, contents.replaceAll('"@resvg/resvg-wasm/index_bg.wasm"', `"${path}index_bg-${resvgHash}.wasm${postfix}"`).replaceAll('"@css-inline/css-inline-wasm/index_bg.wasm"', `"${path}index_bg-${cssInlineHash}.wasm${postfix}"`).replaceAll('"yoga-wasm-web/dist/yoga.wasm"', `"${path}yoga-${yogaHash}.wasm${postfix}"`), { encoding: "utf-8" });
     });
   });
 }
@@ -342,20 +365,46 @@ function sha1(source) {
   return createHash("sha1").update(source).digest("hex").slice(0, 16);
 }
 
-async function ensureChromium(logger) {
-  logger.info("Ensuring Chromium install for og:image generation...");
-  const installChromeProcess = execa("npx", ["playwright", "install", "chromium"], {
-    stdio: "inherit"
-  });
-  installChromeProcess.stderr?.pipe(process.stderr);
-  await new Promise((resolve) => {
-    installChromeProcess.on("exit", (e) => {
-      if (e !== 0)
-        logger.error("Failed to install Playwright dependency for og:image generation. Trying anyway...");
-      resolve(true);
-    });
+const isUndefinedOrTruthy = (v) => typeof v === "undefined" || v !== false;
+function checkLocalChrome() {
+  if (isCI)
+    return false;
+  let hasChromeLocally = false;
+  try {
+    hasChromeLocally = !!Launcher.getFirstInstallation();
+  } catch {
+  }
+  return hasChromeLocally;
+}
+async function checkPlaywrightDependency() {
+  return !!await tryResolveModule("playwright");
+}
+async function downloadFont(font, storage, mirror) {
+  const { name, weight } = font;
+  const key = `${name}-${weight}.ttf.base64`;
+  if (await storage.hasItem(key))
+    return true;
+  const host = typeof mirror === "undefined" ? "fonts.googleapis.com" : mirror === true ? "fonts.font.im" : mirror;
+  const css = await $fetch(`https://${host}/css2?family=${name}:wght@${weight}`, {
+    timeout: 10 * 1e3,
+    // 10 second timeout
+    headers: {
+      // Make sure it returns TTF.
+      "User-Agent": "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1"
+    }
+  }).catch(() => {
+    return false;
   });
-  installChromeProcess.pid && terminate(installChromeProcess.pid);
+  if (!css)
+    return false;
+  const ttfResource = css.match(/src: url\((.+)\) format\('(opentype|truetype)'\)/);
+  if (ttfResource?.[1]) {
+    const buf = await $fetch(ttfResource[1], { baseURL: host, responseType: "arrayBuffer" });
+    const base64Font = Buffer.from(buf).toString("base64");
+    await storage.setItem(key, base64Font);
+    return true;
+  }
+  return false;
 }
 
 function normaliseFontInput(fonts) {
@@ -365,7 +414,7 @@ function normaliseFontInput(fonts) {
       return {
         cacheKey: f,
         name,
-        weight: weight || "400",
+        weight: weight || 400,
         style: "normal",
         path: void 0
       };
@@ -383,7 +432,7 @@ const module = defineNuxtModule({
   meta: {
     name: "nuxt-og-image",
     compatibility: {
-      nuxt: "^3.8.2",
+      nuxt: "^3.9.0",
       bridge: false
     },
     configKey: "ogImage"
@@ -395,6 +444,7 @@ const module = defineNuxtModule({
         emojis: "noto",
         renderer: "satori",
         component: "NuxtSeo",
+        extension: "png",
         width: 1200,
         height: 600,
         // default is to cache the image for 3 day (72 hours)
@@ -407,23 +457,27 @@ const module = defineNuxtModule({
     };
   },
   async setup(config, nuxt) {
-    const logger = useLogger("nuxt-og-image");
+    const { resolve } = createResolver(import.meta.url);
+    const { name, version } = await readPackageJSON(resolve("../package.json"));
+    const logger = useLogger(name);
     logger.level = config.debug || nuxt.options.debug ? 4 : 3;
     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`) });
+      });
       return;
     }
     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;
     }
-    const { resolve } = createResolver(import.meta.url);
+    nuxt.options.build.transpile.push(resolve("./runtime"));
     const preset = resolveNitroPreset(nuxt.options.nitro);
     const targetCompatibility = getPresetNitroPresetCompatibility(preset);
     const hasSharpDependency = !!await tryResolveModule("sharp");
     const userConfiguredExtension = config.defaults.extension;
     const hasConfiguredJpegs = userConfiguredExtension && ["jpeg", "jpg"].includes(userConfiguredExtension);
-    config.defaults.extension = userConfiguredExtension || (hasSharpDependency && targetCompatibility.sharp ? "jpg" : "png");
     if (hasConfiguredJpegs && config.defaults.renderer !== "chromium") {
       if (hasSharpDependency && !targetCompatibility.sharp) {
         logger.warn(`Rendering JPEGs requires sharp which does not work with ${preset}. Images will be rendered as PNG at runtime.`);
@@ -442,32 +496,32 @@ const module = defineNuxtModule({
         prerender: { sharp: false }
       });
     }
-    let hasChromeLocally = false;
-    try {
-      hasChromeLocally = !!Launcher.getFirstInstallation();
-    } catch {
-    }
-    const isUndefinedOrTruthy = (v) => typeof v === "undefined" || v !== false;
-    if (isUndefinedOrTruthy(config.compatibility?.prerender?.chromium) && isUndefinedOrTruthy(config.compatibility?.runtime?.chromium)) {
-      if (isCI)
-        await ensureChromium(logger);
-      const hasPlaywrightDependency = !!await tryResolveModule("playwright");
-      if (hasChromeLocally) {
-        config.compatibility = defu(config.compatibility, {
-          runtime: { chromium: false },
-          dev: { chromium: "node" },
-          prerender: { chromium: "node" }
-        });
-      } else if (hasPlaywrightDependency && targetCompatibility.chromium) {
-        config.compatibility = defu(config.compatibility, {
-          runtime: { chromium: "node" },
-          dev: { chromium: "node" },
-          prerender: { chromium: "node" }
-        });
-      }
-    } else if (!hasChromeLocally && nuxt.options.dev && config.compatibility?.dev?.chromium === "node") {
-      await ensureChromium(logger);
+    const hasChromeLocally = checkLocalChrome();
+    const hasPlaywrightDependency = await checkPlaywrightDependency();
+    const chromeCompatibilityFlags = {
+      prerender: config.compatibility?.prerender?.chromium,
+      dev: config.compatibility?.dev?.chromium,
+      runtime: config.compatibility?.runtime?.chromium
+    };
+    const chromiumBinding = {
+      dev: null,
+      prerender: null,
+      runtime: null
+    };
+    if (nuxt.options.dev) {
+      if (isUndefinedOrTruthy(chromeCompatibilityFlags.dev))
+        chromiumBinding.dev = hasChromeLocally ? "chrome-launcher" : hasPlaywrightDependency ? "playwright" : "on-demand";
+    } else {
+      if (isUndefinedOrTruthy(chromeCompatibilityFlags.prerender))
+        chromiumBinding.prerender = hasChromeLocally ? "chrome-launcher" : hasPlaywrightDependency ? "playwright" : "on-demand";
+      if (isUndefinedOrTruthy(chromeCompatibilityFlags.runtime))
+        chromiumBinding.runtime = hasPlaywrightDependency ? "playwright" : null;
     }
+    config.compatibility = defu(config.compatibility, {
+      runtime: { chromium: chromiumBinding.runtime },
+      dev: { chromium: chromiumBinding.dev },
+      prerender: { chromium: chromiumBinding.prerender }
+    });
     await import('@resvg/resvg-js').catch(() => {
       logger.warn("ReSVG is missing dependencies for environment. Falling back to WASM version, this may slow down PNG rendering.");
       config.compatibility = defu(config.compatibility, {
@@ -483,67 +537,80 @@ const module = defineNuxtModule({
     await installNuxtSiteConfig();
     if (hasNuxtModule("@nuxt/content"))
       addServerPlugin(resolve("./runtime/nitro/plugins/nuxt-content"));
-    if (!config.fonts.length)
-      config.fonts = ["Inter:400", "Inter:700"];
-    if (preset === "cloudflare") {
-      config.fonts = config.fonts.filter((f) => {
-        if (typeof f !== "string" && f.path) {
-          logger.warn(`The ${f.name}:${f.weight} font was skipped because remote fonts are not available in Cloudflare Workers, please use a Google font.`);
+    if (!config.fonts.length) {
+      config.fonts = [
+        { name: "Inter", weight: 400, path: resolve("./runtime/assets/Inter-400.ttf.base64"), absolutePath: true },
+        { name: "Inter", weight: 700, path: resolve("./runtime/assets/Inter-700.ttf.base64"), absolutePath: true }
+      ];
+    }
+    const serverFontsDir = resolve(nuxt.options.buildDir, "cache", `nuxt-og-image@${version}`, "_fonts");
+    const fontStorage = createStorage({
+      driver: fsDriver({
+        base: serverFontsDir
+      })
+    });
+    config.fonts = (await Promise.all(normaliseFontInput(config.fonts).map(async (f) => {
+      if (!f.key && !f.path) {
+        if (preset === "stackblitz") {
+          logger.warn(`The ${f.name}:${f.weight} font was skipped because remote fonts are not available in StackBlitz, please use a local font.`);
           return false;
         }
-        return true;
-      });
-    }
-    if (preset === "stackblitz") {
-      config.fonts = config.fonts.map((f) => {
-        if (typeof f === "string" && f.startsWith("Inter:")) {
-          const [_, weight] = f.split(":");
-          return {
-            name: "Inter",
-            weight,
-            // nuxt server assets
-            key: `nuxt-og-image:fonts:inter-latin-ext-${weight}-normal.woff`
-          };
+        if (await downloadFont(f, fontStorage, config.googleFontMirror)) {
+          f.key = `nuxt-og-image:fonts:${f.name}-${f.weight}.ttf.base64`;
+        } else {
+          logger.warn(`Failed to download font ${f.name}:${f.weight}. You may be offline or behind a firewall blocking Google. Consider setting \`googleFontMirror: true\`.`);
+          return false;
         }
-        if (typeof f === "string" || !f.path && !f.key) {
-          logger.warn(`The ${typeof f === "string" ? f : `${f.name}:${f.weight}`} font was skipped because remote fonts are not available in StackBlitz, please use a local font.`);
+      } else if (f.path) {
+        const extension = basename(f.path.replace(".base64", "")).split(".").pop();
+        if (!["woff", "ttf", "otf"].includes(extension)) {
+          logger.warn(`The ${f.name}:${f.weight} font was skipped because the file extension ${extension} is not supported. Only woff, ttf and otf are supported.`);
           return false;
         }
-        return f;
-      }).filter(Boolean);
-      nuxt.hooks.hook("nitro:config", (nitroConfig) => {
-        nitroConfig.serverAssets = nitroConfig.serverAssets || [];
-        nitroConfig.serverAssets.push({ baseName: "nuxt-og-image:fonts", dir: resolve("./runtime/server/assets") });
-      });
-    }
+        if (!f.absolutePath)
+          f.path = join(nuxt.options.rootDir, nuxt.options.dir.public, withoutLeadingSlash(f.path));
+        if (!existsSync(f.path)) {
+          logger.warn(`The ${f.name}:${f.weight} font was skipped because the file does not exist at path ${f.path}.`);
+          return false;
+        }
+        const fontData = await readFile(f.path, f.path.endsWith(".base64") ? "utf-8" : "base64");
+        f.key = `nuxt-og-image:fonts:${f.name}-${f.weight}.${extension}.base64`;
+        await fontStorage.setItem(`${f.name}-${f.weight}.${extension}.base64`, fontData);
+        delete f.path;
+        delete f.absolutePath;
+      }
+      return f;
+    }))).filter(Boolean);
+    nuxt.options.nitro.serverAssets = nuxt.options.nitro.serverAssets || [];
+    nuxt.options.nitro.serverAssets.push({ baseName: "nuxt-og-image:fonts", dir: serverFontsDir });
     nuxt.options.experimental.componentIslands = true;
     addServerHandler({
       lazy: true,
       route: "/__og-image__/font/**",
-      handler: resolve("./runtime/server/routes/__og-image__/font-[name]-[weight].[extension]")
+      handler: resolve("./runtime/nitro/routes/font")
     });
     if (config.debug || nuxt.options.dev) {
       addServerHandler({
         lazy: true,
         route: "/__og-image__/debug.json",
-        handler: resolve("./runtime/server/routes/__og-image__/debug.json")
+        handler: resolve("./runtime/nitro/routes/debug.json")
       });
     }
     addServerHandler({
       lazy: true,
       route: "/__og-image__/image/**",
-      handler: resolve("./runtime/server/routes/__og-image__/image")
+      handler: resolve("./runtime/nitro/routes/image")
     });
     nuxt.options.optimization.treeShake.composables.client["nuxt-og-image"] = [];
-    ["defineOgImage", "defineOgImageComponent", "defineOgImageScreenshot"].forEach((name) => {
+    ["defineOgImage", "defineOgImageComponent", "defineOgImageScreenshot"].forEach((name2) => {
       addImports({
-        name,
-        from: resolve(`./runtime/composables/${name}`)
+        name: name2,
+        from: resolve(`./runtime/nuxt/composables/${name2}`)
       });
-      nuxt.options.optimization.treeShake.composables.client["nuxt-og-image"].push(name);
+      nuxt.options.optimization.treeShake.composables.client["nuxt-og-image"].push(name2);
     });
     await addComponentsDir({
-      path: resolve("./runtime/components/Templates/Community"),
+      path: resolve("./runtime/nuxt/components/Templates/Community"),
       island: true,
       watch: true
     });
@@ -551,10 +618,10 @@ const module = defineNuxtModule({
       // new
       "OgImage",
       "OgImageScreenshot"
-    ].forEach((name) => {
+    ].forEach((name2) => {
       addComponent({
-        name,
-        filePath: resolve(`./runtime/components/OgImage/${name}`),
+        name: name2,
+        filePath: resolve(`./runtime/nuxt/components/OgImage/${name2}`),
         ...config.componentOptions
       });
     });
@@ -569,13 +636,13 @@ const module = defineNuxtModule({
           if (component.pascalName.startsWith(dir) || component.kebabName.startsWith(dir) || component.shortPath.includes(`/${dir}/`))
             valid = true;
         });
-        if (component.filePath.includes(resolve("./runtime/components/Templates")))
+        if (component.filePath.includes(resolve("./runtime/nuxt/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/components/Templates/Community")))
+          if (component.filePath.includes(resolve("./runtime/nuxt/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();
@@ -603,9 +670,9 @@ const module = defineNuxtModule({
     nuxt.options.nitro.virtual["#nuxt-og-image/component-names.mjs"] = () => {
       return `export const componentNames = ${JSON.stringify(ogImageComponentCtx.components)}`;
     };
-    let unoCssConfig = { theme: {} };
+    let unoCssConfig = {};
     nuxt.hook("tailwindcss:config", (tailwindConfig) => {
-      unoCssConfig = defu(tailwindConfig.theme.extend, { ...tailwindConfig.theme || {}, extend: void 0 });
+      unoCssConfig = defu(tailwindConfig.theme?.extend, { ...tailwindConfig.theme, extend: void 0 });
     });
     nuxt.hook("unocss:config", (_unoCssConfig) => {
       unoCssConfig = { ..._unoCssConfig.theme };
@@ -616,7 +683,10 @@ const module = defineNuxtModule({
     extendTypes("nuxt-og-image", ({ typesPath }) => {
       const componentImports = ogImageComponentCtx.components.map((component) => {
         const relativeComponentPath = relative(resolve(nuxt.options.rootDir, nuxt.options.buildDir, "module"), component.path);
-        return `    '${component.pascalName}': typeof import('${relativeComponentPath}')['default']`;
+        const name2 = config.componentDirs.sort((a, b) => b.length - a.length).reduce((name3, dir) => {
+          return name3.replace(new RegExp(`^${dir}`), "");
+        }, component.pascalName);
+        return `    '${name2}': typeof import('${relativeComponentPath}')['default']`;
       }).join("\n");
       return `
 declare module 'nitropack' {
@@ -637,6 +707,9 @@ declare module '#nuxt-og-image/components' {
 ${componentImports}
   }
 }
+declare module '#nuxt-og-image/unocss-config' {
+  export type theme = any
+}
 `;
     });
     const cacheEnabled = typeof config.runtimeCacheStorage !== "undefined" && config.runtimeCacheStorage !== false;
@@ -650,12 +723,10 @@ ${componentImports}
     }
     nuxt.hooks.hook("modules:done", async () => {
       const normalisedFonts = normaliseFontInput(config.fonts);
-      if (!nuxt.options._generate && nuxt.options.build) {
+      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 || [];
-        normalisedFonts.filter((f) => !f.path && !f.key).forEach(({ name, weight }) => {
-          nuxt.options.nitro.prerender.routes.push(`/__og-image__/font/${name}/${weight}.ttf`);
-        });
       }
       const hasColorModeModule = hasNuxtModule("@nuxtjs/color-mode");
       const colorModeOptions = hasColorModeModule ? await getNuxtModuleOptions("@nuxtjs/color-mode") : {};
@@ -677,7 +748,9 @@ ${componentImports}
         // convert the fonts to uniform type to fix ts issue
         fonts: normalisedFonts,
         hasNuxtIcon: hasNuxtModule("nuxt-icon"),
-        colorPreference
+        colorPreference,
+        // @ts-expect-error runtime type
+        isNuxtContentDocumentDriven: !!nuxt.options.content?.documentDriven
       };
       nuxt.hooks.callHook("nuxt-og-image:runtime-config", runtimeConfig);
       nuxt.options.runtimeConfig["nuxt-og-image"] = runtimeConfig;
@@ -685,7 +758,7 @@ ${componentImports}
     if (nuxt.options.dev) {
       setupDevHandler(config, resolve);
       setupDevToolsUI(config, resolve);
-    } else if (nuxt.options._generate) {
+    } else if (isNuxtGenerate()) {
       setupGenerateHandler(config, resolve);
     } else if (nuxt.options.build) {
       await setupBuildHandler(config, resolve);