lighthouse 9.5.0-dev.20220712 → 9.5.0-dev.20220713

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

@@ -3,13 +3,13 @@
 // found in the LICENSE file.
 'use strict';
 
-const fs = require('fs');
-const http = require('http');
-const https = require('https');
-const path = require('path');
-const parseURL = require('url').parse;
-const shell = require('child_process').execSync;
-const Stream = require('stream').Transform;
+import fs from 'fs';
+import http from 'http';
+import https from 'https';
+import path from 'path';
+import { parse as parseURL } from 'url';
+import { execSync as shell } from 'child_process';
+import { Transform as Stream } from 'stream';
 
 function fetch(url) {
   return new Promise(fetchPromise);
@@ -115,7 +115,7 @@ function parseArgs(args) {
   return argObject;
 }
 
-module.exports = {
+export {
   fetch,
   atob,
   isFile,

package/tsconfig.json

@@ -13,8 +13,11 @@
   ],
   "include": [
     "root.js",
+    "esm-utils.js",
     "lighthouse-cli/**/*.js",
     "lighthouse-core/**/*.js",
+    "lighthouse-core/index.cjs",
+    "lighthouse-core/util.cjs",
     "clients/**/*.js",
     "build/**/*.js",
     "./types/**/*.d.ts",
@@ -30,7 +33,6 @@
     "third-party/snyk/snapshot.json",
     "lighthouse-core/audits/byte-efficiency/polyfill-graph-data.json",
     "shared/localization/locales/en-US.json",
-    "esm-utils.mjs",
   ],
   "exclude": [
     "lighthouse-core/test/audits/**/*.js",

package/types/artifacts.d.ts

@@ -4,16 +4,14 @@
  * 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 parseManifest = require('../lighthouse-core/lib/manifest-parser.js');
-import LanternSimulator = require('../lighthouse-core/lib/dependency-graph/simulator/simulator.js');
-import LighthouseError = require('../lighthouse-core/lib/lh-error.js');
-import _NetworkRequest = require('../lighthouse-core/lib/network-request.js');
-import speedline = require('speedline-core');
-import TextSourceMap = require('../lighthouse-core/lib/cdt/generated/SourceMap.js');
-import ArbitraryEqualityMap = require('../lighthouse-core/lib/arbitrary-equality-map.js');
-
-type _TaskNode = import('../lighthouse-core/lib/tracehouse/main-thread-tasks.js').TaskNode;
-
+import {parseManifest} from '../lighthouse-core/lib/manifest-parser.js';
+import {Simulator} from '../lighthouse-core/lib/dependency-graph/simulator/simulator.js';
+import {LighthouseError} from '../lighthouse-core/lib/lh-error.js';
+import {NetworkRequest as _NetworkRequest} from '../lighthouse-core/lib/network-request.js';
+import speedline from 'speedline-core';
+import TextSourceMap from '../lighthouse-core/lib/cdt/generated/SourceMap.js';
+import {ArbitraryEqualityMap} from '../lighthouse-core/lib/arbitrary-equality-map.js';
+import type { TaskNode as _TaskNode } from '../lighthouse-core/lib/tracehouse/main-thread-tasks.js';
 import AuditDetails from './lhr/audit-details'
 import Config from './config';
 import Gatherer from './gatherer';
@@ -643,7 +641,7 @@ declare module Artifacts {
     trace: Trace;
     settings: Immutable<Config.Settings>;
     gatherContext: Artifacts['GatherContext'];
-    simulator?: InstanceType<typeof LanternSimulator>;
+    simulator?: InstanceType<typeof Simulator>;
     URL: Artifacts['URL'];
   }
 

package/types/audit.d.ts

@@ -4,12 +4,12 @@
  * 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 ArbitraryEqualityMap = require('../lighthouse-core/lib/arbitrary-equality-map.js');
+import {ArbitraryEqualityMap} from '../lighthouse-core/lib/arbitrary-equality-map.js';
 import {Artifacts} from './artifacts';
 import AuditDetails from './lhr/audit-details';
 import Config from './config';
 import Gatherer from './gatherer';
-import {FormattedIcu, IcuMessage} from './lhr/i18n';
+import {IcuMessage} from './lhr/i18n';
 import * as AuditResult from './lhr/audit-result';
 
 declare module Audit {

package/types/config.d.ts

@@ -5,7 +5,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 Audit = require('../lighthouse-core/audits/audit.js');
+import {Audit} from '../lighthouse-core/audits/audit.js';
 import {SharedFlagsSettings, ConfigSettings} from './lhr/settings';
 import Gatherer from './gatherer';
 import {IcuMessage} from './lhr/i18n';

package/types/cssstyle/index.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.
  */
 
-declare module 'cssstyle/lib/parsers' {
+declare module 'cssstyle/lib/parsers.js' {
   interface TYPES {
     INTEGER: 1;
     NUMBER: 2;

package/types/gatherer.d.ts

@@ -4,13 +4,13 @@
  * 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 _NetworkNode = require('../lighthouse-core/lib/dependency-graph/network-node');
-import _CPUNode = require('../lighthouse-core/lib/dependency-graph/cpu-node');
-import _Simulator = require('../lighthouse-core/lib/dependency-graph/simulator/simulator');
-import Driver = require('../lighthouse-core/gather/driver');
-import ExecutionContext = require('../lighthouse-core/gather/driver/execution-context');
-import Fetcher = require('../lighthouse-core/gather/fetcher');
-import ArbitraryEqualityMap = require('../lighthouse-core/lib/arbitrary-equality-map');
+import {NetworkNode as _NetworkNode} from '../lighthouse-core/lib/dependency-graph/network-node';
+import {CPUNode as _CPUNode} from '../lighthouse-core/lib/dependency-graph/cpu-node';
+import {Simulator as _Simulator} from '../lighthouse-core/lib/dependency-graph/simulator/simulator';
+import {Driver} from '../lighthouse-core/gather/driver';
+import {ExecutionContext} from '../lighthouse-core/gather/driver/execution-context';
+import {Fetcher} from '../lighthouse-core/gather/fetcher';
+import {ArbitraryEqualityMap} from '../lighthouse-core/lib/arbitrary-equality-map';
 
 import {Artifacts, BaseArtifacts, FRBaseArtifacts, GathererArtifacts} from './artifacts';
 import Config from './config';

package/types/global-lh.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 ArbitraryEqualityMap_ = require('../lighthouse-core/lib/arbitrary-equality-map.js');
+import {ArbitraryEqualityMap as ArbitraryEqualityMap_} from '../lighthouse-core/lib/arbitrary-equality-map.js';
 import * as Artifacts_ from './artifacts';
 import Audit_ from './audit';
 import Budget_ from './lhr/budget';
@@ -14,7 +14,7 @@ import _CrdpMappings from 'devtools-protocol/types/protocol-mapping';
 import * as Externs from './externs';
 import Gatherer_ from './gatherer';
 import * as I18n from './lhr/i18n';
-import LighthouseError_ = require('../lighthouse-core/lib/lh-error.js');
+import {LighthouseError as LighthouseError_} from '../lighthouse-core/lib/lh-error.js';
 import LHResult from './lhr/lhr';
 import FlowResult_ from './lhr/flow';
 import Protocol_ from './protocol';

package/types/smokehouse.d.ts

@@ -67,6 +67,8 @@ declare global {
       lighthouseRunner?: LighthouseRunner;
       /** A function that gets a list of URLs requested to the server since the last fetch. */
       takeNetworkRequestUrls?: () => string[];
+      /** A function run once before all smoke tests. */
+      setup?: () => Promise<void>;
     }
 
     export interface SmokehouseLibOptions extends SmokehouseOptions {