lighthouse 13.5.0-dev.20261016 → 13.5.0-dev.20261019

package/core/lib/cdt/Common.js

@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const ParsedURL = require('./generated/ParsedURL.js');
+import * as ParsedURL from './generated/ParsedURL.js';
 
-module.exports = {
+export {
   ParsedURL,
 };

package/core/lib/cdt/Platform.d.ts

@@ -1,3 +1,10 @@
+export namespace ArrayUtilities {
+    export { lowerBound };
+    export { upperBound };
+}
+export namespace DevToolsPath {
+    let EmptyUrlString: string;
+}
 /**
  * @license
  * Copyright 2021 Google LLC
@@ -15,12 +22,5 @@ declare function lowerBound(array: any[], needle: any, comparator: any, left: an
  * @param {any} comparator
  */
 declare function upperBound(array: any[], needle: any, comparator: any, left: any, right: any): any;
-export namespace ArrayUtilities {
-    export { lowerBound };
-    export { upperBound };
-}
-export namespace DevToolsPath {
-    let EmptyUrlString: string;
-}
 export {};
 //# sourceMappingURL=Platform.d.ts.map

package/core/lib/cdt/Platform.js

@@ -46,12 +46,15 @@ function upperBound(array, needle, comparator, left, right) {
   return r;
 }
 
-module.exports = {
-  ArrayUtilities: {
-    lowerBound,
-    upperBound,
-  },
-  DevToolsPath: {
-    EmptyUrlString: '',
-  },
+const ArrayUtilities = {
+  lowerBound,
+  upperBound,
+};
+const DevToolsPath = {
+  EmptyUrlString: '',
+};
+
+export {
+  ArrayUtilities,
+  DevToolsPath,
 };

package/core/lib/cdt/SDK.d.ts

@@ -1,2 +1,6 @@
-export let SourceMap: typeof import("./generated/SourceMap.js");
+export default SDK;
+declare namespace SDK {
+    export { SourceMap };
+}
+import SourceMap from './generated/SourceMap.js';
 //# sourceMappingURL=SDK.d.ts.map

package/core/lib/cdt/SDK.js

@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import SourceMap from './generated/SourceMap.js';
+
 const SDK = {
-  SourceMap: require('./generated/SourceMap.js'),
+  SourceMap,
 };
 
 // Add `lastColumnNumber` to mappings. This will eventually be added to CDT.
@@ -25,4 +27,4 @@ SDK.SourceMap.prototype.computeLastGeneratedColumns = function() {
   // Now, all but the last mapping on each line will have 'lastColumnNumber' set to a number.
 };
 
-module.exports = SDK;
+export default SDK;

package/core/lib/cdt/generated/ParsedURL.d.ts

@@ -1,4 +1,3 @@
-export const __esModule: boolean;
 /**
  * http://tools.ietf.org/html/rfc3986#section-5.2.4
  */

package/core/lib/cdt/generated/ParsedURL.js

@@ -1,7 +1,6 @@
 // @ts-nocheck
 // generated by yarn build-cdt-lib
 /* eslint-disable */
-"use strict";
 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
@@ -31,15 +30,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParsedURL = void 0;
-exports.normalizePath = normalizePath;
-exports.schemeIs = schemeIs;
 ;
 /**
  * http://tools.ietf.org/html/rfc3986#section-5.2.4
  */
-function normalizePath(path) {
+export function normalizePath(path) {
     if (path.indexOf('..') === -1 && path.indexOf('.') === -1) {
         return path;
     }
@@ -69,7 +64,7 @@ function normalizePath(path) {
     }
     return normalizedPath;
 }
-function schemeIs(url, scheme) {
+export function schemeIs(url, scheme) {
     try {
         return (new URL(url)).protocol === scheme;
     }
@@ -77,7 +72,7 @@ function schemeIs(url, scheme) {
         return false;
     }
 }
-class ParsedURL {
+export class ParsedURL {
     isValid;
     url;
     scheme;
@@ -186,5 +181,4 @@ class ParsedURL {
     }
     static urlRegexInstance = null;
 }
-exports.ParsedURL = ParsedURL;
 

package/core/lib/cdt/generated/SourceMap.d.ts

@@ -1,5 +1,23 @@
-export = SourceMap;
-declare class SourceMap {
+/**
+ * Parses the {@link content} as JSON, ignoring BOM markers in the beginning, and
+ * also handling the CORB bypass prefix correctly.
+ *
+ * @param content the string representation of a sourcemap.
+ * @returns the {@link SourceMapV3} representation of the {@link content}.
+ */
+export function parseSourceMap(content: any): any;
+export class SourceMapEntry {
+    static compare(entry1: any, entry2: any): number;
+    constructor(lineNumber: any, columnNumber: any, sourceIndex: any, sourceURL: any, sourceLineNumber: any, sourceColumnNumber: any, name: any);
+    lineNumber: any;
+    columnNumber: any;
+    sourceIndex: any;
+    sourceURL: any;
+    sourceLineNumber: any;
+    sourceColumnNumber: any;
+    name: any;
+}
+export class SourceMap {
     /**
      * @param {string} compiledURL
      * @param {string} sourceMappingURL
@@ -76,30 +94,10 @@ declare class SourceMap {
     findOriginalFunctionName(position: any): any;
     #private;
 }
-declare namespace SourceMap {
-    export { parseSourceMap, __esModule, SourceMapEntry, SourceMap, TokenIterator };
-}
-/**
- * Parses the {@link content} as JSON, ignoring BOM markers in the beginning, and
- * also handling the CORB bypass prefix correctly.
- *
- * @param content the string representation of a sourcemap.
- * @returns the {@link SourceMapV3} representation of the {@link content}.
- */
-declare function parseSourceMap(content: any): any;
-declare const __esModule: boolean;
-declare class SourceMapEntry {
-    static compare(entry1: any, entry2: any): number;
-    constructor(lineNumber: any, columnNumber: any, sourceIndex: any, sourceURL: any, sourceLineNumber: any, sourceColumnNumber: any, name: any);
-    lineNumber: any;
-    columnNumber: any;
-    sourceIndex: any;
-    sourceURL: any;
-    sourceLineNumber: any;
-    sourceColumnNumber: any;
-    name: any;
+export namespace SourceMap {
+    export { parseSourceMap };
 }
-declare class TokenIterator {
+export class TokenIterator {
     constructor(string: any);
     next(): any;
     /** Returns the unicode value of the next character and advances the iterator  */
@@ -114,4 +112,5 @@ declare class TokenIterator {
     peekVLQ(): number | null;
     #private;
 }
+export default SourceMap;
 //# sourceMappingURL=SourceMap.d.ts.map

package/core/lib/cdt/generated/SourceMap.js

@@ -1,9 +1,8 @@
 // @ts-nocheck
 // generated by yarn build-cdt-lib
 /* eslint-disable */
-"use strict";
-const Common = require('../Common.js');
-const Platform = require('../Platform.js');
+import * as Common from '../Common.js';
+import * as Platform from '../Platform.js';
 
         const BASE64_CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
         const BASE64_CODES = new Uint8Array(123);
@@ -14,9 +13,6 @@ const Platform = require('../Platform.js');
 // Copyright 2021 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TokenIterator = exports.SourceMap = exports.SourceMapEntry = void 0;
-exports.parseSourceMap = parseSourceMap;
 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
@@ -59,7 +55,7 @@ exports.parseSourceMap = parseSourceMap;
  * @param content the string representation of a sourcemap.
  * @returns the {@link SourceMapV3} representation of the {@link content}.
  */
-function parseSourceMap(content) {
+export function parseSourceMap(content) {
     if (content.startsWith(')]}')) {
         content = content.substring(content.indexOf('\n'));
     }
@@ -69,7 +65,7 @@ function parseSourceMap(content) {
     }
     return JSON.parse(content);
 }
-class SourceMapEntry {
+export class SourceMapEntry {
     lineNumber;
     columnNumber;
     sourceIndex;
@@ -93,8 +89,7 @@ class SourceMapEntry {
         return entry1.columnNumber - entry2.columnNumber;
     }
 }
-exports.SourceMapEntry = SourceMapEntry;
-class SourceMap {
+export class SourceMap {
     #json;
     #compiledURLInternal;
     #sourceMappingURL;
@@ -502,11 +497,10 @@ class SourceMap {
         return this.#scopesInfo?.findOriginalFunctionName(position) ?? null;
     }
 }
-exports.SourceMap = SourceMap;
 const VLQ_BASE_SHIFT = 5;
 const VLQ_BASE_MASK = (1 << 5) - 1;
 const VLQ_CONTINUATION_MASK = 1 << 5;
-class TokenIterator {
+export class TokenIterator {
     #string;
     #position;
     constructor(string) {
@@ -565,8 +559,6 @@ class TokenIterator {
         }
     }
 }
-exports.TokenIterator = TokenIterator;
 
-
-module.exports = SourceMap;
+export default SourceMap;
 SourceMap.parseSourceMap = parseSourceMap;

package/core/lib/i18n/i18n.js

@@ -15,7 +15,6 @@ import log from 'lighthouse-logger';
 import {getAvailableLocales} from '../../../shared/localization/format.js';
 import {LH_ROOT} from '../../../shared/root.js';
 import {isIcuMessage, formatMessage, DEFAULT_LOCALE} from '../../../shared/localization/format.js';
-import {getModulePath} from '../../../shared/esm-utils.js';
 
 const UIStrings = {
   /** Used to show the duration in milliseconds that something lasted. The `{timeInMs}` placeholder will be replaced with the time duration, shown in milliseconds (e.g. 63 ms) */
@@ -198,7 +197,7 @@ function createIcuMessageFn(filename, fileStrings = {}) {
     // one of the common strings found in `i18n.UIStrings`.
     const filenameToLookup = keyname in fileStrings ?
       filename :
-      path.relative(LH_ROOT, getModulePath(import.meta));
+      path.relative(LH_ROOT, import.meta.filename);
     const unixStyleFilename = filenameToLookup.replace(/\\/g, '/');
     const i18nId = `${unixStyleFilename} | ${keyname}`;
 

package/core/lib/legacy-javascript/legacy-javascript.d.ts

@@ -15,10 +15,10 @@ export type Result = {
 };
 /**
  * @param {string} content
- * @param {import('../cdt/generated/SourceMap.js')|null} map
+ * @param {import('../cdt/generated/SourceMap.js').default|null} map
  * @return {Result}
  */
-export function detectLegacyJavaScript(content: string, map: import("../cdt/generated/SourceMap.js") | null): Result;
+export function detectLegacyJavaScript(content: string, map: import("../cdt/generated/SourceMap.js").default | null): Result;
 /**
  * @return {Pattern[]}
  */

package/core/lib/legacy-javascript/legacy-javascript.js

@@ -401,7 +401,7 @@ const matcher = new CodePatternMatcher([
 
 /**
  * @param {string} content
- * @param {import('../cdt/generated/SourceMap.js')|null} map
+ * @param {import('../cdt/generated/SourceMap.js').default|null} map
  * @return {Result}
  */
 function detectLegacyJavaScript(content, map) {

package/core/runner.js

@@ -19,13 +19,12 @@ import {Sentry} from './lib/sentry.js';
 import {ReportGenerator} from '../report/generator/report-generator.js';
 import {LighthouseError} from './lib/lh-error.js';
 import {lighthouseVersion} from '../shared/root.js';
-import {getModuleDirectory} from '../shared/esm-utils.js';
 import {EntityClassification} from './computed/entity-classification.js';
 import UrlUtils from './lib/url-utils.js';
 import {Util} from '../shared/util.js';
 import {isEqual} from './lib/arbitrary-equality-map.js';
 
-const moduleDir = getModuleDirectory(import.meta);
+const moduleDir = import.meta.dirname;
 
 /** @typedef {import('./lib/arbitrary-equality-map.js').ArbitraryEqualityMap} ArbitraryEqualityMap */
 
@@ -230,6 +229,7 @@ class Runner {
       log.time(runnerStatus, 'verbose');
 
       const artifacts = await gatherFn({resolvedConfig: options.resolvedConfig});
+      options.resolvedConfig.artifacts = null;
       log.timeEnd(runnerStatus);
 
       // If `gather` is run multiple times before `audit`, the timing entries for each `gather` can pollute one another.