nuxt-og-image 2.0.0-beta.7 → 2.0.0-beta.9

package/dist/runtime/nitro/routes/options.mjs

@@ -1,9 +1,11 @@
 import { createError, defineEventHandler, getHeaders, getQuery } from "h3";
+import { withoutBase } from "ufo";
 import { extractOgImageOptions, useHostname } from "../utils.mjs";
-import { getRouteRules, useRuntimeConfig } from "#internal/nitro";
+import { getRouteRules } from "#internal/nitro";
+import { useRuntimeConfig } from "#imports";
 export default defineEventHandler(async (e) => {
   const query = getQuery(e);
-  const path = query.path || "/";
+  const path = withoutBase(query.path || "/", useRuntimeConfig().app.baseURL);
   const fetchOptions = process.dev || process.env.prerender ? {
     headers: getHeaders(e)
   } : {

package/dist/runtime/nitro/routes/svg.mjs

@@ -2,8 +2,10 @@ import { createError, defineEventHandler, getQuery, setHeader } from "h3";
 import { withBase } from "ufo";
 import { fetchOptions, useHostname } from "../utils.mjs";
 import { useProvider } from "#nuxt-og-image/provider";
+import { useRuntimeConfig } from "#imports";
 export default defineEventHandler(async (e) => {
-  const path = getQuery(e).path || "/";
+  const query = getQuery(e);
+  const path = withBase(query.path || "/", useRuntimeConfig().app.baseURL);
   const options = await fetchOptions(e, path);
   setHeader(e, "Content-Type", "image/svg+xml");
   const provider = await useProvider(options.provider);

package/dist/runtime/nitro/routes/vnode.mjs

@@ -2,8 +2,10 @@ import { createError, defineEventHandler, getQuery, setHeader } from "h3";
 import { withBase } from "ufo";
 import { fetchOptions, useHostname } from "../utils.mjs";
 import { useProvider } from "#nuxt-og-image/provider";
+import { useRuntimeConfig } from "#imports";
 export default defineEventHandler(async (e) => {
-  const path = getQuery(e).path || "/";
+  const query = getQuery(e);
+  const path = withBase(query.path || "/", useRuntimeConfig().app.baseURL);
   const options = await fetchOptions(e, path);
   setHeader(e, "Content-Type", "application/json");
   const provider = await useProvider(options.provider);

package/dist/runtime/nitro/utils-pure.d.ts

@@ -1,3 +1,4 @@
+import type { OgImageOptions } from '../../types';
 export declare function decodeHtml(html: string): string;
-export declare function extractOgImageOptions(html: string): false | Record<string, any>;
+export declare function extractOgImageOptions(html: string): OgImageOptions | false;
 export declare function stripOgImageOptions(html: string): string;

package/dist/runtime/nitro/utils.d.ts

@@ -11,7 +11,7 @@ export declare function renderIsland(payload: OgImageOptions): Promise<{
     html: string;
     head: any;
 }>;
-export declare function useHostname(e: H3Event): any;
+export declare function useHostname(e: H3Event): string;
 export declare function readPublicAsset(file: string, encoding?: BufferEncoding): Promise<string | Buffer | undefined>;
 export declare function readPublicAssetBase64(file: string): Promise<string | undefined>;
 export * from './utils-pure';

package/dist/runtime/nitro/utils.mjs

@@ -1,6 +1,7 @@
 import { existsSync, promises as fsp } from "node:fs";
 import { getHeaders, getQuery, getRequestHeader } from "h3";
 import { join } from "pathe";
+import { withBase } from "ufo";
 import { useRuntimeConfig } from "#internal/nitro";
 export function wasmLoader(key, fallback, baseUrl) {
   let promise;
@@ -60,18 +61,18 @@ export function renderIsland(payload) {
 }
 export function useHostname(e) {
   const config = useRuntimeConfig()["nuxt-og-image"];
+  const base = useRuntimeConfig().app.baseURL;
   if (!process.dev && config.siteUrl)
-    return config.siteUrl;
+    return withBase(base, config.siteUrl);
   const host = getRequestHeader(e, "host") || process.env.NITRO_HOST || process.env.HOST || "localhost";
   const protocol = getRequestHeader(e, "x-forwarded-proto") || "http";
   const useHttp = process.env.NODE_ENV === "development" || host.includes("127.0.0.1") || host.includes("localhost") || protocol === "http";
   const port = host.includes(":") ? host.split(":").pop() : process.env.NITRO_PORT || process.env.PORT;
-  const base = useRuntimeConfig().app.baseURL;
-  return `http${useHttp ? "" : "s"}://${host.includes(":") ? host.split(":")[0] : host}${port ? `:${port}` : ""}${base}`;
+  return withBase(base, `http${useHttp ? "" : "s"}://${host.includes(":") ? host.split(":")[0] : host}${port ? `:${port}` : ""}`);
 }
-const r = (base, key) => {
+function r(base, key) {
   return join(base, key.replace(/:/g, "/"));
-};
+}
 export async function readPublicAsset(file, encoding) {
   const { assetDirs } = useRuntimeConfig()["nuxt-og-image"];
   for (const assetDir of assetDirs) {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "nuxt-og-image",
   "type": "module",
-  "version": "2.0.0-beta.7",
-  "packageManager": "pnpm@7.8.0",
+  "version": "2.0.0-beta.9",
+  "packageManager": "pnpm@8.1.0",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
   "homepage": "https://github.com/harlan-zw/nuxt-og-image#readme",
@@ -26,7 +26,7 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "3.3.1",
+    "@nuxt/kit": "3.3.3",
     "@types/fs-extra": "^11.0.1",
     "birpc": "^0.2.10",
     "chalk": "^5.2.0",
@@ -37,10 +37,11 @@
     "flatted": "^3.2.7",
     "fs-extra": "^11.1.1",
     "launch-editor": "^2.6.0",
+    "ofetch": "^1.0.1",
     "ohash": "^1.0.0",
     "pathe": "^1.1.0",
-    "playwright-core": "^1.31.2",
-    "radix3": "^1.0.0",
+    "playwright-core": "^1.32.1",
+    "radix3": "^1.0.1",
     "satori": "0.4.4",
     "satori-html": "^0.3.2",
     "sirv": "^2.0.2",
@@ -53,18 +54,18 @@
     "yoga-wasm-web": "^0.3.3"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.37.0",
-    "@nuxt/devtools-edge": "0.2.5-27992993.59d3c52",
+    "@antfu/eslint-config": "^0.38.2",
+    "@nuxt/devtools-edge": "0.3.1-28002813.ab4e03d",
     "@nuxt/module-builder": "^0.2.1",
-    "@nuxt/test-utils": "3.3.1",
+    "@nuxt/test-utils": "3.3.3",
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@types/ws": "^8.5.4",
-    "bumpp": "^9.0.0",
-    "eslint": "8.36.0",
+    "bumpp": "^9.1.0",
+    "eslint": "8.37.0",
     "jest-image-snapshot": "^6.1.0",
-    "nuxt": "^3.3.1",
-    "puppeteer": "^19.7.5",
-    "vitest": "^0.29.7"
+    "nuxt": "^3.3.3",
+    "puppeteer": "^19.8.2",
+    "vitest": "^0.29.8"
   },
   "scripts": {
     "build": "pnpm dev:prepare && pnpm build:module && pnpm build:client",