Add detection for Google-PageRenderer bot (#31521)

- Fixes #31482
vercel · Nov 17, 2021 · d87dc2b · d87dc2b
1 parent 2ad9dac
commit d87dc2b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/packages/next/server/utils.ts b/packages/next/server/utils.ts
@@ -16,7 +16,7 @@ export function cleanAmpPath(pathname: string): string {
 }
 
 export function isBot(userAgent: string): boolean {
-  return /Googlebot|Mediapartners-Google|AdsBot-Google|googleweblight|Storebot-Google|Bingbot|BingPreview|Slurp|DuckDuckBot|baiduspider|yandex|sogou|LinkedInBot|bitlybot|tumblr|vkShare|quora link preview|facebookexternalhit|facebookcatalog|Twitterbot|applebot|redditbot|Slackbot|Discordbot|WhatsApp|SkypeUriPreview|ia_archiver/i.test(
+  return /Googlebot|Mediapartners-Google|AdsBot-Google|googleweblight|Storebot-Google|Google-PageRenderer|Bingbot|BingPreview|Slurp|DuckDuckBot|baiduspider|yandex|sogou|LinkedInBot|bitlybot|tumblr|vkShare|quora link preview|facebookexternalhit|facebookcatalog|Twitterbot|applebot|redditbot|Slackbot|Discordbot|WhatsApp|SkypeUriPreview|ia_archiver/i.test(
     userAgent
   )
 }
diff --git a/test/integration/react-18/test/index.test.js b/test/integration/react-18/test/index.test.js
@@ -185,6 +185,21 @@ describe('Concurrent mode', () => {
       )
       expect(res.headers.get('etag')).toBeDefined()
     })
+
+    it('should not stream to google pagerender bot', async () => {
+      const res = await fetchViaHTTP(
+        context.appPort,
+        '/ssr',
+        {},
+        {
+          headers: {
+            'user-agent':
+              'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36 Google-PageRenderer Google (+https://developers.google.com/+/web/snippet/)',
+          },
+        }
+      )
+      expect(res.headers.get('etag')).toBeDefined()
+    })
   })
 })