sitespeed.io 35.7.4 → 36.0.0-alpha.1

package/lib/plugins/axe/axePostScript.cjs

@@ -1,21 +1,19 @@
 const axe = require('axe-core').source;
-const clone = require('lodash.clonedeep');
-const log = require('intel').getLogger('sitespeedio.plugin.axe');
 
 module.exports = async function runAxe(context) {
   // Insert the axe source
   await context.selenium.driver.executeScript(axe);
 
   const runOptions = context.options.axe.run
-    ? clone(context.options.axe.run)
+    ? structuredClone(context.options.axe.run)
     : {};
   const configureOptions = context.options.axe
-    ? clone(context.options.axe)
+    ? structuredClone(context.options.axe)
     : {};
   delete configureOptions.run;
 
   if (Object.keys(configureOptions).length > 0) {
-    log.info('Configure AXE with %j', configureOptions);
+    context.log.info('Configure AXE with %j', configureOptions);
   }
   await context.selenium.driver.executeScript(
     `axe.configure(${JSON.stringify(configureOptions)});`,
@@ -23,7 +21,7 @@ module.exports = async function runAxe(context) {
   );
 
   if (runOptions) {
-    log.info('Run AXE with run options %j', runOptions);
+    context.log.info('Run AXE with run options %j', runOptions);
   }
 
   // Get the result from axe

package/lib/plugins/axe/index.js

@@ -1,11 +1,11 @@
 import path from 'node:path';
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import axe from 'axe-core';
 const { version: axeVersion } = axe;
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
-const log = intel.getLogger('sitespeedio.plugin.axe');
+const log = getLogger('sitespeedio.plugin.axe');
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
 export default class AxePlugin extends SitespeedioPlugin {

package/lib/plugins/browsertime/analyzer.js

@@ -1,13 +1,12 @@
 import path from 'node:path';
 import merge from 'lodash.merge';
-import forEach from 'lodash.foreach';
 import set from 'lodash.set';
 import get from 'lodash.get';
 import coach from 'coach-core';
 import { BrowsertimeEngine, browserScripts } from 'browsertime';
 const { getDomAdvice } = coach;
-import intel from 'intel';
-const log = intel.getLogger('plugin.browsertime');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('plugin.browsertime');
 
 const defaultBrowsertimeOptions = {
   statistics: true
@@ -141,9 +140,9 @@ function addExtraScripts(scriptsByCategory, pluginScripts) {
   // For all different script in the array
   for (let scripts of pluginScripts) {
     // and then for all scripts in that category
-    forEach(scripts.scripts, function (script, name) {
+    for (const [name, script] of Object.entries(scripts.scripts)) {
       set(scriptsByCategory, scripts.category + '.' + name, script);
-    });
+    }
   }
   return scriptsByCategory;
 }
@@ -153,9 +152,9 @@ function setupAsynScripts(asyncScripts) {
   // For all different script in the array
   for (let scripts of asyncScripts) {
     // and then for all scripts in that category
-    forEach(scripts.scripts, function (script, name) {
+    for (const [name, script] of Object.entries(scripts.scripts)) {
       set(allAsyncScripts, scripts.category + '.' + name, script);
-    });
+    }
   }
   return allAsyncScripts;
 }

package/lib/plugins/browsertime/browsertimeAggregator.js

@@ -1,4 +1,3 @@
-import forEach from 'lodash.foreach';
 import { pushGroupStats, setStatsSummary } from '../../support/statsHelpers.js';
 
 const timings = ['firstPaint', 'timeToDomContentFlushed'];
@@ -62,7 +61,7 @@ export class BrowsertimeAggregator {
         );
       }
 
-      forEach(timings, timing => {
+      for (const timing of timings) {
         if (browsertimeRunData.timings[timing]) {
           pushGroupStats(
             this.statsPerType,
@@ -71,9 +70,11 @@ export class BrowsertimeAggregator {
             browsertimeRunData.timings[timing]
           );
         }
-      });
+      }
 
-      forEach(browsertimeRunData.timings.navigationTiming, (value, name) => {
+      for (const [name, value] of Object.entries(
+        browsertimeRunData.timings.navigationTiming
+      )) {
         if (value) {
           pushGroupStats(
             this.statsPerType,
@@ -82,43 +83,47 @@ export class BrowsertimeAggregator {
             value
           );
         }
-      });
+      }
 
-      forEach(browsertimeRunData.timings.pageTimings, (value, name) => {
+      for (const [name, value] of Object.entries(
+        browsertimeRunData.timings.pageTimings
+      )) {
         pushGroupStats(
           this.statsPerType,
           this.groups[group],
           ['pageTimings', name],
           value
         );
-      });
+      }
 
-      forEach(browsertimeRunData.timings.paintTiming, (value, name) => {
+      for (const [name, value] of Object.entries(
+        browsertimeRunData.timings.paintTiming
+      )) {
         pushGroupStats(
           this.statsPerType,
           this.groups[group],
           ['paintTiming', name],
           value
         );
-      });
+      }
 
-      forEach(browsertimeRunData.timings.userTimings.marks, timing => {
+      for (const timing of browsertimeRunData.timings.userTimings.marks) {
         pushGroupStats(
           this.statsPerType,
           this.groups[group],
           ['userTimings', 'marks', timing.name],
           timing.startTime
         );
-      });
+      }
 
-      forEach(browsertimeRunData.timings.userTimings.measures, timing => {
+      for (const timing of browsertimeRunData.timings.userTimings.measures) {
         pushGroupStats(
           this.statsPerType,
           this.groups[group],
           ['userTimings', 'measures', timing.name],
           timing.duration
         );
-      });
+      }
     }
 
     if (
@@ -134,28 +139,31 @@ export class BrowsertimeAggregator {
     }
 
     // pick up one level of custom metrics
-    forEach(browsertimeRunData.custom, (value, name) => {
-      pushGroupStats(
-        this.statsPerType,
-        this.groups[group],
-        ['custom', name],
-        value
-      );
-    });
-
-    forEach(browsertimeRunData.visualMetrics, (value, name) => {
-      // Sometimes visual elements fails and gives us null values
-      // And skip VisualProgress, ContentfulSpeedIndexProgress and others
-      if (!name.includes('Progress') && value !== null) {
+    if (browsertimeRunData.custom) {
+      for (const [name, value] of Object.entries(browsertimeRunData.custom)) {
         pushGroupStats(
           this.statsPerType,
           this.groups[group],
-          ['visualMetrics', name],
+          ['custom', name],
           value
         );
       }
-    });
+    }
 
+    if (browsertimeRunData.visualMetrics) {
+      for (const [name, value] of Object.entries(
+        browsertimeRunData.visualMetrics
+      )) {
+        if (!name.includes('Progress') && value !== null) {
+          pushGroupStats(
+            this.statsPerType,
+            this.groups[group],
+            ['visualMetrics', name],
+            value
+          );
+        }
+      }
+    }
     if (browsertimeRunData.cpu) {
       if (browsertimeRunData.cpu.longTasks) {
         pushGroupStats(
@@ -226,12 +234,22 @@ export class BrowsertimeAggregator {
         summary.userTimings = {};
         const marksData = {},
           measuresData = {};
-        forEach(object.userTimings.marks, (stats, timingName) => {
-          setStatsSummary(marksData, timingName, stats);
-        });
-        forEach(object.userTimings.measures, (stats, timingName) => {
-          setStatsSummary(measuresData, timingName, stats);
-        });
+        if (object.userTimings.marks) {
+          for (const [timingName, stats] of Object.entries(
+            object.userTimings.marks
+          )) {
+            setStatsSummary(marksData, timingName, stats);
+          }
+        }
+
+        if (object.userTimings.measures) {
+          for (const [timingName, stats] of Object.entries(
+            object.userTimings.measures
+          )) {
+            setStatsSummary(measuresData, timingName, stats);
+          }
+        }
+
         summary.userTimings.marks = marksData;
         summary.userTimings.measures = measuresData;
       } else if ('cpu'.includes(name)) {
@@ -239,13 +257,17 @@ export class BrowsertimeAggregator {
         const categories = {};
         summary.cpu = {};
 
-        forEach(object.cpu.longTasks, (stats, name) => {
-          setStatsSummary(longTasks, name, stats);
-        });
+        if (object.cpu.longTasks) {
+          for (const [name, stats] of Object.entries(object.cpu.longTasks)) {
+            setStatsSummary(longTasks, name, stats);
+          }
+        }
 
-        forEach(object.cpu.categories, (stats, name) => {
-          setStatsSummary(categories, name, stats);
-        });
+        if (object.cpu.categories) {
+          for (const [name, stats] of Object.entries(object.cpu.categories)) {
+            setStatsSummary(categories, name, stats);
+          }
+        }
 
         summary.cpu.longTasks = longTasks;
         summary.cpu.categories = categories;
@@ -255,9 +277,9 @@ export class BrowsertimeAggregator {
         summary.memory = memory.memory;
       } else {
         const categoryData = {};
-        forEach(object[name], (stats, timingName) => {
+        for (const [timingName, stats] of Object.entries(object[name])) {
           setStatsSummary(categoryData, timingName, stats);
-        });
+        }
         summary[name] = categoryData;
       }
       return summary;

package/lib/plugins/browsertime/filmstrip.js

@@ -2,8 +2,8 @@ import { readdir as _readdir } from 'node:fs';
 import { promisify } from 'node:util';
 import path from 'node:path';
 const readdir = promisify(_readdir);
-import intel from 'intel';
-const log = intel.getLogger('sitespeedio.plugin.browsertime');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('sitespeedio.plugin.browsertime');
 
 function findFrame(videoFrames, time) {
   let frame = videoFrames[0];

package/lib/plugins/browsertime/index.js

@@ -2,11 +2,10 @@ import { parse } from 'node:url';
 
 import { default as _merge } from 'lodash.merge';
 
-import intel from 'intel';
-const log = intel.getLogger('plugin.browsertime');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('plugin.browsertime');
 
 import dayjs from 'dayjs';
-import isEmpty from 'lodash.isempty';
 import get from 'lodash.get';
 import { Stats } from 'fast-stats';
 import coach from 'coach-core';
@@ -21,6 +20,7 @@ import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 
 import { summarizeStats } from '../../support/statsHelpers.js';
 import { analyzeUrl } from './analyzer.js';
+import { isEmpty } from '../../support/util.js';
 
 import { BrowsertimeAggregator } from './browsertimeAggregator.js';
 import { metricsPageSummary as DEFAULT_METRICS_PAGE_SUMMARY } from './default/metricsPageSummary.js';

package/lib/plugins/budget/deprecatedVerify.js

@@ -3,8 +3,8 @@
  */
 import get from 'lodash.get';
 import { noop, size } from '../../support/helpers/index.js';
-import intel from 'intel';
-const log = intel.getLogger('sitespeedio.plugin.budget');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('sitespeedio.plugin.budget');
 
 function getItem(url, type, metric, value, limit, limitType) {
   return {

package/lib/plugins/budget/index.js

@@ -1,4 +1,4 @@
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 import { verify as deprecatedVerify } from './deprecatedVerify.js';
 import { verify } from './verify.js';
@@ -6,7 +6,7 @@ import { writeTap } from './tap.js';
 import { writeJunit } from './junit.js';
 import { writeJson } from './json.js';
 
-const log = intel.getLogger('sitespeedio.plugin.budget');
+const log = getLogger('sitespeedio.plugin.budget');
 
 export default class BudgetPlugin extends SitespeedioPlugin {
   constructor(options, context, queue) {

package/lib/plugins/budget/json.js

@@ -1,8 +1,8 @@
 import { writeFileSync } from 'node:fs';
 import path from 'node:path';
 
-import intel from 'intel';
-const log = intel.getLogger('sitespeedio.plugin.budget');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('sitespeedio.plugin.budget');
 
 export function writeJson(results, dir) {
   const file = path.join(dir, 'budgetResult.json');

package/lib/plugins/budget/junit.js

@@ -3,8 +3,8 @@ import { parse } from 'node:url';
 
 import jrp from 'junit-report-builder';
 
-import intel from 'intel';
-const log = intel.getLogger('sitespeedio.plugin.budget');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('sitespeedio.plugin.budget');
 
 import merge from 'lodash.merge';
 

package/lib/plugins/budget/tap.js

@@ -2,8 +2,8 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { EOL } from 'node:os';
 import tap from 'tape';
-import intel from 'intel';
-const log = intel.getLogger('sitespeedio.plugin.budget');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('sitespeedio.plugin.budget');
 
 export function writeTap(results, dir) {
   const file = path.join(dir, 'budget.tap');

package/lib/plugins/budget/verify.js

@@ -3,8 +3,8 @@
  */
 import get from 'lodash.get';
 import merge from 'lodash.merge';
-import intel from 'intel';
-const log = intel.getLogger('sitespeedio.plugin.budget');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('sitespeedio.plugin.budget');
 import friendlyNames from '../../support/friendlynames.js';
 import { time } from '../../support/helpers/time.js';
 

package/lib/plugins/coach/aggregator.js

@@ -1,4 +1,3 @@
-import forEach from 'lodash.foreach';
 import { pushGroupStats, setStatsSummary } from '../../support/statsHelpers.js';
 
 export class CoachAggregator {
@@ -20,11 +19,10 @@ export class CoachAggregator {
       coachData.advice.score
     );
 
-    forEach(coachData.advice, (category, categoryName) => {
+    for (const [categoryName, category] of Object.entries(coachData.advice)) {
       if (category.score === undefined) {
-        return;
+        continue;
       }
-      // Push the score per category
       pushGroupStats(
         this.statsPerCategory,
         this.groups[group],
@@ -32,15 +30,15 @@ export class CoachAggregator {
         category.score
       );
 
-      forEach(category.adviceList, (advice, adviceName) => {
+      for (const [adviceName, advice] of Object.entries(category.adviceList)) {
         pushGroupStats(
           this.statsPerCategory,
           this.groups[group],
           [categoryName, adviceName],
           advice.score
         );
-      });
-    });
+      }
+    }
   }
   summarize() {
     if (Object.keys(this.statsPerCategory).length === 0) {
@@ -65,9 +63,9 @@ export class CoachAggregator {
       } else {
         const categoryData = {};
 
-        forEach(type[categoryName], (stats, name) => {
+        for (const [name, stats] of Object.entries(type[categoryName])) {
           setStatsSummary(categoryData, name, stats);
-        });
+        }
 
         summary[categoryName] = categoryData;
       }

package/lib/plugins/coach/index.js

@@ -1,7 +1,7 @@
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 import { CoachAggregator } from './aggregator.js';
-import intel from 'intel';
-const log = intel.getLogger('plugin.coach');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('plugin.coach');
 
 const DEFAULT_METRICS_RUN = [];
 

package/lib/plugins/compare/helper.js

@@ -3,9 +3,9 @@ import path from 'node:path';
 
 import { execa } from 'execa';
 import { Stats } from 'fast-stats';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { decimals } from '../../support/helpers/index.js';
-const log = intel.getLogger('sitespeedio.plugin.compare');
+const log = getLogger('sitespeedio.plugin.compare');
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 

package/lib/plugins/compare/index.js

@@ -3,7 +3,7 @@ import { readFileSync } from 'node:fs';
 import path from 'node:path';
 
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import merge from 'lodash.merge';
 import get from 'lodash.get';
 import dayjs from 'dayjs';
@@ -19,7 +19,7 @@ import { getBaseline, saveBaseline } from './baseline.js';
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
-const log = intel.getLogger('sitespeedio.plugin.compare');
+const log = getLogger('sitespeedio.plugin.compare');
 const defaultConfig = {};
 
 function urlToId(url, options) {

package/lib/plugins/crawler/index.js

@@ -1,9 +1,9 @@
 import path from 'node:path';
 import merge from 'lodash.merge';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 
-const log = intel.getLogger('sitespeedio.plugin.crawler');
+const log = getLogger('sitespeedio.plugin.crawler');
 import Crawler from 'simplecrawler';
 import { throwIfMissing } from '../../support/util.js';
 import { toArray } from '../../support/util.js';
@@ -60,10 +60,7 @@ export default class CrawlerPlugin extends SitespeedioPlugin {
           for (let cookieParts of cookies) {
             const parts = new Array(
               cookieParts.slice(0, cookieParts.indexOf('=')),
-              cookieParts.slice(
-                cookieParts.indexOf('=') + 1,
-                cookieParts.length
-              )
+              cookieParts.slice(cookieParts.indexOf('=') + 1)
             );
             crawler.cookies.add(parts[0], parts[1]);
           }

package/lib/plugins/crux/index.js

@@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import merge from 'lodash.merge';
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 
@@ -11,7 +11,7 @@ import { throwIfMissing } from '../../support/util.js';
 import { repackage } from './repackage.js';
 import { send } from './send.js';
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
-const log = intel.getLogger('plugin.crux');
+const log = getLogger('plugin.crux');
 
 const defaultConfig = {};
 

package/lib/plugins/crux/send.js

@@ -1,6 +1,6 @@
 import { request as _request } from 'node:https';
-import intel from 'intel';
-const log = intel.getLogger('plugin.crux');
+import { getLogger } from '@sitespeed.io/log';
+const log = getLogger('plugin.crux');
 
 export async function send(url, key, formFactor, shouldWeTestTheURL) {
   let data = shouldWeTestTheURL ? { url } : { origin: url };

package/lib/plugins/domains/aggregator.js

@@ -1,13 +1,11 @@
 import { parse } from 'node:url';
 
 import { Stats } from 'fast-stats';
-import intel from 'intel';
-import isEmpty from 'lodash.isempty';
-import reduce from 'lodash.reduce';
+import { getLogger } from '@sitespeed.io/log';
 
 import { summarizeStats } from '../../support/statsHelpers.js';
 
-const log = intel.getLogger('sitespeedio.plugin.domains');
+const log = getLogger('sitespeedio.plugin.domains');
 
 const timingNames = [
   'blocked',
@@ -39,22 +37,22 @@ function getDomain(domainName) {
 }
 
 function calc(domains) {
-  return reduce(
-    domains,
-    (summary, domainStats, domainName) => {
+  return Object.entries(domains).reduce(
+    (summary, [domainName, domainStats]) => {
       const domainSummary = {
         requestCount: domainStats.requestCount,
         domainName
       };
 
       const stats = summarizeStats(domainStats.totalTime);
-      if (!isEmpty(stats)) {
+      if (stats && Object.keys(stats).length > 0) {
         domainSummary.totalTime = stats;
       }
+
       for (const name of timingNames) {
-        const stats = summarizeStats(domainStats[name]);
-        if (!isEmpty(stats)) {
-          domainSummary[name] = stats;
+        const stat = summarizeStats(domainStats[name]);
+        if (stat && Object.keys(stat).length > 0) {
+          domainSummary[name] = stat;
         }
       }
 

package/lib/plugins/domains/index.js

@@ -1,6 +1,6 @@
-import isEmpty from 'lodash.isempty';
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 import { DomainsAggregator } from './aggregator.js';
+import { isEmpty } from '../../support/util.js';
 
 export default class DomainsPlugin extends SitespeedioPlugin {
   constructor(options, context, queue) {

package/lib/plugins/gcs/index.js

@@ -2,26 +2,25 @@ import path from 'node:path';
 import fs from 'node:fs';
 
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
-import readdir from 'recursive-readdir';
+
 // Documentation of @google-cloud/storage: https://cloud.google.com/nodejs/docs/reference/storage/2.3.x/Bucket#upload
 import { Storage } from '@google-cloud/storage';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 import { throwIfMissing } from '../../support/util.js';
+import { recursiveReaddir } from '../../support/fileUtil.js';
 
-const log = intel.getLogger('sitespeedio.plugin.gcs');
-
-function ignoreDirectories(file, stats) {
-  return stats.isDirectory();
-}
+const log = getLogger('sitespeedio.plugin.gcs');
 
 async function uploadLatestFiles(dir, gcsOptions, prefix) {
-  const storage = new Storage({
+  const config = {
     projectId: gcsOptions.projectId,
     keyFilename: gcsOptions.key
-  });
+  };
+
+  const storage = new Storage(config);
   const bucket = storage.bucket(gcsOptions.bucketname);
 
-  const files = await readdir(dir, [ignoreDirectories]);
+  const files = await recursiveReaddir(dir, true);
   const promises = [];
 
   for (let file of files) {
@@ -31,14 +30,17 @@ async function uploadLatestFiles(dir, gcsOptions, prefix) {
 }
 
 async function upload(dir, gcsOptions, prefix) {
-  const files = await readdir(dir);
+  const files = await recursiveReaddir(dir, true);
   const promises = [];
 
   const storage = new Storage({
-    projectId: gcsOptions.projectId,
-    keyFilename: gcsOptions.key
+    projectId: gcsOptions.projectId
   });
 
+  if (gcsOptions.key) {
+    storage.keyFilename = gcsOptions.key;
+  }
+
   const bucket = storage.bucket(gcsOptions.bucketname);
 
   for (let file of files) {
@@ -71,9 +73,8 @@ async function uploadFile(
     validation: 'crc32c',
     gzip: !!gcsOptions.gzip,
     metadata: {
-      metadata: {
-        cacheControl: 'public, max-age=' + noCacheTime ? 0 : 31_536_000
-      }
+      // eslint-disable-next-line unicorn/numeric-separators-style
+      cacheControl: 'public, max-age=' + (noCacheTime ? 0 : 31536000)
     }
   };