fix: import runtime types from module entrypoint (#1384)

Author: danielroe

src/runtime/composables.ts

@@ -1,4 +1,4 @@
-import type { $Img } from '../types'
+import type { $Img } from '../module'
 
 import { createImage } from './image'
 // @ts-expect-error virtual file

src/runtime/image.ts

@@ -1,6 +1,6 @@
 import { defu } from 'defu'
 import { hasProtocol, parseURL, joinURL, withLeadingSlash } from 'ufo'
-import type { ImageOptions, ImageSizesOptions, CreateImageOptions, ResolvedImage, ImageCTX, $Img, ImageSizes, ImageSizesVariant } from '../types/image'
+import type { ImageOptions, ImageSizesOptions, CreateImageOptions, ResolvedImage, ImageCTX, $Img, ImageSizes, ImageSizesVariant } from '../module'
 import { imageMeta } from './utils/meta'
 import { checkDensities, parseDensities, parseSize, parseSizes } from './utils'
 import { prerenderStaticImages } from './utils/prerender'

src/runtime/plugin.ts

@@ -1,5 +1,5 @@
 import type { Plugin } from 'nuxt/app'
-import type { $Img } from '../types'
+import type { $Img } from '../module'
 import { defineNuxtPlugin, useImage } from '#imports'
 
 export default defineNuxtPlugin(() => {

src/runtime/providers/awsAmplify.ts

@@ -1,5 +1,5 @@
 import { stringifyQuery } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 
 export const getImage: ProviderGetImage = (src, { modifiers, baseURL = '/_amplify/image' } = {}, ctx) => {
   const validWidths = Object.values(ctx.options.screens || {}).sort((a, b) => a - b)

src/runtime/providers/bunny.ts

@@ -1,5 +1,5 @@
 import { joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 export const operationsGenerator = createOperationsGenerator({

src/runtime/providers/caisy.ts

@@ -1,5 +1,5 @@
 import { joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 export const operationsGenerator = createOperationsGenerator({

src/runtime/providers/cloudflare.ts

@@ -1,5 +1,5 @@
 import { joinURL, encodeQueryItem } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 const operationsGenerator = createOperationsGenerator({

src/runtime/providers/cloudimage.ts

@@ -1,5 +1,5 @@
 import { joinURL, hasProtocol } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 const operationsGenerator = createOperationsGenerator({

src/runtime/providers/cloudinary.ts

@@ -1,6 +1,6 @@
 import { joinURL, encodePath } from 'ufo'
 import { defu } from 'defu'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 const convertHexToRgbFormat = (value: string) => value.startsWith('#') ? value.replace('#', 'rgb_') : value

src/runtime/providers/contentful.ts

@@ -1,5 +1,5 @@
 import { withBase, parseURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 // https://www.contentful.com/developers/docs/references/images-api/

src/runtime/providers/directus.ts

@@ -1,5 +1,5 @@
 import { joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 export const operationsGenerator = createOperationsGenerator({

src/runtime/providers/edgio.ts

@@ -1,5 +1,5 @@
 import { joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 const operationsGenerator = createOperationsGenerator({

src/runtime/providers/fastly.ts

@@ -1,5 +1,5 @@
 import { joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 const operationsGenerator = createOperationsGenerator({

src/runtime/providers/glide.ts

@@ -1,7 +1,7 @@
 // https://glide.thephpleague.com/2.0/api/quick-reference/
 
 import { joinURL, encodeQueryItem, encodePath, withBase } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 const operationsGenerator = createOperationsGenerator({

src/runtime/providers/gumlet.ts

@@ -1,5 +1,5 @@
 import { joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 export const operationsGenerator = createOperationsGenerator({

src/runtime/providers/imageengine.ts

@@ -1,5 +1,5 @@
 import { joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 export const operationsGenerator = createOperationsGenerator({

src/runtime/providers/imagekit.ts

@@ -1,5 +1,5 @@
 import { joinURL, withQuery } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 const operationsGenerator = createOperationsGenerator({

src/runtime/providers/imgix.ts

@@ -1,5 +1,5 @@
 import { joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 export const operationsGenerator = createOperationsGenerator({

src/runtime/providers/ipx.ts

@@ -1,5 +1,5 @@
 import { joinURL, encodePath, encodeParam } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 const operationsGenerator = createOperationsGenerator({

src/runtime/providers/netlifyImageCdn.ts

@@ -1,5 +1,5 @@
 import { encodeQueryItem } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 // https://docs.netlify.com/image-cdn/overview/

src/runtime/providers/netlifyLargeMedia.ts

@@ -1,5 +1,5 @@
 import { encodeQueryItem, joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 export const operationsGenerator = createOperationsGenerator({

src/runtime/providers/none.ts

@@ -1,3 +1,3 @@
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 
 export const getImage: ProviderGetImage = url => ({ url })

src/runtime/providers/prepr/getImage.ts

@@ -1,6 +1,6 @@
 import { joinURL } from 'ufo'
 
-import type { ImageOptions, ResolvedImage, ImageCTX } from '../../../types'
+import type { ImageOptions, ResolvedImage, ImageCTX } from '../../../module'
 
 import { formatter } from './formatter'
 import { keyMap } from './keyMap'

src/runtime/providers/prismic.ts

@@ -1,5 +1,5 @@
 import { joinURL, parseQuery, parseURL, stringifyQuery } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { operationsGenerator } from './imgix'
 
 const PRISMIC_IMGIX_BUCKET = 'https://images.prismic.io'

src/runtime/providers/sanity.ts

@@ -1,5 +1,5 @@
 import { joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 const sanityCDN = 'https://cdn.sanity.io/images'

src/runtime/providers/sirv.ts

@@ -1,5 +1,5 @@
 import { joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 const deleteHash = (value: string) => value.startsWith('#') ? value.replace('#', '') : value

src/runtime/providers/storyblok.ts

@@ -1,5 +1,5 @@
 import { withBase, joinURL, parseURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 
 // https://www.storyblok.com/docs/image-service
 const storyblockCDN = 'https://a.storyblok.com'

src/runtime/providers/strapi.ts

@@ -1,5 +1,5 @@
 import { withBase, withoutLeadingSlash } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 
 // https://strapi.io/documentation/developer-docs/latest/development/plugins/upload.html#upload
 

src/runtime/providers/twicpics.ts

@@ -1,5 +1,5 @@
 import { joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createMapper, createOperationsGenerator } from '#image'
 
 const fits = createMapper({

src/runtime/providers/unsplash.ts

@@ -1,7 +1,7 @@
 // https://unsplash.com/documentation#dynamically-resizable-images
 
 import { getQuery, withBase, withQuery } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { operationsGenerator } from './imgix'
 
 const unsplashCDN = 'https://images.unsplash.com/'

src/runtime/providers/uploadcare.ts

@@ -19,7 +19,7 @@
  */
 
 import { joinURL, hasProtocol, withTrailingSlash } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 import { createOperationsGenerator } from '#image'
 
 const operationsGenerator = createOperationsGenerator({

src/runtime/providers/vercel.ts

@@ -1,5 +1,5 @@
 import { stringifyQuery } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 
 // https://vercel.com/docs/more/adding-your-framework#images
 

src/runtime/providers/wagtail.ts

@@ -1,5 +1,5 @@
 import { withBase, joinURL } from 'ufo'
-import type { ProviderGetImage } from '../../types'
+import type { ProviderGetImage } from '../../module'
 
 // https://docs.wagtail.org/en/v4.2.1/topics/images.html
 

src/runtime/providers/weserv.ts

@@ -1,5 +1,5 @@
 import { withBase } from 'ufo'
-import type { OperationGeneratorConfig, ProviderGetImage, ImageOptions } from '../../types'
+import type { OperationGeneratorConfig, ProviderGetImage, ImageOptions } from '../../module'
 import { createOperationsGenerator } from '#image'
 import { createError } from '#imports'
 

src/runtime/utils/index.ts

@@ -1,4 +1,4 @@
-import type { OperationGeneratorConfig } from '../../types/image'
+import type { OperationGeneratorConfig } from '../../module'
 
 export default function imageFetch(url: string) {
   return fetch(cleanDoubleSlashes(url))

src/runtime/utils/meta.ts

@@ -1,4 +1,4 @@
-import type { ImageInfo, ImageCTX } from '../../types/image'
+import type { ImageInfo, ImageCTX } from '../../module'
 
 export async function imageMeta(_ctx: ImageCTX, url: string): Promise<ImageInfo> {
   // TODO: Reimplement cache using storage