Add support for string width/height on Image component

packages/next/client/image.tsx

@@ -29,8 +29,8 @@ type ImageProps = Omit<
   loading?: LoadingValue
   unoptimized?: boolean
 } & (
-    | { width: number; height: number; unsized?: false }
-    | { width?: number; height?: number; unsized: true }
+    | { width: number | string; height: number | string; unsized?: false }
+    | { width?: number | string; height?: number | string; unsized: true }
   )
 
 const imageData: ImageData = process.env.__NEXT_IMAGE_OPTS as any
@@ -229,16 +229,18 @@ export default function Image({
     className = className ? className + ' __lazy' : '__lazy'
   }
 
-  // No need to add preloads on the client side--by the time the application is hydrated,
-  // it's too late for preloads
-  const shouldPreload = priority && typeof window === 'undefined'
-
   let divStyle: React.CSSProperties | undefined
   let imgStyle: React.CSSProperties | undefined
   let wrapperStyle: React.CSSProperties | undefined
-  if (typeof height === 'number' && typeof width === 'number' && !unsized) {
-    // <Image src="i.png" width=100 height=100 />
-    const quotient = height / width
+  if (
+    typeof height !== 'undefined' &&
+    typeof width !== 'undefined' &&
+    !unsized
+  ) {
+    // <Image src="i.png" width={100} height={100} />
+    // <Image src="i.png" width="100"" height="100" />
+    const quotient =
+      parseInt(height as string, 10) / parseInt(width as string, 10)
     const ratio = isNaN(quotient) ? 1 : quotient * 100
     wrapperStyle = {
       maxWidth: '100%',
@@ -278,6 +280,10 @@ export default function Image({
     }
   }
 
+  // No need to add preloads on the client side--by the time the application is hydrated,
+  // it's too late for preloads
+  const shouldPreload = priority && typeof window === 'undefined'
+
   return (
     <div style={wrapperStyle}>
       <div style={divStyle}>

test/integration/image-component/default/pages/index.js

@@ -6,6 +6,12 @@ const Page = () => {
     <div>
       <p>Hello World</p>
       <Image id="basic-image" src="/test.jpg" width={400} height={400}></Image>
+      <Image
+        id="width-height-string"
+        src="/test.jpg"
+        width="400"
+        height="400"
+      ></Image>
       <Image id="unsized-image" src="/test.png" unsized></Image>
       <p id="stubtext">This is the index page</p>
     </div>

test/integration/image-component/default/test/index.test.js

@@ -36,6 +36,17 @@ function runTests() {
         return 'result-correct'
       }, /result-correct/)
 
+      await check(async () => {
+        const result = await browser.eval(
+          `document.getElementById('width-height-string').naturalWidth`
+        )
+        if (result === 0) {
+          throw new Error('Incorrectly loaded image')
+        }
+
+        return 'result-correct'
+      }, /result-correct/)
+
       await check(async () => {
         const result = await browser.eval(
           `document.getElementById('unsized-image').naturalWidth`

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

@@ -6,11 +6,17 @@ const Page = () => {
     <div>
       <p>Hello World</p>
       <Image
-        id="with-and-height"
+        id="width-and-height-num"
         src="https://via.placeholder.com/500"
         width={500}
         height={500}
       ></Image>
+      <Image
+        id="width-and-height-str"
+        src="https://via.placeholder.com/500"
+        width="500"
+        height="500"
+      ></Image>
       <Image
         id="unsized-image"
         src="https://via.placeholder.com/100"