lighthouse 9.5.0-dev.20220404 → 9.5.0-dev.20220407

package/dist/report/bundle.esm.js

@@ -4999,7 +4999,7 @@ function computeWindowNameSuffix(json) {
   // @ts-expect-error - If this is a v2 LHR, use old `generatedTime`.
   const fallbackFetchTime = /** @type {string} */ (json.generatedTime);
   const fetchTime = json.fetchTime || fallbackFetchTime;
-  return `${json.lighthouseVersion}-${json.requestedUrl}-${fetchTime}`;
+  return `${json.lighthouseVersion}-${json.finalUrl}-${fetchTime}`;
 }
 
 /**
@@ -5081,7 +5081,6 @@ function openTreemap(json) {
   /** @type {LH.Treemap.Options} */
   const treemapOptions = {
     lhr: {
-      requestedUrl: json.requestedUrl,
       finalUrl: json.finalUrl,
       audits: {
         'script-treemap-data': json.audits['script-treemap-data'],

package/dist/report/flow.js

@@ -188,7 +188,7 @@ class ja{constructor(e,a){this._document=e,this._lighthouseChannel="unknown",thi
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    * See the License for the specific language governing permissions and
    * limitations under the License.
-   */function cn(){const e=window.location.host.endsWith(".vercel.app"),a=new URLSearchParams(window.location.search).has("dev");return e?`https://${window.location.host}/gh-pages`:a?"http://localhost:8000":"https://googlechrome.github.io/lighthouse"}function dn(e){const a=e.generatedTime,n=e.fetchTime||a;return`${e.lighthouseVersion}-${e.requestedUrl}-${n}`}async function mn(e,a,n){const t=new URL(a),i=Boolean(window.CompressionStream);t.hash=await un.toBase64(JSON.stringify(e),{gzip:i}),i&&t.searchParams.set("gzip","1"),window.open(t.toString(),n)}async function hn(e){const a="viewer-"+dn(e);!function(e,a,n){const t=new URL(a).origin;window.addEventListener("message",(function a(n){n.origin===t&&i&&n.data.opened&&(i.postMessage(e,t),window.removeEventListener("message",a))}));const i=window.open(a,n)}({lhr:e},cn()+"/viewer/",a)}
+   */function cn(){const e=window.location.host.endsWith(".vercel.app"),a=new URLSearchParams(window.location.search).has("dev");return e?`https://${window.location.host}/gh-pages`:a?"http://localhost:8000":"https://googlechrome.github.io/lighthouse"}function dn(e){const a=e.generatedTime,n=e.fetchTime||a;return`${e.lighthouseVersion}-${e.finalUrl}-${n}`}async function mn(e,a,n){const t=new URL(a),i=Boolean(window.CompressionStream);t.hash=await un.toBase64(JSON.stringify(e),{gzip:i}),i&&t.searchParams.set("gzip","1"),window.open(t.toString(),n)}async function hn(e){const a="viewer-"+dn(e);!function(e,a,n){const t=new URL(a).origin;window.addEventListener("message",(function a(n){n.origin===t&&i&&n.data.opened&&(i.postMessage(e,t),window.removeEventListener("message",a))}));const i=window.open(a,n)}({lhr:e},cn()+"/viewer/",a)}
 /**
    * @license Copyright 2021 The Lighthouse Authors. All Rights Reserved.
    * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
@@ -220,7 +220,7 @@ class gn{constructor(e){this._dom=e,this._toggleEl,this._menuEl,this.onDocumentK
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    * See the License for the specific language governing permissions and
    * limitations under the License.
-   */class yn{constructor(e,a={}){this.json,this._dom=e,this._opts=a,this._topbar=a.omitTopbar?null:new vn(this,e),this.onMediaQueryChange=this.onMediaQueryChange.bind(this)}initFeatures(e){this.json=e,this._topbar&&(this._topbar.enable(e),this._topbar.resetUIState()),this._setupMediaQueryListeners(),this._setupThirdPartyFilter(),this._setupElementScreenshotOverlay(this._dom.rootEl);const a=this._dom.isDevTools()||this._opts.disableDarkMode||this._opts.disableAutoDarkModeAndFireworks;!a&&window.matchMedia("(prefers-color-scheme: dark)").matches&&sn(this._dom,!0);const n=["performance","accessibility","best-practices","seo"].every((a=>{const n=e.categories[a];return n&&1===n.score})),t=this._opts.disableFireworks||this._opts.disableAutoDarkModeAndFireworks;n&&!t&&(this._enableFireworks(),a||sn(this._dom,!0));if(e.categories.performance&&e.categories.performance.auditRefs.some((a=>Boolean("metrics"===a.group&&e.audits[a.id].errorMessage)))){this._dom.find("input.lh-metrics-toggle__input",this._dom.rootEl).checked=!0}this.json.audits["script-treemap-data"]&&this.json.audits["script-treemap-data"].details&&this.addButton({text:de.i18n.strings.viewTreemapLabel,icon:"treemap",onClick:()=>function(e){if(!e.audits["script-treemap-data"].details)throw new Error("no script treemap data found");mn({lhr:{requestedUrl:e.requestedUrl,finalUrl:e.finalUrl,audits:{"script-treemap-data":e.audits["script-treemap-data"]},configSettings:{locale:e.configSettings.locale}}},cn()+"/treemap/","treemap-"+dn(e))}(this.json)}),this._opts.onViewTrace&&this.addButton({text:"simulate"===e.configSettings.throttlingMethod?de.i18n.strings.viewOriginalTraceLabel:de.i18n.strings.viewTraceLabel,onClick:()=>this._opts.onViewTrace?.()}),this._opts.getStandaloneReportHTML&&this._dom.find('a[data-action="save-html"]',this._dom.rootEl).classList.remove("lh-hidden");for(const e of this._dom.findAll("[data-i18n]",this._dom.rootEl)){const a=e.getAttribute("data-i18n");e.textContent=de.i18n.strings[a]}}addButton(e){const a=this._dom.rootEl.querySelector(".lh-audit-group--metrics");if(!a)return;let n=a.querySelector(".lh-buttons");n||(n=this._dom.createChildOf(a,"div","lh-buttons"));const t=["lh-button"];e.icon&&(t.push("lh-report-icon"),t.push(`lh-report-icon--${e.icon}`));const i=this._dom.createChildOf(n,"button",t.join(" "));return i.textContent=e.text,i.addEventListener("click",e.onClick),i}resetUIState(){this._topbar&&this._topbar.resetUIState()}getReportHtml(){if(!this._opts.getStandaloneReportHTML)throw new Error("`getStandaloneReportHTML` is not set");return this.resetUIState(),this._opts.getStandaloneReportHTML()}saveAsGist(){throw new Error("Cannot save as gist from base report")}_enableFireworks(){this._dom.find(".lh-scores-container",this._dom.rootEl).classList.add("lh-score100")}_setupMediaQueryListeners(){const e=self.matchMedia("(max-width: 500px)");e.addListener(this.onMediaQueryChange),this.onMediaQueryChange(e)}_resetUIState(){this._topbar&&this._topbar.resetUIState()}onMediaQueryChange(e){this._dom.rootEl.classList.toggle("lh-narrow",e.matches)}_setupThirdPartyFilter(){const e=["uses-rel-preconnect","third-party-facades"],a=["legacy-javascript"];Array.from(this._dom.rootEl.querySelectorAll("table.lh-table")).filter((e=>e.querySelector("td.lh-table-column--url, td.lh-table-column--source-location"))).filter((a=>{const n=a.closest(".lh-audit");if(!n)throw new Error(".lh-table not within audit");return!e.includes(n.id)})).forEach((e=>{const n=function(e){return Array.from(e.tBodies[0].rows)}(e),t=this._getThirdPartyRows(n,this.json.finalUrl),i=this._dom.createComponent("3pFilter"),o=this._dom.find("input",i);o.addEventListener("change",(e=>{const a=e.target instanceof HTMLInputElement&&!e.target.checked;let i=!0,o=n[0];for(;o;){const e=a&&t.includes(o);do{o.classList.toggle("lh-row--hidden",e),o.classList.toggle("lh-row--even",!e&&i),o.classList.toggle("lh-row--odd",!e&&!i),o=o.nextElementSibling}while(o&&o.classList.contains("lh-sub-item-row"));e||(i=!i)}})),this._dom.find(".lh-3p-filter-count",i).textContent=`${t.length}`,this._dom.find(".lh-3p-ui-string",i).textContent=de.i18n.strings.thirdPartyResourcesLabel;const r=t.length===n.length,s=!t.length;if((r||s)&&(this._dom.find("div.lh-3p-filter",i).hidden=!0),!e.parentNode)return;e.parentNode.insertBefore(i,e);const l=e.closest(".lh-audit");if(!l)throw new Error(".lh-table not within audit");a.includes(l.id)&&!r&&o.click()}))}_setupElementScreenshotOverlay(e){const a=this.json.audits["full-page-screenshot"]&&this.json.audits["full-page-screenshot"].details&&"full-page-screenshot"===this.json.audits["full-page-screenshot"].details.type&&this.json.audits["full-page-screenshot"].details;a&&en.installOverlayFeature({dom:this._dom,rootEl:e,overlayContainerEl:e,fullPageScreenshot:a})}_getThirdPartyRows(e,a){const n=[],t=de.getRootDomain(a);for(const a of e){if(a.classList.contains("lh-sub-item-row"))continue;const e=a.querySelector("div.lh-text__url");if(!e)continue;const i=e.dataset.url;if(!i)continue;de.getRootDomain(i)!==t&&n.push(a)}return n}_saveFile(e){const a=e.type.match("json")?".json":".html",n=bn.getLhrFilenamePrefix(this.json)+a;this._opts.onSaveFileOverride?this._opts.onSaveFileOverride(e,n):this._dom.saveFile(e,n)}}
+   */class yn{constructor(e,a={}){this.json,this._dom=e,this._opts=a,this._topbar=a.omitTopbar?null:new vn(this,e),this.onMediaQueryChange=this.onMediaQueryChange.bind(this)}initFeatures(e){this.json=e,this._topbar&&(this._topbar.enable(e),this._topbar.resetUIState()),this._setupMediaQueryListeners(),this._setupThirdPartyFilter(),this._setupElementScreenshotOverlay(this._dom.rootEl);const a=this._dom.isDevTools()||this._opts.disableDarkMode||this._opts.disableAutoDarkModeAndFireworks;!a&&window.matchMedia("(prefers-color-scheme: dark)").matches&&sn(this._dom,!0);const n=["performance","accessibility","best-practices","seo"].every((a=>{const n=e.categories[a];return n&&1===n.score})),t=this._opts.disableFireworks||this._opts.disableAutoDarkModeAndFireworks;n&&!t&&(this._enableFireworks(),a||sn(this._dom,!0));if(e.categories.performance&&e.categories.performance.auditRefs.some((a=>Boolean("metrics"===a.group&&e.audits[a.id].errorMessage)))){this._dom.find("input.lh-metrics-toggle__input",this._dom.rootEl).checked=!0}this.json.audits["script-treemap-data"]&&this.json.audits["script-treemap-data"].details&&this.addButton({text:de.i18n.strings.viewTreemapLabel,icon:"treemap",onClick:()=>function(e){if(!e.audits["script-treemap-data"].details)throw new Error("no script treemap data found");mn({lhr:{finalUrl:e.finalUrl,audits:{"script-treemap-data":e.audits["script-treemap-data"]},configSettings:{locale:e.configSettings.locale}}},cn()+"/treemap/","treemap-"+dn(e))}(this.json)}),this._opts.onViewTrace&&this.addButton({text:"simulate"===e.configSettings.throttlingMethod?de.i18n.strings.viewOriginalTraceLabel:de.i18n.strings.viewTraceLabel,onClick:()=>this._opts.onViewTrace?.()}),this._opts.getStandaloneReportHTML&&this._dom.find('a[data-action="save-html"]',this._dom.rootEl).classList.remove("lh-hidden");for(const e of this._dom.findAll("[data-i18n]",this._dom.rootEl)){const a=e.getAttribute("data-i18n");e.textContent=de.i18n.strings[a]}}addButton(e){const a=this._dom.rootEl.querySelector(".lh-audit-group--metrics");if(!a)return;let n=a.querySelector(".lh-buttons");n||(n=this._dom.createChildOf(a,"div","lh-buttons"));const t=["lh-button"];e.icon&&(t.push("lh-report-icon"),t.push(`lh-report-icon--${e.icon}`));const i=this._dom.createChildOf(n,"button",t.join(" "));return i.textContent=e.text,i.addEventListener("click",e.onClick),i}resetUIState(){this._topbar&&this._topbar.resetUIState()}getReportHtml(){if(!this._opts.getStandaloneReportHTML)throw new Error("`getStandaloneReportHTML` is not set");return this.resetUIState(),this._opts.getStandaloneReportHTML()}saveAsGist(){throw new Error("Cannot save as gist from base report")}_enableFireworks(){this._dom.find(".lh-scores-container",this._dom.rootEl).classList.add("lh-score100")}_setupMediaQueryListeners(){const e=self.matchMedia("(max-width: 500px)");e.addListener(this.onMediaQueryChange),this.onMediaQueryChange(e)}_resetUIState(){this._topbar&&this._topbar.resetUIState()}onMediaQueryChange(e){this._dom.rootEl.classList.toggle("lh-narrow",e.matches)}_setupThirdPartyFilter(){const e=["uses-rel-preconnect","third-party-facades"],a=["legacy-javascript"];Array.from(this._dom.rootEl.querySelectorAll("table.lh-table")).filter((e=>e.querySelector("td.lh-table-column--url, td.lh-table-column--source-location"))).filter((a=>{const n=a.closest(".lh-audit");if(!n)throw new Error(".lh-table not within audit");return!e.includes(n.id)})).forEach((e=>{const n=function(e){return Array.from(e.tBodies[0].rows)}(e),t=this._getThirdPartyRows(n,this.json.finalUrl),i=this._dom.createComponent("3pFilter"),o=this._dom.find("input",i);o.addEventListener("change",(e=>{const a=e.target instanceof HTMLInputElement&&!e.target.checked;let i=!0,o=n[0];for(;o;){const e=a&&t.includes(o);do{o.classList.toggle("lh-row--hidden",e),o.classList.toggle("lh-row--even",!e&&i),o.classList.toggle("lh-row--odd",!e&&!i),o=o.nextElementSibling}while(o&&o.classList.contains("lh-sub-item-row"));e||(i=!i)}})),this._dom.find(".lh-3p-filter-count",i).textContent=`${t.length}`,this._dom.find(".lh-3p-ui-string",i).textContent=de.i18n.strings.thirdPartyResourcesLabel;const r=t.length===n.length,s=!t.length;if((r||s)&&(this._dom.find("div.lh-3p-filter",i).hidden=!0),!e.parentNode)return;e.parentNode.insertBefore(i,e);const l=e.closest(".lh-audit");if(!l)throw new Error(".lh-table not within audit");a.includes(l.id)&&!r&&o.click()}))}_setupElementScreenshotOverlay(e){const a=this.json.audits["full-page-screenshot"]&&this.json.audits["full-page-screenshot"].details&&"full-page-screenshot"===this.json.audits["full-page-screenshot"].details.type&&this.json.audits["full-page-screenshot"].details;a&&en.installOverlayFeature({dom:this._dom,rootEl:e,overlayContainerEl:e,fullPageScreenshot:a})}_getThirdPartyRows(e,a){const n=[],t=de.getRootDomain(a);for(const a of e){if(a.classList.contains("lh-sub-item-row"))continue;const e=a.querySelector("div.lh-text__url");if(!e)continue;const i=e.dataset.url;if(!i)continue;de.getRootDomain(i)!==t&&n.push(a)}return n}_saveFile(e){const a=e.type.match("json")?".json":".html",n=bn.getLhrFilenamePrefix(this.json)+a;this._opts.onSaveFileOverride?this._opts.onSaveFileOverride(e,n):this._dom.saveFile(e,n)}}
 /**
    * @license Copyright 2021 The Lighthouse Authors. All Rights Reserved.
    * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0

package/dist/report/standalone.js

@@ -171,7 +171,7 @@ class s{constructor(e,t){this._document=e,this._lighthouseChannel="unknown",this
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    * See the License for the specific language governing permissions and
    * limitations under the License.
-   */function P(){const e=window.location.host.endsWith(".vercel.app"),t=new URLSearchParams(window.location.search).has("dev");return e?`https://${window.location.host}/gh-pages`:t?"http://localhost:8000":"https://googlechrome.github.io/lighthouse"}function U(e){const t=e.generatedTime,n=e.fetchTime||t;return`${e.lighthouseVersion}-${e.requestedUrl}-${n}`}async function $(e,t,n){const r=new URL(t),o=Boolean(window.CompressionStream);r.hash=await R.toBase64(JSON.stringify(e),{gzip:o}),o&&r.searchParams.set("gzip","1"),window.open(r.toString(),n)}async function O(e){const t="viewer-"+U(e);!function(e,t,n){const r=new URL(t).origin;window.addEventListener("message",(function t(n){n.origin===r&&o&&n.data.opened&&(o.postMessage(e,r),window.removeEventListener("message",t))}));const o=window.open(t,n)}({lhr:e},P()+"/viewer/",t)}
+   */function P(){const e=window.location.host.endsWith(".vercel.app"),t=new URLSearchParams(window.location.search).has("dev");return e?`https://${window.location.host}/gh-pages`:t?"http://localhost:8000":"https://googlechrome.github.io/lighthouse"}function U(e){const t=e.generatedTime,n=e.fetchTime||t;return`${e.lighthouseVersion}-${e.finalUrl}-${n}`}async function $(e,t,n){const r=new URL(t),o=Boolean(window.CompressionStream);r.hash=await R.toBase64(JSON.stringify(e),{gzip:o}),o&&r.searchParams.set("gzip","1"),window.open(r.toString(),n)}async function O(e){const t="viewer-"+U(e);!function(e,t,n){const r=new URL(t).origin;window.addEventListener("message",(function t(n){n.origin===r&&o&&n.data.opened&&(o.postMessage(e,r),window.removeEventListener("message",t))}));const o=window.open(t,n)}({lhr:e},P()+"/viewer/",t)}
 /**
    * @license Copyright 2021 The Lighthouse Authors. All Rights Reserved.
    * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
@@ -203,7 +203,7 @@ class B{constructor(e){this._dom=e,this._toggleEl,this._menuEl,this.onDocumentKe
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    * See the License for the specific language governing permissions and
    * limitations under the License.
-   */class j{constructor(e,t={}){this.json,this._dom=e,this._opts=t,this._topbar=t.omitTopbar?null:new I(this,e),this.onMediaQueryChange=this.onMediaQueryChange.bind(this)}initFeatures(e){this.json=e,this._topbar&&(this._topbar.enable(e),this._topbar.resetUIState()),this._setupMediaQueryListeners(),this._setupThirdPartyFilter(),this._setupElementScreenshotOverlay(this._dom.rootEl);const t=this._dom.isDevTools()||this._opts.disableDarkMode||this._opts.disableAutoDarkModeAndFireworks;!t&&window.matchMedia("(prefers-color-scheme: dark)").matches&&N(this._dom,!0);const n=["performance","accessibility","best-practices","seo"].every((t=>{const n=e.categories[t];return n&&1===n.score})),r=this._opts.disableFireworks||this._opts.disableAutoDarkModeAndFireworks;n&&!r&&(this._enableFireworks(),t||N(this._dom,!0));if(e.categories.performance&&e.categories.performance.auditRefs.some((t=>Boolean("metrics"===t.group&&e.audits[t.id].errorMessage)))){this._dom.find("input.lh-metrics-toggle__input",this._dom.rootEl).checked=!0}this.json.audits["script-treemap-data"]&&this.json.audits["script-treemap-data"].details&&this.addButton({text:l.i18n.strings.viewTreemapLabel,icon:"treemap",onClick:()=>function(e){if(!e.audits["script-treemap-data"].details)throw new Error("no script treemap data found");$({lhr:{requestedUrl:e.requestedUrl,finalUrl:e.finalUrl,audits:{"script-treemap-data":e.audits["script-treemap-data"]},configSettings:{locale:e.configSettings.locale}}},P()+"/treemap/","treemap-"+U(e))}(this.json)}),this._opts.onViewTrace&&this.addButton({text:"simulate"===e.configSettings.throttlingMethod?l.i18n.strings.viewOriginalTraceLabel:l.i18n.strings.viewTraceLabel,onClick:()=>this._opts.onViewTrace?.()}),this._opts.getStandaloneReportHTML&&this._dom.find('a[data-action="save-html"]',this._dom.rootEl).classList.remove("lh-hidden");for(const e of this._dom.findAll("[data-i18n]",this._dom.rootEl)){const t=e.getAttribute("data-i18n");e.textContent=l.i18n.strings[t]}}addButton(e){const t=this._dom.rootEl.querySelector(".lh-audit-group--metrics");if(!t)return;let n=t.querySelector(".lh-buttons");n||(n=this._dom.createChildOf(t,"div","lh-buttons"));const r=["lh-button"];e.icon&&(r.push("lh-report-icon"),r.push(`lh-report-icon--${e.icon}`));const o=this._dom.createChildOf(n,"button",r.join(" "));return o.textContent=e.text,o.addEventListener("click",e.onClick),o}resetUIState(){this._topbar&&this._topbar.resetUIState()}getReportHtml(){if(!this._opts.getStandaloneReportHTML)throw new Error("`getStandaloneReportHTML` is not set");return this.resetUIState(),this._opts.getStandaloneReportHTML()}saveAsGist(){throw new Error("Cannot save as gist from base report")}_enableFireworks(){this._dom.find(".lh-scores-container",this._dom.rootEl).classList.add("lh-score100")}_setupMediaQueryListeners(){const e=self.matchMedia("(max-width: 500px)");e.addListener(this.onMediaQueryChange),this.onMediaQueryChange(e)}_resetUIState(){this._topbar&&this._topbar.resetUIState()}onMediaQueryChange(e){this._dom.rootEl.classList.toggle("lh-narrow",e.matches)}_setupThirdPartyFilter(){const e=["uses-rel-preconnect","third-party-facades"],t=["legacy-javascript"];Array.from(this._dom.rootEl.querySelectorAll("table.lh-table")).filter((e=>e.querySelector("td.lh-table-column--url, td.lh-table-column--source-location"))).filter((t=>{const n=t.closest(".lh-audit");if(!n)throw new Error(".lh-table not within audit");return!e.includes(n.id)})).forEach((e=>{const n=function(e){return Array.from(e.tBodies[0].rows)}(e),r=this._getThirdPartyRows(n,this.json.finalUrl),o=this._dom.createComponent("3pFilter"),i=this._dom.find("input",o);i.addEventListener("change",(e=>{const t=e.target instanceof HTMLInputElement&&!e.target.checked;let o=!0,i=n[0];for(;i;){const e=t&&r.includes(i);do{i.classList.toggle("lh-row--hidden",e),i.classList.toggle("lh-row--even",!e&&o),i.classList.toggle("lh-row--odd",!e&&!o),i=i.nextElementSibling}while(i&&i.classList.contains("lh-sub-item-row"));e||(o=!o)}})),this._dom.find(".lh-3p-filter-count",o).textContent=`${r.length}`,this._dom.find(".lh-3p-ui-string",o).textContent=l.i18n.strings.thirdPartyResourcesLabel;const a=r.length===n.length,s=!r.length;if((a||s)&&(this._dom.find("div.lh-3p-filter",o).hidden=!0),!e.parentNode)return;e.parentNode.insertBefore(o,e);const c=e.closest(".lh-audit");if(!c)throw new Error(".lh-table not within audit");t.includes(c.id)&&!a&&i.click()}))}_setupElementScreenshotOverlay(e){const t=this.json.audits["full-page-screenshot"]&&this.json.audits["full-page-screenshot"].details&&"full-page-screenshot"===this.json.audits["full-page-screenshot"].details.type&&this.json.audits["full-page-screenshot"].details;t&&A.installOverlayFeature({dom:this._dom,rootEl:e,overlayContainerEl:e,fullPageScreenshot:t})}_getThirdPartyRows(e,t){const n=[],r=l.getRootDomain(t);for(const t of e){if(t.classList.contains("lh-sub-item-row"))continue;const e=t.querySelector("div.lh-text__url");if(!e)continue;const o=e.dataset.url;if(!o)continue;l.getRootDomain(o)!==r&&n.push(t)}return n}_saveFile(e){const t=e.type.match("json")?".json":".html",n=G.getLhrFilenamePrefix(this.json)+t;this._opts.onSaveFileOverride?this._opts.onSaveFileOverride(e,n):this._dom.saveFile(e,n)}}
+   */class j{constructor(e,t={}){this.json,this._dom=e,this._opts=t,this._topbar=t.omitTopbar?null:new I(this,e),this.onMediaQueryChange=this.onMediaQueryChange.bind(this)}initFeatures(e){this.json=e,this._topbar&&(this._topbar.enable(e),this._topbar.resetUIState()),this._setupMediaQueryListeners(),this._setupThirdPartyFilter(),this._setupElementScreenshotOverlay(this._dom.rootEl);const t=this._dom.isDevTools()||this._opts.disableDarkMode||this._opts.disableAutoDarkModeAndFireworks;!t&&window.matchMedia("(prefers-color-scheme: dark)").matches&&N(this._dom,!0);const n=["performance","accessibility","best-practices","seo"].every((t=>{const n=e.categories[t];return n&&1===n.score})),r=this._opts.disableFireworks||this._opts.disableAutoDarkModeAndFireworks;n&&!r&&(this._enableFireworks(),t||N(this._dom,!0));if(e.categories.performance&&e.categories.performance.auditRefs.some((t=>Boolean("metrics"===t.group&&e.audits[t.id].errorMessage)))){this._dom.find("input.lh-metrics-toggle__input",this._dom.rootEl).checked=!0}this.json.audits["script-treemap-data"]&&this.json.audits["script-treemap-data"].details&&this.addButton({text:l.i18n.strings.viewTreemapLabel,icon:"treemap",onClick:()=>function(e){if(!e.audits["script-treemap-data"].details)throw new Error("no script treemap data found");$({lhr:{finalUrl:e.finalUrl,audits:{"script-treemap-data":e.audits["script-treemap-data"]},configSettings:{locale:e.configSettings.locale}}},P()+"/treemap/","treemap-"+U(e))}(this.json)}),this._opts.onViewTrace&&this.addButton({text:"simulate"===e.configSettings.throttlingMethod?l.i18n.strings.viewOriginalTraceLabel:l.i18n.strings.viewTraceLabel,onClick:()=>this._opts.onViewTrace?.()}),this._opts.getStandaloneReportHTML&&this._dom.find('a[data-action="save-html"]',this._dom.rootEl).classList.remove("lh-hidden");for(const e of this._dom.findAll("[data-i18n]",this._dom.rootEl)){const t=e.getAttribute("data-i18n");e.textContent=l.i18n.strings[t]}}addButton(e){const t=this._dom.rootEl.querySelector(".lh-audit-group--metrics");if(!t)return;let n=t.querySelector(".lh-buttons");n||(n=this._dom.createChildOf(t,"div","lh-buttons"));const r=["lh-button"];e.icon&&(r.push("lh-report-icon"),r.push(`lh-report-icon--${e.icon}`));const o=this._dom.createChildOf(n,"button",r.join(" "));return o.textContent=e.text,o.addEventListener("click",e.onClick),o}resetUIState(){this._topbar&&this._topbar.resetUIState()}getReportHtml(){if(!this._opts.getStandaloneReportHTML)throw new Error("`getStandaloneReportHTML` is not set");return this.resetUIState(),this._opts.getStandaloneReportHTML()}saveAsGist(){throw new Error("Cannot save as gist from base report")}_enableFireworks(){this._dom.find(".lh-scores-container",this._dom.rootEl).classList.add("lh-score100")}_setupMediaQueryListeners(){const e=self.matchMedia("(max-width: 500px)");e.addListener(this.onMediaQueryChange),this.onMediaQueryChange(e)}_resetUIState(){this._topbar&&this._topbar.resetUIState()}onMediaQueryChange(e){this._dom.rootEl.classList.toggle("lh-narrow",e.matches)}_setupThirdPartyFilter(){const e=["uses-rel-preconnect","third-party-facades"],t=["legacy-javascript"];Array.from(this._dom.rootEl.querySelectorAll("table.lh-table")).filter((e=>e.querySelector("td.lh-table-column--url, td.lh-table-column--source-location"))).filter((t=>{const n=t.closest(".lh-audit");if(!n)throw new Error(".lh-table not within audit");return!e.includes(n.id)})).forEach((e=>{const n=function(e){return Array.from(e.tBodies[0].rows)}(e),r=this._getThirdPartyRows(n,this.json.finalUrl),o=this._dom.createComponent("3pFilter"),i=this._dom.find("input",o);i.addEventListener("change",(e=>{const t=e.target instanceof HTMLInputElement&&!e.target.checked;let o=!0,i=n[0];for(;i;){const e=t&&r.includes(i);do{i.classList.toggle("lh-row--hidden",e),i.classList.toggle("lh-row--even",!e&&o),i.classList.toggle("lh-row--odd",!e&&!o),i=i.nextElementSibling}while(i&&i.classList.contains("lh-sub-item-row"));e||(o=!o)}})),this._dom.find(".lh-3p-filter-count",o).textContent=`${r.length}`,this._dom.find(".lh-3p-ui-string",o).textContent=l.i18n.strings.thirdPartyResourcesLabel;const a=r.length===n.length,s=!r.length;if((a||s)&&(this._dom.find("div.lh-3p-filter",o).hidden=!0),!e.parentNode)return;e.parentNode.insertBefore(o,e);const c=e.closest(".lh-audit");if(!c)throw new Error(".lh-table not within audit");t.includes(c.id)&&!a&&i.click()}))}_setupElementScreenshotOverlay(e){const t=this.json.audits["full-page-screenshot"]&&this.json.audits["full-page-screenshot"].details&&"full-page-screenshot"===this.json.audits["full-page-screenshot"].details.type&&this.json.audits["full-page-screenshot"].details;t&&A.installOverlayFeature({dom:this._dom,rootEl:e,overlayContainerEl:e,fullPageScreenshot:t})}_getThirdPartyRows(e,t){const n=[],r=l.getRootDomain(t);for(const t of e){if(t.classList.contains("lh-sub-item-row"))continue;const e=t.querySelector("div.lh-text__url");if(!e)continue;const o=e.dataset.url;if(!o)continue;l.getRootDomain(o)!==r&&n.push(t)}return n}_saveFile(e){const t=e.type.match("json")?".json":".html",n=G.getLhrFilenamePrefix(this.json)+t;this._opts.onSaveFileOverride?this._opts.onSaveFileOverride(e,n):this._dom.saveFile(e,n)}}
 /**
    * @license Copyright 2021 The Lighthouse Authors. All Rights Reserved.
    * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0

package/lighthouse-core/audits/byte-efficiency/render-blocking-resources.js

@@ -262,7 +262,6 @@ class RenderBlockingResources extends Audit {
     try {
       const unusedCssItems = await UnusedCSS.request({
         CSSUsage: artifacts.CSSUsage,
-        URL: artifacts.URL,
         devtoolsLog: artifacts.devtoolsLogs[Audit.DEFAULT_PASS],
       }, context);
       for (const item of unusedCssItems) {

package/lighthouse-core/audits/byte-efficiency/unminified-css.js

@@ -53,15 +53,14 @@ class UnminifiedCSS extends ByteEfficiencyAudit {
   /**
    * @param {LH.Artifacts.CSSStyleSheetInfo} stylesheet
    * @param {LH.Artifacts.NetworkRequest|undefined} networkRecord
-   * @param {string} pageUrl
    * @return {{url: string, totalBytes: number, wastedBytes: number, wastedPercent: number}}
    */
-  static computeWaste(stylesheet, networkRecord, pageUrl) {
+  static computeWaste(stylesheet, networkRecord) {
     const content = stylesheet.content;
     const totalTokenLength = UnminifiedCSS.computeTokenLength(content);
 
     let url = stylesheet.header.sourceURL;
-    if (!url || url === pageUrl) {
+    if (!url || stylesheet.header.isInline) {
       const contentPreview = UnusedCSS.determineContentPreview(stylesheet.content);
       url = contentPreview;
     }
@@ -85,14 +84,13 @@ class UnminifiedCSS extends ByteEfficiencyAudit {
    * @return {ByteEfficiencyAudit.ByteEfficiencyProduct}
    */
   static audit_(artifacts, networkRecords) {
-    const pageUrl = artifacts.URL.finalUrl;
     const items = [];
     for (const stylesheet of artifacts.CSSUsage.stylesheets) {
       const networkRecord = networkRecords
         .find(record => record.url === stylesheet.header.sourceURL);
       if (!stylesheet.content) continue;
 
-      const result = UnminifiedCSS.computeWaste(stylesheet, networkRecord, pageUrl);
+      const result = UnminifiedCSS.computeWaste(stylesheet, networkRecord);
 
       // If the ratio is minimal, the file is likely already minified, so ignore it.
       // If the total number of bytes to be saved is quite small, it's also safe to ignore.

package/lighthouse-core/audits/byte-efficiency/unminified-javascript.js

@@ -8,7 +8,7 @@
 const ByteEfficiencyAudit = require('./byte-efficiency-audit.js');
 const i18n = require('../../lib/i18n/i18n.js');
 const computeTokenLength = require('../../lib/minification-estimator.js').computeJSTokenLength;
-const {getRequestForScript} = require('../../lib/script-helpers.js');
+const {getRequestForScript, isInline} = require('../../lib/script-helpers.js');
 
 const UIStrings = {
   /** Imperative title of a Lighthouse audit that tells the user to minify the page’s JS code to reduce file size. This is displayed in a list of audit titles that Lighthouse generates. */
@@ -83,7 +83,8 @@ class UnminifiedJavaScript extends ByteEfficiencyAudit {
       if (!script.content) continue;
 
       const networkRecord = getRequestForScript(networkRecords, script);
-      const displayUrl = script.name === artifacts.URL.finalUrl ?
+
+      const displayUrl = isInline(script) ?
         `inline: ${script.content.substring(0, 40)}...` :
         script.url;
       try {

package/lighthouse-core/audits/byte-efficiency/unused-css-rules.js

@@ -47,7 +47,6 @@ class UnusedCSSRules extends ByteEfficiencyAudit {
   static async audit_(artifacts, _, context) {
     const unusedCssItems = await UnusedCSS.request({
       CSSUsage: artifacts.CSSUsage,
-      URL: artifacts.URL,
       devtoolsLog: artifacts.devtoolsLogs[ByteEfficiencyAudit.DEFAULT_PASS],
     }, context);
     const items = unusedCssItems

package/lighthouse-core/audits/script-treemap-data.js

@@ -19,6 +19,7 @@ const Audit = require('./audit.js');
 const JsBundles = require('../computed/js-bundles.js');
 const UnusedJavaScriptSummary = require('../computed/unused-javascript-summary.js');
 const ModuleDuplication = require('../computed/module-duplication.js');
+const {isInline} = require('../lib/script-helpers.js');
 
 class ScriptTreemapDataAudit extends Audit {
   /**
@@ -236,8 +237,7 @@ class ScriptTreemapDataAudit extends Audit {
 
       // If this is an inline script, place the node inside a top-level (aka depth-one) node.
       // Also separate each iframe / the main page's inline scripts into their own top-level nodes.
-      const isInlineHtmlScript = script.startColumn || script.startLine;
-      if (isInlineHtmlScript) {
+      if (isInline(script)) {
         let htmlNode = htmlNodesByFrameId.get(script.executionContextAuxData.frameId);
         if (!htmlNode) {
           htmlNode = {

package/lighthouse-core/audits/seo/link-text.js

@@ -119,6 +119,8 @@ class LinkText extends Audit {
         if (
           href.startsWith('javascript:') ||
           href.startsWith('mailto:') ||
+          // This line prevents the audit from flagging anchor links.
+          // In this case it is better to use `finalUrl` than `mainDocumentUrl`.
           URL.equalWithExcludedFragments(link.href, artifacts.URL.finalUrl)
         ) {
           return false;

package/lighthouse-core/audits/service-worker.js

@@ -51,6 +51,7 @@ class ServiceWorker extends Audit {
       title: str_(UIStrings.title),
       failureTitle: str_(UIStrings.failureTitle),
       description: str_(UIStrings.description),
+      supportedModes: ['navigation'],
       requiredArtifacts: ['URL', 'ServiceWorker', 'WebAppManifest'],
     };
   }
@@ -128,8 +129,12 @@ class ServiceWorker extends Audit {
    * @return {LH.Audit.Product}
    */
   static audit(artifacts) {
-    // Match against artifacts.URL.finalUrl so audit accounts for any redirects.
-    const pageUrl = new URL(artifacts.URL.finalUrl);
+    // Match against `artifacts.URL.mainDocumentUrl` so audit accounts for any redirects.
+    // Service workers won't control network requests if the page uses `history.pushState` to "enter" the SW scope.
+    // For this reason it is better to evaluate the SW in relation to the main document url rather than the final frame url.
+    const {mainDocumentUrl} = artifacts.URL;
+    if (!mainDocumentUrl) throw new Error('mainDocumentUrl must exist in navigation mode');
+    const pageUrl = new URL(mainDocumentUrl);
     const {versions, registrations} = artifacts.ServiceWorker;
 
     const versionsForOrigin = ServiceWorker.getVersionsForOrigin(versions, pageUrl);

package/lighthouse-core/computed/main-resource.js

@@ -20,9 +20,10 @@ class MainResource {
    * @return {Promise<LH.Artifacts.NetworkRequest>}
    */
   static async compute_(data, context) {
-    const finalUrl = data.URL.finalUrl;
+    const {mainDocumentUrl} = data.URL;
+    if (!mainDocumentUrl) throw new Error('mainDocumentUrl must exist to get the main resource');
     const requests = await NetworkRecords.request(data.devtoolsLog, context);
-    const mainResource = NetworkAnalyzer.findResourceForUrl(requests, finalUrl);
+    const mainResource = NetworkAnalyzer.findResourceForUrl(requests, mainDocumentUrl);
     if (!mainResource) {
       throw new Error('Unable to identify the main resource');
     }

package/lighthouse-core/computed/page-dependency-graph.js

@@ -396,6 +396,7 @@ class PageDependencyGraph {
     const networkNodeOutput = PageDependencyGraph.getNetworkNodeOutput(networkRecords);
     const cpuNodes = PageDependencyGraph.getCPUNodes(processedTrace);
     const {requestedUrl, mainDocumentUrl} = URL;
+    if (!requestedUrl) throw new Error('requestedUrl is required to get the root request');
     if (!mainDocumentUrl) throw new Error('mainDocumentUrl is required to get the main resource');
 
     const rootRequest = NetworkAnalyzer.findResourceForUrl(networkRecords, requestedUrl);

package/lighthouse-core/computed/resource-summary.js

@@ -35,11 +35,11 @@ class ResourceSummary {
 
   /**
    * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
-   * @param {string} mainResourceURL
+   * @param {LH.Artifacts.URL} URLArtifact
    * @param {ImmutableObject<LH.Budget[]|null>} budgets
    * @return {Record<LH.Budget.ResourceType, ResourceEntry>}
    */
-  static summarize(networkRecords, mainResourceURL, budgets) {
+  static summarize(networkRecords, URLArtifact, budgets) {
     /** @type {Record<LH.Budget.ResourceType, ResourceEntry>} */
     const resourceSummary = {
       'stylesheet': {count: 0, resourceSize: 0, transferSize: 0},
@@ -52,13 +52,13 @@ class ResourceSummary {
       'total': {count: 0, resourceSize: 0, transferSize: 0},
       'third-party': {count: 0, resourceSize: 0, transferSize: 0},
     };
-    const budget = Budget.getMatchingBudget(budgets, mainResourceURL);
+    const budget = Budget.getMatchingBudget(budgets, URLArtifact.mainDocumentUrl);
     /** @type {ReadonlyArray<string>} */
     let firstPartyHosts = [];
     if (budget?.options?.firstPartyHostnames) {
       firstPartyHosts = budget.options.firstPartyHostnames;
     } else {
-      const rootDomain = Util.getRootDomain(mainResourceURL);
+      const rootDomain = Util.getRootDomain(URLArtifact.finalUrl);
       firstPartyHosts = [`*.${rootDomain}`];
     }
 
@@ -107,7 +107,7 @@ class ResourceSummary {
    */
   static async compute_(data, context) {
     const networkRecords = await NetworkRecords.request(data.devtoolsLog, context);
-    return ResourceSummary.summarize(networkRecords, data.URL.finalUrl, data.budgets);
+    return ResourceSummary.summarize(networkRecords, data.URL, data.budgets);
   }
 }
 

package/lighthouse-core/computed/unused-css.js

@@ -120,12 +120,11 @@ class UnusedCSS {
 
   /**
    * @param {StyleSheetInfo} stylesheetInfo The stylesheetInfo object.
-   * @param {string} pageUrl The URL of the page, used to identify inline styles.
    * @return {LH.Audit.ByteEfficiencyItem}
    */
-  static mapSheetToResult(stylesheetInfo, pageUrl) {
+  static mapSheetToResult(stylesheetInfo) {
     let url = stylesheetInfo.header.sourceURL;
-    if (!url || url === pageUrl) {
+    if (!url || stylesheetInfo.header.isInline) {
       const contentPreview = UnusedCSS.determineContentPreview(stylesheetInfo.content);
       url = contentPreview;
     }
@@ -135,20 +134,20 @@ class UnusedCSS {
   }
 
   /**
-   * @param {{CSSUsage: LH.Artifacts['CSSUsage'], URL: LH.Artifacts['URL'], devtoolsLog: LH.DevtoolsLog}} data
+   * @param {{CSSUsage: LH.Artifacts['CSSUsage'], devtoolsLog: LH.DevtoolsLog}} data
    * @param {LH.Artifacts.ComputedContext} context
    * @return {Promise<LH.Audit.ByteEfficiencyItem[]>}
   */
   static async compute_(data, context) {
-    const {CSSUsage, URL, devtoolsLog} = data;
+    const {CSSUsage, devtoolsLog} = data;
     const networkRecords = await NetworkRecords.request(devtoolsLog, context);
     const indexedSheets = UnusedCSS.indexStylesheetsById(CSSUsage.stylesheets, networkRecords);
     UnusedCSS.indexUsedRules(CSSUsage.rules, indexedSheets);
 
     const items = Object.keys(indexedSheets)
-      .map(sheetId => UnusedCSS.mapSheetToResult(indexedSheets[sheetId], URL.finalUrl));
+      .map(sheetId => UnusedCSS.mapSheetToResult(indexedSheets[sheetId]));
     return items;
   }
 }
 
-module.exports = makeComputedArtifact(UnusedCSS, ['CSSUsage', 'URL', 'devtoolsLog']);
+module.exports = makeComputedArtifact(UnusedCSS, ['CSSUsage', 'devtoolsLog']);

package/lighthouse-core/config/budget.js

@@ -137,11 +137,11 @@ class Budget {
    * If multiple budgets match based on thier 'path' property,
    * then the last-listed of those budgets is returned.
    * @param {Immutable<Array<LH.Budget>>|null} budgets
-   * @param {string} url
+   * @param {string|undefined} url
    * @return {Immutable<LH.Budget> | undefined} budget
    */
   static getMatchingBudget(budgets, url) {
-    if (budgets === null) return;
+    if (budgets === null || url === undefined) return;
 
     // Applies the LAST matching budget.
     for (let i = budgets.length - 1; i >= 0; i--) {

package/lighthouse-core/fraggle-rock/gather/base-artifacts.js

@@ -35,10 +35,8 @@ async function getBaseArtifacts(config, driver, context) {
     HostFormFactor: userAgent.includes('Android') || userAgent.includes('Mobile') ?
       'mobile' : 'desktop',
     // Contextual artifacts whose collection changes based on gather mode.
-    // TODO: Make `requestedUrl` optional in timespan and snapshot modes.
     URL: {
       initialUrl: '',
-      requestedUrl: '',
       finalUrl: '',
     },
     PageLoadError: null,
@@ -88,13 +86,11 @@ function finalizeArtifacts(baseArtifacts, gathererArtifacts) {
   artifacts.LighthouseRunWarnings = deduplicateWarnings(warnings);
 
   if (artifacts.PageLoadError && !artifacts.URL.finalUrl) {
-    artifacts.URL.finalUrl = artifacts.URL.requestedUrl;
+    artifacts.URL.finalUrl = artifacts.URL.requestedUrl || artifacts.URL.initialUrl;
   }
 
   // Check that the runner remembered to mutate the special-case URL artifact.
-  // TODO: Make `requestedUrl` optional.
   if (!artifacts.URL.initialUrl) throw new Error('Runner did not set initialUrl');
-  if (!artifacts.URL.requestedUrl) throw new Error('Runner did not set requestedUrl');
   if (!artifacts.URL.finalUrl) throw new Error('Runner did not set finalUrl');
 
   return artifacts;

package/lighthouse-core/fraggle-rock/gather/navigation-runner.js

@@ -229,9 +229,8 @@ async function _navigation(navigationContext) {
   const navigateResult = await _navigate(navigationContext);
 
   // Every required url is initialized to an empty string in `getBaseArtifacts`.
-  // If we haven't set the required urls yet, set them here.
-  const {URL} = phaseState.baseArtifacts;
-  if (!URL.finalUrl || !URL.initialUrl) {
+  // If we haven't set all the required urls yet, set them here.
+  if (!Object.values(phaseState.baseArtifacts).every(Boolean)) {
     phaseState.baseArtifacts.URL = {
       initialUrl,
       requestedUrl: navigateResult.requestedUrl,

package/lighthouse-core/fraggle-rock/gather/snapshot-runner.js

@@ -38,8 +38,6 @@ async function snapshotGather(options) {
       const baseArtifacts = await getBaseArtifacts(config, driver, {gatherMode: 'snapshot'});
       baseArtifacts.URL = {
         initialUrl: url,
-        // TODO: Remove `requestedUrl` from snapshot mode.
-        requestedUrl: url,
         finalUrl: url,
       };
 

package/lighthouse-core/fraggle-rock/gather/timespan-runner.js

@@ -59,8 +59,6 @@ async function startTimespanGather(options) {
         async () => {
           baseArtifacts.URL = {
             initialUrl,
-            // TODO: Remove requestedUrl from timespan mode
-            requestedUrl: initialUrl,
             finalUrl,
           };
 

package/lighthouse-core/lib/script-helpers.js

@@ -5,6 +5,14 @@
  */
 'use strict';
 
+/**
+ * @param {LH.Artifacts.Script} script
+ * @return {boolean}
+ */
+function isInline(script) {
+  return Boolean(script.startLine || script.startColumn);
+}
+
 /**
  * @param {LH.Artifacts.NetworkRequest[]} networkRecords
  * @param {LH.Artifacts.Script} script
@@ -18,4 +26,4 @@ function getRequestForScript(networkRecords, script) {
   return networkRequest;
 }
 
-module.exports = {getRequestForScript};
+module.exports = {getRequestForScript, isInline};

package/lighthouse-core/runner.js

@@ -158,11 +158,6 @@ class Runner {
         // No browser required, just load the artifacts from disk.
         const path = this._getDataSavePath(settings);
         artifacts = assetSaver.loadArtifacts(path);
-        const requestedUrl = artifacts.URL.requestedUrl;
-
-        if (!requestedUrl) {
-          throw new Error('Cannot run audit mode on empty URL');
-        }
       } else {
         const runnerStatus = {msg: 'Gather phase', id: 'lh:runner:gather'};
         log.time(runnerStatus, 'verbose');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lighthouse",
-  "version": "9.5.0-dev.20220404",
+  "version": "9.5.0-dev.20220407",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
   "bin": {

package/report/generator/report-generator.js

@@ -105,7 +105,7 @@ class ReportGenerator {
 
     // First we have metadata about the LHR.
     rows.push(rowFormatter(topLevelKeys));
-    rows.push(rowFormatter(topLevelKeys.map(key => lhr[key])));
+    rows.push(rowFormatter(topLevelKeys.map(key => lhr[key] ?? null)));
 
     // Some spacing.
     rows.push([]);

package/report/renderer/open-tab.js

@@ -38,7 +38,7 @@ function computeWindowNameSuffix(json) {
   // @ts-expect-error - If this is a v2 LHR, use old `generatedTime`.
   const fallbackFetchTime = /** @type {string} */ (json.generatedTime);
   const fetchTime = json.fetchTime || fallbackFetchTime;
-  return `${json.lighthouseVersion}-${json.requestedUrl}-${fetchTime}`;
+  return `${json.lighthouseVersion}-${json.finalUrl}-${fetchTime}`;
 }
 
 /**
@@ -120,7 +120,6 @@ function openTreemap(json) {
   /** @type {LH.Treemap.Options} */
   const treemapOptions = {
     lhr: {
-      requestedUrl: json.requestedUrl,
       finalUrl: json.finalUrl,
       audits: {
         'script-treemap-data': json.audits['script-treemap-data'],

package/types/artifacts.d.ts

@@ -191,11 +191,10 @@ declare module Artifacts {
     /** URL of the main frame before Lighthouse starts. */
     initialUrl: string;
     /**
-     * URL of the first document request during a Lighthouse navigation.
-     * Will be the same as `initialUrl` in timespan/snapshot.
-     * TODO: Make this property `undefined` in timespan/snapshot.
+     * URL of the initially requested URL during a Lighthouse navigation.
+     * Will be `undefined` in timespan/snapshot.
      */
-    requestedUrl: string;
+    requestedUrl?: string;
     /**
      * URL of the last document request during a Lighthouse navigation.
      * Will be `undefined` in timespan/snapshot.

package/types/lhr/lhr.d.ts

@@ -13,8 +13,8 @@ import {ConfigSettings} from './settings';
 interface Result {
   /** Gather mode used to collect artifacts for this result. */
   gatherMode: Result.GatherMode;
-  /** The URL that was supplied to Lighthouse and initially navigated to. */
-  requestedUrl: string;
+  /** The URL that Lighthouse initially navigated to. Will be `undefined` in timespan/snapshot. */
+  requestedUrl?: string;
   /** The post-redirects URL that Lighthouse loaded. */
   finalUrl: string;
   /** The ISO-8601 timestamp of when the results were generated. */

package/types/lhr/treemap.d.ts

@@ -10,7 +10,6 @@ import {Locale} from './settings';
 declare module Treemap {
   interface Options {
     lhr: {
-      requestedUrl: string;
       finalUrl: string;
       audits: {
         'script-treemap-data': AuditResult;