Don't import internally from types in next-env.d.ts (#34394)

* Move type to image component * Add types/global.d.ts to excludes too * Undo global exclude as it's using internally * Don't add root imports for module augmentations
vercel · Feb 19, 2022 · 27affb4 · 27affb4
1 parent 4613e3b
commit 27affb4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/packages/next/client/image.tsx b/packages/next/client/image.tsx
@@ -72,6 +72,13 @@ type OnLoadingComplete = (result: {
 
 type ImgElementStyle = NonNullable<JSX.IntrinsicElements['img']['style']>
 
+export interface StaticImageData {
+  src: string
+  height: number
+  width: number
+  blurDataURL?: string
+}
+
 interface StaticRequire {
   default: StaticImageData
 }

diff --git a/packages/next/image-types/global.d.ts b/packages/next/image-types/global.d.ts
@@ -1,15 +1,8 @@
 // this file is conditionally added/removed to next-env.d.ts
 // if the static image import handling is enabled
 
-interface StaticImageData {
-  src: string
-  height: number
-  width: number
-  blurDataURL?: string
-}
-
 declare module '*.png' {
-  const content: StaticImageData
+  const content: import('../dist/client/image').StaticImageData
 
   export default content
 }
@@ -26,43 +19,43 @@ declare module '*.svg' {
 }
 
 declare module '*.jpg' {
-  const content: StaticImageData
+  const content: import('../dist/client/image').StaticImageData
 
   export default content
 }
 
 declare module '*.jpeg' {
-  const content: StaticImageData
+  const content: import('../dist/client/image').StaticImageData
 
   export default content
 }
 
 declare module '*.gif' {
-  const content: StaticImageData
+  const content: import('../dist/client/image').StaticImageData
 
   export default content
 }
 
 declare module '*.webp' {
-  const content: StaticImageData
+  const content: import('../dist/client/image').StaticImageData
 
   export default content
 }
 
 declare module '*.avif' {
-  const content: StaticImageData
+  const content: import('../dist/client/image').StaticImageData
 
   export default content
 }
 
 declare module '*.ico' {
-  const content: StaticImageData
+  const content: import('../dist/client/image').StaticImageData
 
   export default content
 }
 
 declare module '*.bmp' {
-  const content: StaticImageData
+  const content: import('../dist/client/image').StaticImageData
 
   export default content
 }
diff --git a/packages/next/tsconfig.json b/packages/next/tsconfig.json
@@ -7,5 +7,5 @@
     "moduleResolution": "node",
     "jsx": "react"
   },
-  "exclude": ["dist", "./*.d.ts"]
+  "exclude": ["dist", "./*.d.ts", "image-types/global.d.ts"]
 }