From ec39aa46dc40e4b2a86e6500fdf5b48d30c1fa0d Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Tue, 4 Feb 2020 14:10:40 -0600
Subject: [PATCH] Update optimize event with static 404 status (#10420)

Co-authored-by: Joe Haddad <timer150@gmail.com>
---
 packages/next/build/index.ts                  |  1 +
 packages/next/telemetry/events/build.ts       |  1 +
 test/integration/telemetry/test/index.test.js | 11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
index bf2053faea..4d4307882b 100644
--- a/packages/next/build/index.ts
+++ b/packages/next/build/index.ts
@@ -773,6 +773,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
       durationInSeconds: analysisEnd[0],
       staticPageCount: staticPages.size,
       ssrPageCount: pagePaths.length - staticPages.size,
+      hasStatic404: useStatic404,
     })
   )
 
diff --git a/packages/next/telemetry/events/build.ts b/packages/next/telemetry/events/build.ts
index 7ea9f882a2..8ab16b812a 100644
--- a/packages/next/telemetry/events/build.ts
+++ b/packages/next/telemetry/events/build.ts
@@ -40,6 +40,7 @@ type EventBuildOptimized = {
   ssrPageCount: number
   hasDunderPages: boolean
   hasTestPages: boolean
+  hasStatic404: boolean
 }
 
 export function eventBuildOptimize(
diff --git a/test/integration/telemetry/test/index.test.js b/test/integration/telemetry/test/index.test.js
index 32b0979b71..51ccb25fa1 100644
--- a/test/integration/telemetry/test/index.test.js
+++ b/test/integration/telemetry/test/index.test.js
@@ -8,6 +8,7 @@ import {
   findPort,
   killApp,
   waitFor,
+  nextBuild,
 } from 'next-test-utils'
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 2
@@ -117,6 +118,16 @@ describe('Telemetry CLI', () => {
     expect(event2).toMatch(/hasTestPages.*?true/)
   })
 
+  it('detect static 404 correctly for `next build`', async () => {
+    const { stderr } = await nextBuild(appDir, [], {
+      stderr: true,
+      env: { NEXT_TELEMETRY_DEBUG: 1 },
+    })
+
+    const event1 = /NEXT_BUILD_OPTIMIZED[\s\S]+?{([\s\S]+?)}/.exec(stderr).pop()
+    expect(event1).toMatch(/hasStatic404.*?true/)
+  })
+
   it('detects isSrcDir dir correctly for `next dev`', async () => {
     let port = await findPort()
     let stderr = ''
-- 
GitLab