chore: upgrade prettier to v2

Author: bahmutov

package-lock.json

@@ -68,7 +68,7 @@
     "lodash": "4.17.20",
     "markdown-link-check": "3.8.4",
     "parcel-bundler": "1.12.4",
-    "prettier": "1.19.1",
+    "prettier": "2.2.1",
     "semantic-release": "17.3.0",
     "serve": "11.3.2",
     "start-server-and-test": "1.11.6",

package.json

@@ -22,17 +22,17 @@ const filterSpecsFromCoverage = (totalCoverage, config = Cypress.config) => {
 
   const isUsingDefaultTestPattern = testFilePattern === '**/*.*'
 
-  const isTestFile = filename => {
-    const matchedPattern = testFilePatterns.some(specPattern =>
+  const isTestFile = (filename) => {
+    const matchedPattern = testFilePatterns.some((specPattern) =>
       Cypress.minimatch(filename, specPattern)
     )
-    const matchedEndOfPath = testFilePatterns.some(specPattern =>
+    const matchedEndOfPath = testFilePatterns.some((specPattern) =>
       filename.endsWith(specPattern)
     )
     return matchedPattern || matchedEndOfPath
   }
 
-  const isInIntegrationFolder = filename =>
+  const isInIntegrationFolder = (filename) =>
     filename.startsWith(integrationFolder)
 
   const isA = (fileCoverge, filename) => isInIntegrationFolder(filename)
@@ -50,13 +50,13 @@ const filterSpecsFromCoverage = (totalCoverage, config = Cypress.config) => {
  * or containing Webpack loaders and query parameters)
  */
 function fixSourcePaths(coverage) {
-  Object.values(coverage).forEach(file => {
+  Object.values(coverage).forEach((file) => {
     const { path: absolutePath, inputSourceMap } = file
     const fileName = /([^\/\\]+)$/.exec(absolutePath)[1]
     if (!inputSourceMap || !fileName) return
 
     if (inputSourceMap.sourceRoot) inputSourceMap.sourceRoot = ''
-    inputSourceMap.sources = inputSourceMap.sources.map(source =>
+    inputSourceMap.sources = inputSourceMap.sources.map((source) =>
       source.includes(fileName) ? absolutePath : source
     )
   })

support-utils.js

@@ -24,23 +24,23 @@ const sendCoverage = (coverage, pathname = '/') => {
  * so the user knows the log message is coming from this plugin.
  * @param {string} s Message to log.
  */
-const logMessage = s => {
+const logMessage = (s) => {
   cy.log(`${s} \`[@cypress/code-coverage]\``)
 }
 
 /**
  * Removes support file from the coverage object.
  * If there are more files loaded from support folder, also removes them
  */
-const filterSupportFilesFromCoverage = totalCoverage => {
+const filterSupportFilesFromCoverage = (totalCoverage) => {
   const integrationFolder = Cypress.config('integrationFolder')
   const supportFile = Cypress.config('supportFile')
 
   /** @type {string} Cypress run-time config has the support folder string */
   // @ts-ignore
   const supportFolder = Cypress.config('supportFolder')
 
-  const isSupportFile = filename => filename === supportFile
+  const isSupportFile = (filename) => filename === supportFile
 
   let coverage = Cypress._.omitBy(totalCoverage, (fileCoverage, filename) =>
     isSupportFile(filename)
@@ -93,7 +93,7 @@ const registerHooks = () => {
     // to let the user know the coverage has been collected
     windowCoverageObjects = []
 
-    const saveCoverageObject = win => {
+    const saveCoverageObject = (win) => {
       // if application code has been instrumented, the app iframe "window" has an object
       const applicationSourceCoverage = win.__coverage__
       if (!applicationSourceCoverage) {
@@ -126,7 +126,7 @@ const registerHooks = () => {
   afterEach(() => {
     // save coverage after the test
     // because now the window coverage objects have been updated
-    windowCoverageObjects.forEach(cover => {
+    windowCoverageObjects.forEach((cover) => {
       sendCoverage(cover.coverage, cover.pathname)
     })
 
@@ -172,10 +172,10 @@ const registerHooks = () => {
         log: false,
         failOnStatusCode: false
       })
-        .then(r => {
+        .then((r) => {
           return Cypress._.get(r, 'body.coverage', null)
         })
-        .then(coverage => {
+        .then((coverage) => {
           if (!coverage) {
             // we did not get code coverage - this is the
             // original failed request
@@ -209,7 +209,7 @@ const registerHooks = () => {
     cy.task('coverageReport', null, {
       timeout: Cypress.moment.duration(3, 'minutes').asMilliseconds(),
       log: false
-    }).then(coverageReportFolder => {
+    }).then((coverageReportFolder) => {
       logInstance.set('consoleProps', () => ({
         'coverage report folder': coverageReportFolder
       }))

support.js

@@ -192,8 +192,8 @@ function findCommonRoot(filepaths) {
   }
 
   // assuming / as file separator
-  const splitParts = filepaths.map(name => name.split('/'))
-  const lengths = splitParts.map(arr => arr.length)
+  const splitParts = filepaths.map((name) => name.split('/'))
+  const lengths = splitParts.map((arr) => arr.length)
   const shortestLength = Math.min.apply(null, lengths)
   debug('shorted file path has %d parts', shortestLength)
 
@@ -205,19 +205,19 @@ function findCommonRoot(filepaths) {
     const part = splitParts[0][k]
     const prefix = commonPrefix.concat(part).join('/')
     debug('testing prefix %o', prefix)
-    const allFilesStart = filepaths.every(name => name.startsWith(prefix))
+    const allFilesStart = filepaths.every((name) => name.startsWith(prefix))
     if (!allFilesStart) {
       debug('stopped at non-common prefix %s', prefix)
       break
     }
 
     commonPrefix.push(part)
 
-    const removedPrefixNames = filepaths.map(filepath =>
+    const removedPrefixNames = filepaths.map((filepath) =>
       filepath.slice(prefix.length)
     )
     debug('removedPrefix %o', removedPrefixNames)
-    const foundAllPaths = removedPrefixNames.every(filepath =>
+    const foundAllPaths = removedPrefixNames.every((filepath) =>
       existsSync(join(cwd, filepath))
     )
     debug('all files found at %s? %o', prefix, foundAllPaths)
@@ -234,7 +234,7 @@ function findCommonRoot(filepaths) {
 function tryFindingLocalFiles(nycFilename) {
   const nycCoverage = JSON.parse(readFileSync(nycFilename, 'utf8'))
   const coverageKeys = Object.keys(nycCoverage)
-  const filenames = coverageKeys.map(key => nycCoverage[key].path)
+  const filenames = coverageKeys.map((key) => nycCoverage[key].path)
   const commonFolder = findCommonRoot(filenames)
   if (!commonFolder) {
     debug('could not find common folder %s', commonFolder)
@@ -249,7 +249,7 @@ function tryFindingLocalFiles(nycFilename) {
   const length = commonFolder.length
   let changed
 
-  coverageKeys.forEach(key => {
+  coverageKeys.forEach((key) => {
     const from = nycCoverage[key].path
     if (from.startsWith(commonFolder)) {
       const to = join(cwd, from.slice(length))
@@ -298,13 +298,13 @@ function findSourceFiles(nycOptions) {
     patterns.push(nycOptions.include)
   } else {
     debug('using default list of extensions')
-    nycOptions.extension.forEach(extension => {
+    nycOptions.extension.forEach((extension) => {
       patterns.push('**/*' + extension)
     })
   }
 
   if (Array.isArray(nycOptions.exclude)) {
-    const negated = nycOptions.exclude.map(s => '!' + s)
+    const negated = nycOptions.exclude.map((s) => '!' + s)
     patterns = patterns.concat(negated)
   } else if (typeof nycOptions.exclude === 'string') {
     patterns.push('!' + nycOptions.exclude)
@@ -343,7 +343,7 @@ function includeAllFiles(nycFilename, nycOptions) {
 
   const nycCoverage = JSON.parse(readFileSync(nycFilename, 'utf8'))
   const coverageKeys = Object.keys(nycCoverage)
-  const coveredPaths = coverageKeys.map(key => nycCoverage[key].path)
+  const coveredPaths = coverageKeys.map((key) => nycCoverage[key].path)
 
   debug('coverage has %d record(s)', coveredPaths.length)
   // report on first couple of entries
@@ -353,7 +353,7 @@ function includeAllFiles(nycFilename, nycOptions) {
   }
 
   let changed
-  allFiles.forEach(fullPath => {
+  allFiles.forEach((fullPath) => {
     if (coveredPaths.includes(fullPath)) {
       // all good, this file exists in coverage object
       return

task-utils.js

@@ -83,12 +83,12 @@ function maybePrintFinalCoverageFiles(folder) {
     jsonReportFilename
   )
 
-  finalCoverageKeys.forEach(key => {
+  finalCoverageKeys.forEach((key) => {
     const s = finalCoverage[key].s || {}
     const statements = Object.keys(s)
     const totalStatements = statements.length
     let coveredStatements = 0
-    statements.forEach(statementKey => {
+    statements.forEach((statementKey) => {
       if (s[statementKey]) {
         coveredStatements += 1
       }