chore: progress commit

nuxt-modules · Jan 19, 2023 · eeecc03 · eeecc03
1 parent 7b99d94
commit eeecc03
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.playground/pages/index.vue b/.playground/pages/index.vue
@@ -7,7 +7,8 @@ definePageMeta({
 </script>
 <template>
 <div class="px-5 my-10">
-  <h1 class="text-3xl mb-5">Nuxt Og Image Test</h1>
+  <OgImageStatic />
+  <h1 class="text-3xl mb-5">Nuxt OG Image Test</h1>
   <div class="mb-10">
   <h2 class="text-lg font-bold mb-3">Browser Screenshot</h2>
     <div><NuxtLink to="/browser/custom">custom</NuxtLink></div>

diff --git a/src/runtime/nitro/routes/__og_image__/html.ts b/src/runtime/nitro/routes/__og_image__/html.ts
@@ -1,4 +1,4 @@
-import { parseURL, withoutTrailingSlash } from 'ufo'
+import {parseURL, withBase, withoutTrailingSlash} from 'ufo'
 import { renderSSRHead } from '@unhead/ssr'
 import { createHeadCore } from '@unhead/vue'
 import { defineEventHandler, sendRedirect } from 'h3'
@@ -17,7 +17,7 @@ export default defineEventHandler(async (e) => {
 
   // for screenshots just return the base path
   if (payload.provider === 'browser')
-    return sendRedirect(e, useHostname(e) + basePath)
+    return sendRedirect(e, withBase(basePath, useHostname(e)))
 
   const component = payload.component || 'OgImageTemplate'
   delete payload.component

diff --git a/src/runtime/nitro/routes/__og_image__/index.ts b/src/runtime/nitro/routes/__og_image__/index.ts
@@ -25,6 +25,6 @@ export default defineEventHandler(async (e) => {
     height: 100%;
   }
 </style>
-<title>Og Image Playground</title>
+<title>OG Image Playground</title>
 <iframe src="${useHostname(e)}/__nuxt_og_image__/client/?&path=${withoutTrailingSlash(path.replace('__og_image__', ''))}"></iframe>`
 })
diff --git a/src/runtime/nitro/routes/__og_image__/og.png.ts b/src/runtime/nitro/routes/__og_image__/og.png.ts
@@ -1,5 +1,5 @@
 import { defineEventHandler, setHeader } from 'h3'
-import { parseURL, withBase, withoutTrailingSlash } from 'ufo'
+import {joinURL, parseURL, withBase, withoutTrailingSlash} from 'ufo'
 import { fetchPayload, useHostname } from '../../utils'
 import { useProvider } from '#nuxt-og-image/provider'
 
@@ -29,5 +29,5 @@ export default defineEventHandler(async (e) => {
   }
 
   const provider = await useProvider(providerName!)
-  return provider.createPng(withBase(`${basePath}/__og_image__/html`, useHostname(e)))
+  return provider.createPng(withBase(joinURL(basePath, '/__og_image__/html'), useHostname(e)))
 })
diff --git a/src/runtime/nitro/routes/__og_image__/svg.ts b/src/runtime/nitro/routes/__og_image__/svg.ts
@@ -1,5 +1,5 @@
 import { defineEventHandler, setHeader } from 'h3'
-import { parseURL, withBase, withoutTrailingSlash } from 'ufo'
+import { joinURL, parseURL, withBase, withoutTrailingSlash } from 'ufo'
 import { fetchPayload, useHostname } from '../../utils'
 import { useProvider } from '#nuxt-og-image/provider'
 
@@ -16,5 +16,5 @@ export default defineEventHandler(async (e) => {
   const { provider: providerName } = await fetchPayload(basePath)
   setHeader(e, 'Content-Type', 'image/svg+xml')
   const provider = await useProvider(providerName!)
-  return provider.createSvg(withBase(`${basePath}/__og_image__/html`, useHostname(e)))
+  return provider.createSvg(withBase(joinURL(basePath, '/__og_image__/html'), useHostname(e)))
 })