sitespeed.io 33.6.0 → 34.0.0

package/.github/workflows/building-docker-release.yml

@@ -48,17 +48,6 @@ jobs:
           push: true
           provenance: false
           tags: sitespeedio/sitespeed.io:${{steps.tag.outputs.tag}}-plus1
-      -
-        name: Build and push sitespeed.io+wpt
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          file: ./docker/Dockerfile-webpagetest
-          build-args: version=${{steps.tag.outputs.tag}} 
-          push: true
-          provenance: false
-          tags: sitespeedio/sitespeed.io:${{steps.tag.outputs.tag}}-webpagetest
       -
         name: Build and push sitespeed.io-slim
         uses: docker/build-push-action@v5

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # CHANGELOG - sitespeed.io  (we use [semantic versioning](https://semver.org))
 
+## 34.0.0 - 2024-05-29
+
+### Breaking
+
+* Woho! There's now a way to deploy your own version of sitespeed.io online for your own testing using [onlinetest)[https://github.com/sitespeedio/onlinetest]! It has a HTML GUI and an API that you can use using sitespeed.io command line. There's one server part (the frontend and the API) and a testrunner part. You can run desktop, emulated mobile and Android test. I do not host a global version but I worked hard to make it easy to host yourself. I still work on the documentation but feel free to start to try it out before all documentation is finished :) If you have quick question and need help, please use the [Slack channel](https://join.slack.com/t/sitespeedio/shared_invite/zt-296jzr7qs-d6DId2KpEnMPJSQ8_R~WFw). If you have more complicated problems, please feel free to create issues [here](https://github.com/sitespeedio/onlinetest/issues/new).
+ 
+* With this release we remove all dependencies to WebPageTest [#4085](https://github.com/sitespeedio/sitespeed.io/pull/4085). You are only affected if you used the [plugin-webpagetest](https://github.com/sitespeedio/plugin-webpagetest) or the +webpagetest Docker container. If you still want to use WebPageTest with sitespeed.io you can build something on the archived [plugin-webpagetest](https://github.com/sitespeedio/plugin-webpagetest).
+
+* The S3 plugin has been upgraded to @aws-sdk/client-s3 v3 [#4138](https://github.com/sitespeedio/sitespeed.io/pull/4138). If you are using the S3 plugin and not set region, that will now fail. The v2 version of the aws-sdk used us-east-1 region as default, but v3 has removed the default setting. If you didn't used to set region you can add `--s3.region us-east-1` and it will work as before. If you do not do that, the uploads to S3 will fail.
+
+* The -plus1 Docker container now has plugin-lighthouse and plugin-gpsi installed from npm instead of the git repository. It will work as before, but if you want to disable one of them, that has changed. To not run the GPSI plugin add `--plugins.remove @sitespeed.io/plugin-gpsi` and to disble Lighthouse you add `--plugins.remove @sitespeed.io/plugin-lighthouse`.
+
+* Updated to [Browsertime 22](https://github.com/sitespeedio/browsertime/blob/main/CHANGELOG.md#2200---2024-05-16). This version of Browsertime drops the Browsertime extension and start use the kind of new HAR exporter using Bidi as the default HAR exporter! If you add request headers to your Firefox test or clear the cache inside of your script using Firefox, this will stop to work for now until support is added in Firefox (request headers are coming soon!).
+
+### Added
+* Updated to Chrome 125, Firefox 126 and Edge 124 in the Docker container [#4156](https://github.com/sitespeedio/sitespeed.io/pull/4156).
+
+### Fixed
+* Fix loading globally installed plugins [#4167](https://github.com/sitespeedio/sitespeed.io/pull/4167).
+* Fix configurations documentation for scp, thank you [Arash Hatam](https://github.com/hatamiarash7) for [#4166](https://github.com/sitespeedio/sitespeed.io/pull/4166).
+
+
+## 33.6.1 - 2024-05-13
+### Fixed
+* The plus1 container was updated with the latest version of the gpsi-plugin, since the old version broke when GPSI was updated to Lighthouse 12. 
+
 ## 33.6.0 - 2024-04-17
 ### Added
 * Updated to Chrome 124 and Firefox 125 in the Docker container [#4142](https://github.com/sitespeedio/sitespeed.io/pull/4142) and [#4142](https://github.com/sitespeedio/sitespeed.io/pull/4141).

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM sitespeedio/webbrowsers:chrome-124.0-firefox-125.0-edge-123.0
+FROM sitespeedio/webbrowsers:chrome-125.0-firefox-126.0-edge-124.0
 
 ARG TARGETPLATFORM=linux/amd64
 

package/bin/sitespeed.js

@@ -7,6 +7,7 @@ import { execSync } from 'node:child_process';
 import { platform } from 'node:os';
 import { resolve, basename } from 'node:path';
 import { readFileSync } from 'node:fs';
+import { EventEmitter } from 'node:events';
 
 import merge from 'lodash.merge';
 import ora from 'ora';
@@ -15,6 +16,10 @@ import { parseCommandLine } from '../lib/cli/cli.js';
 import { run } from '../lib/sitespeed.js';
 import { addTest, waitAndGetResult, get } from '../lib/api/send.js';
 
+// This is due to CDP do no have (or has it) a way to remove listeners
+// and default 10 is quite small number.
+EventEmitter.defaultMaxListeners = 30;
+
 async function api(options) {
   const action = options.api.action ?? 'addAndGetResult';
 
@@ -91,6 +96,9 @@ async function api(options) {
           }
         } else if (result.status === 'failed') {
           spinner.fail('Test failed');
+          if (options.api.json) {
+            console.log(JSON.stringify(result));
+          }
           process.exitCode = 1;
           process.exit();
         }

package/lib/cli/cli.js

@@ -1,7 +1,7 @@
 import { resolve } from 'node:path';
 import { platform } from 'node:os';
 import { createRequire } from 'node:module';
-import { readFileSync, statSync, existsSync } from 'node:fs';
+import { readFileSync, statSync } from 'node:fs';
 
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
@@ -1145,7 +1145,7 @@ export async function parseCommandLine() {
       describe: 'The host.',
       group: 'scp'
     })
-    .option('scp. destinationPath', {
+    .option('scp.destinationPath', {
       describe:
         'The destination path on the remote server where the files will be copied.',
       group: 'scp'
@@ -1213,7 +1213,7 @@ export async function parseCommandLine() {
       default: false,
       type: 'boolean',
       describe:
-        'Include screenshot (from Browsertime/WebPageTest) in the annotation. You need to specify a --resultBaseURL for this to work.',
+        'Include screenshot (from Browsertime) in the annotation. You need to specify a --resultBaseURL for this to work.',
       group: 'Grafana'
     })
 
@@ -1280,7 +1280,7 @@ export async function parseCommandLine() {
       default: false,
       type: 'boolean',
       describe:
-        'Include screenshot (from Browsertime/WebPageTest) in the annotation. You need to specify a --resultBaseURL for this to work.',
+        'Include screenshot (from Browsertime) in the annotation. You need to specify a --resultBaseURL for this to work.',
       group: 'Graphite'
     })
     .option('graphite.sendAnnotation', {
@@ -1622,7 +1622,7 @@ export async function parseCommandLine() {
       group: 's3'
     })
     .option('s3.region', {
-      describe: 'The S3 region. Optional depending on your settings.',
+      describe: 'The S3 region.',
       group: 's3'
     })
     .option('s3.acl', {
@@ -1789,6 +1789,11 @@ export async function parseCommandLine() {
       default: false,
       type: 'boolean'
     })
+    .option('html.homeurl', {
+      default: 'https://www.sitespeed.io/',
+      describe: 'The URL for the logo in the result',
+      group: 'HTML'
+    })
     .option('summary', {
       describe: 'Show brief text summary to stdout',
       default: false,
@@ -2076,28 +2081,6 @@ export async function parseCommandLine() {
         return plugins;
       }
     })
-    .coerce('webpagetest', function (argument) {
-      if (argument) {
-        // for backwards compatible reasons we check if the passed parameters is a path to a script, if so just us it (PR #1445)
-        if (argument.script && existsSync(argument.script)) {
-          argument.script = readFileSync(resolve(argument.script), 'utf8');
-          /* eslint no-console: off */
-          console.log(
-            '[WARNING] Since sitespeed.io 4.4 you should pass the path to the script file through the --webpagetest.file flag (https://github.com/sitespeedio/sitespeed.io/pull/1445).'
-          );
-          return argument;
-        }
-
-        if (argument.file) {
-          argument.script = readFileSync(resolve(argument.file), 'utf8');
-        } else if (argument.script) {
-          // because the escaped characters are passed re-escaped from the console
-          argument.script = argument.script.split('\\t').join('\t');
-          argument.script = argument.script.split('\\n').join('\n');
-        }
-        return argument;
-      }
-    })
     //     .describe('browser', 'Specify browser')
     .wrap(yargsInstance.terminalWidth())
     //  .check(validateInput)
@@ -2153,12 +2136,6 @@ export async function parseCommandLine() {
     explicitOptions = merge(explicitOptions, config);
   }
 
-  if (argv.webpagetest && argv.webpagetest.custom) {
-    argv.webpagetest.custom = readFileSync(resolve(argv.webpagetest.custom), {
-      encoding: 'utf8'
-    });
-  }
-
   if (argv.summaryDetail) argv.summary = true;
 
   if (

package/lib/core/pluginLoader.js

@@ -77,7 +77,7 @@ export async function loadPlugins(pluginNames, options, context, queue) {
           plugins.push(p);
         } catch (error) {
           // try global
-          let plugin = await importGlobalSilent(name);
+          let { default: plugin } = await importGlobalSilent(name);
           if (plugin) {
             let p = new plugin(options, context, queue);
             plugins.push(p);

package/lib/plugins/analysisstorer/index.js

@@ -17,8 +17,6 @@ function shouldIgnoreMessage(message) {
     'browsertime.asyncscripts',
     'compare.setup',
     'sitespeedio.setup',
-    'webpagetest.har',
-    'webpagetest.setup',
     'aggregateassets.summary',
     'slowestassets.summary',
     'largestassets.summary',

package/lib/plugins/budget/index.js

@@ -22,7 +22,6 @@ export default class BudgetPlugin extends SitespeedioPlugin {
     this.make = context.messageMaker('budget').make;
     this.budgetTypes = [
       'browsertime.pageSummary',
-      'webpagetest.pageSummary',
       'pagexray.pageSummary',
       'coach.pageSummary',
       'axe.pageSummary'

package/lib/plugins/domains/index.js

@@ -27,14 +27,6 @@ export default class DomainsPlugin extends SitespeedioPlugin {
         break;
       }
 
-      case 'webpagetest.har': {
-        // Only collect WebPageTest data if we don't run Browsertime
-        if (this.browsertime === false) {
-          this.domainsAggregator.addToAggregate(message.data, message.url);
-        }
-        break;
-      }
-
       case 'sitespeedio.summarize': {
         const summary = this.domainsAggregator.summarize();
         if (!isEmpty(summary)) {

package/lib/plugins/grafana/index.js

@@ -3,7 +3,6 @@ import dayjs from 'dayjs';
 import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 
 import { send } from './send-annotation.js';
-import { toSafeKey } from '../../support/tsdbUtil.js';
 import { throwIfMissing } from '../../support/util.js';
 
 export default class GrafanaPlugin extends SitespeedioPlugin {
@@ -25,13 +24,6 @@ export default class GrafanaPlugin extends SitespeedioPlugin {
   }
 
   processMessage(message, queue) {
-    if (message.type === 'webpagetest.pageSummary') {
-      this.wptExtras[message.url] = {};
-      this.wptExtras[message.url].webPageTestResultURL =
-        message.data.data.summary;
-      this.wptExtras[message.url].connectivity = message.connectivity;
-      this.wptExtras[message.url].location = toSafeKey(message.location);
-    }
     if (this.messageTypesToFireAnnotations.includes(message.type)) {
       this.receivedTypesThatFireAnnotations[message.url]
         ? this.receivedTypesThatFireAnnotations[message.url]++
@@ -46,11 +38,6 @@ export default class GrafanaPlugin extends SitespeedioPlugin {
 
         break;
       }
-      case 'webpagetest.setup': {
-        this.messageTypesToFireAnnotations.push('webpagetest.pageSummary');
-
-        break;
-      }
       case 'sitespeedio.setup': {
         // Let other plugins know that the Grafana plugin is alive
         queue.postMessage(this.make('grafana.setup'));
@@ -77,10 +64,7 @@ export default class GrafanaPlugin extends SitespeedioPlugin {
         break;
       }
       default: {
-        if (message.type === 'webpagetest.browser' && !this.usingBrowsertime) {
-          // We are only interested in WebPageTest browser if we run it standalone
-          this.browser = message.data.browser;
-        } else if (message.type === 'browsertime.alias') {
+        if (message.type === 'browsertime.alias') {
           this.alias[message.url] = message.data;
         } else if (
           this.receivedTypesThatFireAnnotations[message.url] ===

package/lib/plugins/grafana/send-annotation.js

@@ -65,19 +65,13 @@ export function send(
     tags.push(...extraTags);
   }
 
-  if (webPageTestExtraData) {
-    tags.push(webPageTestExtraData.connectivity, webPageTestExtraData.location);
-  }
-
   const tagsArray = getTagsAsArray(tags);
 
   const message = getAnnotationMessage(
     absolutePagePath,
     screenShotsEnabledInBrowsertime,
     screenshotType,
-    webPageTestExtraData
-      ? webPageTestExtraData.webPageTestResultURL
-      : undefined,
+    undefined,
     usingBrowsertime,
     options
   );

package/lib/plugins/graphite/data-generator.js

@@ -27,13 +27,6 @@ function keyPathFromMessage(message, options, includeQueryParameters, alias) {
 
     typeParts.splice(1, 0, connectivity);
     typeParts.splice(1, 0, options.browser);
-  } else if (/(^webpagetest)/.test(message.type)) {
-    if (message.connectivity) {
-      typeParts.splice(2, 0, message.connectivity);
-    }
-    if (message.location) {
-      typeParts.splice(2, 0, toSafeKey(message.location));
-    }
   } else if (/(^gpsi)/.test(message.type)) {
     typeParts.splice(2, 0, options.mobile ? 'mobile' : 'desktop');
   }

package/lib/plugins/graphite/index.js

@@ -7,7 +7,6 @@ import { SitespeedioPlugin } from '@sitespeed.io/plugin';
 
 import { send } from './send-annotation.js';
 import { GraphiteDataGenerator as DataGenerator } from './data-generator.js';
-import { toSafeKey } from '../../support/tsdbUtil.js';
 import { isStatsD } from './helpers/is-statsd.js';
 import { throwIfMissing } from '../../support/util.js';
 import { toArray } from '../../support/util.js';
@@ -67,7 +66,7 @@ export default class GraphitePlugin extends SitespeedioPlugin {
   }
 
   processMessage(message, queue) {
-    // First catch if we are running Browsertime and/or WebPageTest
+    // First catch if we are running Browsertime
     switch (message.type) {
       case 'browsertime.setup': {
         this.messageTypesToFireAnnotations.push('browsertime.pageSummary');
@@ -75,11 +74,6 @@ export default class GraphitePlugin extends SitespeedioPlugin {
 
         break;
       }
-      case 'webpagetest.setup': {
-        this.messageTypesToFireAnnotations.push('webpagetest.pageSummary');
-
-        break;
-      }
       case 'browsertime.config': {
         if (message.data.screenshot) {
           this.useScreenshots = message.data.screenshot;
@@ -104,12 +98,6 @@ export default class GraphitePlugin extends SitespeedioPlugin {
 
         break;
       }
-      default: {
-        if (message.type === 'webpagetest.browser' && !this.usingBrowsertime) {
-          // We are only interested in WebPageTest browser if we run it standalone
-          this.browser = message.data.browser;
-        }
-      }
     }
 
     if (message.type === 'browsertime.alias') {
@@ -129,14 +117,6 @@ export default class GraphitePlugin extends SitespeedioPlugin {
         : (this.receivedTypesThatFireAnnotations[message.url] = 1);
     }
 
-    if (message.type === 'webpagetest.pageSummary') {
-      this.wptExtras[message.url] = {};
-      this.wptExtras[message.url].webPageTestResultURL =
-        message.data.data.summary;
-      this.wptExtras[message.url].connectivity = message.connectivity;
-      this.wptExtras[message.url].location = toSafeKey(message.location);
-    }
-
     // we only sends individual groups to Graphite, not the
     // total of all groups (you can calculate that yourself)
     if (message.group === 'total') {
@@ -175,8 +155,7 @@ export default class GraphitePlugin extends SitespeedioPlugin {
             this.messageTypesToFireAnnotations.length &&
           this.resultUrls.hasBaseUrl() &&
           this.sendAnnotation &&
-          (message.type === 'browsertime.pageSummary' ||
-            message.type === 'webpagetest.pageSummary')
+          message.type === 'browsertime.pageSummary'
         ) {
           this.receivedTypesThatFireAnnotations[message.url] = 0;
           const absolutePagePath = this.resultUrls.absoluteSummaryPagePath(

package/lib/plugins/graphite/send-annotation.js

@@ -59,9 +59,6 @@ export function send(
   if (extraTags.length > 0) {
     tags.push(...extraTags);
   }
-  if (webPageTestExtraData) {
-    tags.push(webPageTestExtraData.connectivity, webPageTestExtraData.location);
-  }
   const theTags = options.graphite.arrayTags
     ? getTagsAsArray(tags)
     : getTagsAsString(tags);
@@ -70,9 +67,7 @@ export function send(
     absolutePagePath,
     screenShotsEnabledInBrowsertime,
     screenshotType,
-    webPageTestExtraData
-      ? webPageTestExtraData.webPageTestResultURL
-      : undefined,
+    undefined,
     usingBrowsertime,
     options
   );

package/lib/plugins/harstorer/index.js

@@ -20,8 +20,7 @@ export default class HarstorerPlugin extends SitespeedioPlugin {
         this.alias[message.url] = message.data;
         break;
       }
-      case 'browsertime.har':
-      case 'webpagetest.har': {
+      case 'browsertime.har': {
         const json = JSON.stringify(message.data);
 
         return this.gzipHAR

package/lib/plugins/html/defaultConfig.js

@@ -42,13 +42,6 @@ export default {
       'transferSize.image',
       'thirdParty.transferSize',
       'thirdParty.requests',
-      'webpagetest.SpeedIndex',
-      'webpagetest.lastVisualChange',
-      'webpagetest.render',
-      'webpagetest.visualComplete',
-      'webpagetest.visualComplete95',
-      'webpagetest.TTFB',
-      'webpagetest.fullyLoaded',
       'axe.critical',
       'axe.serious',
       'axe.minor',

package/lib/plugins/html/htmlBuilder.js

@@ -1,7 +1,7 @@
 import { join } from 'node:path';
 import osName from 'os-name';
 import { promisify } from 'node:util';
-import { platform } from 'node:os';
+import { platform, hostname } from 'node:os';
 import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
 
@@ -198,7 +198,6 @@ export class HTMLBuilder {
     let ios;
     let connectivity;
     let usingBrowsertime;
-    let usingWebPageTest;
     let cpuBenchmark;
     let windowSize;
     const urlPageRenders = [];
@@ -215,7 +214,6 @@ export class HTMLBuilder {
       pageNumber++;
       // In the future we can fix so we just pickup the setup messages
       usingBrowsertime = pageInfo.data.browsertime;
-      usingWebPageTest = pageInfo.data.webpagetest;
       // if we don't use Browsertime, we don't get the browser version
       browser = usingBrowsertime
         ? {
@@ -289,7 +287,6 @@ export class HTMLBuilder {
               options
             )
           : [];
-
       let rootPath = this.storageManager.rootPathFromUrl(url, daurlAlias);
       let data = {
         daurl: url,
@@ -315,6 +312,7 @@ export class HTMLBuilder {
         rootPath,
         resultUrls: this.context.resultUrls,
         assetsPath: assetsBaseURL || rootPath,
+        sitespeedioURL: options.html.homeurl,
         menu: 'pages',
         pageTitle: `Summary for ${helpers.plural(
           this.options.browsertime.iterations,
@@ -387,6 +385,7 @@ export class HTMLBuilder {
           rootPath,
           resultUrls: this.context.resultUrls,
           assetsPath: assetsBaseURL || rootPath,
+          sitespeedioURL: options.html.homeurl,
           menu: 'pages',
           pageTitle: `Run ${
             Number.parseInt(runIndex) + 1
@@ -452,10 +451,12 @@ export class HTMLBuilder {
             h: helpers,
             rootPath: '',
             assetsPath: assetsBaseURL || '',
+            sitespeedioURL: options.html.homeurl,
             menu: name,
             pageTitle: name,
             pageDescription: '',
             browser,
+            hostname: hostname(),
             cpuBenchmark,
             windowSize,
             os: osInfo,
@@ -463,7 +464,7 @@ export class HTMLBuilder {
             android,
             ios,
             usingBrowsertime,
-            usingWebPageTest,
+            usingWebPageTest: false,
             headers: this.summary,
             version: version,
             browsertimeVersion: dependencies.browsertime,

package/lib/plugins/html/index.js

@@ -34,8 +34,6 @@ export default class HTMLPlugin extends SitespeedioPlugin {
       'pagexray.pageSummary',
       'coach.run',
       'coach.pageSummary',
-      'webpagetest.run',
-      'webpagetest.pageSummary',
       'thirdparty.run',
       'thirdparty.pageSummary',
       'crux.pageSummary'
@@ -70,7 +68,6 @@ export default class HTMLPlugin extends SitespeedioPlugin {
           break;
         }
         // we always want to add data from our HARs
-        case 'webpagetest.har':
         case 'browsertime.har': {
           dataCollector.addDataForUrl(
             message.url,
@@ -204,7 +201,6 @@ export default class HTMLPlugin extends SitespeedioPlugin {
           }
           break;
         }
-        case 'webpagetest.summary':
         case 'coach.summary':
         case 'pagexray.summary':
         case 'browsertime.summary':

package/lib/plugins/html/setup/detailed.js

@@ -1,5 +1,4 @@
 import { noop, size, time } from '../../../support/helpers/index.js';
-import get from 'lodash.get';
 
 function row(stat, name, metricName, formatter) {
   if (stat === undefined) {
@@ -23,7 +22,6 @@ export default function (data) {
   const coach = data.coach;
   const pagexray = data.pagexray;
   const browsertime = data.browsertime;
-  const webpagetest = data.webpagetest;
   const axe = data.axe;
   const sustainable = data.sustainable;
 
@@ -309,27 +307,6 @@ export default function (data) {
     }
   }
 
-  if (webpagetest) {
-    const firstView = get(webpagetest, 'summary.timing.firstView');
-    if (firstView) {
-      rows.push(
-        row(firstView.render, 'WPT render (firstView)', 'render', time.ms),
-        row(
-          firstView.SpeedIndex,
-          'WPT SpeedIndex (firstView)',
-          'SpeedIndex',
-          time.ms
-        ),
-        row(
-          firstView.fullyLoaded,
-          'WPT Fully loaded (firstView)',
-          'fullyLoaded',
-          time.ms
-        )
-      );
-    }
-  }
-
   if (axe) {
     rows.push(
       row(

package/lib/plugins/html/setup/summaryBoxesDefaultLimits.js

@@ -75,13 +75,5 @@ export default {
     co2PerPageView: {},
     co2FirstParty: {},
     co2ThirdParty: {}
-  },
-  webpagetest: {
-    SpeedIndex: {},
-    lastVisualChange: {},
-    render: {},
-    visualComplete: {},
-    visualComplete95: {},
-    fullyLoaded: {}
   }
 };

package/lib/plugins/html/templates/header.pug

@@ -7,7 +7,7 @@ mixin headerLink(id, name)
 .darkblue.nav
   .navgrid
     .logo
-        a(href='https://www.sitespeed.io')
+        a(href=sitespeedioURL)
           img.navbar-brand(src= assetsPath + 'img/sitespeed.io-logo.png', width='162', height='50', alt='sitespeed.io logo')
     ul
       +headerLink('index', 'Summary')

package/lib/plugins/html/templates/runInfo.pug

@@ -12,6 +12,3 @@ if usingBrowsertime
   
   if options.browsertime.browser === 'safari'
         p At the moment we get limited metrics from Safari. Transfer sizes and number of requests are missing.
-
-else if usingWebPageTest
-  p.small Tested #{timestamp} using WebPageTest #{options.webpagetest.location} using connectivity #{options.webpagetest.connectivity} for #{h.plural(options.webpagetest.runs, 'run')}.

package/lib/plugins/html/templates/settings.pug

@@ -26,6 +26,10 @@ block content
         tr 
           td Emulated mobile
           td Yes
+      if hostname
+         tr
+          td Hostname
+          td #{hostname}
       if cpuBenchmark
         tr
           td CPU benchmark

package/lib/plugins/html/templates/url/includes/pageRunInfo.pug

@@ -7,6 +7,3 @@ if pageInfo.data.browsertime
     else if options.multi
       | .
     a(href= rootPath + 'settings.html')= '(runtime settings).'
-
-else if pageInfo.data.webpagetest
-  p.small Tested #{timestamp} using WebPageTest #{options.webpagetest.location} using connectivity #{options.webpagetest.connectivity} for #{h.plural(options.webpagetest.runs, 'run')}.

package/lib/plugins/html/templates/url/iteration/index.pug

@@ -175,31 +175,9 @@ block content
               tr
                 td Last Visual Change
                 td #{h.time.ms(lastVisualChange)}
-            if !d.browsertime && d.webpagetest
-              tr
-                th(colspan='2') WebPageTest
-              tr
-                td Render (first view)
-                td #{d.webpagetest.run.firstView.render}
-              tr
-                td Speed Index (first view)
-                td #{d.webpagetest.run.firstView.SpeedIndex}
-              tr
-                td Visual Complete 85% (first view)
-                td #{d.webpagetest.run.firstView.visualComplete85}
-              tr
-                td Last Visual Change (first view)
-                td #{d.webpagetest.run.firstView.lastVisualChange}
-              tr
-                td Requests
-                td #{d.webpagetest.run.firstView.requestsFull}
 
         .one-half.column
-            if !d.browsertime && d.webpagetest
-              - screenshotName = 'data/screenshots/wpt-' + iteration + '-firstView.png'
-              a(href=screenshotName)
-                img.screenshot(src=screenshotName, alt='Screenshot')
-            else if hasScreenShots
+            if hasScreenShots
               - screenshotName = 'data/screenshots/' + iteration + '/afterPageCompleteCheck.' + screenShotType
               - const width = options.mobile ? 150 : '100%';
               a(href=screenshotName)