lighthouse 9.5.0-dev.20220906 → 9.5.0-dev.20220908

package/core/gather/gatherers/script-elements.js

@@ -5,7 +5,7 @@
  */
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
-import NetworkRecords from '../../computed/network-records.js';
+import {NetworkRecords} from '../../computed/network-records.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import DevtoolsLog from './devtools-log.js';

package/core/gather/gatherers/source-maps.js

@@ -5,7 +5,6 @@
  */
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
-import URL from '../../lib/url-shim.js';
 
 /**
  * @fileoverview Gets JavaScript source maps.

package/core/gather/gatherers/trace-elements.js

@@ -18,10 +18,10 @@ import {pageFunctions} from '../../lib/page-functions.js';
 import * as RectHelpers from '../../lib/rect-helpers.js';
 import {Sentry} from '../../lib/sentry.js';
 import Trace from './trace.js';
-import ProcessedTrace from '../../computed/processed-trace.js';
-import ProcessedNavigation from '../../computed/processed-navigation.js';
+import {ProcessedTrace} from '../../computed/processed-trace.js';
+import {ProcessedNavigation} from '../../computed/processed-navigation.js';
 import {LighthouseError} from '../../lib/lh-error.js';
-import ComputedResponsiveness from '../../computed/metrics/responsiveness.js';
+import {Responsiveness} from '../../computed/metrics/responsiveness.js';
 
 /** @typedef {{nodeId: number, score?: number, animations?: {name?: string, failureReasonsMask?: number, unsupportedProperties?: string[]}[], type?: string}} TraceElementData */
 
@@ -150,7 +150,7 @@ class TraceElements extends FRGatherer {
   static async getResponsivenessElement(trace, context) {
     const {settings} = context;
     try {
-      const responsivenessEvent = await ComputedResponsiveness.request({trace, settings}, context);
+      const responsivenessEvent = await Responsiveness.request({trace, settings}, context);
       if (!responsivenessEvent || responsivenessEvent.name === 'FallbackTiming') return;
       return {nodeId: responsivenessEvent.args.data.nodeId};
     } catch {

package/core/index.js

@@ -9,7 +9,7 @@ import log from 'lighthouse-logger';
 import {Runner} from './runner.js';
 import {CriConnection} from './gather/connections/cri.js';
 import {Config} from './config/config.js';
-import URL from './lib/url-shim.js';
+import UrlUtils from './lib/url-utils.js';
 import * as fraggleRock from './fraggle-rock/api.js';
 import {Driver} from './gather/driver.js';
 import {initializeConfig} from './fraggle-rock/config/config.js';
@@ -67,7 +67,7 @@ async function legacyNavigation(url, flags = {}, configJSON, userConnection) {
 
   // kick off a lighthouse run
   const artifacts = await Runner.gather(() => {
-    const requestedUrl = URL.normalizeUrl(url);
+    const requestedUrl = UrlUtils.normalizeUrl(url);
     return Runner._gatherArtifactsFromBrowser(requestedUrl, options, connection);
   }, options);
   return Runner.audit(artifacts, options);
@@ -110,7 +110,7 @@ const traceCategories = Driver.traceCategories;
 export default lighthouse;
 export {Audit} from './audits/audit.js';
 export {default as Gatherer} from './fraggle-rock/gather/base-gatherer.js';
-export {default as NetworkRecords} from './computed/network-records.js';
+export {NetworkRecords} from './computed/network-records.js';
 export {
   legacyNavigation,
   generateConfig,

package/core/lib/asset-saver.js

@@ -14,8 +14,8 @@ import log from 'lighthouse-logger';
 import {Simulator} from './dependency-graph/simulator/simulator.js';
 import lanternTraceSaver from './lantern-trace-saver.js';
 import {MetricTraceEvents} from './traces/metric-trace-events.js';
-import NetworkAnalysisComputed from '../computed/network-analysis.js';
-import LoadSimulatorComputed from '../computed/load-simulator.js';
+import {NetworkAnalysis} from '../computed/network-analysis.js';
+import {LoadSimulator} from '../computed/load-simulator.js';
 import {LighthouseError} from '../lib/lh-error.js';
 
 const {promisify} = util;
@@ -310,8 +310,8 @@ async function saveLanternNetworkData(devtoolsLog, outputPath) {
   /** @type {LH.Audit.Context} */
   // @ts-expect-error - the full audit context isn't needed for analysis.
   const context = {computedCache: new Map()};
-  const networkAnalysis = await NetworkAnalysisComputed.request(devtoolsLog, context);
-  const lanternData = LoadSimulatorComputed.convertAnalysisToSaveableLanternData(networkAnalysis);
+  const networkAnalysis = await NetworkAnalysis.request(devtoolsLog, context);
+  const lanternData = LoadSimulator.convertAnalysisToSaveableLanternData(networkAnalysis);
 
   fs.writeFileSync(outputPath, JSON.stringify(lanternData));
 }

package/core/lib/dependency-graph/simulator/network-analyzer.js

@@ -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 URL from '../../url-shim.js';
+import UrlUtils from '../../url-utils.js';
 
 const INITIAL_CWD = 14 * 1024;
 
@@ -440,7 +440,7 @@ class NetworkAnalyzer {
     // equalWithExcludedFragments is expensive, so check that the resourceUrl starts with the request url first
     return records.find(request =>
       resourceUrl.startsWith(request.url) &&
-      URL.equalWithExcludedFragments(request.url, resourceUrl)
+      UrlUtils.equalWithExcludedFragments(request.url, resourceUrl)
     );
   }
 

package/core/lib/icons.js

@@ -4,8 +4,6 @@
  * 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 URL from './url-shim.js';
-
 /**
  * @param {NonNullable<LH.Artifacts.Manifest['value']>} manifest
  * @return {boolean} Does the manifest have any icons?

package/core/lib/manifest-parser.js

@@ -6,8 +6,6 @@
 
 import cssParsers from 'cssstyle/lib/parsers.js';
 
-import URL from './url-shim.js';
-
 const ALLOWED_DISPLAY_VALUES = [
   'fullscreen',
   'standalone',

package/core/lib/network-request.js

@@ -52,7 +52,7 @@
       Trace: ResourceFinish.ts
  */
 
-import URL from './url-shim.js';
+import UrlUtils from './url-utils.js';
 
 // Lightrider X-Header names for timing information.
 // See: _updateTransferSizeForLightrider and _updateTimingsForLightrider.
@@ -215,7 +215,7 @@ class NetworkRequest {
       host: url.hostname,
       securityOrigin: url.origin,
     };
-    this.isSecure = URL.isSecureScheme(this.parsedURL.scheme);
+    this.isSecure = UrlUtils.isSecureScheme(this.parsedURL.scheme);
 
     this.startTime = data.timestamp;
 
@@ -522,9 +522,9 @@ class NetworkRequest {
    */
   static isNonNetworkRequest(record) {
     // The 'protocol' field in devtools a string more like a `scheme`
-    return URL.isNonNetworkProtocol(record.protocol) ||
+    return UrlUtils.isNonNetworkProtocol(record.protocol) ||
       // But `protocol` can fail to be populated if the request fails, so fallback to scheme.
-      URL.isNonNetworkProtocol(record.parsedURL.scheme);
+      UrlUtils.isNonNetworkProtocol(record.parsedURL.scheme);
   }
 
   /**
@@ -535,9 +535,9 @@ class NetworkRequest {
    * @return {boolean}
    */
   static isSecureRequest(record) {
-    return URL.isSecureScheme(record.parsedURL.scheme) ||
-        URL.isSecureScheme(record.protocol) ||
-        URL.isLikeLocalhost(record.parsedURL.host) ||
+    return UrlUtils.isSecureScheme(record.parsedURL.scheme) ||
+        UrlUtils.isSecureScheme(record.protocol) ||
+        UrlUtils.isLikeLocalhost(record.parsedURL.host) ||
         NetworkRequest.isHstsRequest(record);
   }
 

package/core/lib/{url-shim.js → url-utils.js}

@@ -4,12 +4,8 @@
  * 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.
  */
 
-/**
- * URL shim so we keep our code DRY
- */
-
 import {Util} from '../util.cjs';
-import {LighthouseError} from '../lib/lh-error.js';
+import {LighthouseError} from './lh-error.js';
 
 /** @typedef {import('./network-request.js').NetworkRequest} NetworkRequest */
 
@@ -43,8 +39,7 @@ function rewriteChromeInternalUrl(url) {
   return url.replace(/^chrome:\/\/chrome\//, 'chrome://');
 }
 
-// URL is global as of node 10. https://nodejs.org/api/globals.html#globals_url
-class URLShim extends URL {
+class UrlUtils {
   /**
    * @param {string} url
    * @return {boolean}
@@ -264,11 +259,8 @@ class URLShim extends URL {
   }
 }
 
-URLShim.URL = URL;
-
-URLShim.INVALID_URL_DEBUG_STRING =
+UrlUtils.INVALID_URL_DEBUG_STRING =
     'Lighthouse was unable to determine the URL of some script executions. ' +
     'It\'s possible a Chrome extension or other eval\'d code is the source.';
 
-// TODO(esmodules): don't use default export
-export default URLShim;
+export default UrlUtils;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "9.5.0-dev.20220906",
+  "version": "9.5.0-dev.20220908",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./core/index.js",
   "bin": {
@@ -98,7 +98,6 @@
     "@build-tracker/cli": "^1.0.0-beta.15",
     "@esbuild-kit/esm-loader": "^2.1.1",
     "@jest/fake-timers": "^28.1.0",
-    "@puppeteer/replay": "^0.6.1",
     "@rollup/plugin-alias": "^3.1.2",
     "@rollup/plugin-commonjs": "^20.0.0",
     "@rollup/plugin-dynamic-import-vars": "^1.1.1",
@@ -160,7 +159,7 @@
     "jsdom": "^12.2.0",
     "jsonld": "^5.2.0",
     "jsonlint-mod": "^1.7.6",
-    "lighthouse-plugin-publisher-ads": "^1.5.6",
+    "lighthouse-plugin-publisher-ads": "1.5.7-beta",
     "magic-string": "^0.25.7",
     "mime-types": "^2.1.30",
     "mocha": "^10.0.0",

package/report/test/renderer/performance-category-renderer-test.js

@@ -10,7 +10,6 @@ import jsdom from 'jsdom';
 
 import {Util} from '../../renderer/util.js';
 import {I18n} from '../../renderer/i18n.js';
-import URL from '../../../core/lib/url-shim.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {PerformanceCategoryRenderer} from '../../renderer/performance-category-renderer.js';

package/report/test/renderer/report-renderer-test.js

@@ -10,7 +10,6 @@ import jsdom from 'jsdom';
 import jestMock from 'jest-mock';
 
 import {Util} from '../../renderer/util.js';
-import URL from '../../../core/lib/url-shim.js';
 import {DOM} from '../../renderer/dom.js';
 import {DetailsRenderer} from '../../renderer/details-renderer.js';
 import {CategoryRenderer} from '../../renderer/category-renderer.js';

package/tsconfig.json

@@ -99,7 +99,7 @@
     "core/test/lib/tracehouse/task-summary-test.js",
     "core/test/lib/tracehouse/trace-processor-test.js",
     "core/test/lib/traces/metrics-trace-events-test.js",
-    "core/test/lib/url-shim-test.js",
+    "core/test/lib/url-utils-test.js",
     "core/test/network-records-to-devtools-log-test.js",
     "core/test/runner-test.js",
     "core/test/scoring-test.js",

package/core/fraggle-rock/replay/stringify-extension.js

@@ -1,104 +0,0 @@
-/**
- * @license Copyright 2022 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.
- */
-
-import * as PuppeteerReplay from '@puppeteer/replay';
-
-/**
- * @param {PuppeteerReplay.Schema.Step} step
- * @return {boolean}
- */
-function isNavigationStep(step) {
-  return Boolean(
-    step.type === 'navigate' ||
-    step.assertedEvents?.some(event => event.type === 'navigation')
-  );
-}
-
-class LighthouseStringifyExtension extends PuppeteerReplay.PuppeteerStringifyExtension {
-  #isProcessingTimespan = false;
-
-  /**
-   * @override
-   * @param {PuppeteerReplay.LineWriter} out
-   * @param {PuppeteerReplay.Schema.UserFlow} flow
-   */
-  async beforeAllSteps(out, flow) {
-    out.appendLine(`const fs = require('fs');`);
-
-    let isMobile = true;
-    for (const step of flow.steps) {
-      if (step.type !== 'setViewport') continue;
-      isMobile = step.isMobile;
-    }
-
-    await super.beforeAllSteps(out, flow);
-
-    const flags = {
-      screenEmulation: {
-        disabled: true,
-      },
-    };
-    out.appendLine(`const flags = ${JSON.stringify(flags)}`);
-    if (isMobile) {
-      out.appendLine(`const config = undefined;`);
-    } else {
-      // eslint-disable-next-line max-len
-      out.appendLine(`const config = (await import('lighthouse/core/config/desktop-config.js')).default;`);
-    }
-
-    out.appendLine(`const lhApi = await import('lighthouse/core/fraggle-rock/api.js');`);
-    // eslint-disable-next-line max-len
-    out.appendLine(`const lhFlow = await lhApi.startFlow(page, {name: ${JSON.stringify(flow.title)}, config, flags});`);
-  }
-
-  /**
-   * @override
-   * @param {PuppeteerReplay.LineWriter} out
-   * @param {PuppeteerReplay.Schema.Step} step
-   * @param {PuppeteerReplay.Schema.UserFlow} flow
-   */
-  async stringifyStep(out, step, flow) {
-    if (step.type === 'setViewport') {
-      await super.stringifyStep(out, step, flow);
-      return;
-    }
-
-    const isNavigation = isNavigationStep(step);
-
-    if (isNavigation) {
-      if (this.#isProcessingTimespan) {
-        out.appendLine(`await lhFlow.endTimespan();`);
-        this.#isProcessingTimespan = false;
-      }
-      out.appendLine(`await lhFlow.startNavigation();`);
-    } else if (!this.#isProcessingTimespan) {
-      out.appendLine(`await lhFlow.startTimespan();`);
-      this.#isProcessingTimespan = true;
-    }
-
-    await super.stringifyStep(out, step, flow);
-
-    if (isNavigation) {
-      out.appendLine(`await lhFlow.endNavigation();`);
-    }
-  }
-
-  /**
-   * @override
-   * @param {PuppeteerReplay.LineWriter} out
-   * @param {PuppeteerReplay.Schema.UserFlow} flow
-   */
-  async afterAllSteps(out, flow) {
-    if (this.#isProcessingTimespan) {
-      out.appendLine(`await lhFlow.endTimespan();`);
-    }
-    out.appendLine(`const lhFlowReport = await lhFlow.generateReport();`);
-    out.appendLine(`fs.writeFileSync(__dirname + '/flow.report.html', lhFlowReport)`);
-    await super.afterAllSteps(out, flow);
-  }
-}
-
-export default LighthouseStringifyExtension;