From c0b6119e49b1104cb809902c56656c85ed810d68 Mon Sep 17 00:00:00 2001 From: Harlan Wilton Date: Thu, 16 Mar 2023 22:42:14 +1100 Subject: [PATCH] fix: nitro runtime issue --- src/module.ts | 5 +++-- src/runtime/nitro/routes/options.ts | 3 +-- src/{utils.ts => runtime/nitro/utils-pure.ts} | 2 +- src/runtime/nitro/utils.ts | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) rename src/{utils.ts => runtime/nitro/utils-pure.ts} (96%) diff --git a/src/module.ts b/src/module.ts index 15a1bb35..d3b9ff87 100644 --- 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 index 49b069b9..3ee1939b 100644 --- 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 b/src/runtime/nitro/utils-pure.ts similarity index 96% rename from src/utils.ts rename to src/runtime/nitro/utils-pure.ts index a716419e..4f540cc7 100644 --- a/src/utils.ts +++ b/src/runtime/nitro/utils-pure.ts @@ -1,4 +1,4 @@ -import type { OgImageOptions } from './types' +import type { OgImageOptions } from '../../types' function decodeHtmlEntities(obj: Record) { Object.entries(obj).forEach(([key, value]) => { diff --git a/src/runtime/nitro/utils.ts b/src/runtime/nitro/utils.ts index 950a2770..059638a7 100644 --- 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'