updates for using lighthouse v3

.gitignore

@@ -2,6 +2,7 @@ node_modules
 tmp
 .DS_Store
 npm-debug.log
+yarn-error.log
 .idea
 
 gsheets.config.js

.travis.yml

@@ -1,25 +1,25 @@
 language: node_js
 matrix:
   include:
-    - node_js: "6"
-    - node_js: "7"
-      env: RUN_RECIPES=1
-  allow_failures:
-    - node_js: "7"
+    - node_js: "8"
+    - node_js: "9"
       env: RUN_RECIPES=1
 dist: trusty
 cache:
   yarn: true
   directories:
     - node_modules
-before_install:
-  - npm install -g --no-progress [email protected]
 install:
-  - yarn install --no-progress
+  # if our e2e tests fail in the future it might be that we are not compatible
+  # with the latest puppeteer api so we probably need to run on chromimum
+  # @see https://github.com/GoogleChrome/lighthouse/pull/4640/files#r171425004
+  - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
+  - yarn
 before_script:
   - export DISPLAY=:99.0
-  - export LIGHTHOUSE_CHROMIUM_PATH="$(pwd)/chrome-linux/chrome"
+  # see comment above about puppeteer
+  - export CHROME_PATH="$(which google-chrome-stable)"
   - sh -e /etc/init.d/xvfb start
-  - sleep 3 # wait for xvfb to boot
+  - yarn build
 addons:
   chrome: stable

bin/cli.js

@@ -3,14 +3,17 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE
 'use strict';
 
-/* eslint-disable no-console */
+/* eslint-disable no-logger */
 const sysPath = require('path');
 const fs = require('fs');
 const yargs = require('yargs');
 
 const PWMetrics = require('../lib/index');
 const {getConfigFromFile} = require('../lib/utils/fs');
 const {getMessageWithPrefix, getMessage} = require('../lib/utils/messages');
+const {Logger} = require('../lib/utils/logger');
+const logger = Logger.getInstance();
+
 let config;
 
 const cliFlags = yargs
@@ -91,7 +94,7 @@ const writeToDisk = function(fileName, data) {
     const path = sysPath.join(process.cwd(), fileName);
     fs.writeFile(path, data, err => {
       if (err) reject(err);
-      console.log(getMessageWithPrefix('SUCCESS', 'SAVED_TO_JSON', path));
+      logger.log(getMessageWithPrefix('SUCCESS', 'SAVED_TO_JSON', path));
       resolve();
     });
   });
@@ -104,15 +107,16 @@ pwMetrics.start()
       // serialize accordingly
       data = JSON.stringify(data, null, 2) + '\n';
       // output to file.
-      if (options.flags.outputPath != 'stdout')
+      if (options.flags.outputPath != 'stdout') {
         return writeToDisk(options.flags.outputPath, data);
-      // output to stdout
-      else if (data)
+        // output to stdout
+      } else if (data) {
         process.stdout.write(data);
+      }
     }
   }).then(() => {
     process.exit(0);
   }).catch(err => {
-    console.error(err);
+    logger.error(err);
     process.exit(1);
   });

lib/chart/chart.ts

@@ -2,10 +2,10 @@ const wunderbar = require('@gribnoysup/wunderbar');
 const eol = require('os').EOL;
 
 import {Timing, ChartOptions} from '../../types/types';
-const Logger = require('../utils/logger');
+import {Logger} from '../utils/logger';
 const logger = Logger.getInstance();
 
-const drawChart = (timings: Timing[], options: ChartOptions) => {
+export const drawChart = (timings: Timing[], options: ChartOptions) => {
   const {lmargin, width, xlabel, xmin, xmax} = options;
 
   const normalizedTimings = timings.map(value => {
@@ -53,5 +53,3 @@ const drawChart = (timings: Timing[], options: ChartOptions) => {
   logger.log([chartTop, chart, chartBottom, chartScale].join(eol));
   logger.log('');
 };
-
-module.exports = drawChart;

lib/drive/gdrive.ts

@@ -5,9 +5,9 @@ const google = require('googleapis');
 const promisify = require('micro-promisify');
 
 import { Oauth2Client, AuthorizeCredentials, DriveResponse } from '../../types/types';
+import { Logger } from '../utils/logger';
 const GoogleOauth = require('../oauth/google-oauth');
 const messages = require('../utils/messages');
-const Logger = require('../utils/logger');
 const logger = Logger.getInstance();
 
 class GDrive {

lib/expectations.ts

@@ -1,12 +1,13 @@
 // Copyright 2016 Google Inc. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE
 
-import { Timing, ExpectationMetrics, NormalizedExpectationMetrics } from '../types/types';
-const { getAssertionMessage, getMessageWithPrefix } = require('./utils/messages');
-const Logger = require('./utils/logger');
+import {Logger} from './utils/logger';
+import {getAssertionMessage, getMessageWithPrefix} from './utils/messages';
+import {Timing, ExpectationMetrics, NormalizedExpectationMetrics} from '../types/types';
+
 const logger = Logger.getInstance();
 
-function validateMetrics(metrics: ExpectationMetrics) {
+export const validateMetrics = (metrics: ExpectationMetrics) => {
   const metricsKeys = Object.keys(metrics);
 
   if (!metrics || !metricsKeys.length) {
@@ -20,9 +21,9 @@ function validateMetrics(metrics: ExpectationMetrics) {
       process.exit(1);
     }
   });
-}
+};
 
-function normalizeMetrics(metrics: ExpectationMetrics): NormalizedExpectationMetrics {
+export const normalizeExpectationMetrics = (metrics: ExpectationMetrics): NormalizedExpectationMetrics => {
   let normalizedMetrics: NormalizedExpectationMetrics = {};
   Object.keys(metrics).forEach(key => {
     normalizedMetrics[key] = {
@@ -31,9 +32,9 @@ function normalizeMetrics(metrics: ExpectationMetrics): NormalizedExpectationMet
     };
   });
   return normalizedMetrics;
-}
+};
 
-function checkExpectations(metricsData: Timing[], expectationMetrics: NormalizedExpectationMetrics) {
+export const checkExpectations = (metricsData: Timing[], expectationMetrics: NormalizedExpectationMetrics) => {
   metricsData.forEach(metric => {
     const metricName = metric.id;
     const expectationValue = expectationMetrics[metricName];
@@ -52,10 +53,4 @@ function checkExpectations(metricsData: Timing[], expectationMetrics: Normalized
       logger.log(msg);
     }
   });
-}
-
-module.exports = {
-  validateMetrics: validateMetrics,
-  normalizeMetrics: normalizeMetrics,
-  checkExpectations: checkExpectations
 };