fix: rework path aliases

Author: harlan-zw

src/module.ts

@@ -199,7 +199,7 @@ export default defineNuxtModule<ModuleOptions>({
       logger.warn('Nuxt OG Image is enabled but SSR is disabled.\n\nYou should enable SSR (`ssr: true`) or disable the module (`ogImage: { enabled: false }`).')
       return
     }
-    nuxt.options.alias['#nuxt-og-image-utils'] = resolve('./runtime/shared')
+    nuxt.options.alias['#nuxt-og-image'] = resolve('./runtime')
     nuxt.options.alias['#nuxt-og-image-cache'] = resolve('./runtime/nitro/og-image/cache/lru')
 
     const preset = resolveNitroPreset(nuxt.options.nitro)
@@ -491,7 +491,7 @@ export default defineNuxtModule<ModuleOptions>({
       options: { mode: 'server' },
     })
     nuxt.options.nitro.virtual = nuxt.options.nitro.virtual || {}
-    nuxt.options.nitro.virtual['#nuxt-og-image/component-names.mjs'] = () => {
+    nuxt.options.nitro.virtual['#nuxt-og-image-virtual/component-names.mjs'] = () => {
       return `export const componentNames = ${JSON.stringify(ogImageComponentCtx.components)}`
     }
 
@@ -505,7 +505,7 @@ export default defineNuxtModule<ModuleOptions>({
     nuxt.hook('unocss:config', (_unoCssConfig) => {
       unoCssConfig = { ..._unoCssConfig.theme }
     })
-    nuxt.options.nitro.virtual['#nuxt-og-image/unocss-config.mjs'] = () => {
+    nuxt.options.nitro.virtual['#nuxt-og-image-virtual/unocss-config.mjs'] = () => {
       return `export const theme = ${JSON.stringify(unoCssConfig)}`
     }
 

src/runtime/nitro/og-image/context.ts

@@ -6,11 +6,11 @@ import type {
 } from '../../types'
 import type ChromiumRenderer from './chromium/renderer'
 import type SatoriRenderer from './satori/renderer'
+import { useNitroApp } from '#imports'
 import { htmlPayloadCache, prerenderOptionsCache } from '#nuxt-og-image-cache'
 import { defu } from 'defu'
 import { parse } from 'devalue'
 import { createError, getQuery } from 'h3'
-import { useNitroApp } from 'nitropack/runtime/app'
 import { hash } from 'ohash'
 import { parseURL, withoutLeadingSlash, withoutTrailingSlash, withQuery } from 'ufo'
 import { normalizeKey } from 'unstorage'

src/runtime/nitro/og-image/satori/plugins/unocss.ts

@@ -1,5 +1,5 @@
 import type { VNode } from '../../../../types'
-import { theme } from '#nuxt-og-image/unocss-config.mjs'
+import { theme } from '#nuxt-og-image/virtual/unocss-config.mjs'
 import { createGenerator } from '@unocss/core'
 import presetWind from '@unocss/preset-wind'
 import { defineSatoriTransformer } from '../utils'

src/runtime/nitro/og-image/satori/renderer.ts

@@ -1,6 +1,6 @@
 import type { SatoriOptions } from 'satori'
 import type { OgImageRenderEventContext, Renderer, ResolvedFontConfig } from '../../../types'
-import { theme } from '#nuxt-og-image/unocss-config.mjs'
+import { theme } from '#nuxt-og-image/virtual/unocss-config.mjs'
 import { fontCache } from '#nuxt-og-image-cache'
 import { defu } from 'defu'
 import { normaliseFontInput, useOgImageRuntimeConfig } from '../../../shared'

src/runtime/nitro/og-image/templates/html.ts

@@ -1,5 +1,5 @@
 import type { FontConfig, OgImageRenderEventContext } from '../../../types'
-import { theme } from '#nuxt-og-image/unocss-config.mjs'
+import { theme } from '#nuxt-og-image/virtual/unocss-config.mjs'
 import { renderSSRHead } from '@unhead/ssr'
 import { createHeadCore } from '@unhead/vue'
 import { createError } from 'h3'

src/runtime/nitro/plugins/__zero-runtime/nuxt-content.ts

@@ -1,4 +1,4 @@
-import { defineNitroPlugin } from 'nitropack/dist/runtime/plugin'
+import { defineNitroPlugin } from '#imports'
 import { nuxtContentPlugin } from '../../util/plugins'
 
 export default defineNitroPlugin((nitroApp) => {

src/runtime/nitro/plugins/nuxt-content.ts

@@ -1,4 +1,4 @@
-import { defineNitroPlugin } from 'nitropack/dist/runtime/plugin'
+import { defineNitroPlugin } from '#imports'
 import { nuxtContentPlugin } from '../util/plugins'
 
 export default defineNitroPlugin((nitroApp) => {

src/runtime/nitro/plugins/prerender.ts

@@ -1,5 +1,5 @@
+import { defineNitroPlugin } from '#imports'
 import { prerenderOptionsCache } from '#nuxt-og-image-cache'
-import { defineNitroPlugin } from 'nitropack/dist/runtime/plugin'
 import { parseURL } from 'ufo'
 import { isInternalRoute } from '../../pure'
 import { extractAndNormaliseOgImageOptions, resolvePathCacheKey } from '../og-image/context'

src/runtime/nitro/routes/debug.json.ts

@@ -1,7 +1,7 @@
 // @ts-expect-error virtual module
 import compatibility from '#nuxt-og-image/compatibility'
 // @ts-expect-error untyped
-import { componentNames } from '#nuxt-og-image/component-names.mjs'
+import { componentNames } from '#nuxt-og-image-virtual/component-names.mjs'
 
 import { defineEventHandler, setHeader } from 'h3'
 

src/runtime/nitro/util/options.ts

@@ -1,6 +1,6 @@
 import type { DefineOgImageInput, OgImageOptions, OgImagePrebuilt } from '../../types'
 // @ts-expect-error untyped
-import { componentNames } from '#nuxt-og-image/component-names.mjs'
+import { componentNames } from '#nuxt-og-image-virtual/component-names.mjs'
 
 export function normaliseOptions(_options: DefineOgImageInput): OgImageOptions | OgImagePrebuilt {
   const options = { ..._options } as OgImageOptions

src/runtime/nuxt/components/Templates/Community/NuxtSeo.vue

@@ -4,7 +4,7 @@
  */
 
 import { useSiteConfig } from '#imports'
-import { useOgImageRuntimeConfig } from '#nuxt-og-image-utils'
+import { useOgImageRuntimeConfig } from '#nuxt-og-image/shared'
 import { computed, defineComponent, h, resolveComponent } from 'vue'
 
 // convert to typescript props

test/fixtures/zero-runtime/components/OgImage/0.NuxtSeo.vue

@@ -4,7 +4,7 @@
  */
 
 import { useSiteConfig } from '#imports'
-import { useOgImageRuntimeConfig } from '#nuxt-og-image-utils'
+import { useOgImageRuntimeConfig } from '#nuxt-og-image/shared'
 import { computed, defineComponent, h, resolveComponent } from 'vue'
 
 // convert to typescript props

virtual.d.ts

@@ -47,3 +47,26 @@ declare module '#nuxt-og-image/bindings/sharp' {
   const sharp: _sharp
   export default sharp
 }
+
+declare module '#nuxt-og-image-virtual/component-names.mjs' {
+  const componentNames: string[]
+  export default componentNames
+}
+
+declare module '#nuxt-og-image-virtual/unocss-config.mjs' {
+  const theme: Record<string, any>
+  export default theme
+}
+
+declare module '#nuxt-og-image-cache' {
+  import type { OgImageOptions } from '#nuxt-og-image/types'
+  import type { Storage } from 'unstorage'
+
+  export const htmlPayloadCache: Storage<{ expiresAt: number, value: OgImageOptions }>
+
+  export const prerenderOptionsCache: Storage<OgImageOptions> | undefined
+
+  export const fontCache: Storage<BufferSource> | undefined
+
+  export const emojiCache: Storage<string>
+}