From b0931384f3edd8d6780f8417dd2b8e69288510ad Mon Sep 17 00:00:00 2001
From: Sophia Willows <20146550+sophiabits@users.noreply.github.com>
Date: Wed, 16 Feb 2022 22:40:27 +1300
Subject: [PATCH 1/2] Remove unnecessary check against `undefined` as it's
 already ch ecked at the start of the reducer.

Signed-off-by: Sophia Willows <20146550+sophiabits@users.noreply.github.com>
---
 packages/next/server/config.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/next/server/config.ts b/packages/next/server/config.ts
index 5569927609806a6..1350e98aac7e687 100644
--- a/packages/next/server/config.ts
+++ b/packages/next/server/config.ts
@@ -65,11 +65,7 @@ function assignDefaults(userConfig: { [key: string]: any }) {
         return currentConfig
       }
 
-      if (
-        key === 'experimental' &&
-        value !== undefined &&
-        value !== defaultConfig[key]
-      ) {
+      if (key === 'experimental' && value !== defaultConfig[key]) {
         experimentalWarning()
       }
 

From 0c5d91d7699a778eaa99551b9de2334a75903a53 Mon Sep 17 00:00:00 2001
From: Sophia Willows <20146550+sophiabits@users.noreply.github.com>
Date: Wed, 16 Feb 2022 22:41:37 +1300
Subject: [PATCH 2/2] Only output the exerimental features warning if the user
 actual ly opted into at least one experiment.

Signed-off-by: Sophia Willows <20146550+sophiabits@users.noreply.github.com>
---
 packages/next/server/config.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/next/server/config.ts b/packages/next/server/config.ts
index 1350e98aac7e687..b32276b80bd4ede 100644
--- a/packages/next/server/config.ts
+++ b/packages/next/server/config.ts
@@ -65,7 +65,12 @@ function assignDefaults(userConfig: { [key: string]: any }) {
         return currentConfig
       }
 
-      if (key === 'experimental' && value !== defaultConfig[key]) {
+      if (
+        key === 'experimental' &&
+        value !== defaultConfig[key] &&
+        typeof value === 'object' &&
+        Object.keys(value).length > 0
+      ) {
         experimentalWarning()
       }