From 303dc676c7263e6a75677ea101747e54eb647dd9 Mon Sep 17 00:00:00 2001
From: Kyle Mathews <mathews.kyle@gmail.com>
Date: Fri, 27 Nov 2020 16:16:56 -0800
Subject: [PATCH 1/2] feat(gatsby): people who are using a flag, invite them to
 try out other flags

---
 .../__snapshots__/handle-flags.ts.snap        |  4 ++
 .../src/utils/__tests__/handle-flags.ts       |  7 +++
 packages/gatsby/src/utils/handle-flags.ts     | 47 ++++++++++++-------
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/packages/gatsby/src/utils/__tests__/__snapshots__/handle-flags.ts.snap b/packages/gatsby/src/utils/__tests__/__snapshots__/handle-flags.ts.snap
index b07d4965c35ee..5d046aa2c4d17 100644
--- a/packages/gatsby/src/utils/__tests__/__snapshots__/handle-flags.ts.snap
+++ b/packages/gatsby/src/utils/__tests__/__snapshots__/handle-flags.ts.snap
@@ -41,6 +41,10 @@ Object {
 - ALL_COMMANDS · (Umbrella Issue (test)) · test
 - DEV_SSR · (Umbrella Issue (https://github.com/gatsbyjs/gatsby/discussions/28138)) · SSR pages on full reloads during develop. Helps you detect SSR bugs and fix them without needing to do full builds.
 - QUERY_ON_DEMAND · (Umbrella Issue (https://github.com/gatsbyjs/gatsby/discussions/27620)) · Only run queries when needed instead of running all queries upfront. Speeds starting the develop server.
+
+There are 2 other flags available that you might be interested in:
+- ONLY_BUILDS · (Umbrella Issue (test)) · test
+- YET_ANOTHER · (Umbrella Issue (test)) · test
 ",
 }
 `;
diff --git a/packages/gatsby/src/utils/__tests__/handle-flags.ts b/packages/gatsby/src/utils/__tests__/handle-flags.ts
index 25322498bb4ea..4824781c65f75 100644
--- a/packages/gatsby/src/utils/__tests__/handle-flags.ts
+++ b/packages/gatsby/src/utils/__tests__/handle-flags.ts
@@ -46,6 +46,13 @@ describe(`handle flags`, () => {
       description: `test`,
       umbrellaIssue: `test`,
     },
+    {
+      name: `YET_ANOTHER`,
+      env: `GATSBY_EXPERIMENTAL_SOMETHING_COOL2`,
+      command: `all`,
+      description: `test`,
+      umbrellaIssue: `test`,
+    },
   ]
 
   const configFlags = {
diff --git a/packages/gatsby/src/utils/handle-flags.ts b/packages/gatsby/src/utils/handle-flags.ts
index c2fcf0321a69e..b356a9bb3ce01 100644
--- a/packages/gatsby/src/utils/handle-flags.ts
+++ b/packages/gatsby/src/utils/handle-flags.ts
@@ -56,31 +56,42 @@ const handleFlags = (
   // TODO remove flags that longer exist.
   //  w/ message of thanks
 
+  const generateFlagLine = (flag): string => {
+    let message = ``
+    message += `\n- ${flag.name}`
+    if (flag.experimental) {
+      message += ` · ${chalk.white.bgRed.bold(`EXPERIMENTAL`)}`
+    }
+    if (flag.umbrellaIssue) {
+      message += ` · (${terminalLink(`Umbrella Issue`, flag.umbrellaIssue)})`
+    }
+    message += ` · ${flag.description}`
+
+    return message
+  }
+
   let message = ``
   //  Create message about what flags are active.
   if (enabledConfigFlags.length > 0) {
     message = `The following flags are active:`
     enabledConfigFlags.forEach(flag => {
-      message += `\n- ${flag.name}`
-      if (flag.experimental) {
-        message += ` · ${chalk.white.bgRed.bold(`EXPERIMENTAL`)}`
-      }
-      if (flag.umbrellaIssue) {
-        message += ` · (${terminalLink(`Umbrella Issue`, flag.umbrellaIssue)})`
-      }
-      message += ` · ${flag.description}`
+      message += generateFlagLine(flag)
     })
 
-    // TODO renable once "gatsby flags` CLI command exists.
-    // Suggest enabling other flags if they're not trying them all.
-    // const otherFlagsCount = flags.length - enabledConfigFlags.length
-    // if (otherFlagsCount > 0) {
-    // message += `\n\nThere ${
-    // otherFlagsCount === 1
-    // ? `is one other flag`
-    // : `are ${otherFlagsCount} other flags`
-    // } available you can test — run "gatsby flags" to enable them`
-    // }
+    const otherFlagsCount = flags.length - enabledConfigFlags.length
+    if (otherFlagsCount > 0) {
+      message += `\n\nThere ${
+        otherFlagsCount === 1
+          ? `is one other flag`
+          : `are ${otherFlagsCount} other flags`
+      } available that you might be interested in:`
+
+      flags.forEach(flag => {
+        if (!enabledConfigFlags.some(f => f.name === flag.name)) {
+          message += generateFlagLine(flag)
+        }
+      })
+    }
 
     message += `\n`
   }

From b46bf1aabea7ba161b46ede23cc4106e4e5e424c Mon Sep 17 00:00:00 2001
From: Kyle Mathews <mathews.kyle@gmail.com>
Date: Fri, 27 Nov 2020 21:38:59 -0800
Subject: [PATCH 2/2] Avoid scaling problems

---
 packages/gatsby/src/utils/handle-flags.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/gatsby/src/utils/handle-flags.ts b/packages/gatsby/src/utils/handle-flags.ts
index b356a9bb3ce01..2253cfb9577b3 100644
--- a/packages/gatsby/src/utils/handle-flags.ts
+++ b/packages/gatsby/src/utils/handle-flags.ts
@@ -86,8 +86,10 @@ const handleFlags = (
           : `are ${otherFlagsCount} other flags`
       } available that you might be interested in:`
 
+      const enabledFlagsSet = new Set()
+      enabledConfigFlags.forEach(f => enabledFlagsSet.add(f.name))
       flags.forEach(flag => {
-        if (!enabledConfigFlags.some(f => f.name === flag.name)) {
+        if (!enabledFlagsSet.has(flag.name)) {
           message += generateFlagLine(flag)
         }
       })