lighthouse 9.5.0-dev.20220905 → 9.5.0-dev.20220907-2

package/core/gather/gatherers/dobetterweb/optimized-images.js

@@ -13,10 +13,10 @@
 import log from 'lighthouse-logger';
 
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
-import URL from '../../../lib/url-shim.js';
+import UrlUtils from '../../../lib/url-utils.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
 import {Sentry} from '../../../lib/sentry.js';
-import NetworkRecords from '../../../computed/network-records.js';
+import {NetworkRecords} from '../../../computed/network-records.js';
 import DevtoolsLog from '../devtools-log.js';
 
 // Image encoding can be slow and we don't want to spend forever on it.
@@ -139,7 +139,7 @@ class OptimizedImages extends FRGatherer {
         // want to tank the entire run due to a single image.
         Sentry.captureException(err, {
           tags: {gatherer: 'OptimizedImages'},
-          extra: {imageUrl: URL.elideDataURI(record.url)},
+          extra: {imageUrl: UrlUtils.elideDataURI(record.url)},
           level: 'warning',
         });
 

package/core/gather/gatherers/dobetterweb/response-compression.js

@@ -14,12 +14,12 @@ import {Buffer} from 'buffer';
 import {gzip} from 'zlib';
 
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
-import URL from '../../../lib/url-shim.js';
+import UrlUtils from '../../../lib/url-utils.js';
 import {Sentry} from '../../../lib/sentry.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
 import DevtoolsLog from '../devtools-log.js';
 import {fetchResponseBodyFromCache} from '../../driver/network.js';
-import NetworkRecords from '../../../computed/network-records.js';
+import {NetworkRecords} from '../../../computed/network-records.js';
 
 const CHROME_EXTENSION_PROTOCOL = 'chrome-extension:';
 const compressionHeaders = [
@@ -122,7 +122,7 @@ class ResponseCompression extends FRGatherer {
       }).catch(err => {
         Sentry.captureException(err, {
           tags: {gatherer: 'ResponseCompression'},
-          extra: {url: URL.elideDataURI(record.url)},
+          extra: {url: UrlUtils.elideDataURI(record.url)},
           level: 'warning',
         });
 

package/core/gather/gatherers/dobetterweb/tags-blocking-first-paint.js

@@ -17,7 +17,7 @@
  */
 
 
-import NetworkRecords from '../../../computed/network-records.js';
+import {NetworkRecords} from '../../../computed/network-records.js';
 import DevtoolsLog from '../devtools-log.js';
 import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
 

package/core/gather/gatherers/inspector-issues.js

@@ -10,7 +10,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 DevtoolsLog from './devtools-log.js';
 
 class InspectorIssues extends FRGatherer {

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

@@ -7,10 +7,9 @@
 import LinkHeader from 'http-link-header';
 
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
-import URL from '../../lib/url-shim.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import DevtoolsLog from './devtools-log.js';
-import MainResource from '../../computed/main-resource.js';
+import {MainResource} from '../../computed/main-resource.js';
 
 /* globals HTMLLinkElement getNodeDetails */
 

package/core/gather/gatherers/main-document-content.js

@@ -7,7 +7,7 @@
 import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
 import DevtoolsLog from './devtools-log.js';
 import {fetchResponseBodyFromCache} from '../driver/network.js';
-import MainResource from '../../computed/main-resource.js';
+import {MainResource} from '../../computed/main-resource.js';
 
 /**
  * Collects the content of the main html document.

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;