From d964dd71e1af0a93939d064facf1c8d064b41a3e Mon Sep 17 00:00:00 2001
From: Rifai <abdelrahman.rifai@gmail.com>
Date: Wed, 4 Mar 2020 14:37:44 +0100
Subject: [PATCH 1/4] fix: remove minimum-scale from default viewport

---
 packages/next/next-server/lib/head.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/next/next-server/lib/head.tsx b/packages/next/next-server/lib/head.tsx
index f9aad9a57b13b64..3686f7144999c65 100644
--- a/packages/next/next-server/lib/head.tsx
+++ b/packages/next/next-server/lib/head.tsx
@@ -12,10 +12,7 @@ export function defaultHead(inAmpMode = false) {
   const head = [<meta charSet="utf-8" />]
   if (!inAmpMode) {
     head.push(
-      <meta
-        name="viewport"
-        content="width=device-width,minimum-scale=1,initial-scale=1"
-      />
+      <meta name="viewport" content="width=device-width, initial-scale=1" />
     )
   }
   return head

From bbcb29ff579fe150aec4f206f77129e4e1531a77 Mon Sep 17 00:00:00 2001
From: Rifai <abdelrahman.rifai@gmail.com>
Date: Wed, 4 Mar 2020 15:08:34 +0100
Subject: [PATCH 2/4] update test

---
 test/integration/client-navigation/test/rendering.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/client-navigation/test/rendering.js b/test/integration/client-navigation/test/rendering.js
index 4bc7ef238d89d22..1003cf02996877f 100644
--- a/test/integration/client-navigation/test/rendering.js
+++ b/test/integration/client-navigation/test/rendering.js
@@ -52,7 +52,7 @@ export default function(render, fetch) {
     test('header renders default viewport', async () => {
       const html = await render('/default-head')
       expect(html).toContain(
-        '<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1"/>'
+        '<meta name="viewport" content="width=device-width, ,initial-scale=1"/>'
       )
     })
 

From 3ae572607db92b55d6710a230b3f32f58e1c6ffe Mon Sep 17 00:00:00 2001
From: Rifai <abdelrahman.rifai@gmail.com>
Date: Wed, 4 Mar 2020 15:11:10 +0100
Subject: [PATCH 3/4] remove extra comma

---
 test/integration/client-navigation/test/rendering.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/client-navigation/test/rendering.js b/test/integration/client-navigation/test/rendering.js
index 1003cf02996877f..1038b67357d487a 100644
--- a/test/integration/client-navigation/test/rendering.js
+++ b/test/integration/client-navigation/test/rendering.js
@@ -52,7 +52,7 @@ export default function(render, fetch) {
     test('header renders default viewport', async () => {
       const html = await render('/default-head')
       expect(html).toContain(
-        '<meta name="viewport" content="width=device-width, ,initial-scale=1"/>'
+        '<meta name="viewport" content="width=device-width, initial-scale=1"/>'
       )
     })
 

From 1bccd590c38f8f197cfadf4f76b15679d854c61d Mon Sep 17 00:00:00 2001
From: Rifai <abdelrahman.rifai@gmail.com>
Date: Wed, 4 Mar 2020 21:34:26 +0100
Subject: [PATCH 4/4] drop initial-scale

---
 packages/next/next-server/lib/head.tsx               | 4 +---
 test/integration/client-navigation/test/rendering.js | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/next/next-server/lib/head.tsx b/packages/next/next-server/lib/head.tsx
index 3686f7144999c65..b1c5f81bca12312 100644
--- a/packages/next/next-server/lib/head.tsx
+++ b/packages/next/next-server/lib/head.tsx
@@ -11,9 +11,7 @@ type WithInAmpMode = {
 export function defaultHead(inAmpMode = false) {
   const head = [<meta charSet="utf-8" />]
   if (!inAmpMode) {
-    head.push(
-      <meta name="viewport" content="width=device-width, initial-scale=1" />
-    )
+    head.push(<meta name="viewport" content="width=device-width" />)
   }
   return head
 }
diff --git a/test/integration/client-navigation/test/rendering.js b/test/integration/client-navigation/test/rendering.js
index 1038b67357d487a..f4314d66cbd7d81 100644
--- a/test/integration/client-navigation/test/rendering.js
+++ b/test/integration/client-navigation/test/rendering.js
@@ -52,7 +52,7 @@ export default function(render, fetch) {
     test('header renders default viewport', async () => {
       const html = await render('/default-head')
       expect(html).toContain(
-        '<meta name="viewport" content="width=device-width, initial-scale=1"/>'
+        '<meta name="viewport" content="width=device-width"/>'
       )
     })