lighthouse 12.1.0-dev.20240702 → 12.1.0-dev.20240704

package/core/config/config-helpers.d.ts

@@ -1,5 +1,5 @@
-export type GathererConstructor = typeof import('../gather/base-gatherer.js').default;
-export type Audit = typeof import('../audits/audit.js')['Audit'];
+export type GathererConstructor = typeof import("../gather/base-gatherer.js").default;
+export type Audit = typeof import("../audits/audit.js")["Audit"];
 export type Gatherer = InstanceType<GathererConstructor>;
 /**
  * // TODO(bckenny): could adopt "jsonified" type to ensure T will survive JSON
@@ -32,7 +32,7 @@ export const mergeConfigFragment: LH.Config.Merge;
  * @param {(item: T) => string} keyFn
  * @return {Array<T>}
  */
-export function mergeConfigFragmentArrayByKey<T extends Record<string, any>>(baseArray: T[] | null | undefined, extensionArray: T[] | null | undefined, keyFn: (item: T) => string): T[];
+export function mergeConfigFragmentArrayByKey<T extends Record<string, any>>(baseArray: Array<T> | null | undefined, extensionArray: Array<T> | null | undefined, keyFn: (item: T) => string): Array<T>;
 /**
  * If any items with identical `path` properties are found in the input array,
  * merge their `options` properties into the first instance and then discard any
@@ -42,7 +42,7 @@ export function mergeConfigFragmentArrayByKey<T extends Record<string, any>>(bas
  * @return T[]
  */
 export function mergeOptionsOfItems<T extends {
-    path?: string | undefined;
+    path?: string;
     options: Record<string, unknown>;
 }>(items: T[]): T[];
 /**
@@ -62,7 +62,7 @@ export function mergePlugins(config: LH.Config, configDir: string | undefined, f
  * @param {string=} configDir
  * @return {Promise<Array<LH.Config.AuditDefn>|null>}
  */
-export function resolveAuditsToDefns(audits: LH.Config['audits'], configDir?: string | undefined): Promise<Array<LH.Config.AuditDefn> | null>;
+export function resolveAuditsToDefns(audits: LH.Config["audits"], configDir?: string | undefined): Promise<Array<LH.Config.AuditDefn> | null>;
 /**
  * Turns a GathererJson into a GathererDefn which involves a few main steps:
  *    - Expanding the JSON shorthand the full definition format.

package/core/config/config.d.ts

@@ -4,11 +4,11 @@
  * @return {{configWorkingCopy: LH.Config, configDir?: string, configPath?: string}}
  */
 export function resolveWorkingCopy(config: LH.Config | undefined, context: {
-    configPath?: string | undefined;
+    configPath?: string;
 }): {
     configWorkingCopy: LH.Config;
-    configDir?: string | undefined;
-    configPath?: string | undefined;
+    configDir?: string;
+    configPath?: string;
 };
 /**
  * @param {LH.Gatherer.GatherMode} gatherMode

package/core/config/constants.d.ts

@@ -37,20 +37,20 @@ export namespace userAgents {
 /** @type {LH.Config.Settings} */
 export const defaultSettings: LH.Config.Settings;
 export namespace nonSimulatedSettingsOverrides {
-    const pauseAfterFcpMs: number;
-    const pauseAfterLoadMs: number;
-    const networkQuietThresholdMs: number;
-    const cpuQuietThresholdMs: number;
+    let pauseAfterFcpMs: number;
+    let pauseAfterLoadMs: number;
+    let networkQuietThresholdMs: number;
+    let cpuQuietThresholdMs: number;
 }
 /**
  * @type {Required<LH.SharedFlagsSettings['screenEmulation']>}
  */
-declare const MOTOGPOWER_EMULATION_METRICS: Required<LH.SharedFlagsSettings['screenEmulation']>;
+declare const MOTOGPOWER_EMULATION_METRICS: Required<LH.SharedFlagsSettings["screenEmulation"]>;
 /**
  * Desktop metrics adapted from emulated_devices/module.json
  * @type {Required<LH.SharedFlagsSettings['screenEmulation']>}
  */
-declare const DESKTOP_EMULATION_METRICS: Required<LH.SharedFlagsSettings['screenEmulation']>;
+declare const DESKTOP_EMULATION_METRICS: Required<LH.SharedFlagsSettings["screenEmulation"]>;
 declare const MOTOG4_USERAGENT: "Mozilla/5.0 (Linux; Android 11; moto g power (2022)) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Mobile Safari/537.36";
 declare const DESKTOP_USERAGENT: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36";
 export {};

package/core/config/filters.d.ts

@@ -14,7 +14,7 @@ export function filterConfigByGatherMode(resolvedConfig: LH.Config.ResolvedConfi
  * @param {Pick<LH.Config.Settings, 'onlyAudits'|'onlyCategories'|'skipAudits'>} filters
  * @return {LH.Config.ResolvedConfig}
  */
-export function filterConfigByExplicitFilters(resolvedConfig: LH.Config.ResolvedConfig, filters: Pick<LH.Config.Settings, 'onlyAudits' | 'onlyCategories' | 'skipAudits'>): LH.Config.ResolvedConfig;
+export function filterConfigByExplicitFilters(resolvedConfig: LH.Config.ResolvedConfig, filters: Pick<LH.Config.Settings, "onlyAudits" | "onlyCategories" | "skipAudits">): LH.Config.ResolvedConfig;
 /**
  * Filters an array of artifacts down to the set that supports the specified gather mode.
  *
@@ -22,7 +22,7 @@ export function filterConfigByExplicitFilters(resolvedConfig: LH.Config.Resolved
  * @param {LH.Gatherer.GatherMode} mode
  * @return {LH.Config.ResolvedConfig['artifacts']}
  */
-export function filterArtifactsByGatherMode(artifacts: LH.Config.ResolvedConfig['artifacts'], mode: LH.Gatherer.GatherMode): LH.Config.ResolvedConfig['artifacts'];
+export function filterArtifactsByGatherMode(artifacts: LH.Config.ResolvedConfig["artifacts"], mode: LH.Gatherer.GatherMode): LH.Config.ResolvedConfig["artifacts"];
 /**
  * Filters an array of artifacts down to the set that's required by the specified audits.
  *
@@ -30,7 +30,7 @@ export function filterArtifactsByGatherMode(artifacts: LH.Config.ResolvedConfig[
  * @param {LH.Config.ResolvedConfig['audits']} audits
  * @return {LH.Config.ResolvedConfig['artifacts']}
  */
-export function filterArtifactsByAvailableAudits(artifacts: LH.Config.ResolvedConfig['artifacts'], audits: LH.Config.ResolvedConfig['audits']): LH.Config.ResolvedConfig['artifacts'];
+export function filterArtifactsByAvailableAudits(artifacts: LH.Config.ResolvedConfig["artifacts"], audits: LH.Config.ResolvedConfig["audits"]): LH.Config.ResolvedConfig["artifacts"];
 /**
  * Filters an array of audits down to the set that can be computed using only the specified artifacts.
  *
@@ -38,7 +38,7 @@ export function filterArtifactsByAvailableAudits(artifacts: LH.Config.ResolvedCo
  * @param {Array<LH.Config.AnyArtifactDefn>} availableArtifacts
  * @return {LH.Config.ResolvedConfig['audits']}
  */
-export function filterAuditsByAvailableArtifacts(audits: LH.Config.ResolvedConfig['audits'], availableArtifacts: Array<LH.Config.AnyArtifactDefn>): LH.Config.ResolvedConfig['audits'];
+export function filterAuditsByAvailableArtifacts(audits: LH.Config.ResolvedConfig["audits"], availableArtifacts: Array<LH.Config.AnyArtifactDefn>): LH.Config.ResolvedConfig["audits"];
 /**
  * Optional `supportedModes` property can explicitly exclude an audit even if all required artifacts are available.
  *
@@ -46,7 +46,7 @@ export function filterAuditsByAvailableArtifacts(audits: LH.Config.ResolvedConfi
  * @param {LH.Gatherer.GatherMode} mode
  * @return {LH.Config.ResolvedConfig['audits']}
  */
-export function filterAuditsByGatherMode(audits: LH.Config.ResolvedConfig['audits'], mode: LH.Gatherer.GatherMode): LH.Config.ResolvedConfig['audits'];
+export function filterAuditsByGatherMode(audits: LH.Config.ResolvedConfig["audits"], mode: LH.Gatherer.GatherMode): LH.Config.ResolvedConfig["audits"];
 /**
  * Filters a categories object and their auditRefs down to the set that can be computed using
  * only the specified audits.
@@ -55,7 +55,7 @@ export function filterAuditsByGatherMode(audits: LH.Config.ResolvedConfig['audit
  * @param {Array<LH.Config.AuditDefn>} availableAudits
  * @return {LH.Config.ResolvedConfig['categories']}
  */
-export function filterCategoriesByAvailableAudits(categories: LH.Config.ResolvedConfig['categories'], availableAudits: Array<LH.Config.AuditDefn>): LH.Config.ResolvedConfig['categories'];
+export function filterCategoriesByAvailableAudits(categories: LH.Config.ResolvedConfig["categories"], availableAudits: Array<LH.Config.AuditDefn>): LH.Config.ResolvedConfig["categories"];
 /**
  * Filters a categories object and their auditRefs down to the specified category ids.
  *
@@ -63,7 +63,7 @@ export function filterCategoriesByAvailableAudits(categories: LH.Config.Resolved
  * @param {string[] | null | undefined} onlyCategories
  * @return {LH.Config.ResolvedConfig['categories']}
  */
-export function filterCategoriesByExplicitFilters(categories: LH.Config.ResolvedConfig['categories'], onlyCategories: string[] | null | undefined): LH.Config.ResolvedConfig['categories'];
+export function filterCategoriesByExplicitFilters(categories: LH.Config.ResolvedConfig["categories"], onlyCategories: string[] | null | undefined): LH.Config.ResolvedConfig["categories"];
 /**
  * Optional `supportedModes` property can explicitly exclude a category even if some audits are available.
  *
@@ -71,5 +71,5 @@ export function filterCategoriesByExplicitFilters(categories: LH.Config.Resolved
  * @param {LH.Gatherer.GatherMode} mode
  * @return {LH.Config.ResolvedConfig['categories']}
  */
-export function filterCategoriesByGatherMode(categories: LH.Config.ResolvedConfig['categories'], mode: LH.Gatherer.GatherMode): LH.Config.ResolvedConfig['categories'];
+export function filterCategoriesByGatherMode(categories: LH.Config.ResolvedConfig["categories"], mode: LH.Gatherer.GatherMode): LH.Config.ResolvedConfig["categories"];
 //# sourceMappingURL=filters.d.ts.map

package/core/config/validation.d.ts

@@ -30,7 +30,7 @@ export function assertValidAudit(auditDefinition: LH.Config.AuditDefn): void;
  * @param {LH.Config.ResolvedConfig['audits']} audits
  * @param {LH.Config.ResolvedConfig['groups']} groups
  */
-export function assertValidCategories(categories: LH.Config.ResolvedConfig['categories'], audits: LH.Config.ResolvedConfig['audits'], groups: LH.Config.ResolvedConfig['groups']): void;
+export function assertValidCategories(categories: LH.Config.ResolvedConfig["categories"], audits: LH.Config.ResolvedConfig["audits"], groups: LH.Config.ResolvedConfig["groups"]): void;
 /**
  * Validate the settings after they've been built.
  * @param {LH.Config.Settings} settings

package/core/gather/driver/environment.d.ts

@@ -1,11 +1,11 @@
 export namespace UIStrings {
-    const warningSlowHostCpu: string;
+    let warningSlowHostCpu: string;
 }
 /**
  * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<LH.Crdp.Browser.GetVersionResponse & {milestone: number}>}
  */
-export function getBrowserVersion(session: LH.Gatherer.ProtocolSession): Promise<import("devtools-protocol").Protocol.Browser.GetVersionResponse & {
+export function getBrowserVersion(session: LH.Gatherer.ProtocolSession): Promise<LH.Crdp.Browser.GetVersionResponse & {
     milestone: number;
 }>;
 /**
@@ -13,7 +13,7 @@ export function getBrowserVersion(session: LH.Gatherer.ProtocolSession): Promise
  * @param {LH.Gatherer.Driver['executionContext']} executionContext
  * @return {Promise<number>}
  */
-export function getBenchmarkIndex(executionContext: LH.Gatherer.Driver['executionContext']): Promise<number>;
+export function getBenchmarkIndex(executionContext: LH.Gatherer.Driver["executionContext"]): Promise<number>;
 /**
  * Returns a warning if the host device appeared to be underpowered according to BenchmarkIndex.
  *
@@ -22,7 +22,7 @@ export function getBenchmarkIndex(executionContext: LH.Gatherer.Driver['executio
  */
 export function getSlowHostCpuWarning(context: {
     settings: LH.Config.Settings;
-    baseArtifacts: Pick<LH.Artifacts, 'BenchmarkIndex'>;
+    baseArtifacts: Pick<LH.Artifacts, "BenchmarkIndex">;
 }): LH.IcuMessage | undefined;
 /**
  * @param {{settings: LH.Config.Settings, baseArtifacts: Pick<LH.Artifacts, 'BenchmarkIndex'>}} context
@@ -30,6 +30,6 @@ export function getSlowHostCpuWarning(context: {
  */
 export function getEnvironmentWarnings(context: {
     settings: LH.Config.Settings;
-    baseArtifacts: Pick<LH.Artifacts, 'BenchmarkIndex'>;
+    baseArtifacts: Pick<LH.Artifacts, "BenchmarkIndex">;
 }): Array<LH.IcuMessage>;
 //# sourceMappingURL=environment.d.ts.map

package/core/gather/driver/environment.js

@@ -93,7 +93,7 @@ function getSlowHostCpuWarning(context) {
 function getEnvironmentWarnings(context) {
   return [
     getSlowHostCpuWarning(context),
-  ].filter(/** @return {s is LH.IcuMessage} */ s => !!s);
+  ].filter(s => !!s);
 }
 
 export {

package/core/gather/driver/execution-context.d.ts

@@ -82,10 +82,10 @@ export class ExecutionContext {
      *   defined for `mainFn` to work.
      * @return {Promise<Awaited<R>>}
      */
-    evaluate<T extends unknown[], R>(mainFn: (...args: T) => R, options: {
+    evaluate<T extends unknown[], R>(mainFn: ((...args: T) => R), options: {
         args: T;
-        useIsolation?: boolean | undefined;
-        deps?: (string | Function)[] | undefined;
+        useIsolation?: boolean;
+        deps?: Array<Function | string>;
     }): Promise<Awaited<R>>;
     /**
      * Evaluate a function on every new frame from now on.
@@ -96,9 +96,9 @@ export class ExecutionContext {
      *   defined for `mainFn` to work.
      * @return {Promise<void>}
      */
-    evaluateOnNewDocument<T_1 extends unknown[]>(mainFn: (...args: T_1) => void, options: {
-        args: T_1;
-        deps?: (string | Function)[] | undefined;
+    evaluateOnNewDocument<T extends unknown[]>(mainFn: ((...args: T) => void), options: {
+        args: T;
+        deps?: Array<Function | string>;
     }): Promise<void>;
     /**
      * Cache native functions/objects inside window so we are sure polyfills do not overwrite the

package/core/gather/driver/navigation.d.ts

@@ -1,5 +1,5 @@
 export type NavigationOptions = {
-    waitUntil: Array<'fcp' | 'load' | 'navigated'>;
+    waitUntil: Array<"fcp" | "load" | "navigated">;
 } & Partial<LH.Config.Settings>;
 /**
  * Navigates to the given URL, assuming that the page is not already on this URL.
@@ -27,7 +27,7 @@ export function getNavigationWarnings(navigation: {
     mainDocumentUrl: string;
 }): Array<LH.IcuMessage>;
 export namespace UIStrings {
-    const warningRedirected: string;
-    const warningTimeout: string;
+    let warningRedirected: string;
+    let warningTimeout: string;
 }
 //# sourceMappingURL=navigation.d.ts.map

package/core/gather/driver/network-monitor.d.ts

@@ -1,5 +1,5 @@
-export type NetworkRecorderEventMap = import('../../lib/network-recorder.js').NetworkRecorderEventMap;
-export type NetworkMonitorEvent_ = 'network-2-idle' | 'network-critical-idle' | 'networkidle' | 'networkbusy' | 'network-critical-busy' | 'network-2-busy';
+export type NetworkRecorderEventMap = import("../../lib/network-recorder.js").NetworkRecorderEventMap;
+export type NetworkMonitorEvent_ = "network-2-idle" | "network-critical-idle" | "networkidle" | "networkbusy" | "network-critical-busy" | "network-2-busy";
 export type NetworkMonitorEventMap = Record<NetworkMonitorEvent_, []> & NetworkRecorderEventMap;
 export type NetworkMonitorEvent = keyof NetworkMonitorEventMap;
 export type NetworkMonitorEmitter = LH.Protocol.StrictEventEmitterClass<NetworkMonitorEventMap>;
@@ -19,13 +19,13 @@ export class NetworkMonitor extends NetworkMonitor_base {
         end: number;
     }>;
     /** @param {LH.Gatherer.Driver['targetManager']} targetManager */
-    constructor(targetManager: LH.Gatherer.Driver['targetManager']);
+    constructor(targetManager: LH.Gatherer.Driver["targetManager"]);
     /** @type {NetworkRecorder|undefined} */
     _networkRecorder: NetworkRecorder | undefined;
     /** @type {Array<LH.Crdp.Page.Frame>} */
     _frameNavigations: Array<LH.Crdp.Page.Frame>;
     /** @type {LH.Gatherer.Driver['targetManager']} */
-    _targetManager: LH.Gatherer.Driver['targetManager'];
+    _targetManager: LH.Gatherer.Driver["targetManager"];
     /** @type {LH.Gatherer.ProtocolSession} */
     _session: LH.Gatherer.ProtocolSession;
     /** @param {LH.Crdp.Page.FrameNavigatedEvent} event */
@@ -42,8 +42,8 @@ export class NetworkMonitor extends NetworkMonitor_base {
     disable(): Promise<void>;
     /** @return {Promise<{requestedUrl?: string, mainDocumentUrl?: string}>} */
     getNavigationUrls(): Promise<{
-        requestedUrl?: string | undefined;
-        mainDocumentUrl?: string | undefined;
+        requestedUrl?: string;
+        mainDocumentUrl?: string;
     }>;
     /**
      * @return {Array<NetworkRequest>}

package/core/gather/driver/storage.d.ts

@@ -4,7 +4,7 @@
  * @param {LH.Config.Settings['clearStorageTypes']} clearStorageTypes
  * @return {Promise<LH.IcuMessage[]>}
  */
-export function clearDataForOrigin(session: LH.Gatherer.ProtocolSession, url: string, clearStorageTypes: LH.Config.Settings['clearStorageTypes']): Promise<LH.IcuMessage[]>;
+export function clearDataForOrigin(session: LH.Gatherer.ProtocolSession, url: string, clearStorageTypes: LH.Config.Settings["clearStorageTypes"]): Promise<LH.IcuMessage[]>;
 /**
  * Clear the network cache on disk and in memory.
  * @param {LH.Gatherer.ProtocolSession} session
@@ -18,8 +18,8 @@ export function clearBrowserCaches(session: LH.Gatherer.ProtocolSession): Promis
  */
 export function getImportantStorageWarning(session: LH.Gatherer.ProtocolSession, url: string): Promise<LH.IcuMessage | undefined>;
 export namespace UIStrings {
-    const warningData: string;
-    const warningCacheTimeout: string;
-    const warningOriginDataTimeout: string;
+    let warningData: string;
+    let warningCacheTimeout: string;
+    let warningOriginDataTimeout: string;
 }
 //# sourceMappingURL=storage.d.ts.map

package/core/gather/driver/target-manager.d.ts

@@ -5,7 +5,7 @@ export type TargetWithSession = {
     protocolListener: (event: unknown) => void;
 };
 export type ProtocolEventMap = {
-    'protocolevent': [LH.Protocol.RawEventMessage];
+    "protocolevent": [LH.Protocol.RawEventMessage];
 };
 export type ProtocolEventMessageEmitter = LH.Protocol.StrictEventEmitterClass<ProtocolEventMap>;
 declare const TargetManager_base: ProtocolEventMessageEmitter;
@@ -17,7 +17,7 @@ export class TargetManager extends TargetManager_base {
     /** @param {LH.Puppeteer.CDPSession} cdpSession */
     constructor(cdpSession: LH.Puppeteer.CDPSession);
     _enabled: boolean;
-    _rootCdpSession: import("../../../types/puppeteer.js").default.CDPSession;
+    _rootCdpSession: import("../../index.js").Puppeteer.CDPSession;
     _mainFrameId: string;
     /**
      * A map of target id to target/session information. Used to ensure unique
@@ -53,7 +53,7 @@ export class TargetManager extends TargetManager_base {
      * @param {string} targetType
      * @return {targetType is LH.Protocol.TargetType}
      */
-    _isAcceptedTargetType(targetType: string): targetType is import("../../../types/protocol.js").default.TargetType;
+    _isAcceptedTargetType(targetType: string): targetType is LH.Protocol.TargetType;
     /**
      * Returns the root session.
      * @return {LH.Gatherer.ProtocolSession}
@@ -66,7 +66,7 @@ export class TargetManager extends TargetManager_base {
      * @param {LH.Protocol.TargetType} targetType
      * @param {string} sessionId
      */
-    _getProtocolEventListener(targetType: LH.Protocol.TargetType, sessionId: string): <EventName extends keyof import("devtools-protocol/types/protocol-mapping.js").ProtocolMapping.Events>(method: EventName, params: import("../../../types/protocol.js").default.RawEventMessageRecord[EventName]["params"]) => void;
+    _getProtocolEventListener(targetType: LH.Protocol.TargetType, sessionId: string): <EventName extends keyof LH.Protocol.RawEventMessageRecord>(method: EventName, params: LH.Protocol.RawEventMessageRecord[EventName]["params"]) => void;
     /**
      * @return {Promise<void>}
      */
@@ -76,6 +76,5 @@ export class TargetManager extends TargetManager_base {
      */
     disable(): Promise<void>;
 }
-import { ProtocolSession } from '../session.js';
 export {};
 //# sourceMappingURL=target-manager.d.ts.map

package/core/gather/driver/wait-for-condition.d.ts

@@ -1,5 +1,5 @@
-export type NetworkMonitor = InstanceType<typeof import("./network-monitor.js")['NetworkMonitor']>;
-export type NetworkMonitorEvent = import('./network-monitor.js').NetworkMonitorEvent;
+export type NetworkMonitor = InstanceType<typeof import("./network-monitor.js")["NetworkMonitor"]>;
+export type NetworkMonitorEvent = import("./network-monitor.js").NetworkMonitorEvent;
 export type CancellableWait<T = void> = {
     promise: Promise<T>;
     cancel: () => void;
@@ -82,7 +82,7 @@ export function waitForNetworkIdle(session: LH.Gatherer.ProtocolSession, network
     busyEvent: NetworkMonitorEvent;
     idleEvent: NetworkMonitorEvent;
     isIdle(recorder: NetworkMonitor): boolean;
-    pretendDCLAlreadyFired?: boolean | undefined;
+    pretendDCLAlreadyFired?: boolean;
 }): CancellableWait;
 /**
  * Resolves when there have been no long tasks for at least waitForCPUQuiet ms.

package/core/gather/driver/wait-for-condition.js

@@ -126,7 +126,7 @@ function waitForFcp(session, pauseAfterFcpMs, maxWaitForFcpMs) {
  */
 function waitForNetworkIdle(session, networkMonitor, networkQuietOptions) {
   let hasDCLFired = false;
-  /** @type {NodeJS.Timer|undefined} */
+  /** @type {NodeJS.Timeout|undefined} */
   let idleTimeout;
   /** @type {(() => void)} */
   let cancel = () => {
@@ -225,7 +225,7 @@ function waitForCPUIdle(session, waitForCPUQuiet) {
     };
   }
 
-  /** @type {NodeJS.Timer|undefined} */
+  /** @type {NodeJS.Timeout|undefined} */
   let lastTimeout;
   let canceled = false;
 
@@ -355,7 +355,7 @@ function waitForLoadEvent(session, pauseAfterLoadMs) {
   };
 
   const promise = new Promise((resolve, reject) => {
-    /** @type {NodeJS.Timer|undefined} */
+    /** @type {NodeJS.Timeout|undefined} */
     let loadTimeout;
     const loadListener = function() {
       loadTimeout = setTimeout(resolve, pauseAfterLoadMs);
@@ -420,7 +420,7 @@ async function waitForFullyLoaded(session, networkMonitor, options) {
     cpuQuietThresholdMs, maxWaitForLoadedMs, maxWaitForFcpMs} = options;
   const {waitForFcp, waitForLoadEvent, waitForNetworkIdle, waitForCPUIdle} =
     options._waitForTestOverrides || DEFAULT_WAIT_FUNCTIONS;
-  /** @type {NodeJS.Timer|undefined} */
+  /** @type {NodeJS.Timeout|undefined} */
   let maxTimeoutHandle;
 
   // Listener for FCP. Resolves pauseAfterFcpMs ms after first FCP event.

package/core/gather/driver.d.ts

@@ -4,7 +4,7 @@ export class Driver implements LH.Gatherer.Driver {
      * @param {LH.Puppeteer.Page} page
      */
     constructor(page: LH.Puppeteer.Page);
-    _page: import("../../types/puppeteer.js").default.Page;
+    _page: import("../index.js").Puppeteer.Page;
     /** @type {TargetManager|undefined} */
     _targetManager: TargetManager | undefined;
     /** @type {NetworkMonitor|undefined} */

package/core/gather/gatherers/accessibility.d.ts

@@ -19,5 +19,5 @@ declare function runA11yChecks(): Promise<LH.Artifacts.Accessibility>;
  * @param {import('axe-core/axe').Result} result
  * @return {LH.Artifacts.AxeRuleResult}
  */
-declare function createAxeRuleResultArtifact(result: import('axe-core/axe').Result): LH.Artifacts.AxeRuleResult;
+declare function createAxeRuleResultArtifact(result: import("axe-core/axe").Result): LH.Artifacts.AxeRuleResult;
 //# sourceMappingURL=accessibility.d.ts.map

package/core/gather/gatherers/anchor-elements.d.ts

@@ -4,7 +4,7 @@ declare class AnchorElements extends BaseGatherer {
      * @param {LH.Gatherer.Context} passContext
      * @return {Promise<LH.Artifacts['AnchorElements']>}
      */
-    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts['AnchorElements']>;
+    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts["AnchorElements"]>;
 }
 import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=anchor-elements.d.ts.map

package/core/gather/gatherers/bf-cache-failures.d.ts

@@ -16,7 +16,7 @@ declare class BFCacheFailures extends BaseGatherer {
      */
     static processBFCacheEvent(event: LH.Crdp.Page.BackForwardCacheNotUsedEvent | undefined): LH.Artifacts.BFCacheFailure;
     /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
-    meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
+    meta: LH.Gatherer.GathererMeta<"DevtoolsLog">;
     /**
      * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Crdp.Page.BackForwardCacheNotUsedEvent|undefined>}
@@ -26,12 +26,12 @@ declare class BFCacheFailures extends BaseGatherer {
      * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {LH.Crdp.Page.BackForwardCacheNotUsedEvent[]}
      */
-    passivelyCollectBFCacheEvents(context: LH.Gatherer.Context<'DevtoolsLog'>): LH.Crdp.Page.BackForwardCacheNotUsedEvent[];
+    passivelyCollectBFCacheEvents(context: LH.Gatherer.Context<"DevtoolsLog">): LH.Crdp.Page.BackForwardCacheNotUsedEvent[];
     /**
      * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {Promise<LH.Artifacts['BFCacheFailures']>}
      */
-    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['BFCacheFailures']>;
+    getArtifact(context: LH.Gatherer.Context<"DevtoolsLog">): Promise<LH.Artifacts["BFCacheFailures"]>;
 }
 import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=bf-cache-failures.d.ts.map

package/core/gather/gatherers/cache-contents.d.ts

@@ -5,7 +5,7 @@ declare class CacheContents extends BaseGatherer {
      * @param {LH.Gatherer.Context} passContext
      * @return {Promise<LH.Artifacts['CacheContents']>}
      */
-    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts['CacheContents']>;
+    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts["CacheContents"]>;
 }
 import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=cache-contents.d.ts.map

package/core/gather/gatherers/console-messages.d.ts

@@ -33,7 +33,7 @@ declare class ConsoleMessages extends BaseGatherer {
     /**
      * @return {Promise<LH.Artifacts['ConsoleMessages']>}
      */
-    getArtifact(): Promise<LH.Artifacts['ConsoleMessages']>;
+    getArtifact(): Promise<LH.Artifacts["ConsoleMessages"]>;
 }
 import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=console-messages.d.ts.map

package/core/gather/gatherers/css-usage.d.ts

@@ -4,7 +4,7 @@ declare class CSSUsage extends BaseGatherer {
      * @param {LH.Gatherer.Context} context
      * @return {Promise<LH.Artifacts['CSSUsage']>}
      */
-    getArtifact(context: LH.Gatherer.Context): Promise<LH.Artifacts['CSSUsage']>;
+    getArtifact(context: LH.Gatherer.Context): Promise<LH.Artifacts["CSSUsage"]>;
 }
 import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=css-usage.d.ts.map

package/core/gather/gatherers/devtools-log-compat.d.ts

@@ -1,13 +1,13 @@
 export default DevtoolsLogCompat;
 /** @implements {LH.Gatherer.GathererInstance<'DevtoolsLog'>} */
-declare class DevtoolsLogCompat extends BaseGatherer implements LH.Gatherer.GathererInstance<'DevtoolsLog'> {
+declare class DevtoolsLogCompat extends BaseGatherer implements LH.Gatherer.GathererInstance<"DevtoolsLog"> {
     /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
-    meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
+    meta: LH.Gatherer.GathererMeta<"DevtoolsLog">;
     /**
      * @param {LH.Gatherer.Context<'DevtoolsLog'>} passContext
      * @return {Promise<LH.Artifacts['devtoolsLogs']>}
      */
-    getArtifact(passContext: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['devtoolsLogs']>;
+    getArtifact(passContext: LH.Gatherer.Context<"DevtoolsLog">): Promise<LH.Artifacts["devtoolsLogs"]>;
 }
 import BaseGatherer from '../base-gatherer.js';
 //# sourceMappingURL=devtools-log-compat.d.ts.map

package/core/gather/gatherers/devtools-log.d.ts

@@ -15,11 +15,11 @@ declare class DevtoolsLog extends BaseGatherer {
     /**
      * @return {LH.Artifacts['DevtoolsLog']}
      */
-    getDebugData(): LH.Artifacts['DevtoolsLog'];
+    getDebugData(): LH.Artifacts["DevtoolsLog"];
     /**
      * @return {Promise<LH.Artifacts['DevtoolsLog']>}
      */
-    getArtifact(): Promise<LH.Artifacts['DevtoolsLog']>;
+    getArtifact(): Promise<LH.Artifacts["DevtoolsLog"]>;
 }
 /**
  * This class saves all protocol messages whose method match a particular
@@ -33,7 +33,7 @@ export class DevtoolsMessageLog {
     constructor(regexFilter?: RegExp | undefined);
     _filter: RegExp | undefined;
     /** @type {LH.DevtoolsLog} */
-    _messages: import("../../index.js").DevtoolsLog;
+    _messages: LH.DevtoolsLog;
     _isRecording: boolean;
     /**
      * @return {LH.DevtoolsLog}

package/core/gather/gatherers/dobetterweb/doctype.d.ts

@@ -4,7 +4,7 @@ declare class Doctype extends BaseGatherer {
      * @param {LH.Gatherer.Context} passContext
      * @return {Promise<LH.Artifacts['Doctype']>}
      */
-    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts['Doctype']>;
+    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts["Doctype"]>;
 }
 import BaseGatherer from '../../base-gatherer.js';
 //# sourceMappingURL=doctype.d.ts.map

package/core/gather/gatherers/dobetterweb/domstats.d.ts

@@ -4,7 +4,7 @@ declare class DOMStats extends BaseGatherer {
      * @param {LH.Gatherer.Context} passContext
      * @return {Promise<LH.Artifacts['DOMStats']>}
      */
-    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts['DOMStats']>;
+    getArtifact(passContext: LH.Gatherer.Context): Promise<LH.Artifacts["DOMStats"]>;
 }
 import BaseGatherer from '../../base-gatherer.js';
 //# sourceMappingURL=domstats.d.ts.map

package/core/gather/gatherers/dobetterweb/optimized-images.d.ts

@@ -13,7 +13,7 @@ declare class OptimizedImages extends BaseGatherer {
      */
     static filterImageRequests(networkRecords: Array<LH.Artifacts.NetworkRequest>): Array<SimplifiedNetworkRecord>;
     /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
-    meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
+    meta: LH.Gatherer.GathererMeta<"DevtoolsLog">;
     _encodingStartAt: number;
     /**
      * @param {LH.Gatherer.ProtocolSession} session
@@ -21,7 +21,7 @@ declare class OptimizedImages extends BaseGatherer {
      * @param {'jpeg'|'webp'} encoding Either webp or jpeg.
      * @return {Promise<LH.Crdp.Audits.GetEncodedResponseResponse>}
      */
-    _getEncodedResponse(session: LH.Gatherer.ProtocolSession, requestId: string, encoding: 'jpeg' | 'webp'): Promise<LH.Crdp.Audits.GetEncodedResponseResponse>;
+    _getEncodedResponse(session: LH.Gatherer.ProtocolSession, requestId: string, encoding: "jpeg" | "webp"): Promise<LH.Crdp.Audits.GetEncodedResponseResponse>;
     /**
      * @param {LH.Gatherer.ProtocolSession} session
      * @param {SimplifiedNetworkRecord} networkRecord
@@ -29,21 +29,20 @@ declare class OptimizedImages extends BaseGatherer {
      */
     calculateImageStats(session: LH.Gatherer.ProtocolSession, networkRecord: SimplifiedNetworkRecord): Promise<{
         originalSize: number;
-        jpegSize?: number | undefined;
-        webpSize?: number | undefined;
+        jpegSize?: number;
+        webpSize?: number;
     }>;
     /**
      * @param {LH.Gatherer.ProtocolSession} session
      * @param {Array<SimplifiedNetworkRecord>} imageRecords
      * @return {Promise<LH.Artifacts['OptimizedImages']>}
      */
-    computeOptimizedImages(session: LH.Gatherer.ProtocolSession, imageRecords: Array<SimplifiedNetworkRecord>): Promise<LH.Artifacts['OptimizedImages']>;
+    computeOptimizedImages(session: LH.Gatherer.ProtocolSession, imageRecords: Array<SimplifiedNetworkRecord>): Promise<LH.Artifacts["OptimizedImages"]>;
     /**
      * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {Promise<LH.Artifacts['OptimizedImages']>}
      */
-    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['OptimizedImages']>;
+    getArtifact(context: LH.Gatherer.Context<"DevtoolsLog">): Promise<LH.Artifacts["OptimizedImages"]>;
 }
 import BaseGatherer from '../../base-gatherer.js';
-import { NetworkRequest } from '../../../lib/network-request.js';
 //# sourceMappingURL=optimized-images.d.ts.map

package/core/gather/gatherers/dobetterweb/response-compression.d.ts

@@ -4,21 +4,20 @@ declare class ResponseCompression extends BaseGatherer {
      * @param {LH.Artifacts.NetworkRequest[]} networkRecords
      * @return {LH.Artifacts['ResponseCompression']}
      */
-    static filterUnoptimizedResponses(networkRecords: LH.Artifacts.NetworkRequest[]): LH.Artifacts['ResponseCompression'];
+    static filterUnoptimizedResponses(networkRecords: LH.Artifacts.NetworkRequest[]): LH.Artifacts["ResponseCompression"];
     /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
-    meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
+    meta: LH.Gatherer.GathererMeta<"DevtoolsLog">;
     /**
      * @param {LH.Gatherer.Context} context
      * @param {LH.Artifacts.NetworkRequest[]} networkRecords
      * @return {Promise<LH.Artifacts['ResponseCompression']>}
      */
-    getCompressibleRecords(context: LH.Gatherer.Context, networkRecords: LH.Artifacts.NetworkRequest[]): Promise<LH.Artifacts['ResponseCompression']>;
+    getCompressibleRecords(context: LH.Gatherer.Context, networkRecords: LH.Artifacts.NetworkRequest[]): Promise<LH.Artifacts["ResponseCompression"]>;
     /**
      * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
      * @return {Promise<LH.Artifacts['ResponseCompression']>}
      */
-    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['ResponseCompression']>;
+    getArtifact(context: LH.Gatherer.Context<"DevtoolsLog">): Promise<LH.Artifacts["ResponseCompression"]>;
 }
 import BaseGatherer from '../../base-gatherer.js';
-import { NetworkRequest } from '../../../lib/network-request.js';
 //# sourceMappingURL=response-compression.d.ts.map