sitespeed.io 34.1.0 → 34.1.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG - sitespeed.io  (we use [semantic versioning](https://semver.org))
 
+## 34.1.2 - 2024-06-12
+### Fixed
+* Using `--preWarmServer` resulted in trying to use an  Android phone to prewarm. Fixed in [#4182](https://github.com/sitespeedio/sitespeed.io/pull/4182).
+
+## 34.1.1 - 2024-06-07
+### Fixed
+* Enabling extra profile run/video run didn't stop the Browsertime engine in the correct place. PR [#4179](https://github.com/sitespeedio/sitespeed.io/pull/4179) fixes that.
+
 ## 34.1.0 - 2024-06-06
 ### Added
 * Add `--enableVideoRun`. You can use it together with `--video false --visualMetrics true` to do one extra run where the video is kept. This is useful for tests against replay proxies [#4177](https://github.com/sitespeedio/sitespeed.io/pull/4177).

package/lib/plugins/browsertime/analyzer.js

@@ -24,25 +24,28 @@ async function preWarmServer(urls, options, scriptOrMultiple) {
     browser: options.browser,
     iterations: 1,
     xvfb: options.xvfb,
-    android: options.android,
     docker: options.docker,
     headless: options.headless
   };
-  const chromeDevice = get(options, 'chrome.android.deviceSerial');
-  const firefoxDevice = get(options, 'firefox.android.deviceSerial');
+
+  if (options.android.enabled) {
+    preWarmOptions.android = options.android;
+    const chromeDevice = get(options, 'chrome.android.deviceSerial');
+    const firefoxDevice = get(options, 'firefox.android.deviceSerial');
+    if (options.browser === 'chrome') {
+      set(preWarmOptions, 'chrome.android.package', 'com.android.chrome');
+    }
+    if (chromeDevice) {
+      set(preWarmOptions, 'chrome.android.deviceSerial', chromeDevice);
+    } else if (firefoxDevice) {
+      set(preWarmOptions, 'firefox.android.deviceSerial', firefoxDevice);
+    }
+  }
+
   const safariIos = get(options, 'safari.ios');
   const safariDeviceName = get(options, 'safari.deviceName');
   const safariDeviceUDID = get(options, 'safari.deviceUDID ');
 
-  if (options.android && options.browser === 'chrome') {
-    set(preWarmOptions, 'chrome.android.package', 'com.android.chrome');
-  }
-  if (chromeDevice) {
-    set(preWarmOptions, 'chrome.android.deviceSerial', chromeDevice);
-  } else if (firefoxDevice) {
-    set(preWarmOptions, 'firefox.android.deviceSerial', firefoxDevice);
-  }
-
   if (safariIos) {
     set(preWarmOptions, 'safari.ios', true);
     if (safariDeviceName) {
@@ -196,20 +199,13 @@ export async function analyzeUrl(
 
   try {
     await engine.start();
-    if (scriptOrMultiple) {
-      const res = await engine.runMultiple(url, scriptsByCategory, asyncScript);
-      if (btOptions.enableProfileRun || btOptions.enableVideoRun) {
-        await extraProfileRun(url, btOptions, scriptOrMultiple);
-      }
-      return res;
-    } else {
-      const res = await engine.run(url, scriptsByCategory, asyncScript);
-      if (btOptions.enableProfileRun || btOptions.enableVideoRun) {
-        await extraProfileRun(url, btOptions, scriptOrMultiple);
-      }
-      return res;
-    }
+    return await (scriptOrMultiple
+      ? engine.runMultiple(url, scriptsByCategory, asyncScript)
+      : engine.run(url, scriptsByCategory, asyncScript));
   } finally {
     await engine.stop();
+    if (btOptions.enableProfileRun || btOptions.enableVideoRun) {
+      await extraProfileRun(url, btOptions, scriptOrMultiple);
+    }
   }
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "sitespeed.io",
-  "version": "34.1.0",
+  "version": "34.1.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "sitespeed.io",
-      "version": "34.1.0",
+      "version": "34.1.2",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "3.564.0",

package/package.json

@@ -5,7 +5,7 @@
     "sitespeed.io": "./bin/sitespeed.js",
     "sitespeed.io-wpr": "./bin/browsertimeWebPageReplay.js"
   },
-  "version": "34.1.0",
+  "version": "34.1.2",
   "description": "sitespeed.io is an open-source tool for comprehensive web performance analysis, enabling you to test, monitor, and optimize your website’s speed using real browsers in various environments.",
   "keywords": [
     "performance",