Skip to content

Commit

Permalink
update lighthouse core paths (#355)
Browse files Browse the repository at this point in the history
  • Loading branch information
connorjclark authored Aug 3, 2022
1 parent 8073f1c commit 1076265
Show file tree
Hide file tree
Showing 50 changed files with 116 additions and 116 deletions.
2 changes: 1 addition & 1 deletion config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* For the possible types, see
* https://github.com/GoogleChrome/lighthouse/blob/master/typings/config.d.ts.
* and
* https://github.com/GoogleChrome/lighthouse/tree/master/lighthouse-core/config
* https://github.com/GoogleChrome/lighthouse/tree/master/core/config
* @const {LH.Config}
*/
const config = {
Expand Down
2 changes: 1 addition & 1 deletion index.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ async function main() {
}

// @ts-ignore let LH handle the CLI
const {begin} = await import('lighthouse/lighthouse-cli/bin.js');
const {begin} = await import('lighthouse/cli/bin.js');
await begin();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import AdRequestTime from '../computed/ad-request-time.js';

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';
import LongTasks from '../computed/long-tasks.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';

// @ts-ignore
import {auditNotApplicable} from '../messages/common-strings.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import ComputedAdRequestTime from '../computed/ad-request-time.js';

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';
import {auditNotApplicable, runWarning} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import ComputedAdRequestTime from '../computed/ad-request-time.js';

import ComputedTagLoadTime from '../computed/tag-load-time.js';
import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
Expand Down
2 changes: 1 addition & 1 deletion lighthouse-plugin-publisher-ads/audits/ads-in-viewport.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import {auditNotApplicable} from '../messages/common-strings.js';

import {Audit} from 'lighthouse';
import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';
import {isBoxInViewport} from '../utils/geometry.js';
import {isGptIframe} from '../utils/resource-classification.js';

Expand Down
6 changes: 3 additions & 3 deletions lighthouse-plugin-publisher-ads/audits/async-ad-tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

import * as array from '../utils/array.js';

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

// @ts-ignore
import MainResource from 'lighthouse/lighthouse-core/computed/main-resource.js';
import MainResource from 'lighthouse/core/computed/main-resource.js';

import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
import {isAdTag, isStaticRequest} from '../utils/resource-classification.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import ComputedBidRequestTime from '../computed/bid-request-time.js';

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';

// @ts-expect-error
import ProcessedTrace from 'lighthouse/lighthouse-core/computed/processed-trace.js';
import ProcessedTrace from 'lighthouse/core/computed/processed-trace.js';

// @ts-expect-error
import ProcessedNavigation from 'lighthouse/lighthouse-core/computed/processed-navigation.js';
import ProcessedNavigation from 'lighthouse/core/computed/processed-navigation.js';

import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
import {isGpt, isGptImplTag} from '../utils/resource-classification.js';
Expand Down
8 changes: 4 additions & 4 deletions lighthouse-plugin-publisher-ads/audits/duplicate-tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

// @ts-ignore
import MainResource from 'lighthouse/lighthouse-core/computed/main-resource.js';
import MainResource from 'lighthouse/core/computed/main-resource.js';

import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import {NetworkRequest} from 'lighthouse/lighthouse-core/lib/network-request.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';
import {NetworkRequest} from 'lighthouse/core/lib/network-request.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
import {containsAnySubstring} from '../utils/resource-classification.js';
Expand Down
2 changes: 1 addition & 1 deletion lighthouse-plugin-publisher-ads/audits/first-ad-render.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import ComputedAdRenderTime from '../computed/ad-render-time.js';

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';
import {auditNotApplicable, runWarning} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';

Expand Down
4 changes: 2 additions & 2 deletions lighthouse-plugin-publisher-ads/audits/full-width-slots.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
import {isAdRequest} from '../utils/resource-classification.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';

import {assert} from '../utils/asserts.js';
import {auditNotApplicable} from '../messages/common-strings.js';
Expand Down
4 changes: 2 additions & 2 deletions lighthouse-plugin-publisher-ads/audits/gpt-errors-overall.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
import {isGpt, isGptImplTag} from '../utils/resource-classification.js';
Expand Down
10 changes: 5 additions & 5 deletions lighthouse-plugin-publisher-ads/audits/idle-network-times.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import MainThreadTasks from 'lighthouse/lighthouse-core/computed/main-thread-tasks.js';
import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import MainThreadTasks from 'lighthouse/core/computed/main-thread-tasks.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';

// @ts-expect-error
import ProcessedTrace from 'lighthouse/lighthouse-core/computed/processed-trace.js';
import ProcessedTrace from 'lighthouse/core/computed/processed-trace.js';

// @ts-expect-error
import ProcessedNavigation from 'lighthouse/lighthouse-core/computed/processed-navigation.js';
import ProcessedNavigation from 'lighthouse/core/computed/processed-navigation.js';

import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
import {isAdTag} from '../utils/resource-classification.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
import {isGptTag} from '../utils/resource-classification.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

import * as array from '../utils/array.js';

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import PageDependencyGraph from 'lighthouse/lighthouse-core/computed/page-dependency-graph.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';
import PageDependencyGraph from 'lighthouse/core/computed/page-dependency-graph.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
import {computeAdRequestWaterfall} from '../utils/graph.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

import ComputedAdRequestTime from '../computed/ad-request-time.js';

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

// @ts-ignore
import MainResource from 'lighthouse/lighthouse-core/computed/main-resource.js';
import MainResource from 'lighthouse/core/computed/main-resource.js';

import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
import {bucket} from '../utils/array.js';
Expand Down
2 changes: 1 addition & 1 deletion lighthouse-plugin-publisher-ads/audits/tag-load-time.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import ComputedTagLoadTime from '../computed/tag-load-time.js';

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';
import {auditNotApplicable, runWarning} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import LongTasks from '../computed/long-tasks.js';
import NetworkRecords from 'lighthouse/lighthouse-core/computed/network-records.js';
import NetworkRecords from 'lighthouse/core/computed/network-records.js';
import {auditNotApplicable} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
import {getAttributableUrl} from '../utils/tasks.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import * as i18n from 'lighthouse/lighthouse-core/lib/i18n/i18n.js';
import * as i18n from 'lighthouse/core/lib/i18n/i18n.js';

import {auditNotApplicable, auditError} from '../messages/common-strings.js';
import {Audit} from 'lighthouse';
Expand Down
8 changes: 4 additions & 4 deletions lighthouse-plugin-publisher-ads/computed/ad-lantern-metric.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import {BaseNode} from 'lighthouse/lighthouse-core/lib/dependency-graph/base-node.js';
import {BaseNode} from 'lighthouse/core/lib/dependency-graph/base-node.js';

// eslint-disable-next-line no-unused-vars
import {CPUNode} from 'lighthouse/lighthouse-core/lib/dependency-graph/cpu-node.js';
import {CPUNode} from 'lighthouse/core/lib/dependency-graph/cpu-node.js';

// @ts-ignore Remove request() below after importing the type.
import LanternMetric from 'lighthouse/lighthouse-core/computed/metrics/lantern-metric.js';
import LanternMetric from 'lighthouse/core/computed/metrics/lantern-metric.js';

// eslint-disable-next-line no-unused-vars
import {NetworkNode} from 'lighthouse/lighthouse-core/lib/dependency-graph/network-node.js';
import {NetworkNode} from 'lighthouse/core/lib/dependency-graph/network-node.js';

import {
isBidRelatedRequest,
Expand Down
6 changes: 3 additions & 3 deletions lighthouse-plugin-publisher-ads/computed/ad-render-time.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
import AdLanternMetric from './ad-lantern-metric.js';

// @ts-ignore
import ComputedMetric from 'lighthouse/lighthouse-core/computed/metrics/metric.js';
import ComputedMetric from 'lighthouse/core/computed/metrics/metric.js';

// @ts-ignore
import {makeComputedArtifact} from 'lighthouse/lighthouse-core/computed/computed-artifact.js';
import {makeComputedArtifact} from 'lighthouse/core/computed/computed-artifact.js';

import {getPageStartTime, getImpressionStartTime} from '../utils/network-timing.js';
import {isImpressionPing} from '../utils/resource-classification.js';

// @ts-ignore
// eslint-disable-next-line max-len
/** @typedef {import('lighthouse/lighthouse-core/lib/dependency-graph/base-node.js').Node} Node */
/** @typedef {import('lighthouse/core/lib/dependency-graph/base-node.js').Node} Node */

/** Computes simulated first ad render time using Lantern. */
class LanternAdRenderTime extends AdLanternMetric {
Expand Down
6 changes: 3 additions & 3 deletions lighthouse-plugin-publisher-ads/computed/ad-request-time.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
import AdLanternMetric from './ad-lantern-metric.js';

// @ts-ignore
import ComputedMetric from 'lighthouse/lighthouse-core/computed/metrics/metric.js';
import ComputedMetric from 'lighthouse/core/computed/metrics/metric.js';

// @ts-ignore
import {makeComputedArtifact} from 'lighthouse/lighthouse-core/computed/computed-artifact.js';
import {makeComputedArtifact} from 'lighthouse/core/computed/computed-artifact.js';

import {getAdStartTime, getPageStartTime} from '../utils/network-timing.js';
import {isAdRequest} from '../utils/resource-classification.js';

// @ts-ignore
// eslint-disable-next-line max-len
/** @typedef {import('lighthouse/lighthouse-core/lib/dependency-graph/base-node.js').Node} Node */
/** @typedef {import('lighthouse/core/lib/dependency-graph/base-node.js').Node} Node */

/** Computes simulated first ad request time using Lantern. */
class LanternAdRequestTime extends AdLanternMetric {
Expand Down
Loading

0 comments on commit 1076265

Please sign in to comment.