nuxt-og-image 2.0.0-beta.2 → 2.0.0-beta.21

package/dist/runtime/nitro/utils-pure.mjs

@@ -1,8 +1,12 @@
-function decodeHtmlEntities(obj) {
+export function decodeHtml(html) {
+  return html.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&cent;/g, "\xA2").replace(/&pound;/g, "\xA3").replace(/&yen;/g, "\xA5").replace(/&euro;/g, "\u20AC").replace(/&copy;/g, "\xA9").replace(/&reg;/g, "\xAE").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&#x27;/g, "'").replace(/&#x2F;/g, "/").replace(/&#([0-9]+);/g, (full, int) => {
+    return String.fromCharCode(parseInt(int));
+  });
+}
+function decodeObjectHtmlEntities(obj) {
   Object.entries(obj).forEach(([key, value]) => {
-    if (typeof value === "string") {
-      obj[key] = value.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&#x27;/g, "'").replace(/&#x2F;/g, "/");
-    }
+    if (typeof value === "string")
+      obj[key] = decodeHtml(value);
   });
   return obj;
 }
@@ -19,15 +23,14 @@ export function extractOgImageOptions(html) {
       console.warn("Failed to parse #nuxt-og-image-options", e, options);
   }
   if (options) {
-    const description = html.match(/<meta property="og:description" content="(.*?)">/)?.[1];
-    if (description)
-      options.description = description;
-    else
-      options.description = html.match(/<meta name="description" content="(.*?)">/)?.[1];
-    return decodeHtmlEntities(options);
+    if (!options.description) {
+      const description = html.match(/<meta property="og:description" content="(.*?)">/)?.[1];
+      if (description)
+        options.description = description;
+      else
+        options.description = html.match(/<meta name="description" content="(.*?)">/)?.[1];
+    }
+    return decodeObjectHtmlEntities(options);
   }
   return false;
 }
-export function stripOgImageOptions(html) {
-  return html.replace(/<script id="nuxt-og-image-options" type="application\/json">(.*?)<\/script>/, "");
-}

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

@@ -1,7 +1,9 @@
 /// <reference types="node" />
+import { Buffer } from 'node:buffer';
 import type { H3Event } from 'h3';
 import type { OgImageOptions } from '../../types';
-export declare function wasmLoader(key: any, fallback: string, baseUrl: string): {
+export * from './util-hostname';
+export declare function wasmLoader(asyncModuleLoad: Promise<any>, fallback: string, baseUrl: string): {
     loaded(): boolean | Promise<any>;
     load(): Promise<any>;
 };
@@ -11,7 +13,6 @@ export declare function renderIsland(payload: OgImageOptions): Promise<{
     html: string;
     head: any;
 }>;
-export declare function useHostname(e: H3Event): any;
 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,8 +1,11 @@
 import { existsSync, promises as fsp } from "node:fs";
-import { getHeaders, getQuery, getRequestHeader } from "h3";
+import { Buffer } from "node:buffer";
+import { getHeaders, getQuery } from "h3";
 import { join } from "pathe";
-import { useRuntimeConfig } from "#internal/nitro";
-export function wasmLoader(key, fallback, baseUrl) {
+import { useHostname } from "./util-hostname.mjs";
+import { useRuntimeConfig } from "#imports";
+export * from "./util-hostname.mjs";
+export function wasmLoader(asyncModuleLoad, fallback, baseUrl) {
   let promise;
   let loaded = false;
   return {
@@ -17,7 +20,7 @@ export function wasmLoader(key, fallback, baseUrl) {
       promise = promise || new Promise(async (resolve) => {
         let wasm;
         try {
-          wasm = await key;
+          wasm = await asyncModuleLoad;
           if (typeof wasm === "string")
             wasm = void 0;
         } catch (e) {
@@ -58,20 +61,9 @@ export function renderIsland(payload) {
     query: { props: JSON.stringify(payload) }
   });
 }
-export function useHostname(e) {
-  const config = useRuntimeConfig()["nuxt-og-image"];
-  if (!process.dev && config.siteUrl)
-    return 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}`;
-}
-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.2",
-  "packageManager": "pnpm@7.8.0",
+  "version": "2.0.0-beta.21",
+  "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,22 +26,23 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "3.3.1",
+    "@nuxt/kit": "3.4.2",
     "@types/fs-extra": "^11.0.1",
-    "birpc": "^0.2.10",
+    "birpc": "^0.2.11",
     "chalk": "^5.2.0",
-    "chrome-launcher": "^0.15.1",
+    "chrome-launcher": "^0.15.2",
     "defu": "^6.1.2",
     "execa": "^7.1.1",
     "fast-glob": "^3.2.12",
     "flatted": "^3.2.7",
     "fs-extra": "^11.1.1",
     "launch-editor": "^2.6.0",
-    "ohash": "^1.0.0",
+    "ofetch": "^1.0.1",
+    "ohash": "^1.1.1",
     "pathe": "^1.1.0",
-    "playwright-core": "^1.31.2",
-    "radix3": "^1.0.0",
-    "satori": "0.4.4",
+    "playwright-core": "^1.32.3",
+    "radix3": "^1.0.1",
+    "satori": "0.4.14",
     "satori-html": "^0.3.2",
     "sirv": "^2.0.2",
     "std-env": "^3.3.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",
-    "@nuxt/module-builder": "^0.2.1",
-    "@nuxt/test-utils": "3.3.1",
+    "@antfu/eslint-config": "^0.38.5",
+    "@nuxt/devtools-edge": "0.4.1-28031816.5910844",
+    "@nuxt/module-builder": "^0.3.0",
+    "@nuxt/test-utils": "3.4.2",
     "@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.38.0",
     "jest-image-snapshot": "^6.1.0",
-    "nuxt": "^3.3.1",
-    "puppeteer": "^19.7.5",
-    "vitest": "^0.29.7"
+    "nuxt": "^3.4.2",
+    "puppeteer": "^19.10.1",
+    "vitest": "^0.30.1"
   },
   "scripts": {
     "build": "pnpm dev:prepare && pnpm build:module && pnpm build:client",

package/dist/client/_nuxt/IconCSS.a041aca0.js

@@ -1 +0,0 @@
-import{a as p,b as u,e as l,f as t,o as f,h as m,i as _,u as o,j as d}from"./entry.74018bda.js";const x=p({__name:"IconCSS",props:{name:{type:String,required:!0},size:{type:String,default:""}},setup(c){const s=c;u(e=>({"387181c2":o(r)}));const n=l();n?.nuxtIcon?.aliases;const i=t(()=>(n?.nuxtIcon?.aliases||{})[s.name]||s.name),r=t(()=>`url('https://api.iconify.design/${i.value.replace(":","/")}.svg')`),a=t(()=>{if(!s.size&&typeof n.nuxtIcon?.size=="boolean"&&!n.nuxtIcon?.size)return;const e=s.size||n.nuxtIcon?.size||"1em";return String(Number(e))===e?`${e}px`:e});return(e,z)=>(f(),m("span",{style:_({width:o(a),height:o(a)})},null,4))}}),g=d(x,[["__scopeId","data-v-3c47f034"]]);export{g as default};