From 3c03e2c4472ebf7d484623366ac89174cc7da253 Mon Sep 17 00:00:00 2001
From: Paul Irish <paul.irish@gmail.com>
Date: Mon, 1 Oct 2018 10:43:24 -0700
Subject: [PATCH] 3.2.1 (#6149)

---
 changelog.md                                             | 9 +++++++++
 .../test/smokehouse/dobetterweb/dbw-expectations.js      | 8 ++++++++
 .../gather/gatherers/dobetterweb/js-libraries.js         | 4 ++--
 lighthouse-core/lib/emulation.js                         | 4 ++--
 lighthouse-core/test/results/sample_v2.json              | 2 +-
 lighthouse-extension/app/manifest.json                   | 2 +-
 package.json                                             | 2 +-
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/changelog.md b/changelog.md
index 128fe5c9b4a3..a2356d2f9a3d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,12 @@
+ <a name="3.2.1"></a>
+# 3.2.1 (2018-10-01)
+[Full Changelog](https://github.com/googlechrome/lighthouse/compare/v3.2.0...v3.2.1)
+
+## Core
+
+* await js-libraries detection to fix Workbox always showing up ([#6141](https://github.com/googlechrome/lighthouse/pull/6141))
+* emulation: set desktop viewport to 1350x940 ([#6131](https://github.com/googlechrome/lighthouse/pull/6131))
+
  <a name="3.2.0"></a>
 # 3.2.0 (2018-09-27)
 [Full Changelog](https://github.com/googlechrome/lighthouse/compare/v3.1.1...v3.2.0)
diff --git a/lighthouse-cli/test/smokehouse/dobetterweb/dbw-expectations.js b/lighthouse-cli/test/smokehouse/dobetterweb/dbw-expectations.js
index bd51a1c8fc5a..b3ae12bf89a7 100644
--- a/lighthouse-cli/test/smokehouse/dobetterweb/dbw-expectations.js
+++ b/lighthouse-cli/test/smokehouse/dobetterweb/dbw-expectations.js
@@ -138,6 +138,14 @@ module.exports = [
           ],
         },
       },
+      'js-libraries': {
+        score: 1,
+        details: {
+          items: [{
+            name: 'jQuery',
+          }],
+        },
+      },
     },
   },
 ];
diff --git a/lighthouse-core/gather/gatherers/dobetterweb/js-libraries.js b/lighthouse-core/gather/gatherers/dobetterweb/js-libraries.js
index 2d6a0c7b3ec0..040690f97422 100644
--- a/lighthouse-core/gather/gatherers/dobetterweb/js-libraries.js
+++ b/lighthouse-core/gather/gatherers/dobetterweb/js-libraries.js
@@ -29,9 +29,9 @@ function detectLibraries() {
   // d41d8cd98f00b204e9800998ecf8427e_ is a consistent prefix used by the detect libraries
   // see https://github.com/HTTPArchive/httparchive/issues/77#issuecomment-291320900
   // @ts-ignore - injected libDetectorSource var
-  Object.entries(d41d8cd98f00b204e9800998ecf8427e_LibraryDetectorTests).forEach(([name, lib]) => {
+  Object.entries(d41d8cd98f00b204e9800998ecf8427e_LibraryDetectorTests).forEach(async ([name, lib]) => { // eslint-disable-line max-len
     try {
-      const result = lib.test(window);
+      const result = await lib.test(window);
       if (result) {
         libraries.push({
           name: name,
diff --git a/lighthouse-core/lib/emulation.js b/lighthouse-core/lib/emulation.js
index cb257b7e1864..499842c1a1ea 100644
--- a/lighthouse-core/lib/emulation.js
+++ b/lighthouse-core/lib/emulation.js
@@ -33,8 +33,8 @@ const NEXUS5X_EMULATION_METRICS = {
  */
 const DESKTOP_EMULATION_METRICS = {
   mobile: false,
-  width: 1366,
-  height: 768,
+  width: 1350,
+  height: 940,
   deviceScaleFactor: 1,
 };
 
diff --git a/lighthouse-core/test/results/sample_v2.json b/lighthouse-core/test/results/sample_v2.json
index fc16747b5fbf..aff3c086dd34 100644
--- a/lighthouse-core/test/results/sample_v2.json
+++ b/lighthouse-core/test/results/sample_v2.json
@@ -5,7 +5,7 @@
     "hostUserAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3358.0 Safari/537.36",
     "benchmarkIndex": 1000
   },
-  "lighthouseVersion": "3.2.0",
+  "lighthouseVersion": "3.2.1",
   "fetchTime": "2018-03-13T00:55:45.840Z",
   "requestedUrl": "http://localhost:10200/dobetterweb/dbw_tester.html",
   "finalUrl": "http://localhost:10200/dobetterweb/dbw_tester.html",
diff --git a/lighthouse-extension/app/manifest.json b/lighthouse-extension/app/manifest.json
index 5cc854f7ec55..fbfe1e718822 100644
--- a/lighthouse-extension/app/manifest.json
+++ b/lighthouse-extension/app/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "__MSG_appName__",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "minimum_chrome_version": "66",
   "manifest_version": 2,
   "description": "__MSG_appDescription__",
diff --git a/package.json b/package.json
index 81919aadf894..41e4ada6fe9d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lighthouse",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Lighthouse",
   "main": "./lighthouse-core/index.js",
   "bin": {