remove aggregations

GoogleChrome · Jun 5, 2017 · 4dd6a89 · 4dd6a89
1 parent 3ac3ae4
commit 4dd6a89
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 5,921 deletions.
diff --git a/docs/readme.md b/docs/readme.md
@@ -110,18 +110,16 @@ As an example, here's a trace-only run that's reporting on user timings and crit
  }
  },
 
- "aggregations": [{
- "name": "Performance Metrics",
- "description": "These encapsulate your app's performance.",
- "scored": false,
- "categorizable": false,
- "items": [{
- "audits": {
- "user-timings": { "expectedValue": 0, "weight": 1 },
- "critical-request-chains": { "expectedValue": 0, "weight": 1}
- }
- }]
- }]
+ "categories": {
+ "performance": {
+ "name": "Performance Metrics",
+ "description": "These encapsulate your app's performance.",
+ "audits": [
+ {"id": "user-timings", "weight": 1},
+ {"id": "critical-request-chains", "weight": 1}
+ ]
+ }
+ }
 }
 ```
 

diff --git a/lighthouse-cli/test/smokehouse/pwa-config.js b/lighthouse-cli/test/smokehouse/pwa-config.js
@@ -57,7 +57,5 @@ module.exports = {
  'themed-omnibox',
  // https://github.com/GoogleChrome/lighthouse/issues/566
  // 'cache-start-url'
- ],
-
- aggregations: []
+ ]
 };
diff --git a/lighthouse-cli/types/types.ts b/lighthouse-cli/types/types.ts
@@ -29,22 +29,8 @@ interface AuditFullResults {
  [metric: string]: AuditFullResult
 }
 
-interface AggregationResultItem {
- overall: number;
- name: string;
- scored: boolean;
- subItems: Array<AuditFullResult|string>;
-}
-
-interface Aggregation {
- name: string;
- score: Array<AggregationResultItem>;
- total: number;
-}
-
 interface Results {
  url: string;
- aggregations: Array<Aggregation>;
  audits: AuditFullResults;
  lighthouseVersion: string;
  artifacts?: Object;
@@ -54,8 +40,6 @@ interface Results {
 
 export {
  Results,
- Aggregation,
- AggregationResultItem,
  AuditResult,
  AuditResults,
  AuditFullResult,

diff --git a/lighthouse-core/aggregator/aggregate.js b/lighthouse-core/aggregator/aggregate.js