Add even more baselinei updates

GoogleChrome · Sep 27, 2024 · ee6cfb2 · ee6cfb2
1 parent d148da5
commit ee6cfb2
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 83 deletions.
diff --git a/rollup.config.js b/rollup.config.js
@@ -24,6 +24,7 @@ const configurePlugins = ({module}) => {
         [
           '@babel/preset-env',
           {
+            bugfixes: true,
             targets: [
               // Match browsers supporting "Baseline Widely Available" features:
               // https://web.dev/baseline
@@ -35,7 +36,6 @@ const configurePlugins = ({module}) => {
               'and_ff >0 and last 2.5 years',
               'ios >0 and last 2.5 years',
             ],
-            bugfixes: true,
           },
         ],
       ],
@@ -57,24 +57,24 @@ const configs = [
     },
     plugins: configurePlugins({module: true}),
   },
-  // {
-  //   input: 'dist/modules/index.js',
-  //   output: {
-  //     format: 'umd',
-  //     file: `./dist/web-vitals.umd.cjs`,
-  //     name: 'webVitals',
-  //   },
-  //   plugins: configurePlugins({module: false}),
-  // },
-  // {
-  //   input: 'dist/modules/index.js',
-  //   output: {
-  //     format: 'iife',
-  //     file: './dist/web-vitals.iife.js',
-  //     name: 'webVitals',
-  //   },
-  //   plugins: configurePlugins({module: false}),
-  // },
+  {
+    input: 'dist/modules/index.js',
+    output: {
+      format: 'umd',
+      file: `./dist/web-vitals.umd.cjs`,
+      name: 'webVitals',
+    },
+    plugins: configurePlugins({module: false}),
+  },
+  {
+    input: 'dist/modules/index.js',
+    output: {
+      format: 'iife',
+      file: './dist/web-vitals.iife.js',
+      name: 'webVitals',
+    },
+    plugins: configurePlugins({module: false}),
+  },
   {
     input: 'dist/modules/attribution/index.js',
     output: {
@@ -83,24 +83,24 @@ const configs = [
     },
     plugins: configurePlugins({module: true}),
   },
-  // {
-  //   input: 'dist/modules/attribution/index.js',
-  //   output: {
-  //     format: 'umd',
-  //     file: `./dist/web-vitals.attribution.umd.cjs`,
-  //     name: 'webVitals',
-  //   },
-  //   plugins: configurePlugins({module: false}),
-  // },
-  // {
-  //   input: 'dist/modules/attribution/index.js',
-  //   output: {
-  //     format: 'iife',
-  //     file: './dist/web-vitals.attribution.iife.js',
-  //     name: 'webVitals',
-  //   },
-  //   plugins: configurePlugins({module: false}),
-  // },
+  {
+    input: 'dist/modules/attribution/index.js',
+    output: {
+      format: 'umd',
+      file: `./dist/web-vitals.attribution.umd.cjs`,
+      name: 'webVitals',
+    },
+    plugins: configurePlugins({module: false}),
+  },
+  {
+    input: 'dist/modules/attribution/index.js',
+    output: {
+      format: 'iife',
+      file: './dist/web-vitals.attribution.iife.js',
+      name: 'webVitals',
+    },
+    plugins: configurePlugins({module: false}),
+  },
 ];
 
 export default configs;
diff --git a/src/attribution/onCLS.ts b/src/attribution/onCLS.ts
@@ -53,12 +53,7 @@ const attributeCLS = (metric: CLSMetric): CLSMetricWithAttribution => {
     }
   }
 
-  // Use Object.assign to set property to keep tsc happy.
-  const metricWithAttribution: CLSMetricWithAttribution = Object.assign(
-    metric,
-    {attribution},
-  );
-  return metricWithAttribution;
+  return {...metric, attribution};
 };
 
 /**

diff --git a/src/attribution/onFCP.ts b/src/attribution/onFCP.ts
@@ -35,7 +35,7 @@ const attributeFCP = (metric: FCPMetric): FCPMetricWithAttribution => {
 
   if (metric.entries.length) {
     const navigationEntry = getNavigationEntry();
-    const fcpEntry = metric.entries[metric.entries.length - 1];
+    const fcpEntry = metric.entries.at(-1);
 
     if (navigationEntry) {
       const activationStart = navigationEntry.activationStart || 0;
@@ -51,12 +51,7 @@ const attributeFCP = (metric: FCPMetric): FCPMetricWithAttribution => {
     }
   }
 
-  // Use Object.assign to set property to keep tsc happy.
-  const metricWithAttribution: FCPMetricWithAttribution = Object.assign(
-    metric,
-    {attribution},
-  );
-  return metricWithAttribution;
+  return {...metric, attribution};
 };
 
 /**

diff --git a/src/attribution/onINP.ts b/src/attribution/onINP.ts
@@ -117,7 +117,9 @@ const groupEntriesByRenderTime = (entry: PerformanceEventTiming) => {
 
   // Iterate over all previous render times in reverse order to find a match.
   // Go in reverse since the most likely match will be at the end.
-  for (const potentialGroup of pendingEntriesGroups) {
+  for (let i = pendingEntriesGroups.length - 1; i >= 0; i--) {
+    const potentialGroup = pendingEntriesGroups[i];
+
     // If a group's render time is within 8ms of the entry's render time,
     // assume they were part of the same frame and add it to the group.
     if (Math.abs(renderTime - potentialGroup.renderTime) <= 8) {
@@ -285,12 +287,7 @@ const attributeINP = (metric: INPMetric): INPMetricWithAttribution => {
     loadState: getLoadState(firstEntry.startTime),
   };
 
-  // Use Object.assign to set property to keep tsc happy.
-  const metricWithAttribution: INPMetricWithAttribution = Object.assign(
-    metric,
-    {attribution},
-  );
-  return metricWithAttribution;
+  return {...metric, attribution};
 };
 
 /**

diff --git a/src/attribution/onLCP.ts b/src/attribution/onLCP.ts
@@ -37,7 +37,8 @@ const attributeLCP = (metric: LCPMetric): LCPMetricWithAttribution => {
     const navigationEntry = getNavigationEntry();
     if (navigationEntry) {
       const activationStart = navigationEntry.activationStart || 0;
-      const lcpEntry = metric.entries[metric.entries.length - 1];
+      // The `metric.entries.length` check ensures there will be an entry.
+      const lcpEntry = metric.entries.at(-1)!;
       const lcpResourceEntry =
         lcpEntry.url &&
         performance
@@ -83,12 +84,7 @@ const attributeLCP = (metric: LCPMetric): LCPMetricWithAttribution => {
     }
   }
 
-  // Use Object.assign to set property to keep tsc happy.
-  const metricWithAttribution: LCPMetricWithAttribution = Object.assign(
-    metric,
-    {attribution},
-  );
-  return metricWithAttribution;
+  return {...metric, attribution};
 };
 
 /**

diff --git a/src/attribution/onTTFB.ts b/src/attribution/onTTFB.ts
@@ -73,12 +73,7 @@ const attributeTTFB = (metric: TTFBMetric): TTFBMetricWithAttribution => {
     };
   }
 
-  // Use Object.assign to set property to keep tsc happy.
-  const metricWithAttribution: TTFBMetricWithAttribution = Object.assign(
-    metric,
-    {attribution},
-  );
-  return metricWithAttribution;
+  return {...metric, attribution};
 };
 
 /**

diff --git a/src/lib/bindReporter.ts b/src/lib/bindReporter.ts
@@ -35,7 +35,7 @@ export const bindReporter = <MetricName extends MetricType['name']>(
   thresholds: MetricRatingThresholds,
   reportAllChanges?: boolean,
 ) => {
-  let prevValue: number;
+  let prevValue: number = -1;
   let delta: number;
   return (forceReport?: boolean) => {
     if (metric.value >= 0) {
@@ -46,7 +46,7 @@ export const bindReporter = <MetricName extends MetricType['name']>(
         // value exists (which can happen in the case of the document becoming
         // hidden when the metric value is 0).
         // See: https://github.com/GoogleChrome/web-vitals/issues/14
-        if (delta || prevValue === undefined) {
+        if (delta || prevValue < 0) {
           prevValue = metric.value;
           metric.delta = delta;
           metric.rating = getRating(metric.value, thresholds);

diff --git a/src/lib/getSelector.ts b/src/lib/getSelector.ts
@@ -41,7 +41,7 @@ export const getSelector = (node: Node | null | undefined) => {
       }
       node = el.parentNode;
     }
-  } catch (err) {
+  } catch {
     // Do nothing...
   }
   return sel;

diff --git a/src/lib/initMetric.ts b/src/lib/initMetric.ts
@@ -47,7 +47,7 @@ export const initMetric = <MetricName extends MetricType['name']>(
 
   return {
     name,
-    value: value,
+    value,
     rating: 'good' as const, // If needed, will be updated when reported. `const` to keep the type from widening to `string`.
     delta: 0,
     entries,

diff --git a/src/lib/interactions.ts b/src/lib/interactions.ts
@@ -95,8 +95,7 @@ export const processInteractionEntry = (entry: PerformanceEventTiming) => {
   if (!(entry.interactionId || entry.entryType === 'first-input')) return;
 
   // The least-long of the 10 longest interactions.
-  const minLongestInteraction =
-    longestInteractionList[longestInteractionList.length - 1];
+  const minLongestInteraction = longestInteractionList.at(-1);
 
   const existingInteraction = longestInteractionMap.get(entry.interactionId!);
 
@@ -105,7 +104,8 @@ export const processInteractionEntry = (entry: PerformanceEventTiming) => {
   if (
     existingInteraction ||
     longestInteractionList.length < MAX_INTERACTIONS_TO_CONSIDER ||
-    entry.duration > minLongestInteraction.latency
+    // If the above conditions are false, `minLongestInteraction` will be set.
+    entry.duration > minLongestInteraction!.latency
   ) {
     // If the interaction already exists, update it. Otherwise create one.
     if (existingInteraction) {

diff --git a/src/lib/observe.ts b/src/lib/observe.ts
@@ -48,12 +48,10 @@ export const observe = <K extends keyof PerformanceEntryMap>(
           callback(list.getEntries() as PerformanceEntryMap[K]);
         });
       });
-      po.observe(
-        Object.assign({type, buffered: true}, opts) as PerformanceObserverInit,
-      );
+      po.observe({type, buffered: true, ...opts} as PerformanceObserverInit);
       return po;
     }
-  } catch (e) {
+  } catch {
     // Do nothing.
   }
   return;

diff --git a/src/onCLS.ts b/src/onCLS.ts
@@ -67,15 +67,16 @@ export const onCLS = (
           // Only count layout shifts without recent user input.
           if (!entry.hadRecentInput) {
             const firstSessionEntry = sessionEntries[0];
-            const lastSessionEntry = sessionEntries[sessionEntries.length - 1];
+            const lastSessionEntry = sessionEntries.at(-1);
 
             // If the entry occurred less than 1 second after the previous entry
             // and less than 5 seconds after the first entry in the session,
             // include the entry in the current session. Otherwise, start a new
             // session.
             if (
               sessionValue &&
-              entry.startTime - lastSessionEntry.startTime < 1000 &&
+              // `lastSessionEntry` will be defined if `sessionsValue` is.
+              entry.startTime - lastSessionEntry!.startTime < 1000 &&
               entry.startTime - firstSessionEntry.startTime < 5000
             ) {
               sessionValue += entry.value;