lighthouse 9.5.0-dev.20220314 → 9.5.0-dev.20220317

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lighthouse",
-  "version": "9.5.0-dev.20220314",
+  "version": "9.5.0-dev.20220317",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
   "bin": {
@@ -75,13 +75,14 @@
     "update:lantern-baseline": "node lighthouse-core/scripts/lantern/update-baseline-lantern-values.js",
     "update:sample-artifacts": "node lighthouse-core/scripts/update-report-fixtures.js",
     "update:sample-json": "yarn i18n:collect-strings && node ./lighthouse-cli -A=./lighthouse-core/test/results/artifacts --config-path=./lighthouse-core/test/results/sample-config.js --output=json --output-path=./lighthouse-core/test/results/sample_v2.json && node lighthouse-core/scripts/cleanup-LHR-for-diff.js ./lighthouse-core/test/results/sample_v2.json --only-remove-timing",
-    "update:flow-sample-json": "node ./lighthouse-core/scripts/update-flow-fixtures.js",
+    "update:flow-sample-json": "yarn i18n:collect-strings && node ./lighthouse-core/scripts/update-flow-fixtures.js",
     "update:snapshot-sample-json": "node ./lighthouse-core/scripts/update-snapshot-sample.js",
     "update:test-devtools": "bash lighthouse-core/test/chromium-web-tests/test-locally.sh --reset-results",
     "test-devtools": "bash lighthouse-core/test/chromium-web-tests/test-locally.sh",
     "open-devtools": "bash lighthouse-core/scripts/open-devtools.sh",
     "run-devtools": "node lighthouse-core/scripts/pptr-run-devtools.js",
     "diff:sample-json": "yarn i18n:checks && bash lighthouse-core/scripts/assert-golden-lhr-unchanged.sh",
+    "diff:flow-sample-json": "yarn i18n:collect-strings && bash lighthouse-core/scripts/assert-baseline-flow-result-unchanged.sh",
     "computeBenchmarkIndex": "./lighthouse-core/scripts/benchmark.js",
     "minify-latest-run": "./lighthouse-core/scripts/lantern/minify-trace.js ./latest-run/defaultPass.trace.json ./latest-run/defaultPass.trace.min.json && ./lighthouse-core/scripts/lantern/minify-devtoolslog.js ./latest-run/defaultPass.devtoolslog.json ./latest-run/defaultPass.devtoolslog.min.json",
     "save-latest-run": "./lighthouse-core/scripts/save-latest-run.sh",

package/types/artifacts.d.ts

@@ -147,8 +147,9 @@ export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArt
   GlobalListeners: Array<Artifacts.GlobalListener>;
   /** The issues surfaced in the devtools Issues panel */
   InspectorIssues: Artifacts.InspectorIssues;
-  /** JS coverage information for code used during page load. Keyed by network URL. */
-  JsUsage: Record<string, Array<Omit<LH.Crdp.Profiler.ScriptCoverage, 'url'>>>;
+  /** JS coverage information for code used during audit. Keyed by script id. */
+  // 'url' is excluded because it can be overriden by a magic sourceURL= comment, which makes keeping it a dangerous footgun!
+  JsUsage: Record<string, Omit<LH.Crdp.Profiler.ScriptCoverage, 'url'>>;
   /** Parsed version of the page's Web App Manifest, or null if none found. */
   Manifest: Artifacts.Manifest | null;
   /** The URL loaded with interception */
@@ -161,6 +162,8 @@ export interface GathererArtifacts extends PublicGathererArtifacts,LegacyBaseArt
   ResponseCompression: {requestId: string, url: string, mimeType: string, transferSize: number, resourceSize: number, gzipSize?: number}[];
   /** Information on fetching and the content of the /robots.txt file. */
   RobotsTxt: {status: number|null, content: string|null, errorMessage?: string};
+  /** Information on all scripts in the page. */
+  Scripts: Artifacts.Script[];
   /** Version information for all ServiceWorkers active after the first page load. */
   ServiceWorker: {versions: LH.Crdp.ServiceWorker.ServiceWorkerVersion[], registrations: LH.Crdp.ServiceWorker.ServiceWorkerRegistration[]};
   /** Source maps of scripts executed in the page. */
@@ -287,6 +290,16 @@ declare module Artifacts {
 
   interface PasswordInputsWithPreventedPaste {node: NodeDetails}
 
+  interface Script extends Omit<LH.Crdp.Debugger.ScriptParsedEvent, 'url'|'embedderName'> {
+    /**
+     * Set by a sourceURL= magic comment if present, otherwise this is the same as the URL.
+     * Use this field for presentational purposes only.
+     */
+    name: string;
+    url: string;
+    content?: string;
+  }
+  
   interface ScriptElement {
     type: string | null
     src: string | null
@@ -298,10 +311,6 @@ declare module Artifacts {
     node: NodeDetails | null
     /** Where the script was discovered, either in the head, the body, or network records. */
     source: 'head'|'body'|'network'
-    /** The content of the inline script or the network record with the matching URL, null if the script had a src and no network record could be found. */
-    content: string | null
-    /** The ID of the network request that matched the URL of the src or the main document if inline, null if no request could be found. */
-    requestId: string | null
   }
 
   /** @see https://sourcemaps.info/spec.html#h.qz3o9nc69um5 */
@@ -333,6 +342,8 @@ declare module Artifacts {
    * parsing the map, errorMessage will be defined instead of map.
    */
   type SourceMap = {
+    /** The DevTools protocol script identifier. */
+    scriptId: string;
     /** URL of code that source map applies to. */
     scriptUrl: string
     /** URL of the source map. undefined if from data URL. */
@@ -340,6 +351,8 @@ declare module Artifacts {
     /** Source map data structure. */
     map: RawSourceMap
   } | {
+    /** The DevTools protocol script identifier. */
+    scriptId: string;
     /** URL of code that source map applies to. */
     scriptUrl: string
     /** URL of the source map. undefined if from data URL. */
@@ -352,7 +365,7 @@ declare module Artifacts {
 
   interface Bundle {
     rawMap: RawSourceMap;
-    script: ScriptElement;
+    script: LH.Artifacts.Script;
     map: TextSourceMap;
     sizes: {
       // TODO(cjamcl): Rename to `sources`.
@@ -848,6 +861,8 @@ declare module Artifacts {
     stackTrace?: LH.Crdp.Runtime.StackTrace;
     /** The URL of the log/exception, if known. */
     url?: string;
+    /** The script id of the log/exception, if known. */
+    scriptId?: string;
     /** Line number in the script (0-indexed), if known. */
     lineNumber?: number;
     /** Column number in the script (0-indexed), if known. */