Update printWidth to 120 chars

andreasonny83 · Jul 21, 2019 · 580eaf5 · 580eaf5
1 parent ae99e80
commit 580eaf5
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 143 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -2,7 +2,7 @@
   "trailingComma": "all",
   "semi": true,
   "singleQuote": true,
-  "printWidth": 80,
+  "printWidth": 120,
   "useTabs": false,
   "tabWidth": 2,
   "bracketSpacing": true

diff --git a/__tests__/budgets-analyzer.test.js b/__tests__/budgets-analyzer.test.js
@@ -11,45 +11,33 @@ describe('budgets-analyzer', () => {
     process.exit = processExit;
   });
 
-  it(
-    'should return `false` if any over-budget reported' +
-      'and `--fail-on-budgets` set to `true`',
-    () => {
-      const mockBudgetsReport = {
-        'total-count': '323 requests',
-        'total-size': '12677kb',
-      };
-
-      const result = analyzeBudgets(mockBudgetsReport, true);
-
-      expect(result).toEqual(false);
-    },
-  );
-
-  it(
-    'should return `true` if no over-budget reported' +
-      'and `--fail-on-budgets` set to `true`',
-    () => {
-      const mockBudgetsReport = {};
-
-      const result = analyzeBudgets(mockBudgetsReport, true);
-
-      expect(result).toEqual(true);
-    },
-  );
-
-  it(
-    'should return `true` if any over-budget reported' +
-      'and `--fail-on-budgets` set to `false`',
-    () => {
-      const mockBudgetsReport = {
-        'total-count': '323 requests',
-        'total-size': '12677kb',
-      };
-
-      const result = analyzeBudgets(mockBudgetsReport, true);
-
-      expect(result).toEqual(false);
-    },
-  );
+  it('should return `false` if any over-budget reported and `--fail-on-budgets` set to `true`', () => {
+    const mockBudgetsReport = {
+      'total-count': '323 requests',
+      'total-size': '12677kb',
+    };
+
+    const result = analyzeBudgets(mockBudgetsReport, true);
+
+    expect(result).toEqual(false);
+  });
+
+  it('should return `true` if no over-budget reported and `--fail-on-budgets` set to `true`', () => {
+    const mockBudgetsReport = {};
+
+    const result = analyzeBudgets(mockBudgetsReport, true);
+
+    expect(result).toEqual(true);
+  });
+
+  it('should return `true` if any over-budget reported and `--fail-on-budgets` set to `false`', () => {
+    const mockBudgetsReport = {
+      'total-count': '323 requests',
+      'total-size': '12677kb',
+    };
+
+    const result = analyzeBudgets(mockBudgetsReport, true);
+
+    expect(result).toEqual(false);
+  });
 });
diff --git a/__tests__/helpers.test.js b/__tests__/helpers.test.js
@@ -52,10 +52,7 @@ describe('helpers', () => {
 
       // Assert
       expect(res).resolves.toEqual();
-      expect(rimraf).toHaveBeenCalledWith(
-        expectedFolderName,
-        expect.any(Function),
-      );
+      expect(rimraf).toHaveBeenCalledWith(expectedFolderName, expect.any(Function));
     });
   });
 
@@ -93,10 +90,7 @@ describe('helpers', () => {
 
       // Assert
       expect(res).resolves.toEqual();
-      expect(mkdirp).toHaveBeenCalledWith(
-        expectedFolderName,
-        expect.any(Function),
-      );
+      expect(mkdirp).toHaveBeenCalledWith(expectedFolderName, expect.any(Function));
     });
   });
 

diff --git a/__tests__/score-analyzer.test.js b/__tests__/score-analyzer.test.js
@@ -27,29 +27,23 @@ describe('score-analyzer', () => {
       seo: 0.73,
     };
 
-    expect(() => analyzeScore(mockCategoryReport)).toThrowError(
-      'Invalid threshold score.',
-    );
+    expect(() => analyzeScore(mockCategoryReport)).toThrowError('Invalid threshold score.');
   });
 
-  it(
-    'should return `false` if one or more category index is below the ' +
-      'threshold',
-    () => {
-      const threshold = 75;
-      const mockCategoryReport = {
-        performance: 7,
-        pwa: 36,
-        accessibility: 57,
-        'best-practices': 69,
-        seo: 73,
-      };
+  it('should return `false` if one or more category index is below the threshold', () => {
+    const threshold = 75;
+    const mockCategoryReport = {
+      performance: 7,
+      pwa: 36,
+      accessibility: 57,
+      'best-practices': 69,
+      seo: 73,
+    };
 
-      const result = analyzeScore(mockCategoryReport, threshold);
+    const result = analyzeScore(mockCategoryReport, threshold);
 
-      expect(result).toEqual(false);
-    },
-  );
+    expect(result).toEqual(false);
+  });
 
   it('should return `true` if all the category indexes are above the threshold', () => {
     const threshold = 70;
@@ -75,20 +69,16 @@ describe('score-analyzer', () => {
       seo: 10,
     };
 
-    it(
-      'should return `true` if the target categories indexes are above ' +
-        'the thresholds',
-      () => {
-        const threshold = {
-          performance: 70,
-          pwa: 80,
-        };
+    it('should return `true` if the target categories indexes are above the thresholds', () => {
+      const threshold = {
+        performance: 70,
+        pwa: 80,
+      };
 
-        const result = analyzeScore(mockCategoryReport, threshold);
+      const result = analyzeScore(mockCategoryReport, threshold);
 
-        expect(result).toEqual(true);
-      },
-    );
+      expect(result).toEqual(true);
+    });
 
     it('should pass if the target categories indexes are above the "best-practices" thresholds', () => {
       const threshold = {
@@ -191,25 +181,21 @@ describe('score-analyzer', () => {
     });
   });
 
-  it(
-    'should return `false` if one or more target category index is below ' +
-      'the thresholds',
-    () => {
-      const threshold = {
-        performance: 70,
-        pwa: 80,
-      };
-      const mockCategoryReport = {
-        performance: 70,
-        pwa: 79,
-        accessibility: 10,
-        'best-practices': 10,
-        seo: 10,
-      };
+  it('should return `false` if one or more target category index is below the thresholds', () => {
+    const threshold = {
+      performance: 70,
+      pwa: 80,
+    };
+    const mockCategoryReport = {
+      performance: 70,
+      pwa: 79,
+      accessibility: 10,
+      'best-practices': 10,
+      seo: 10,
+    };
 
-      const result = analyzeScore(mockCategoryReport, threshold);
+    const result = analyzeScore(mockCategoryReport, threshold);
 
-      expect(result).toEqual(false);
-    },
-  );
+    expect(result).toEqual(false);
+  });
 });
diff --git a/lib/config.js b/lib/config.js
@@ -6,12 +6,7 @@
  */
 
 const scores = ['performance', 'pwa', 'accessibility', 'best-practices', 'seo'];
-const chromeFlags = [
-  '--disable-gpu',
-  '--headless',
-  '--no-zygote',
-  '--no-sandbox',
-];
+const chromeFlags = ['--disable-gpu', '--headless', '--no-zygote', '--no-sandbox'];
 
 const getScores = () => scores;
 const getChromeFlags = () => chromeFlags;

diff --git a/lib/helpers.js b/lib/helpers.js
@@ -20,9 +20,7 @@ const clean = () =>
   });
 
 const createDir = () =>
-  new Promise((resolve, reject) =>
-    mkdirp('./lighthouse', err => (err ? reject(err) : resolve())),
-  );
+  new Promise((resolve, reject) => mkdirp('./lighthouse', err => (err ? reject(err) : resolve())));
 
 const scoreReducer = (flags, scoreList) => {
   if (flags.score) {
@@ -57,9 +55,7 @@ const createDefaultConfig = config => {
 };
 
 const getOwnProps = obj => {
-  return Object.keys(obj).filter(key =>
-    Object.prototype.hasOwnProperty.call(obj, key),
-  );
+  return Object.keys(obj).filter(key => Object.prototype.hasOwnProperty.call(obj, key));
 };
 
 const convertToBudgetList = obj => {
@@ -74,8 +70,7 @@ const convertToBudgetList = obj => {
     }, []);
 };
 
-const convertToResourceKey = key =>
-  'resource' + key.charAt(0).toUpperCase() + key.slice(1);
+const convertToResourceKey = key => 'resource' + key.charAt(0).toUpperCase() + key.slice(1);
 
 module.exports = {
   clean,

diff --git a/lib/lighthouse-reporter.js b/lib/lighthouse-reporter.js
@@ -11,22 +11,11 @@ const util = require('util');
 const lighthouse = require('lighthouse');
 const chromeLauncher = require('chrome-launcher');
 const ReportGenerator = require('lighthouse/lighthouse-core/report/report-generator');
-const {
-  createDefaultConfig,
-  getOwnProps,
-  convertToBudgetList,
-  convertToResourceKey,
-} = require('./helpers');
+const { createDefaultConfig, getOwnProps, convertToBudgetList, convertToResourceKey } = require('./helpers');
 
 const readFile = util.promisify(fs.readFile);
 
-const launchChromeAndRunLighthouse = async (
-  url,
-  chromeFlags,
-  lighthouseFlags,
-  configPath,
-  budgetPath,
-) => {
+const launchChromeAndRunLighthouse = async (url, chromeFlags, lighthouseFlags, configPath, budgetPath) => {
   const chrome = await chromeLauncher.launch({
     chromeFlags,
   });
@@ -132,10 +121,7 @@ const createBudgetsReport = results => {
     }
 
     if (obj.sizeOverBudget) {
-      acc[obj.resourceType + '-size'] = `${Math.round(
-        obj.sizeOverBudget / 1024,
-        0,
-      )}kb`;
+      acc[obj.resourceType + '-size'] = `${Math.round(obj.sizeOverBudget / 1024, 0)}kb`;
     }
 
     return acc;
@@ -144,18 +130,8 @@ const createBudgetsReport = results => {
   return report;
 };
 
-async function writeReport(
-  url,
-  flags = {},
-  defaultChromeFlags,
-  lighthouseFlags,
-) {
-  const {
-    chromeFlags,
-    configPath,
-    budgetPath,
-    ...extraLHFlags
-  } = lighthouseFlags;
+async function writeReport(url, flags = {}, defaultChromeFlags, lighthouseFlags) {
+  const { chromeFlags, configPath, budgetPath, ...extraLHFlags } = lighthouseFlags;
   const customChromeFlags = chromeFlags ? chromeFlags.split(',') : [];
 
   const lighthouseResult = await launchChromeAndRunLighthouse(