fix: nitro runtime issue

nuxt-modules · Mar 16, 2023 · c0b6119 · c0b6119
1 parent 7ff7763
commit c0b6119
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/module.ts b/src/module.ts
@@ -25,7 +25,7 @@ import { screenshot } from './runtime/browserUtil'
 import type { OgImageOptions, ScreenshotOptions } from './types'
 import { setupPlaygroundRPC } from './rpc'
 import { exposeModuleConfig } from './nuxt-utils'
-import { extractOgImageOptions, stripOgImageOptions } from './utils'
+import { extractOgImageOptions, stripOgImageOptions } from './runtime/nitro/utils-pure'
 
 export interface ModuleOptions {
   /**
@@ -132,7 +132,8 @@ export {}
         })
       })
 
-    // @ts-expect-error runtime type
+    // eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
+    // @ts-ignore runtime type
     nuxt.hook('devtools:customTabs', (iframeTabs) => {
       iframeTabs.push({
         name: 'ogimage',

diff --git a/src/runtime/nitro/routes/options.ts b/src/runtime/nitro/routes/options.ts
@@ -1,7 +1,6 @@
 import { createError, defineEventHandler, getHeaders, getQuery } from 'h3'
 import type { OgImageOptions } from '../../../types'
-import { useHostname } from '../utils'
-import { extractOgImageOptions } from '../../../utils'
+import { extractOgImageOptions, useHostname } from '../utils'
 import { getRouteRules } from '#internal/nitro'
 import { defaults } from '#nuxt-og-image/config'
 

diff --git a/src/utils.ts → src/runtime/nitro/utils-pure.ts b/src/utils.ts → src/runtime/nitro/utils-pure.ts
@@ -1,4 +1,4 @@
-import type { OgImageOptions } from './types'
+import type { OgImageOptions } from '../../types'
 
 function decodeHtmlEntities(obj: Record<string, string | any>) {
   Object.entries(obj).forEach(([key, value]) => {

diff --git a/src/runtime/nitro/utils.ts b/src/runtime/nitro/utils.ts
@@ -108,3 +108,5 @@ export async function readPublicAssetBase64(file: string) {
   }
   // fine if it fails, we fallback elsewhere
 }
+
+export * from './utils-pure'
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,3 +108,5 @@ export async function readPublicAssetBase64(file: string) { @@
       }
       // fine if it fails, we fallback elsewhere
     }
+    export * from './utils-pure'