Fix types for static image

packages/next/client/image.tsx

@@ -83,33 +83,45 @@ function isStaticImport(src: string | StaticImport): src is StaticImport {
   )
 }
 
+type StringImageProps = {
+  src: string
+} & (
+  | { width?: never; height?: never; layout: 'fill' }
+  | {
+      width: number | string
+      height: number | string
+      layout?: Exclude<LayoutValue, 'fill'>
+    }
+) &
+  (
+    | {
+        placeholder?: Exclude<PlaceholderValue, 'blur'>
+        blurDataURL?: never
+      }
+    | { placeholder: 'blur'; blurDataURL: string }
+  )
+
+type ObjectImageProps = {
+  src: StaticImport
+  width?: number | string
+  height?: number | string
+  layout?: LayoutValue
+  placeholder?: PlaceholderValue
+  blurDataURL?: never
+}
+
 export type ImageProps = Omit<
   JSX.IntrinsicElements['img'],
   'src' | 'srcSet' | 'ref' | 'width' | 'height' | 'loading' | 'style'
 > & {
-  src: string | StaticImport
   loader?: ImageLoader
   quality?: number | string
   priority?: boolean
   loading?: LoadingValue
   unoptimized?: boolean
   objectFit?: ImgElementStyle['objectFit']
   objectPosition?: ImgElementStyle['objectPosition']
-} & (
-    | { width?: never; height?: never; layout: 'fill' }
-    | {
-        width: number | string
-        height: number | string
-        layout?: Exclude<LayoutValue, 'fill'>
-      }
-  ) &
-  (
-    | {
-        placeholder?: Exclude<PlaceholderValue, 'blur'>
-        blurDataURL?: never
-      }
-    | { placeholder: 'blur'; blurDataURL: string }
-  )
+} & (StringImageProps | ObjectImageProps)
 
 const {
   deviceSizes: configDeviceSizes,

packages/next/types/global.d.ts

@@ -25,3 +25,58 @@ declare module '*.module.scss' {
   const classes: { readonly [key: string]: string }
   export default classes
 }
+
+interface StaticImageData {
+  src: string
+  height: number
+  width: number
+  placeholder?: string
+}
+
+declare module '*.png' {
+  const content: StaticImageData
+
+  export default content
+}
+
+declare module '*.svg' {
+  const content: StaticImageData
+
+  export default content
+}
+
+declare module '*.jpg' {
+  const content: StaticImageData
+
+  export default content
+}
+
+declare module '*.jpeg' {
+  const content: StaticImageData
+
+  export default content
+}
+
+declare module '*.gif' {
+  const content: StaticImageData
+
+  export default content
+}
+
+declare module '*.webp' {
+  const content: StaticImageData
+
+  export default content
+}
+
+declare module '*.ico' {
+  const content: StaticImageData
+
+  export default content
+}
+
+declare module '*.bmp' {
+  const content: StaticImageData
+
+  export default content
+}

test/integration/image-component/typescript/pages/invalid.tsx

@@ -9,6 +9,13 @@ const Invalid = () => {
         id="no-width-or-height"
         src="https://via.placeholder.com/500"
       ></Image>
+      <Image
+        id="no-blur-data-url"
+        src="https://via.placeholder.com/500"
+        width={500}
+        height={500}
+        placeholder="blur"
+      ></Image>
       <p id="stubtext">This is the invalid usage</p>
     </div>
   )

test/integration/image-component/typescript/pages/valid.tsx

@@ -1,5 +1,6 @@
 import React from 'react'
 import Image from 'next/image'
+import testTall from '../public/tall.png'
 
 const Page = () => {
   return (
@@ -58,6 +59,20 @@ const Page = () => {
         objectFit="scale-down"
         objectPosition="50px"
       />
+      <Image
+        id="placeholder-and-blur-data-url"
+        src="https://via.placeholder.com/500"
+        width={500}
+        height={500}
+        placeholder="blur"
+        blurDataURL="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs="
+      />
+      <Image id="no-width-and-height" src={testTall} />
+      <Image
+        id="object-src-with-placeholder"
+        src={testTall}
+        placeholder="blur"
+      />
       <p id="stubtext">This is valid usage of the Image component</p>
     </div>
   )

test/integration/rewrite-with-browser-history/test/index.test.js

@@ -32,7 +32,9 @@ const runTests = () => {
 
     await browser.back().waitForElementByCss('#another')
 
-    expect(await browser.elementByCss('#another').text()).toBe('another page')
+    expect(await browser.waitForElementByCss('#another').text()).toBe(
+      'another page'
+    )
 
     expect(await browser.eval('window.beforeNav')).toBe(1)
   })