lighthouse 8.0.0-dev.20210709 → 8.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lighthouse",
-  "version": "8.0.0-dev.20210709",
+  "version": "8.0.0",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
   "bin": {
@@ -13,8 +13,8 @@
   },
   "scripts": {
     "build-all": "npm-run-posix-or-windows build-all:task",
-    "build-all:task": "yarn build-report && yarn build-cdt-lib && yarn build-devtools && (yarn build-extension & yarn build-lr & yarn build-viewer & yarn build-treemap & yarn build-smokehouse-bundle & wait) && yarn build-pack",
-    "build-all:task:windows": "yarn build-report && yarn build-cdt-lib && yarn build-extension && yarn build-devtools && yarn build-lr && yarn build-viewer && yarn build-treemap && yarn build-smokehouse-bundle",
+    "build-all:task": "yarn build-cdt-lib && yarn build-devtools && (yarn build-extension & yarn build-lr & yarn build-viewer & yarn build-treemap & yarn build-smokehouse-bundle & wait) && yarn build-pack",
+    "build-all:task:windows": "yarn build-cdt-lib && yarn build-extension && yarn build-devtools && yarn build-lr && yarn build-viewer && yarn build-treemap && yarn build-smokehouse-bundle",
     "build-cdt-lib": "node ./build/build-cdt-lib.js",
     "build-extension": "yarn build-extension-chrome && yarn build-extension-firefox",
     "build-extension-chrome": "node ./build/build-extension.js chrome",
@@ -23,7 +23,6 @@
     "build-smokehouse-bundle": "node ./build/build-smokehouse-bundle.js",
     "build-lr": "yarn reset-link && node ./build/build-lightrider-bundles.js",
     "build-pack": "bash build/build-pack.sh",
-    "build-report": "node build/build-report.js",
     "build-treemap": "node ./build/build-treemap.js",
     "build-viewer": "node ./build/build-viewer.js",
     "reset-link": "(yarn unlink || true) && yarn link && yarn link lighthouse",
@@ -32,7 +31,7 @@
     "lint": "[ \"$CI\" = true ] && eslint --quiet -f codeframe . || eslint .",
     "smoke": "node lighthouse-cli/test/smokehouse/frontends/smokehouse-bin.js",
     "debug": "node --inspect-brk ./lighthouse-cli/index.js",
-    "start": "yarn build-report && node ./lighthouse-cli/index.js",
+    "start": "node ./lighthouse-cli/index.js",
     "test": "yarn diff:sample-json && yarn lint --quiet && yarn unit && yarn type-check",
     "test-bundle": "yarn smoke --runner bundle -j=1 --retries=2 --invert-match forms",
     "test-clients": "jest \"clients/\"",
@@ -44,11 +43,10 @@
     "test-proto": "yarn compile-proto && yarn build-proto-roundtrip",
     "unit-core": "jest \"lighthouse-core\"",
     "unit-cli": "jest \"lighthouse-cli/\"",
-    "unit-report": "jest \"report/\"",
     "unit-treemap": "jest \"lighthouse-treemap/.*-test.js\"",
     "unit-viewer": "jest \"lighthouse-viewer/.*-test.js\"",
-    "unit": "yarn unit-core && yarn unit-cli && yarn unit-report && yarn unit-viewer && yarn unit-treemap",
-    "unit:ci": "NODE_OPTIONS=--max-old-space-size=8192 npm run unit-core -- --ci && npm run unit-cli -- --ci && npm run unit-report -- --ci && npm run unit-viewer -- --ci && npm run unit-treemap -- --ci",
+    "unit": "yarn unit-core && yarn unit-cli && yarn unit-viewer && yarn unit-treemap",
+    "unit:ci": "NODE_OPTIONS=--max-old-space-size=8192 npm run unit-core -- --ci && npm run unit-cli -- --ci && npm run unit-viewer -- --ci && npm run unit-treemap -- --ci",
     "core-unit": "yarn unit-core",
     "cli-unit": "yarn unit-cli",
     "viewer-unit": "yarn unit-viewer",
@@ -115,7 +113,7 @@
     "@types/semver": "^5.5.0",
     "@types/tabulator-tables": "^4.9.1",
     "@types/update-notifier": "^4.1.0",
-    "@types/ws": "^7.0.0",
+    "@types/ws": "^4.0.1",
     "@types/yargs": "^15.0.11",
     "@types/yargs-parser": "^15.0.0",
     "@typescript-eslint/parser": "^4.21.0",
@@ -142,7 +140,7 @@
     "glob": "^7.1.3",
     "idb-keyval": "2.2.0",
     "intl-messageformat-parser": "^1.8.1",
-    "jest": "^27.0.3",
+    "jest": "^26.6.1",
     "jsdom": "^12.2.0",
     "jsonld": "^5.2.0",
     "jsonlint-mod": "^1.7.6",
@@ -152,16 +150,17 @@
     "npm-run-posix-or-windows": "^2.0.2",
     "package-json-versionify": "^1.0.4",
     "pako": "^2.0.3",
+    "prettier": "^1.14.3",
     "pretty-json-stringify": "^0.0.2",
     "puppeteer": "^9.1.1",
     "tabulator-tables": "^4.9.3",
     "terser": "^5.3.8",
     "typed-query-selector": "^2.4.0",
     "typescript": "4.2.3",
-    "webtreemap-cdt": "^3.2.1"
+    "webtreemap-cdt": "^3.2.0"
   },
   "dependencies": {
-    "axe-core": "4.2.3",
+    "axe-core": "4.2.1",
     "chrome-launcher": "^0.14.0",
     "configstore": "^5.0.1",
     "csp_evaluator": "^1.0.1",
@@ -188,7 +187,7 @@
     "speedline-core": "^1.4.3",
     "third-party-web": "^0.12.2",
     "update-notifier": "^4.1.0",
-    "ws": "^7.0.0",
+    "ws": "3.3.2",
     "yargs": "^16.1.1",
     "yargs-parser": "^20.2.4"
   },

package/readme.md

@@ -383,11 +383,11 @@ Other awesome open source projects that use Lighthouse.
 * **[lighthouse-badges](https://github.com/emazzotta/lighthouse-badges)** - Generate gh-badges (shields.io) based on Lighthouse performance.
 * **[lighthouse-batch](https://www.npmjs.com/package/lighthouse-batch)** - Run Lighthouse over a number of sites and generate a summary of their metrics/scores.
 * **[lighthouse-batch-parallel](https://www.npmjs.com/package/lighthouse-batch-parallel)** - Run multiple Lighthouse runs in parallel to accelerate the data collecting process, get the result stream (csv, json, js object) in your own process (warning: performance results may be volatile).
-* **[lighthouse-check-action](https://github.com/foo-software/lighthouse-check-action)** - A GitHub Action to run Lighthouse in a workflow, featuring Slack notifications and report upload to S3.
+* **[lighthouse-check-action](https://github.com/foo-software/lighthouse-check-action)** - A Github Action to run Lighthouse in a workflow, featuring Slack notifications and report upload to S3.
 * **[lighthouse-check-orb](https://circleci.com/orbs/registry/orb/foo-software/lighthouse-check)** - A CircleCI Orb to run Lighthouse in a workflow, featuring Slack notifications and report upload to S3.
 * **[andreasonny83/lighthouse-ci](https://github.com/andreasonny83/lighthouse-ci)** - Run Lighthouse and assert scores satisfy your custom thresholds.
 * **[GoogleChrome/lighthouse-ci](https://github.com/GoogleChrome/lighthouse-ci)** - (**official**) Automate running Lighthouse for every commit, viewing the changes, and preventing regressions.
-* **[lighthouse-ci-action](https://github.com/treosh/lighthouse-ci-action)** - A GitHub Action that makes it easy to run Lighthouse in CI and keep your pages small using performance budgets.
+* **[lighthouse-ci-action](https://github.com/treosh/lighthouse-ci-action)** - A Github Action that makes it easy to run Lighthouse in CI and keep your pages small using performance budgets.
 * **[lighthouse-cron](https://github.com/thearegee/lighthouse-cron)** - Cron multiple batch Lighthouse audits and emit results for sending to remote server.
 * **[lighthouse-gh-reporter](https://github.com/carlesnunez/lighthouse-gh-reporter)** - Run Lighthouse in CI and report back in a comment on your pull requests
 * **[lighthouse-hue](https://github.com/ebidel/lighthouse-hue)** - Set the color of Philips Hue lights based on a Lighthouse score

package/third-party/chromium-synchronization/inspector-issueAdded-types-test.js

@@ -7,10 +7,9 @@
 
 const fs = require('fs');
 const fetch = require('node-fetch');
-const {LH_ROOT} = require('../../../root.js');
 
-const inspectorIssuesGathererPath = LH_ROOT +
-  '/lighthouse-core/gather/gatherers/inspector-issues.js';
+const inspectorIssuesGathererPath = __dirname +
+    '/../../lighthouse-core/gather/gatherers/inspector-issues.js';
 const inspectorIssuesGathererSource = fs.readFileSync(inspectorIssuesGathererPath, 'utf-8');
 
 /* eslint-env jest */

package/third-party/chromium-synchronization/installability-errors-test.js

@@ -16,7 +16,7 @@ describe('installabilityErrors', () => {
 
   beforeAll(async () => {
     const installableLoggingGitTilesUrl =
-      'https://chromium.googlesource.com/chromium/src/+/main/components/webapps/browser/installable/installable_logging.cc?format=TEXT';
+      'https://chromium.googlesource.com/chromium/src/+/master/components/webapps/browser/installable/installable_logging.cc?format=TEXT';
     const resp = await fetch(installableLoggingGitTilesUrl);
     if (!resp.ok) {
       throw new Error(`Chromium source fetch failed: ${resp.status} ${resp.statusText}`);
@@ -25,7 +25,7 @@ describe('installabilityErrors', () => {
     const buff = Buffer.from(base64, 'base64');
     const text = buff.toString('utf-8');
 
-    // Apply some *beautiful* regexes to parse the C++ of https://chromium.googlesource.com/chromium/src/+/main/chrome/browser/installable/installable_logging.cc
+    // Apply some *beautiful* regexes to parse the C++ of https://chromium.googlesource.com/chromium/src/+/master/chrome/browser/installable/installable_logging.cc
     const handledErrorConsts = [...text.matchAll(/error_id = (k.*?);/g)].map(([_, match]) => match);
     const errorConstsToIdsCode = [...text.matchAll(/static const char k.*?Id\[\](.|\n)*?;/g)].map(
       ([match]) => match.replace(/\n/, '')

package/third-party/download-content-shell/download-content-shell.js

@@ -11,13 +11,12 @@ const fs = require('fs');
 const path = require('path');
 const shell = require('child_process').execSync;
 const utils = require('./utils.js');
-const {LH_ROOT} = require('../../root.js');
 
 const TARGET = 'Release';
 const CONTENT_SHELL_ZIP = 'content-shell.zip';
 const MAX_CONTENT_SHELLS = 10;
 const PLATFORM = getPlatform();
-
+const LH_ROOT = `${__dirname}/../..`;
 const CACHE_PATH = path.resolve(LH_ROOT, '.tmp', 'chromium-web-tests', 'content-shells');
 const COMMIT_POSITION_UPDATE_PERIOD = 420;
 

package/third-party/snyk/snapshot.json

@@ -154,7 +154,7 @@
       {"id":"SNYK-JS-THREE-1064931","severity":"high","semver":{"vulnerable":["<0.125.0"]}}
     ],
     "underscore":[
-      {"id":"SNYK-JS-UNDERSCORE-1080984","severity":"medium","semver":{"vulnerable":[">=1.13.0-0 <1.13.0-2",">=1.3.2 <1.12.1"]}}
+      {"id":"SNYK-JS-UNDERSCORE-1080984","severity":"low","semver":{"vulnerable":[">=1.13.0-0 <1.13.0-2",">=1.3.2 <1.12.1"]}}
     ],
     "vue":[
       {"id":"npm:vue:20170829","severity":"medium","semver":{"vulnerable":["<2.4.3"]}},

package/tsconfig.json

@@ -24,6 +24,7 @@
     "lighthouse-core/lib/cdt",
     "lighthouse-core/test/audits/**/*.js",
     "lighthouse-core/test/fixtures/**/*.js",
+    "lighthouse-core/test/report/**/*.js",
     "lighthouse-core/test/computed/**/*.js",
     "clients/test/**/*.js",
     "lighthouse-cli/test/fixtures/**/*.js",

package/types/artifacts.d.ts

@@ -24,6 +24,8 @@ declare global {
       | 'HTTPRedirect'
       | 'Manifest'
       | 'MixedContent'
+      | 'ScriptElements'
+      | 'ServiceWorker'
       | keyof FRBaseArtifacts
     >;
 
@@ -44,6 +46,10 @@ declare global {
       fetchTime: string;
       /** A set of warnings about unexpected things encountered while loading and testing the page. */
       LighthouseRunWarnings: Array<string | IcuMessage>;
+      /** Device which Chrome is running on. */
+      HostFormFactor: 'desktop'|'mobile';
+      /** The user agent string of the version of Chrome used. */
+      HostUserAgent: string;
       /** The benchmark index that indicates rough device class. */
       BenchmarkIndex: number;
       /** An object containing information about the testing configuration used by Lighthouse. */
@@ -66,10 +72,6 @@ declare global {
      * The set of base artifacts that were replaced by standard gatherers in Fraggle Rock.
      */
     export interface LegacyBaseArtifacts {
-      /** Device which Chrome is running on. */
-      HostFormFactor: 'desktop'|'mobile';
-      /** The user agent string of the version of Chrome used. */
-      HostUserAgent: string;
       /** The user agent string that Lighthouse used to load the page. Set to the empty string if unknown. */
       NetworkUserAgent: string;
       /** Information on detected tech stacks (e.g. JS libraries) used by the page. */
@@ -112,7 +114,7 @@ declare global {
      * Artifacts provided by the default gatherers. Augment this interface when adding additional
      * gatherers. Changes to these artifacts are not considered a breaking Lighthouse change.
      */
-    export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArtifacts {
+    export interface GathererArtifacts extends PublicGathererArtifacts {
       /** The results of running the aXe accessibility tests on the page. */
       Accessibility: Artifacts.Accessibility;
       /** Array of all anchors on the page. */
@@ -140,8 +142,6 @@ declare global {
       FormElements: Artifacts.Form[];
       /** Screenshot of the entire page (rather than just the above the fold content). */
       FullPageScreenshot: Artifacts.FullPageScreenshot | null;
-      /** Information about how Lighthouse artifacts were gathered. */
-      GatherContext: {gatherMode: LH.Gatherer.GatherMode};
       /** Information about event listeners registered on the global object. */
       GlobalListeners: Array<Artifacts.GlobalListener>;
       /** Whether the page ended up on an HTTPS page after attempting to load the HTTP version. */
@@ -612,18 +612,12 @@ declare global {
         devtoolsLog: DevtoolsLog;
         trace: Trace;
         settings: Immutable<Config.Settings>;
-        gatherContext: Artifacts['GatherContext'];
         simulator?: LanternSimulator;
       }
 
       export interface MetricComputationData extends MetricComputationDataInput {
         networkRecords: Array<Artifacts.NetworkRequest>;
-        processedTrace: ProcessedTrace;
-        processedNavigation?: ProcessedNavigation;
-      }
-
-      export interface NavigationMetricComputationData extends MetricComputationData {
-        processedNavigation: ProcessedNavigation;
+        traceOfTab: TraceOfTab;
       }
 
       export interface Metric {
@@ -650,11 +644,6 @@ declare global {
       export type Speedline = speedline.Output<'speedIndex'>;
 
       export interface TraceTimes {
-        timeOrigin: number;
-        traceEnd: number;
-      }
-
-      export interface NavigationTraceTimes {
         timeOrigin: number;
         firstPaint?: number;
         firstContentfulPaint: number;
@@ -667,32 +656,23 @@ declare global {
         domContentLoaded?: number;
       }
 
-      export interface ProcessedTrace {
-        /** The raw timestamps of key events, in microseconds. */
+      export interface TraceOfTab {
+        /** The raw timestamps of key metric events, in microseconds. */
         timestamps: TraceTimes;
-        /** The relative times from timeOrigin to key events, in milliseconds. */
+        /** The relative times from navigationStart to key metric events, in milliseconds. */
         timings: TraceTimes;
         /** The subset of trace events from the page's process, sorted by timestamp. */
         processEvents: Array<TraceEvent>;
         /** The subset of trace events from the page's main thread, sorted by timestamp. */
         mainThreadEvents: Array<TraceEvent>;
-        /** The subset of trace events from the main frame, sorted by timestamp. */
-        frameEvents: Array<TraceEvent>;
         /** The subset of trace events from the main frame and any child frames, sorted by timestamp. */
         frameTreeEvents: Array<TraceEvent>;
         /** IDs for the trace's main frame, process, and thread. */
         mainFrameIds: {pid: number, tid: number, frameId: string};
         /** The list of frames committed in the trace. */
         frames: Array<{id: string, url: string}>;
-        /** The trace event marking the time at which the run should consider to have begun. Typically the same as the navigationStart but might differ due to SPA navigations, client-side redirects, etc. In the FR timespan case, this event is injected by Lighthouse itself. */
+        /** The trace event marking the time at which the page load should consider to have begun. Typically the same as the navigationStart but might differ due to SPA navigations, client-side redirects, etc. */
         timeOriginEvt: TraceEvent;
-      }
-
-      export interface ProcessedNavigation {
-        /** The raw timestamps of key metric events, in microseconds. */
-        timestamps: NavigationTraceTimes;
-        /** The relative times from navigationStart to key metric events, in milliseconds. */
-        timings: NavigationTraceTimes;
         /** The trace event marking firstPaint, if it was found. */
         firstPaintEvt?: TraceEvent;
         /** The trace event marking firstContentfulPaint, if it was found. */
@@ -743,11 +723,11 @@ declare global {
       }
 
       export interface TimingSummary {
-        firstContentfulPaint: number | undefined;
+        firstContentfulPaint: number;
         firstContentfulPaintTs: number | undefined;
         firstContentfulPaintAllFrames: number | undefined;
         firstContentfulPaintAllFramesTs: number | undefined;
-        firstMeaningfulPaint: number | undefined;
+        firstMeaningfulPaint: number;
         firstMeaningfulPaintTs: number | undefined;
         largestContentfulPaint: number | undefined;
         largestContentfulPaintTs: number | undefined;
@@ -761,20 +741,20 @@ declare global {
         cumulativeLayoutShift: number | undefined;
         cumulativeLayoutShiftMainFrame: number | undefined;
         totalCumulativeLayoutShift: number | undefined;
-        totalBlockingTime: number | undefined;
+        totalBlockingTime: number;
         observedTimeOrigin: number;
         observedTimeOriginTs: number;
-        observedNavigationStart: number | undefined;
-        observedNavigationStartTs: number | undefined;
+        observedNavigationStart: number;
+        observedNavigationStartTs: number;
         observedCumulativeLayoutShift: number | undefined;
         observedCumulativeLayoutShiftMainFrame: number | undefined;
         observedTotalCumulativeLayoutShift: number | undefined;
         observedFirstPaint: number | undefined;
         observedFirstPaintTs: number | undefined;
-        observedFirstContentfulPaint: number | undefined;
-        observedFirstContentfulPaintTs: number | undefined;
-        observedFirstContentfulPaintAllFrames: number | undefined;
-        observedFirstContentfulPaintAllFramesTs: number | undefined;
+        observedFirstContentfulPaint: number;
+        observedFirstContentfulPaintTs: number;
+        observedFirstContentfulPaintAllFrames: number;
+        observedFirstContentfulPaintAllFramesTs: number;
         observedFirstMeaningfulPaint: number | undefined;
         observedFirstMeaningfulPaintTs: number | undefined;
         observedLargestContentfulPaint: number | undefined;

package/types/audit.d.ts

@@ -57,8 +57,6 @@ declare global {
       __internalOptionalArtifacts?: Array<keyof Artifacts>;
       /** A string identifying how the score should be interpreted for display. */
       scoreDisplayMode?: Audit.ScoreDisplayMode;
-      /** A list of gather modes that this audit is applicable to. */
-      supportedModes?: Gatherer.GatherMode[],
     }
 
     export interface ByteEfficiencyItem extends Audit.Details.OpportunityItem {

package/types/config.d.ts

@@ -49,7 +49,7 @@ declare global {
        */
       export interface FRConfig {
         settings: Settings;
-        artifacts: AnyArtifactDefn[] | null;
+        artifacts: ArtifactDefn[] | null;
         navigations: NavigationDefn[] | null;
         audits: AuditDefn[] | null;
         categories: Record<string, Category> | null;
@@ -160,7 +160,7 @@ declare global {
       }
 
       export interface NavigationDefn extends Omit<Required<NavigationJson>, 'artifacts'> {
-        artifacts: AnyArtifactDefn[];
+        artifacts: ArtifactDefn[];
       }
 
       export interface ArtifactDefn<TDependencies extends Gatherer.DependencyKey = Gatherer.DependencyKey> {
@@ -171,26 +171,12 @@ declare global {
           Record<Exclude<TDependencies, Gatherer.DefaultDependenciesKey>, {id: string}>;
       }
 
-      type ArtifactDefnExpander<TDependencies extends Gatherer.DependencyKey> =
-        // Lack of brackets intentional here to convert to the union of all individual dependencies.
-        TDependencies extends Gatherer.DefaultDependenciesKey ?
-          ArtifactDefn<Gatherer.DefaultDependenciesKey> :
-          ArtifactDefn<TDependencies>
-      export type AnyArtifactDefn = ArtifactDefnExpander<Gatherer.DefaultDependenciesKey>|ArtifactDefnExpander<Gatherer.DependencyKey>
-
       export interface FRGathererDefn<TDependencies extends Gatherer.DependencyKey = Gatherer.DependencyKey> {
         implementation?: ClassOf<Gatherer.FRGathererInstance<TDependencies>>;
         instance: Gatherer.FRGathererInstance<TDependencies>;
         path?: string;
       }
 
-      type FRGathererDefnExpander<TDependencies extends Gatherer.DependencyKey> =
-        // Lack of brackets intentional here to convert to the union of all individual dependencies.
-        TDependencies extends Gatherer.DefaultDependenciesKey ?
-          FRGathererDefn<Gatherer.DefaultDependenciesKey> :
-          FRGathererDefn<TDependencies>
-      export type AnyFRGathererDefn = FRGathererDefnExpander<Gatherer.DefaultDependenciesKey>|FRGathererDefnExpander<Gatherer.DependencyKey>
-
       export interface GathererDefn {
         implementation?: ClassOf<Gatherer.GathererInstance>;
         instance: Gatherer.GathererInstance;

package/types/externs.d.ts

@@ -317,7 +317,6 @@ declare global {
       args: {
         fileName?: string;
         snapshot?: string;
-        sync_id?: string;
         beginData?: {
           frame?: string;
           startLine?: number;

package/types/gatherer.d.ts

@@ -69,7 +69,14 @@ declare global {
       trace?: Trace;
     }
 
-    export type PhaseResultNonPromise = void | LH.GathererArtifacts[keyof LH.GathererArtifacts];
+    export type PhaseArtifact = |
+        LH.GathererArtifacts[keyof LH.GathererArtifacts] |
+      LH.Artifacts['devtoolsLogs'] |
+      LH.Artifacts['traces'] |
+      LH.Artifacts['WebAppManifest'] |
+      LH.Artifacts['InstallabilityErrors'] |
+      LH.Artifacts['Stacks'];
+    export type PhaseResultNonPromise = void|PhaseArtifact
     export type PhaseResult = PhaseResultNonPromise | Promise<PhaseResultNonPromise>
 
     export type GatherMode = 'snapshot'|'timespan'|'navigation';
@@ -87,7 +94,7 @@ declare global {
     }
 
     interface GathererMetaWithDependencies<
-      TDependencies extends Exclude<DependencyKey, DefaultDependenciesKey>
+      TDependencies extends DependencyKey = DefaultDependenciesKey
     > extends GathererMetaNoDependencies {
       /**
        * The set of required dependencies that this gatherer needs before it can compute its results.
@@ -96,9 +103,9 @@ declare global {
     }
 
     export type GathererMeta<TDependencies extends DependencyKey = DefaultDependenciesKey> =
-      [TDependencies] extends [DefaultDependenciesKey] ?
+      TDependencies extends DefaultDependenciesKey ?
         GathererMetaNoDependencies :
-        GathererMetaWithDependencies<Exclude<TDependencies, DefaultDependenciesKey>>;
+        GathererMetaWithDependencies<TDependencies>;
 
     export interface GathererInstance {
       name: keyof LH.GathererArtifacts;
@@ -114,18 +121,11 @@ declare global {
       meta: GathererMeta<TDependencies>;
       startInstrumentation(context: FRTransitionalContext<DefaultDependenciesKey>): Promise<void>|void;
       startSensitiveInstrumentation(context: FRTransitionalContext<DefaultDependenciesKey>): Promise<void>|void;
-      stopSensitiveInstrumentation(context: FRTransitionalContext<DefaultDependenciesKey>): Promise<void>|void;
-      stopInstrumentation(context: FRTransitionalContext<DefaultDependenciesKey>): Promise<void>|void;
+      stopSensitiveInstrumentation(context: FRTransitionalContext<TDependencies>): Promise<void>|void;
+      stopInstrumentation(context: FRTransitionalContext<TDependencies>): Promise<void>|void;
       getArtifact(context: FRTransitionalContext<TDependencies>): PhaseResult;
     }
 
-    type FRGathererInstanceExpander<TDependencies extends Gatherer.DependencyKey> =
-      // Lack of brackets intentional here to convert to the union of all individual dependencies.
-      TDependencies extends Gatherer.DefaultDependenciesKey ?
-        FRGathererInstance<Gatherer.DefaultDependenciesKey> :
-        FRGathererInstance<Exclude<TDependencies, DefaultDependenciesKey>>
-    export type AnyFRGathererInstance = FRGathererInstanceExpander<Gatherer.DependencyKey>
-
     namespace Simulation {
       export type GraphNode = import('../lighthouse-core/lib/dependency-graph/base-node').Node;
       export type GraphNetworkNode = _NetworkNode;

package/types/html-renderer.d.ts

@@ -4,20 +4,20 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, 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.
  */
 
-import _CategoryRenderer = require('../report/renderer/category-renderer.js');
-import _CriticalRequestChainRenderer = require('../report/renderer/crc-details-renderer.js');
-import _SnippetRenderer = require('../report/renderer/snippet-renderer.js');
-import _ElementScreenshotRenderer = require('../report/renderer/element-screenshot-renderer.js');
-import _DetailsRenderer = require('../report/renderer/details-renderer.js');
-import _DOM = require('../report/renderer/dom.js');
-import _I18n = require('../report/renderer/i18n.js');
-import _PerformanceCategoryRenderer = require('../report/renderer/performance-category-renderer.js');
-import _PwaCategoryRenderer = require('../report/renderer/pwa-category-renderer.js');
-import _ReportRenderer = require('../report/renderer/report-renderer.js');
-import _ReportUIFeatures = require('../report/renderer/report-ui-features.js');
-import _Util = require('../report/renderer/util.js');
-import _TextEncoding = require('../report/renderer/text-encoding.js');
-import _prepareLabData = require('../report/renderer/psi.js');
+import _CategoryRenderer = require('../lighthouse-core/report/html/renderer/category-renderer.js');
+import _CriticalRequestChainRenderer = require('../lighthouse-core/report/html/renderer/crc-details-renderer.js');
+import _SnippetRenderer = require('../lighthouse-core/report/html/renderer/snippet-renderer.js');
+import _ElementScreenshotRenderer = require('../lighthouse-core/report/html/renderer/element-screenshot-renderer.js');
+import _DetailsRenderer = require('../lighthouse-core/report/html/renderer/details-renderer.js');
+import _DOM = require('../lighthouse-core/report/html/renderer/dom.js');
+import _I18n = require('../lighthouse-core/report/html/renderer/i18n.js');
+import _PerformanceCategoryRenderer = require('../lighthouse-core/report/html/renderer/performance-category-renderer.js');
+import _PwaCategoryRenderer = require('../lighthouse-core/report/html/renderer/pwa-category-renderer.js');
+import _ReportRenderer = require('../lighthouse-core/report/html/renderer/report-renderer.js');
+import _ReportUIFeatures = require('../lighthouse-core/report/html/renderer/report-ui-features.js');
+import _Util = require('../lighthouse-core/report/html/renderer/util.js');
+import _TextEncoding = require('../lighthouse-core/report/html/renderer/text-encoding.js');
+import _prepareLabData = require('../lighthouse-core/report/html/renderer/psi.js');
 import _FileNamer = require('../lighthouse-core/lib/file-namer.js');
 
 declare global {

package/types/i18n.d.ts

@@ -4,7 +4,7 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, 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.
  */
 
-import Util = require('../report/renderer/util.js');
+import Util = require('../lighthouse-core/report/html/renderer/util.js');
 
 declare global {
   module LH {

package/lighthouse-core/audits/byte-efficiency/uses-responsive-images-snapshot.js

@@ -1,94 +0,0 @@
-/**
- * @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
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, 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.
- */
-/**
- * @fileoverview Checks to see if the images used on the page are larger than
- *   their display sizes. The audit will list all images that are larger than
- *   their display size with DPR (a 1000px wide image displayed as a
- *   500px high-res image on a Retina display is 100% used);
- */
-'use strict';
-
-const Audit = require('../audit.js');
-const UsesResponsiveImages = require('./uses-responsive-images.js');
-const URL = require('../../lib/url-shim.js');
-const i18n = require('../../lib/i18n/i18n.js');
-
-const UIStrings = {
-  /** Label for a column in a data table; entries will be the dimensions of an image as it appears on the page. */
-  columnDisplayedDimensions: 'Displayed dimensions',
-  /** Label for a column in a data table; entries will be the dimensions of an image from it's source file. */
-  columnActualDimensions: 'Actual dimensions',
-};
-
-const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
-
-// Based on byte threshold of 4096, with 3 bytes per pixel.
-const IGNORE_THRESHOLD_IN_PIXELS = 1365;
-
-class UsesResponsiveImagesSnapshot extends Audit {
-  /**
-   * @return {LH.Audit.Meta}
-   */
-  static get meta() {
-    return {
-      id: 'uses-responsive-images-snapshot',
-      title: UsesResponsiveImages.str_(UsesResponsiveImages.UIStrings.title),
-      description: UsesResponsiveImages.str_(UsesResponsiveImages.UIStrings.description),
-      supportedModes: ['snapshot'],
-      requiredArtifacts: ['ImageElements', 'ViewportDimensions'],
-    };
-  }
-
-  /**
-   * @param {LH.Artifacts} artifacts
-   * @return {Promise<LH.Audit.Product>}
-   */
-  static async audit(artifacts) {
-    let score = 1;
-    /** @type {LH.Audit.Details.TableItem[]} */
-    const items = [];
-    for (const image of artifacts.ImageElements) {
-      if (!image.naturalDimensions) continue;
-      const actual = image.naturalDimensions;
-      const displayed = UsesResponsiveImages.getDisplayedDimensions(
-        {...image, naturalWidth: actual.width, naturalHeight: actual.height},
-        artifacts.ViewportDimensions
-      );
-
-      const actualPixels = actual.width * actual.height;
-      const usedPixels = displayed.width * displayed.height;
-
-      if (actualPixels <= usedPixels) continue;
-      if (actualPixels - usedPixels > IGNORE_THRESHOLD_IN_PIXELS) score = 0;
-
-      items.push({
-        url: URL.elideDataURI(image.src),
-        displayedDimensions: `${displayed.width}x${displayed.height}`,
-        actualDimensions: `${actual.width}x${actual.height}`,
-      });
-    }
-
-    /** @type {LH.Audit.Details.Table['headings']} */
-    const headings = [
-      /* eslint-disable max-len */
-      {key: 'url', itemType: 'thumbnail', text: ''},
-      {key: 'url', itemType: 'url', text: str_(i18n.UIStrings.columnURL)},
-      {key: 'displayedDimensions', itemType: 'text', text: str_(UIStrings.columnDisplayedDimensions)},
-      {key: 'actualDimensions', itemType: 'text', text: str_(UIStrings.columnActualDimensions)},
-      /* eslint-enable max-len */
-    ];
-
-    const details = Audit.makeTableDetails(headings, items);
-
-    return {
-      score,
-      details,
-    };
-  }
-}
-
-module.exports = UsesResponsiveImagesSnapshot;
-module.exports.UIStrings = UIStrings;