move metrics into dedicated metrics/ folder

Author: paulirish

lighthouse-core/audits/estimated-input-latency.js renamed to lighthouse-core/audits/metrics/estimated-input-latency.js

@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const Audit = require('./audit');
+const Audit = require('../audit');
 
 class EstimatedInputLatency extends Audit {
   /**

lighthouse-core/audits/first-contentful-paint.js renamed to lighthouse-core/audits/metrics/first-contentful-paint.js

@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit');
-const Util = require('../report/html/renderer/util.js');
+const Audit = require('../audit');
+const Util = require('../../report/html/renderer/util.js');
 
 class FirstContentfulPaint extends Audit {
   /**

lighthouse-core/audits/first-cpu-idle.js renamed to lighthouse-core/audits/metrics/first-cpu-idle.js

@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit');
-const Util = require('../report/html/renderer/util.js');
+const Audit = require('../audit');
+const Util = require('../../report/html/renderer/util.js');
 
 class FirstCPUIdle extends Audit {
   /**

lighthouse-core/audits/first-meaningful-paint.js renamed to lighthouse-core/audits/metrics/first-meaningful-paint.js

@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit');
-const Util = require('../report/html/renderer/util');
+const Audit = require('../audit');
+const Util = require('../../report/html/renderer/util');
 
 class FirstMeaningfulPaint extends Audit {
   /**

lighthouse-core/audits/interactive.js renamed to lighthouse-core/audits/metrics/interactive.js

@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit');
-const Util = require('../report/html/renderer/util');
+const Audit = require('../audit');
+const Util = require('../../report/html/renderer/util');
 
 /**
  * @fileoverview This audit identifies the time the page is "consistently interactive".

lighthouse-core/audits/speed-index.js renamed to lighthouse-core/audits/metrics/speed-index.js

@@ -5,8 +5,8 @@
  */
 'use strict';
 
-const Audit = require('./audit');
-const Util = require('../report/html/renderer/util');
+const Audit = require('../audit');
+const Util = require('../../report/html/renderer/util');
 
 class SpeedIndex extends Audit {
   /**

lighthouse-core/config/default-config.js

@@ -73,16 +73,16 @@ module.exports = {
     'works-offline',
     'viewport',
     'without-javascript',
-    'first-contentful-paint',
-    'first-meaningful-paint',
+    'metrics/first-contentful-paint',
+    'metrics/first-meaningful-paint',
     'load-fast-enough-for-pwa',
-    'speed-index',
+    'metrics/speed-index',
     'screenshot-thumbnails',
-    'estimated-input-latency',
+    'metrics/estimated-input-latency',
     'errors-in-console',
     'time-to-first-byte',
-    'first-cpu-idle',
-    'interactive',
+    'metrics/first-cpu-idle',
+    'metrics/interactive',
     'user-timings',
     'critical-request-chains',
     'redirects',

lighthouse-core/runner.js

@@ -292,6 +292,7 @@ class Runner {
     const fileList = [
       ...fs.readdirSync(path.join(__dirname, './audits')),
       ...fs.readdirSync(path.join(__dirname, './audits/dobetterweb')).map(f => `dobetterweb/${f}`),
+      ...fs.readdirSync(path.join(__dirname, './audits/metrics')).map(f => `metrics/${f}`),
       ...fs.readdirSync(path.join(__dirname, './audits/seo')).map(f => `seo/${f}`),
       ...fs.readdirSync(path.join(__dirname, './audits/seo/manual')).map(f => `seo/manual/${f}`),
       ...fs.readdirSync(path.join(__dirname, './audits/accessibility'))

lighthouse-core/test/audits/estimated-input-latency-test.js renamed to lighthouse-core/test/audits/metrics/estimated-input-latency-test.js

@@ -5,13 +5,13 @@
  */
 'use strict';
 
-const Audit = require('../../audits/estimated-input-latency');
-const Runner = require('../../runner');
-const Util = require('../../report/html/renderer/util');
+const Audit = require('../../../audits/metrics/estimated-input-latency.js');
+const Runner = require('../../../runner');
+const Util = require('../../../report/html/renderer/util');
 const assert = require('assert');
 const options = Audit.defaultOptions;
 
-const pwaTrace = require('../fixtures/traces/progressive-app-m60.json');
+const pwaTrace = require('../../fixtures/traces/progressive-app-m60.json');
 
 const computedArtifacts = Runner.instantiateComputedArtifacts();
 

lighthouse-core/test/audits/first-contentful-paint-test.js renamed to lighthouse-core/test/audits/metrics/first-contentful-paint-test.js

@@ -4,14 +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.
  */
 'use strict';
-
-const Audit = require('../../audits/first-contentful-paint.js');
-const Runner = require('../../runner.js');
+const Audit = require('../../../audits/metrics/first-contentful-paint');
+const Runner = require('../../../runner.js');
 const assert = require('assert');
 const options = Audit.defaultOptions;
 
-const pwaTrace = require('../fixtures/traces/progressive-app-m60.json');
-const pwaDevtoolsLog = require('../fixtures/traces/progressive-app-m60.devtools.log.json');
+const pwaTrace = require('../../fixtures/traces/progressive-app-m60.json');
+const pwaDevtoolsLog = require('../../fixtures/traces/progressive-app-m60.devtools.log.json');
 
 /* eslint-env mocha */