sitespeed.io 35.7.5 → 36.0.0-alpha.1

package/.dockerignore

@@ -4,4 +4,7 @@
 !package.json
 !LICENSE
 !npm-shrinkwrap.json
-!docker
+!docker/adb
+!docker/scripts
+!tools/postinstall.js
+!docker/webpagereplay/

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # CHANGELOG - sitespeed.io  (we use [semantic versioning](https://semver.org))
 
+## 36.0.0 - UNRELEASED
+
+36.0.0 will be released late January 2025.
+
+### Breaking
+* Only download green2url data when you specifically ask for it [#4354](https://github.com/sitespeedio/sitespeed.io/pull/4354). To install you need to run `DOWNLOAD_URL2GREEN=true npm install sitespeed.io`. The green2url is also updated to use the latest availible data by late 2024. This saves 80 mb in default downloading.
+* Make sure you can't run with both `--cpu` and `--collectProfileRun` since that do not make any sense [#4298](https://github.com/sitespeedio/sitespeed.io/pull/4298)
+* Use correct name in Browsertime: userTimingAllowList instead of whitelist [#4346](https://github.com/sitespeedio/sitespeed.io/pull/4346).
+* Plugins need to update the plugin dependency to @sitespeed.io/plugin 1.0.0 or higher.
+* Replace intel (log) with sitespeed.io/log [#4381](https://github.com/sitespeedio/sitespeed.io/pull/4381). This remove the logToFile option in the cli. Instead of use that option, pipe the output to the file you want.
+
+### Added
+* Update to Coach-core 8.1.1 [#4363](https://github.com/sitespeedio/sitespeed.io/pull/4363)
+* Use the offical Slack plugin instead of node-slack [#4360](https://github.com/sitespeedio/sitespeed.io/pull/4360).
+* Firefox 134 and NodeJS 22 in the Docker container [#4395](https://github.com/sitespeedio/sitespeed.io/pull/4395) and [#4396](https://github.com/sitespeedio/sitespeed.io/pull/4396).
+
+### Fixed
+* Replace dependencies with local code:
+  * Replace lodash.forEach [#4378](https://github.com/sitespeedio/sitespeed.io/pull/4378).
+  * Replace recursive-readdir [#4377](https://github.com/sitespeedio/sitespeed.io/pull/4377).
+  * Replace cli-color [#4374](https://github.com/sitespeedio/sitespeed.io/pull/4374).
+  * Replace text-table [#4373](https://github.com/sitespeedio/sitespeed.io/pull/4373).
+  * Replace lodash.chunk [#4372](https://github.com/sitespeedio/sitespeed.io/pull/4372).
+  * Replace lodash.flatten [#4371](https://github.com/sitespeedio/sitespeed.io/pull/4371).
+  * Replace fs-extra [#4370](https://github.com/sitespeedio/sitespeed.io/pull/4370.)
+  * Replace uuid [#4369](https://github.com/sitespeedio/sitespeed.io/pull/4369).
+  * Replace lodash.clonedeep [#4388](https://github.com/sitespeedio/sitespeed.io/pull/4388).
+  * Remove unused lodash.pick [#4387](https://github.com/sitespeedio/sitespeed.io/pull/4387).
+  * Replace lodash.pullAll and lodash.union [#4386](https://github.com/sitespeedio/sitespeed.io/pull/4386).
+  * Replace find-up [#4385](https://github.com/sitespeedio/sitespeed.io/pull/4385).
+  * Replace getos and osname [#4384](https://github.com/sitespeedio/sitespeed.io/pull/4384).
+  * Replace p-limit [#4394](https://github.com/sitespeedio/sitespeed.io/pull/4394).
+  * Replace concurrent-queue [#4393](https://github.com/sitespeedio/sitespeed.io/pull/4393).
+  * Replace lodash.isEmpty [#4391](https://github.com/sitespeedio/sitespeed.io/pull/4391).
+  * Remove unused jstransformer-markdown-it [#4392](https://github.com/sitespeedio/sitespeed.io/pull/4392)
+
+* Fix cli command: Use `--summaryDetail` (not summary-detail) [#4376](https://github.com/sitespeedio/sitespeed.io/pull/4376).
+* Remove connectivity output from text since it was broken [#4375](https://github.com/sitespeedio/sitespeed.io/pull/4375).
+* Upgrade to co2.js 0.16.4 [#4353](https://github.com/sitespeedio/sitespeed.io/pull/4353).
+* Make sure co2 data is only read once at startup [#4352](https://github.com/sitespeedio/sitespeed.io/pull/4352).
+* Making the slim container a little smaller [#4355](https://github.com/sitespeedio/sitespeed.io/pull/4355).
+* Ugrade to google-cloud/storage-7.14.0 [#4361](https://github.com/sitespeedio/sitespeed.io/pull/4361).
+* Upgrade to AWS client 3.717.0 [#4368](https://github.com/sitespeedio/sitespeed.io/pull/4368)
+* Removed the webdriver manager in the Docker container [4390](https://github.com/sitespeedio/sitespeed.io/pull/4390). We don't use it but on MacOS Selenium still uses it to find the driver for Safari so we can only remove it in Docker.
+
+### Tech
+* New GitHub actions that test uploading to S3, GCS and SCP.
+
 ## 35.7.5 - 2024-12-23
 ### Fixed
 * Update to faststat 0.0.7 [#4347](https://github.com/sitespeedio/sitespeed.io/pull/4347).

package/Dockerfile

@@ -1,9 +1,10 @@
-FROM sitespeedio/webbrowsers:chrome-131.0-firefox-133.0-edge-131.0
+FROM sitespeedio/webbrowsers:chrome-131.0-firefox-134.0-edge-131.0-b
 
 ARG TARGETPLATFORM=linux/amd64
 
-ENV SITESPEED_IO_BROWSERTIME__XVFB true
-ENV SITESPEED_IO_BROWSERTIME__DOCKER true
+ENV SITESPEED_IO_BROWSERTIME__XVFB=true
+ENV SITESPEED_IO_BROWSERTIME__DOCKER=true
+ENV PYTHON=python3
 
 COPY docker/webpagereplay/$TARGETPLATFORM/wpr /usr/local/bin/
 COPY docker/webpagereplay/wpr_cert.pem /webpagereplay/certs/
@@ -11,7 +12,6 @@ COPY docker/webpagereplay/wpr_key.pem /webpagereplay/certs/
 COPY docker/webpagereplay/deterministic.js /webpagereplay/scripts/deterministic.js
 COPY docker/webpagereplay/LICENSE /webpagereplay/
 
-
 RUN sudo apt-get update && sudo apt-get install libnss3-tools python2 \
     net-tools \
     build-essential \
@@ -28,8 +28,12 @@ WORKDIR /usr/src/app
 
 COPY package.json /usr/src/app/
 COPY npm-shrinkwrap.json /usr/src/app/
-RUN npm install --production && npm cache clean --force
-COPY . /usr/src/app
+COPY tools/postinstall.js /usr/src/app/tools/postinstall.js
+RUN npm install --production && npm cache clean --force 
+
+COPY ./bin/ /usr/src/app/bin/
+COPY ./lib/ /usr/src/app/lib/
+RUN rm -fR /usr/src/app/node_modules/selenium-webdriver/bin
 
 COPY docker/scripts/start.sh /start.sh
 

package/Dockerfile-slim

@@ -1,12 +1,12 @@
-FROM node:20.9.0-bookworm-slim
+FROM node:22.13.0-bookworm-slim
 
 ARG TARGETPLATFORM=linux/amd64
 
-ENV SITESPEED_IO_BROWSERTIME__DOCKER true
-ENV SITESPEED_IO_BROWSERTIME__VIDEO false
-ENV SITESPEED_IO_BROWSERTIME__BROWSER firefox
-ENV SITESPEED_IO_BROWSERTIME__VISUAL_METRICS false
-ENV SITESPEED_IO_BROWSERTIME__HEADLESS true
+ENV SITESPEED_IO_BROWSERTIME__DOCKER=true
+ENV SITESPEED_IO_BROWSERTIME__VIDEO=false
+ENV SITESPEED_IO_BROWSERTIME__BROWSER=firefox
+ENV SITESPEED_IO_BROWSERTIME__VISUAL_METRICS=false
+ENV SITESPEED_IO_BROWSERTIME__HEADLESS=true
 
 ENV PATH="/usr/local/bin:${PATH}"
 
@@ -21,7 +21,9 @@ RUN echo "deb http://deb.debian.org/debian/ unstable main contrib non-free" >> /
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 COPY . /usr/src/app
-RUN CHROMEDRIVER_SKIP_DOWNLOAD=true EGDEDRIVER_SKIP_DOWNLOAD=true npm install --production && npm cache clean --force && npm uninstall npm -g
+COPY tools/postinstall.js /usr/src/app/tools/postinstall.js
+RUN CHROMEDRIVER_SKIP_DOWNLOAD=true EGDEDRIVER_SKIP_DOWNLOAD=true npm install --omit=dev --omit=optional && npm cache clean --force && npm uninstall npm npx -g && rm -fR /usr/src/app/node_modules/selenium-webdriver/bin
+
 WORKDIR /usr/src/app
 COPY docker/scripts/start-slim.sh /start.sh
 

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2023 Peter Hedenskog
+Copyright (c) 2012-2025 Peter Hedenskog
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/bin/browsertimeWebPageReplay.js

@@ -8,10 +8,10 @@ import get from 'lodash.get';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
-import { findUpSync }  from 'find-up';
 import { BrowsertimeEngine, configureLogging } from 'browsertime';
 
 import { getURLs } from '../lib/cli/util.js';
+import { findUpSync } from '../lib/support/fileUtil.js';
 
 import {config as browsertimeConfig} from '../lib/plugins/browsertime/index.js';
 

package/lib/cli/cli.js

@@ -6,10 +6,8 @@ import { readFileSync, statSync } from 'node:fs';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import merge from 'lodash.merge';
-import reduce from 'lodash.reduce';
 import set from 'lodash.set';
 import get from 'lodash.get';
-import { findUpSync } from 'find-up';
 
 import { getURLs, getAliases } from './util.js';
 import { toArray } from '../support/util.js';
@@ -19,6 +17,7 @@ import { config as metricsConfig } from '../plugins/metrics/index.js';
 import { config as slackConfig } from '../plugins/slack/index.js';
 import { config as htmlConfig } from '../plugins/html/index.js';
 import { messageTypes as matrixMessageTypes } from '../plugins/matrix/index.js';
+import { findUpSync } from '../support/fileUtil.js';
 
 const metricList = Object.keys(friendlynames);
 const require = createRequire(import.meta.url);
@@ -98,6 +97,10 @@ function validateInput(argv) {
     return 'Error: Getting CrUx data do not work running in multi mode.';
   }
 
+  if (argv.browsertime.cpu && argv.browsertime.enableProfileRun) {
+    return 'Error: Use either --cpu or --enableProfileRun. Profile run will run one extra iteration to collect cpu/trace data.';
+  }
+
   if (
     argv.urlAlias &&
     argv._ &&
@@ -573,13 +576,13 @@ export async function parseCommandLine() {
       alias: 'enableProfileRun',
       type: 'boolean',
       describe:
-        'Make one extra run that collects the profiling trace log (no other metrics is collected). For Chrome it will collect the timeline trace, for Firefox it will get the Geckoprofiler trace. This means you do not need to get the trace for all runs and can skip the overhead it produces.'
+        'Make one extra run that collects the profiling trace log (no other metrics is collected). For Chrome it will collect the timeline trace, for Firefox it will get the Geckoprofiler trace. This means you do not need to get the trace for all runs and can skip the overhead it produces. You should not run this together with --cpu since that will get a trace for every iteration.'
     })
     .option('browsertime.enableVideoRun', {
       alias: 'enableVideoRun',
       type: 'boolean',
       describe:
-        'Make one extra run that collects video and visual metrics. This means you can do your runs with --visualMetrics true --video false --enableVideoRun true to collect visual metrics from all runs and save a video from the profile/video run. If you run it together with --enableProfileRun it will also collect profiling trace.'
+        'Make one extra run that collects video and visual metrics. This means you can do your runs with --visualMetrics true --video false --enableVideoRun true to collect visual metrics from all runs and save a video from the profile/video run. If you run it together with --enableProfileRun it will also collect profiling race.'
     })
     .option('browsertime.videoParams.filmstripFullSize', {
       alias: 'videoParams.filmstripFullSize',
@@ -616,10 +619,10 @@ export async function parseCommandLine() {
         'Show all screenshots in the filmstrip, independent if they have changed or not.',
       group: 'Filmstrip'
     })
-    .option('browsertime.userTimingWhitelist', {
-      alias: 'userTimingWhitelist',
+    .option('browsertime.userTimingAllowList', {
+      alias: 'userTimingAllowList',
       describe:
-        'This option takes a regex that will whitelist which userTimings to capture in the results. All userTimings are captured by default. T',
+        'This option takes a regex that will whitelist which userTimings to capture in the results. All userTimings are captured by default.',
       group: 'Browser'
     })
     .option('axe.enable', {
@@ -1831,7 +1834,7 @@ export async function parseCommandLine() {
       type: 'boolean',
       group: 'Text'
     })
-    .option('summary-detail', {
+    .option('summaryDetail', {
       describe: 'Show longer text summary to stdout',
       default: false,
       type: 'boolean',
@@ -2036,12 +2039,6 @@ export async function parseCommandLine() {
       default: false,
       type: 'boolean'
     })
-    .option('logToFile', {
-      describe:
-        'Store the log for your run into a file in logs/sitespeed.io.log',
-      default: false,
-      type: 'boolean'
-    })
     .option('useHash', {
       describe:
         'If your site uses # for URLs and # give you unique URLs you need to turn on useHash. By default is it turned off, meaning URLs with hash and without hash are treated as the same URL',
@@ -2138,14 +2135,10 @@ export async function parseCommandLine() {
     argv = parsed.argv;
 
   // aliases are long options -> short option
-  const aliasLookup = reduce(
-    aliases,
-    (lookup, value, key) => {
-      lookup.set(value[0], key);
-      return lookup;
-    },
-    new Map()
-  );
+  const aliasLookup = new Map();
+  for (const [key, value] of Object.entries(aliases)) {
+    aliasLookup.set(value[0], key);
+  }
 
   let explicitOptions = yargs(hideBin(process.argv)).argv;
 
@@ -2154,9 +2147,8 @@ export async function parseCommandLine() {
     yargsInstance.getOptions().configObjects[0]
   );
 
-  explicitOptions = reduce(
-    explicitOptions,
-    (result, value, key) => {
+  explicitOptions = Object.entries(explicitOptions).reduce(
+    (result, [key, value]) => {
       if (aliasLookup.has(key)) {
         const fullKey = aliasLookup.get(key);
         result = set(result, fullKey, value);

package/lib/core/logging.js

@@ -1,100 +1,8 @@
-import intel from 'intel';
-import { createWriteStream } from 'node:fs';
-import { inherits } from 'node:util';
-const {
-  INFO,
-  DEBUG,
-  VERBOSE,
-  TRACE,
-  NONE,
-  basicConfig,
-  Logger,
-  Handler,
-  Formatter
-} = intel;
+import { configureLog } from '@sitespeed.io/log';
 
-// FileHandler isn't exposed in Intel when we moved to ESM.
-// To fix that for now we just use the same code as Intel.
-
-function StreamHandler(options) {
-  options = options || {};
-  if (!options.stream) {
-    options = { stream: options };
-  }
-  Handler.call(this, options);
-  this._stream = options.stream;
-}
-
-inherits(StreamHandler, Handler);
-
-StreamHandler.prototype.emit = function streamEmit(record) {
-  this._stream.write(this.format(record) + '\n');
-};
-
-function FileHandler(options) {
-  if (typeof options === 'string') {
-    options = { file: options };
-  }
-  this._file = options.file;
-
-  options.stream = this._open();
-  StreamHandler.call(this, options);
-}
-inherits(FileHandler, StreamHandler);
-
-FileHandler.prototype._open = function open() {
-  return createWriteStream(this._file, { flags: 'a' });
-};
-
-export function configure(options, logDir) {
-  options = options || {};
-
-  let level = INFO;
-
-  switch (options.verbose) {
-    case 1: {
-      level = DEBUG;
-      break;
-    }
-    case 2: {
-      level = VERBOSE;
-      break;
-    }
-    case 3: {
-      level = TRACE;
-      break;
-    }
-    default: {
-      break;
-    }
-  }
-
-  if (options.silent) {
-    level = NONE;
-  }
-
-  if (level === INFO) {
-    basicConfig({
-      format: '[%(date)s] %(levelname)s: %(message)s',
-      level: level
-    });
-  } else {
-    basicConfig({
-      format: '[%(date)s] %(levelname)s: [%(name)s] %(message)s',
-      level: level
-    });
-  }
-
-  if (options.logToFile) {
-    let logger = new Logger();
-    logger.addHandler(
-      new FileHandler({
-        file: logDir + '/sitespeed.io.log',
-        formatter: new Formatter({
-          format: '[%(date)s] %(levelname)s: [%(name)s] %(message)s',
-          level: level
-        })
-      })
-    );
-  }
+export function configure(options = {}) {
+  configureLog({
+    verbose: options.verbose ?? 0,
+    silent: options.silent ?? false
+  });
 }

package/lib/core/queue.js

@@ -0,0 +1,112 @@
+// Simplified implementation of concurrent-queue
+// https://www.npmjs.com/package/concurrent-queue
+
+export function createQueue() {
+  let concurrency = Number.POSITIVE_INFINITY;
+  let processor;
+
+  const tasks = [];
+  let runningCount = 0;
+
+  const enqueuedCallbacks = [];
+  const processingStartedCallbacks = [];
+  const processingEndedCallbacks = [];
+  const drainedCallbacks = [];
+
+  /**
+   * We will trigger drained callbacks when:
+   *   tasks.length === 0 and runningCount === 0
+   */
+  function checkDrained() {
+    if (tasks.length === 0 && runningCount === 0) {
+      for (const cb of drainedCallbacks) {
+        cb();
+      }
+    }
+  }
+
+  /**
+   * Attempt to start processing more tasks if we have
+   * capacity (runningCount < concurrency).
+   */
+  function tryProcessNext() {
+    while (tasks.length > 0 && runningCount < concurrency) {
+      const item = tasks.shift();
+      runningCount++;
+
+      for (const cb of processingStartedCallbacks) {
+        cb({ item });
+      }
+
+      const promise = Promise.resolve(processor(item));
+
+      promise
+        .then(() => {
+          // Fire processingEnded callbacks
+          for (const cb of processingEndedCallbacks) {
+            cb({ item, err: undefined });
+          }
+        })
+        .catch(error => {
+          // Fire processingEnded callbacks with an error
+          for (const cb of processingEndedCallbacks) {
+            cb({ item, err: error });
+          }
+        })
+        .finally(() => {
+          runningCount--;
+          checkDrained();
+          tryProcessNext();
+        });
+    }
+  }
+
+  const queue = function enqueue(item) {
+    for (const cb of enqueuedCallbacks) {
+      cb({ item });
+    }
+    tasks.push(item);
+
+    tryProcessNext();
+  };
+
+  queue.limit = options => {
+    if (options && typeof options.concurrency === 'number') {
+      concurrency = options.concurrency;
+    }
+    return queue;
+  };
+
+  queue.process = fn => {
+    processor = fn;
+    return queue;
+  };
+
+  queue.enqueued = callback => {
+    enqueuedCallbacks.push(callback);
+    return queue;
+  };
+
+  queue.processingStarted = callback => {
+    processingStartedCallbacks.push(callback);
+    return queue;
+  };
+
+  queue.processingEnded = callback => {
+    processingEndedCallbacks.push(callback);
+    return queue;
+  };
+
+  queue.drained = callback => {
+    drainedCallbacks.push(callback);
+    return queue;
+  };
+
+  Object.defineProperty(queue, 'isDrained', {
+    get() {
+      return tasks.length === 0 && runningCount === 0;
+    }
+  });
+
+  return queue;
+}

package/lib/core/queueHandler.js

@@ -1,17 +1,14 @@
-/* eslint no-console:0 */
-
-import cq from 'concurrent-queue';
-import intel from 'intel';
-
+import { getLogger } from '@sitespeed.io/log';
 import { messageMaker } from '../support/messageMaker.js';
 import {
   registerQueueTime,
   registerProcessingTime,
   generateStatistics
 } from './queueStatistics.js';
+import { createQueue } from './queue.js';
 
 const make = messageMaker('queueHandler').make;
-const log = intel.getLogger('sitespeedio.queuehandler');
+const log = getLogger('sitespeedio.queuehandler');
 
 function shortenData(key, value) {
   if (key === 'data') {
@@ -103,36 +100,32 @@ export class QueueHandler {
     this.queues = plugins
       .filter(plugin => plugin.processMessage)
       .map(plugin => {
-        const concurrency = plugin.concurrency || Number.POSITIVE_INFINITY;
-        const queue = cq().limit({ concurrency });
+        const concurrency = plugin.concurrency ?? Number.POSITIVE_INFINITY;
+        // Create a queue with that concurrency
+        const queue = createQueue().limit({ concurrency });
 
         queue.plugin = plugin;
 
-        const messageWaitingStart = {},
-          messageProcessingStart = {};
+        const messageWaitingStart = {};
+        const messageProcessingStart = {};
 
         queue.enqueued(object => {
-          const message = object.item;
+          const { item: message } = object;
           messageWaitingStart[message.uuid] = process.hrtime();
         });
 
         queue.processingStarted(object => {
-          const message = object.item;
-
+          const { item: message } = object;
           const waitingDuration = process.hrtime(
-              messageWaitingStart[message.uuid]
-            ),
-            waitingNanos = waitingDuration[0] * 1e9 + waitingDuration[1];
-
+            messageWaitingStart[message.uuid]
+          );
+          const waitingNanos = waitingDuration[0] * 1e9 + waitingDuration[1];
           registerQueueTime(message, queue.plugin, waitingNanos);
-
           messageProcessingStart[message.uuid] = process.hrtime();
         });
 
-        // FIXME handle rejections (i.e. failures while processing messages) properly
         queue.processingEnded(object => {
-          const message = object.item;
-          const error = object.err;
+          const { item: message, err: error } = object;
           if (error) {
             let rejectionMessage =
               'Rejected ' +
@@ -140,9 +133,9 @@ export class QueueHandler {
               ' for plugin: ' +
               plugin.getName();
 
-            if (message && message.url)
-              rejectionMessage += ', url: ' + message.url;
-
+            if (message?.url) {
+              rejectionMessage += `, url: ${message.url}`;
+            }
             if (error.stack) {
               log.error(error.stack);
             }
@@ -154,7 +147,6 @@ export class QueueHandler {
           );
           const processingNanos =
             processingDuration[0] * 1e9 + processingDuration[1];
-
           registerProcessingTime(message, queue.plugin, processingNanos);
         });
 
@@ -221,9 +213,9 @@ export class QueueHandler {
   }
 
   async startProcessingQueues() {
-    for (let item of this.queues) {
-      const queue = item.queue,
-        plugin = item.plugin;
+    for (const item of this.queues) {
+      const { queue, plugin } = item;
+      // For each queue, set up the processor that handles messages
       queue.process(message =>
         Promise.resolve(plugin.processMessage(message, this))
       );

package/lib/core/resultsStorage/pathToFolder.js

@@ -1,10 +1,10 @@
 import { parse } from 'node:url';
 import { createHash } from 'node:crypto';
 
-import isEmpty from 'lodash.isempty';
-import intel from 'intel';
+import { getLogger } from '@sitespeed.io/log';
 
-const log = intel.getLogger('sitespeedio.file');
+import { isEmpty } from '../../support/util.js';
+const log = getLogger('sitespeedio.file');
 
 function toSafeKey(key) {
   // U+2013 : EN DASH – as used on https://en.wikipedia.org/wiki/2019–20_coronavirus_pandemic

package/lib/core/resultsStorage/storageManager.js

@@ -9,12 +9,12 @@ import {
   writeFile as _writeFile
 } from 'node:fs';
 
-import { copy } from 'fs-extra/esm';
-import intel from 'intel';
+import { cp } from 'node:fs/promises';
+import { getLogger } from '@sitespeed.io/log';
 
 import { pathToFolder } from './pathToFolder.js';
 
-const log = intel.getLogger('sitespeedio.storageManager');
+const log = getLogger('sitespeedio.storageManager');
 const mkdir = promisify(_mkdir);
 const readdir = promisify(_readdir);
 const lstat = promisify(_lstat);
@@ -69,10 +69,12 @@ export function storageManager(baseDir, storagePathPrefix, options) {
       return storagePathPrefix;
     },
     copyToResultDir(filename) {
-      return this.createDirectory().then(dir => copy(filename, dir));
+      return this.createDirectory().then(dir =>
+        cp(filename, dir, { recursive: true })
+      );
     },
     copyFileToDir(filename, dir) {
-      return copy(filename, dir);
+      return cp(filename, dir, { recursive: true });
     },
     // TODO is missing alias
     removeDataForUrl(url) {

package/lib/plugins/assets/index.js

@@ -1,6 +1,6 @@
-import isEmpty from 'lodash.isempty';
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 import { AssetsAggregator } from './aggregator.js';
+import { isEmpty } from '../../support/util.js';
 const DEFAULT_METRICS_LARGEST_ASSETS = ['image.0.transferSize'];
 
 export default class AssetsPlugin extends SitespeedioPlugin {