remove condition of onPerfEntry

vercel · Sep 8, 2021 · bc52d29 · bc52d29
1 parent 3ea62ac
commit bc52d29
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 43 deletions.
diff --git a/packages/next/client/index.tsx b/packages/next/client/index.tsx
@@ -279,39 +279,37 @@ export async function initNext(opts: { webpackHMR?: any } = {}) {
     const { component: app, exports: mod } = appEntrypoint
     CachedApp = app as AppComponent
     const exportedReportWebVitals = mod && mod.reportWebVitals
-    if (exportedReportWebVitals) {
-      onPerfEntry = ({
-        id,
-        name,
-        startTime,
-        value,
-        duration,
-        entryType,
-        entries,
-      }): void => {
-        // Combines timestamp with random number for unique ID
-        const uniqueID: string = `${Date.now()}-${
-          Math.floor(Math.random() * (9e12 - 1)) + 1e12
-        }`
-        let perfStartEntry: string | undefined
-
-        if (entries && entries.length) {
-          perfStartEntry = entries[0].startTime
-        }
+    onPerfEntry = ({
+      id,
+      name,
+      startTime,
+      value,
+      duration,
+      entryType,
+      entries,
+    }: any): void => {
+      // Combines timestamp with random number for unique ID
+      const uniqueID: string = `${Date.now()}-${
+        Math.floor(Math.random() * (9e12 - 1)) + 1e12
+      }`
+      let perfStartEntry: string | undefined
+
+      if (entries && entries.length) {
+        perfStartEntry = entries[0].startTime
+      }
 
-        const webVitals: NextWebVitalsMetric = {
-          id: id || uniqueID,
-          name,
-          startTime: startTime || perfStartEntry,
-          value: value == null ? duration : value,
-          label:
-            entryType === 'mark' || entryType === 'measure'
-              ? 'custom'
-              : 'web-vital',
-        }
-        exportedReportWebVitals?.(webVitals)
-        webVitalsCallbacks.forEach((callback) => callback(webVitals))
+      const webVitals: NextWebVitalsMetric = {
+        id: id || uniqueID,
+        name,
+        startTime: startTime || perfStartEntry,
+        value: value == null ? duration : value,
+        label:
+          entryType === 'mark' || entryType === 'measure'
+            ? 'custom'
+            : 'web-vital',
       }
+      exportedReportWebVitals?.(webVitals)
+      webVitalsCallbacks.forEach((callback) => callback(webVitals))
     }
 
     const pageEntrypoint =
@@ -554,9 +552,7 @@ function markHydrateComplete(): void {
   )
   performance.measure('Next.js-hydration', 'beforeRender', 'afterHydrate')
 
-  if (onPerfEntry) {
-    performance.getEntriesByName('Next.js-hydration').forEach(onPerfEntry)
-  }
+  performance.getEntriesByName('Next.js-hydration').forEach(onPerfEntry)
   clearMarks()
 }
 
@@ -577,12 +573,11 @@ function markRenderComplete(): void {
     'beforeRender'
   )
   performance.measure('Next.js-render', 'beforeRender', 'afterRender')
-  if (onPerfEntry) {
-    performance.getEntriesByName('Next.js-render').forEach(onPerfEntry)
-    performance
-      .getEntriesByName('Next.js-route-change-to-render')
-      .forEach(onPerfEntry)
-  }
+  performance.getEntriesByName('Next.js-render').forEach(onPerfEntry)
+  performance
+    .getEntriesByName('Next.js-route-change-to-render')
+    .forEach(onPerfEntry)
+
   clearMarks()
   ;['Next.js-route-change-to-render', 'Next.js-render'].forEach((measure) =>
     performance.clearMeasures(measure)

diff --git a/packages/next/client/performance-relayer.ts b/packages/next/client/performance-relayer.ts
@@ -1,3 +1,4 @@
+/* global location */
 import {
   getCLS,
   getFCP,

diff --git a/packages/next/vitals/index.tsx → packages/next/vitals/index.ts b/packages/next/vitals/index.tsx → packages/next/vitals/index.ts
diff --git a/packages/next/vitals/vitals.tsx → packages/next/vitals/vitals.ts b/packages/next/vitals/vitals.tsx → packages/next/vitals/vitals.ts
@@ -7,12 +7,13 @@ export const webVitalsCallbacks = new Set<ReportWebVitalsCallback>()
 export function useWebVitalsReport(callback: ReportWebVitalsCallback) {
   // call on initial render, in a very early phase
   useState(() => {
+    // typeof window !== 'undefined' &&
     webVitalsCallbacks.add(callback)
   })
 
   useEffect(() => {
     return () => {
       webVitalsCallbacks.delete(callback)
     }
-  })
+  }, [])
 }
diff --git a/test/integration/relay-analytics/test/hook-impl-app.js b/test/integration/relay-analytics/test/hook-impl-app.js
@@ -10,5 +10,3 @@ export default function MyApp({ Component, pageProps }) {
   })
   return <Component {...pageProps} />
 }
-
-export function reportWebVitals() {}