lighthouse 9.5.0-dev.20220920 → 9.5.0-dev.20220921

package/CONTRIBUTING.md

@@ -128,7 +128,7 @@ accept your pull requests.
 
 ## Tracking Errors
 
-We track our errors in the wild with Sentry. In general, do not worry about wrapping your audits or gatherers in try/catch blocks and reporting every error that could possibly occur; `core/runner.js` and `core/fraggle-rock/gather/*-runner.js` already catch and report any errors that occur while running a gatherer or audit, including errors fatal to the entire run. However, there are some situations when you might want to explicitly handle an error and report it to Sentry or wrap it to avoid reporting. Generally, you can interact with Sentry simply by requiring the `core/lib/sentry.js` file and call its methods. The module exports a delegate that will correctly handle the error reporting based on the user's opt-in preference and will simply no-op if they haven't so you don't need to check.
+We track our errors in the wild with Sentry. In general, do not worry about wrapping your audits or gatherers in try/catch blocks and reporting every error that could possibly occur; `core/runner.js` and `core/gather/*-runner.js` already catch and report any errors that occur while running a gatherer or audit, including errors fatal to the entire run. However, there are some situations when you might want to explicitly handle an error and report it to Sentry or wrap it to avoid reporting. Generally, you can interact with Sentry simply by requiring the `core/lib/sentry.js` file and call its methods. The module exports a delegate that will correctly handle the error reporting based on the user's opt-in preference and will simply no-op if they haven't so you don't need to check.
 
 
 #### If you have an expected error that is recoverable but want to track how frequently it happens, *use Sentry.captureException*.

package/cli/bin.js

@@ -31,7 +31,7 @@ import {generateConfig, generateLegacyConfig} from '../core/index.js';
 import {askPermission} from './sentry-prompt.js';
 import {LH_ROOT} from '../root.js';
 import {Sentry} from '../core/lib/sentry.js';
-import {getConfigDisplayString} from '../core/fraggle-rock/config/config.js';
+import {getConfigDisplayString} from '../core/config/config.js';
 
 const pkg = JSON.parse(fs.readFileSync(LH_ROOT + '/package.json', 'utf-8'));
 

package/core/{fraggle-rock/api.js → api.js}

@@ -8,8 +8,8 @@ import {UserFlow, auditGatherSteps} from './user-flow.js';
 import {snapshotGather} from './gather/snapshot-runner.js';
 import {startTimespanGather} from './gather/timespan-runner.js';
 import {navigationGather} from './gather/navigation-runner.js';
-import {ReportGenerator} from '../../report/generator/report-generator.js';
-import {Runner} from '../runner.js';
+import {ReportGenerator} from '../report/generator/report-generator.js';
+import {Runner} from './runner.js';
 
 /**
  * @param {LH.Puppeteer.Page} page

package/core/config/config-helpers.js

@@ -14,7 +14,7 @@ import {Budget} from './budget.js';
 import ConfigPlugin from './config-plugin.js';
 import {Runner} from '../runner.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import * as validation from '../fraggle-rock/config/validation.js';
+import * as validation from './validation.js';
 import {getModuleDirectory} from '../../esm-utils.js';
 
 const require = createRequire(import.meta.url);

package/core/{fraggle-rock/config → config}/config.js

@@ -8,9 +8,9 @@ import path from 'path';
 
 import log from 'lighthouse-logger';
 
-import {Runner} from '../../runner.js';
-import defaultConfig from '../../config/default-config.js';
-import {defaultNavigationConfig, nonSimulatedPassConfigOverrides} from '../../config/constants.js'; // eslint-disable-line max-len
+import {Runner} from '../runner.js';
+import defaultConfig from './default-config.js';
+import {defaultNavigationConfig, nonSimulatedPassConfigOverrides} from './constants.js'; // eslint-disable-line max-len
 import {
   isFRGathererDefn,
   throwInvalidDependencyOrder,
@@ -28,9 +28,9 @@ import {
   mergePlugins,
   mergeConfigFragment,
   mergeConfigFragmentArrayByKey,
-} from '../../config/config-helpers.js';
-import {getModuleDirectory} from '../../../esm-utils.js';
-import * as format from '../../../shared/localization/format.js';
+} from './config-helpers.js';
+import {getModuleDirectory} from '../../esm-utils.js';
+import * as format from '../../shared/localization/format.js';
 
 const defaultConfigPath = path.join(
   getModuleDirectory(import.meta),

package/core/{fraggle-rock/config → config}/filters.js

@@ -6,7 +6,7 @@
 
 import log from 'lighthouse-logger';
 
-import {Audit} from '../../audits/audit.js';
+import {Audit} from '../audits/audit.js';
 
 /** @type {Record<keyof LH.FRBaseArtifacts, string>} */
 const baseArtifactKeySource = {

package/core/{fraggle-rock/config → config}/validation.js

@@ -4,9 +4,9 @@
  * 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} from '../../audits/audit.js';
+import {Audit} from '../audits/audit.js';
 import BaseFRGatherer from '../gather/base-gatherer.js';
-import * as i18n from '../../lib/i18n/i18n.js';
+import * as i18n from '../lib/i18n/i18n.js';
 
 /**
  * @param {LH.Config.GathererDefn | LH.Config.AnyFRGathererDefn} gathererDefn

package/core/{fraggle-rock/gather → gather}/base-artifacts.js

@@ -9,7 +9,7 @@ import isDeepEqual from 'lodash/isEqual.js';
 
 import {
   getBrowserVersion, getBenchmarkIndex, getEnvironmentWarnings,
-} from '../../gather/driver/environment.js';
+} from './driver/environment.js';
 
 /**
  * @param {LH.Config.FRConfig} config

package/core/gather/driver/target-manager.js

@@ -13,7 +13,7 @@ import EventEmitter from 'events';
 
 import log from 'lighthouse-logger';
 
-import {ProtocolSession} from '../../fraggle-rock/gather/session.js';
+import {ProtocolSession} from '../session.js';
 
 /**
  * @typedef {{

package/core/{fraggle-rock/gather → gather}/driver.js

@@ -6,9 +6,9 @@
 
 import log from 'lighthouse-logger';
 
-import {ExecutionContext} from '../../gather/driver/execution-context.js';
-import {TargetManager} from '../../gather/driver/target-manager.js';
-import {Fetcher} from '../../gather/fetcher.js';
+import {ExecutionContext} from './driver/execution-context.js';
+import {TargetManager} from './driver/target-manager.js';
+import {Fetcher} from './fetcher.js';
 
 /** @return {*} */
 const throwNotConnectedFn = () => {

package/core/gather/gatherers/accessibility.js

@@ -6,7 +6,7 @@
 
 /* global window, document, getNodeDetails */
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import {axeSource} from '../../lib/axe.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 

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

@@ -6,7 +6,7 @@
 
 /* global getNodeDetails */
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import {resolveDevtoolsNodePathToObjectId} from '../driver/dom.js';
 

package/core/gather/gatherers/cache-contents.js

@@ -6,7 +6,7 @@
 
 /* global caches */
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 /**
  * @return {Promise<Array<string>>}

package/core/gather/gatherers/console-messages.js

@@ -10,7 +10,7 @@
  */
 
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 /**
  * @param {LH.Crdp.Runtime.RemoteObject} obj

package/core/gather/gatherers/css-usage.js

@@ -10,7 +10,7 @@
 
 import log from 'lighthouse-logger';
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import {Sentry} from '../../lib/sentry.js';
 
 class CSSUsage extends FRGatherer {

package/core/gather/gatherers/devtools-log-compat.js

@@ -11,7 +11,7 @@
  */
 
 import DevtoolsLogGatherer from './devtools-log.js';
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 /** @implements {LH.Gatherer.FRGathererInstance<'DevtoolsLog'>} */
 class DevtoolsLogCompat extends FRGatherer {

package/core/gather/gatherers/devtools-log.js

@@ -10,7 +10,7 @@
  * This protocol log can be used to recreate the network records using lib/network-recorder.js.
  */
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 class DevtoolsLog extends FRGatherer {
   static symbol = Symbol('DevtoolsLog');

package/core/gather/gatherers/dobetterweb/doctype.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 FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../../base-gatherer.js';
 
 /* global document */
 

package/core/gather/gatherers/dobetterweb/domstats.js

@@ -12,7 +12,7 @@
 /* global getNodeDetails document */
 
 
-import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../../base-gatherer.js';
 import {pageFunctions} from '../../../lib/page-functions.js';
 
 /**

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

@@ -12,7 +12,7 @@
 
 import log from 'lighthouse-logger';
 
-import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../../base-gatherer.js';
 import UrlUtils from '../../../lib/url-utils.js';
 import {NetworkRequest} from '../../../lib/network-request.js';
 import {Sentry} from '../../../lib/sentry.js';

package/core/gather/gatherers/dobetterweb/password-inputs-with-prevented-paste.js

@@ -6,7 +6,7 @@
 
 /* global document ClipboardEvent getNodeDetails */
 
-import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../../base-gatherer.js';
 import {pageFunctions} from '../../../lib/page-functions.js';
 
 /**

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

@@ -13,7 +13,7 @@
 import {Buffer} from 'buffer';
 import {gzip} from 'zlib';
 
-import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../../base-gatherer.js';
 import UrlUtils from '../../../lib/url-utils.js';
 import {Sentry} from '../../../lib/sentry.js';
 import {NetworkRequest} from '../../../lib/network-request.js';

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

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

package/core/gather/gatherers/full-page-screenshot.js

@@ -6,7 +6,7 @@
 
 /* globals window document getBoundingClientRect requestAnimationFrame */
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import * as emulation from '../../lib/emulation.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import {NetworkMonitor} from '../driver/network-monitor.js';

package/core/gather/gatherers/global-listeners.js

@@ -11,7 +11,7 @@
  * around page unload, but this can be expanded in the future.
  */
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 class GlobalListeners extends FRGatherer {
   /** @type {LH.Gatherer.GathererMeta} */

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

@@ -6,7 +6,7 @@
 
 /* global getNodeDetails */
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 
 /* eslint-env browser, node */

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

@@ -11,7 +11,7 @@
 
 import log from 'lighthouse-logger';
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import * as FontSize from './seo/font-size.js';
 

package/core/gather/gatherers/inputs.js

@@ -6,7 +6,7 @@
 
 /* global getNodeDetails */
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 
 /* eslint-env browser, node */

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

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

package/core/gather/gatherers/installability-errors.js

@@ -6,7 +6,7 @@
 
 import log from 'lighthouse-logger';
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 class InstallabilityErrors extends FRGatherer {
   /** @type {LH.Gatherer.GathererMeta} */

package/core/gather/gatherers/js-usage.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 FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 /**
  * @fileoverview Tracks unused JavaScript

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

@@ -6,7 +6,7 @@
 
 import LinkHeader from 'http-link-header';
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import DevtoolsLog from './devtools-log.js';
 import {MainResource} from '../../computed/main-resource.js';

package/core/gather/gatherers/main-document-content.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 FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import DevtoolsLog from './devtools-log.js';
 import {fetchResponseBodyFromCache} from '../driver/network.js';
 import {MainResource} from '../../computed/main-resource.js';

package/core/gather/gatherers/meta-elements.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 FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 
 /* globals getElementsInDocument getNodeDetails */

package/core/gather/gatherers/network-user-agent.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 FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import DevtoolsLogGatherer from './devtools-log.js';
 
 /** @implements {LH.Gatherer.FRGathererInstance<'DevtoolsLog'>} */

package/core/gather/gatherers/script-elements.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 FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import {NetworkRecords} from '../../computed/network-records.js';
 import {NetworkRequest} from '../../lib/network-request.js';
 import {pageFunctions} from '../../lib/page-functions.js';

package/core/gather/gatherers/scripts.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 FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 /**
  * @template T, U

package/core/gather/gatherers/seo/embedded-content.js

@@ -6,7 +6,7 @@
 
 /* globals getElementsInDocument getNodeDetails */
 
-import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../../base-gatherer.js';
 import {pageFunctions} from '../../../lib/page-functions.js';
 
 /**

package/core/gather/gatherers/seo/font-size.js

@@ -15,7 +15,7 @@
  * This gatherer collects stylesheet metadata by itself, instead of relying on the styles gatherer which is slow (because it parses the stylesheet content).
  */
 
-import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../../base-gatherer.js';
 
 const FONT_SIZE_PROPERTY_NAME = 'font-size';
 const MINIMAL_LEGIBLE_FONT_SIZE_PX = 12;

package/core/gather/gatherers/seo/robots-txt.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 FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../../base-gatherer.js';
 
 class RobotsTxt extends FRGatherer {
   /** @type {LH.Gatherer.GathererMeta} */

package/core/gather/gatherers/seo/tap-targets.js

@@ -6,7 +6,7 @@
 
 /* global document, window, getComputedStyle, getElementsInDocument, Node, getNodeDetails, getRectCenterPoint */
 
-import FRGatherer from '../../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../../base-gatherer.js';
 import {pageFunctions} from '../../../lib/page-functions.js';
 import * as RectHelpers from '../../../lib/rect-helpers.js';
 

package/core/gather/gatherers/service-worker.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 FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import * as serviceWorkers from '../driver/service-workers.js';
 
 class ServiceWorker extends FRGatherer {

package/core/gather/gatherers/source-maps.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 FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 /**
  * @fileoverview Gets JavaScript source maps.

package/core/gather/gatherers/stacks.js

@@ -16,7 +16,7 @@ import {createRequire} from 'module';
 
 import log from 'lighthouse-logger';
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 
 // This is removed by rollup, because the only usage is to resolve a module path

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

@@ -11,7 +11,7 @@
  */
 
 import TraceGatherer from './trace.js';
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 /** @implements {LH.Gatherer.FRGathererInstance<'Trace'>} */
 class TraceCompat extends FRGatherer {

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

@@ -12,7 +12,7 @@
  * We take the backend nodeId from the trace and use it to find the corresponding element in the DOM.
  */
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import {resolveNodeIdToObjectId} from '../driver/dom.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import * as RectHelpers from '../../lib/rect-helpers.js';

package/core/gather/gatherers/trace.js

@@ -10,7 +10,7 @@
  * This protocol log can be used to recreate the network records using lib/network-recorder.js.
  */
 
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 
 class Trace extends FRGatherer {

package/core/gather/gatherers/viewport-dimensions.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 FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 /* global window */
 

package/core/gather/gatherers/web-app-manifest.js

@@ -7,7 +7,7 @@
 import log from 'lighthouse-logger';
 
 import {parseManifest} from '../../lib/manifest-parser.js';
-import FRGatherer from '../../fraggle-rock/gather/base-gatherer.js';
+import FRGatherer from '../base-gatherer.js';
 
 class WebAppManifest extends FRGatherer {
   /** @type {LH.Gatherer.GathererMeta} */

package/core/{fraggle-rock/gather → gather}/navigation-runner.js

@@ -8,22 +8,22 @@ import puppeteer from 'puppeteer-core';
 import log from 'lighthouse-logger';
 
 import {Driver} from './driver.js';
-import {Runner} from '../../runner.js';
+import {Runner} from '../runner.js';
 import {getEmptyArtifactState, collectPhaseArtifacts, awaitArtifacts} from './runner-helpers.js';
-import * as prepare from '../../gather/driver/prepare.js';
-import {gotoURL} from '../../gather/driver/navigation.js';
-import * as storage from '../../gather/driver/storage.js';
-import * as emulation from '../../lib/emulation.js';
-import {defaultNavigationConfig} from '../../config/constants.js';
+import * as prepare from './driver/prepare.js';
+import {gotoURL} from './driver/navigation.js';
+import * as storage from './driver/storage.js';
+import * as emulation from '../lib/emulation.js';
+import {defaultNavigationConfig} from '../config/constants.js';
 import {initializeConfig} from '../config/config.js';
 import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';
-import * as format from '../../../shared/localization/format.js';
-import {LighthouseError} from '../../lib/lh-error.js';
-import UrlUtils from '../../lib/url-utils.js';
-import {getPageLoadError} from '../../lib/navigation-error.js';
-import Trace from '../../gather/gatherers/trace.js';
-import DevtoolsLog from '../../gather/gatherers/devtools-log.js';
-import {NetworkRecords} from '../../computed/network-records.js';
+import * as format from '../../shared/localization/format.js';
+import {LighthouseError} from '../lib/lh-error.js';
+import UrlUtils from '../lib/url-utils.js';
+import {getPageLoadError} from '../lib/navigation-error.js';
+import Trace from './gatherers/trace.js';
+import DevtoolsLog from './gatherers/devtools-log.js';
+import {NetworkRecords} from '../computed/network-records.js';
 
 /**
  * @typedef NavigationContext

package/core/{fraggle-rock/gather → gather}/session.js

@@ -6,7 +6,7 @@
 
 import EventEmitter from 'events';
 
-import {LighthouseError} from '../../lib/lh-error.js';
+import {LighthouseError} from '../lib/lh-error.js';
 
 // Controls how long to wait for a response after sending a DevTools protocol command.
 const DEFAULT_PROTOCOL_TIMEOUT = 30000;

package/core/{fraggle-rock/gather → gather}/snapshot-runner.js

@@ -7,7 +7,7 @@
 import log from 'lighthouse-logger';
 
 import {Driver} from './driver.js';
-import {Runner} from '../../runner.js';
+import {Runner} from '../runner.js';
 import {getEmptyArtifactState, collectPhaseArtifacts, awaitArtifacts} from './runner-helpers.js';
 import {initializeConfig} from '../config/config.js';
 import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';

package/core/{fraggle-rock/gather → gather}/timespan-runner.js

@@ -7,9 +7,9 @@
 import log from 'lighthouse-logger';
 
 import {Driver} from './driver.js';
-import {Runner} from '../../runner.js';
+import {Runner} from '../runner.js';
 import {getEmptyArtifactState, collectPhaseArtifacts, awaitArtifacts} from './runner-helpers.js';
-import {prepareTargetForTimespanMode} from '../../gather/driver/prepare.js';
+import {prepareTargetForTimespanMode} from './driver/prepare.js';
 import {initializeConfig} from '../config/config.js';
 import {getBaseArtifacts, finalizeArtifacts} from './base-artifacts.js';
 

package/core/index.js

@@ -10,9 +10,9 @@ import {Runner} from './runner.js';
 import {CriConnection} from './legacy/gather/connections/cri.js';
 import {Config} from './legacy/config/config.js';
 import UrlUtils from './lib/url-utils.js';
-import * as fraggleRock from './fraggle-rock/api.js';
+import * as fraggleRock from './api.js';
 import {Driver} from './legacy/gather/driver.js';
-import {initializeConfig} from './fraggle-rock/config/config.js';
+import {initializeConfig} from './config/config.js';
 
 /** @typedef {import('./legacy/gather/connections/connection.js').Connection} Connection */
 
@@ -109,7 +109,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 Gatherer} from './gather/base-gatherer.js';
 export {NetworkRecords} from './computed/network-records.js';
 export {
   legacyNavigation,

package/core/legacy/config/config.js

@@ -11,7 +11,7 @@ import log from 'lighthouse-logger';
 import legacyDefaultConfig from './legacy-default-config.js';
 import * as constants from '../../config/constants.js';
 import * as format from '../../../shared/localization/format.js';
-import * as validation from '../../fraggle-rock/config/validation.js';
+import * as validation from '../../config/validation.js';
 import {Runner} from '../../runner.js';
 import {
   mergePlugins,

package/core/legacy/gather/gather-runner.js

@@ -20,7 +20,7 @@ import WebAppManifest from '../../gather/gatherers/web-app-manifest.js';
 import InstallabilityErrors from '../../gather/gatherers/installability-errors.js';
 import NetworkUserAgent from '../../gather/gatherers/network-user-agent.js';
 import Stacks from '../../gather/gatherers/stacks.js';
-import {finalizeArtifacts} from '../../fraggle-rock/gather/base-artifacts.js';
+import {finalizeArtifacts} from '../../gather/base-artifacts.js';
 import UrlUtils from '../../lib/url-utils.js';
 
 /** @typedef {import('./driver.js').Driver} Driver */

package/core/{fraggle-rock/user-flow.js → user-flow.js}

@@ -4,11 +4,11 @@
  * 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 {ReportGenerator} from '../../report/generator/report-generator.js';
+import {ReportGenerator} from '../report/generator/report-generator.js';
 import {snapshotGather} from './gather/snapshot-runner.js';
 import {startTimespanGather} from './gather/timespan-runner.js';
 import {navigationGather} from './gather/navigation-runner.js';
-import {Runner} from '../runner.js';
+import {Runner} from './runner.js';
 import {initializeConfig} from './config/config.js';
 
 /** @typedef {Parameters<snapshotGather>[0]} FrOptions */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "9.5.0-dev.20220920",
+  "version": "9.5.0-dev.20220921",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./core/index.js",
   "bin": {

package/types/user-flow.d.ts

@@ -1,4 +1,4 @@
-import {UserFlow as UserFlow_} from '../core/fraggle-rock/user-flow';
+import {UserFlow as UserFlow_} from '../core/user-flow';
 
 declare module UserFlow {
   export interface FlowArtifacts {