refactor: remove Ramda (#18723)

Author: tgriesser

cli/lib/cli.js

@@ -1,6 +1,5 @@
 // @ts-check
 const _ = require('lodash')
-const R = require('ramda')
 const commander = require('commander')
 const { stripIndent } = require('common-tags')
 const logSymbols = require('log-symbols')
@@ -279,12 +278,17 @@ const castCypressRunOptions = (opts) => {
   // only properties that have type "string | false" in our TS definition
   // require special handling, because CLI parsing takes care of purely
   // boolean arguments
-  const result = R.evolve({
-    port: coerceAnyStringToInt,
-    configFile: coerceFalseOrString,
-  })(opts)
+  const castOpts = { ...opts }
 
-  return result
+  if (_.has(opts, 'port')) {
+    castOpts.port = coerceAnyStringToInt(opts.port)
+  }
+
+  if (_.has(opts, 'configFile')) {
+    castOpts.configFile = coerceFalseOrString(opts.configFile)
+  }
+
+  return castOpts
 }
 
 module.exports = {

cli/lib/errors.js

@@ -1,6 +1,5 @@
 const chalk = require('chalk')
 const { stripIndent, stripIndents } = require('common-tags')
-const { merge } = require('ramda')
 const la = require('lazy-ass')
 const is = require('check-more-types')
 
@@ -241,7 +240,7 @@ const CYPRESS_RUN_BINARY = {
 
 function addPlatformInformation (info) {
   return util.getPlatformInfo().then((platform) => {
-    return merge(info, { platform })
+    return { ...info, platform }
   })
 }
 

cli/lib/exec/info.js

@@ -6,7 +6,6 @@ const os = require('os')
 const chalk = require('chalk')
 const prettyBytes = require('pretty-bytes')
 const _ = require('lodash')
-const R = require('ramda')
 
 // color for numbers and show values
 const g = chalk.green
@@ -22,14 +21,20 @@ methods.findProxyEnvironmentVariables = () => {
   return _.pick(process.env, ['HTTP_PROXY', 'HTTPS_PROXY', 'NO_PROXY'])
 }
 
-const maskSensitiveVariables = R.evolve({
-  CYPRESS_RECORD_KEY: R.always('<redacted>'),
-})
+const maskSensitiveVariables = (obj) => {
+  const masked = { ...obj }
+
+  if (masked.CYPRESS_RECORD_KEY) {
+    masked.CYPRESS_RECORD_KEY = '<redacted>'
+  }
+
+  return masked
+}
 
 methods.findCypressEnvironmentVariables = () => {
   const isCyVariable = (val, key) => key.startsWith('CYPRESS_')
 
-  return R.pickBy(isCyVariable)(process.env)
+  return _.pickBy(process.env, isCyVariable)
 }
 
 const formatCypressVariables = () => {

cli/lib/logger.js

@@ -1,4 +1,3 @@
-const R = require('ramda')
 const chalk = require('chalk')
 
 let logs = []
@@ -36,7 +35,9 @@ const always = (...messages) => {
 const logLines = (text) => {
   const lines = text.split('\n')
 
-  R.forEach(log, lines)
+  for (const line of lines) {
+    log(line)
+  }
 }
 
 const print = () => {

cli/lib/tasks/state.js

@@ -2,7 +2,6 @@ const _ = require('lodash')
 const os = require('os')
 const path = require('path')
 const untildify = require('untildify')
-const R = require('ramda')
 const debug = require('debug')('cypress:cli')
 
 const fs = require('../fs')
@@ -179,9 +178,9 @@ const getBinaryPkgAsync = (binaryDir) => {
   })
 }
 
-const getBinaryPkgVersion = R.propOr(null, 'version')
-const getBinaryElectronVersion = R.propOr(null, 'electronVersion')
-const getBinaryElectronNodeVersion = R.propOr(null, 'electronNodeVersion')
+const getBinaryPkgVersion = (o) => _.get(o, 'version', null)
+const getBinaryElectronVersion = (o) => _.get(o, 'electronVersion', null)
+const getBinaryElectronNodeVersion = (o) => _.get(o, 'electronNodeVersion', null)
 
 module.exports = {
   getPathToExecutable,

cli/lib/util.js

@@ -1,5 +1,4 @@
 const _ = require('lodash')
-const R = require('ramda')
 const os = require('os')
 const ospath = require('ospath')
 const crypto = require('crypto')
@@ -114,10 +113,9 @@ const logBrokenGtkDisplayWarning = () => {
 }
 
 function stdoutLineMatches (expectedLine, stdout) {
-  const lines = stdout.split('\n').map(R.trim)
-  const lineMatches = R.equals(expectedLine)
+  const lines = stdout.split('\n').map((val) => val.trim())
 
-  return lines.some(lineMatches)
+  return lines.some((line) => line === expectedLine)
 }
 
 /**
@@ -229,11 +227,14 @@ const parseOpts = (opts) => {
 
   // some options might be quoted - which leads to unexpected results
   // remove double quotes from certain options
-  const removeQuotes = {
-    group: dequote,
-    ciBuildId: dequote,
+  const cleanOpts = { ...opts }
+  const toDequote = ['group', 'ciBuildId']
+
+  for (const prop of toDequote) {
+    if (_.has(opts, prop)) {
+      cleanOpts[prop] = dequote(opts[prop])
+    }
   }
-  const cleanOpts = R.evolve(removeQuotes, opts)
 
   debug('parsed cli options %o', cleanOpts)
 

cli/package.json

@@ -55,7 +55,6 @@
     "ospath": "^1.2.2",
     "pretty-bytes": "^5.6.0",
     "proxy-from-env": "1.0.0",
-    "ramda": "~0.27.1",
     "request-progress": "^3.0.0",
     "supports-color": "^8.1.1",
     "tmp": "~0.2.1",

cli/test/lib/build_spec.js

@@ -5,13 +5,12 @@ const makeUserPackageFile = require('../../scripts/build')
 const snapshot = require('../support/snapshot')
 const la = require('lazy-ass')
 const is = require('check-more-types')
-const R = require('ramda')
 
 const hasVersion = (json) => {
   return la(is.semver(json.version), 'cannot find version', json)
 }
 
-const changeVersion = R.assoc('version', 'x.y.z')
+const changeVersion = (o) => ({ ...o, version: 'x.y.z' })
 
 describe('package.json build', () => {
   beforeEach(function () {

cli/test/lib/cypress_spec.js

@@ -2,7 +2,7 @@ require('../spec_helper')
 
 const os = require('os')
 const path = require('path')
-const R = require('ramda')
+const _ = require('lodash')
 const snapshot = require('../support/snapshot')
 const Promise = require('bluebird')
 const tmp = Promise.promisifyAll(require('tmp'))
@@ -27,11 +27,10 @@ describe('cypress', function () {
       sinon.stub(open, 'start').resolves()
     })
 
-    const getCallArgs = R.path(['lastCall', 'args', 0])
     const getStartArgs = () => {
       expect(open.start).to.be.called
 
-      return getCallArgs(open.start)
+      return _.get(open.start, ['lastCall', 'args', 0])
     }
 
     it('calls open#start, passing in options', function () {
@@ -100,7 +99,6 @@ describe('cypress', function () {
       })
     })
 
-    const getCallArgs = R.path(['lastCall', 'args', 0])
     const normalizeCallArgs = (args) => {
       expect(args.outputPath).to.equal(outputPath)
       delete args.outputPath
@@ -110,7 +108,7 @@ describe('cypress', function () {
     const getStartArgs = () => {
       expect(run.start).to.be.called
 
-      return normalizeCallArgs(getCallArgs(run.start))
+      return normalizeCallArgs(_.get(run.start, ['lastCall', 'args', 0]))
     }
 
     it('calls run#start, passing in options', () => {

package.json

@@ -94,7 +94,6 @@
     "@types/mocha": "8.0.3",
     "@types/node": "14.14.31",
     "@types/prismjs": "1.16.0",
-    "@types/ramda": "0.25.47",
     "@types/react": "16.9.50",
     "@types/react-dom": "16.9.8",
     "@types/request-promise": "4.1.45",
@@ -173,7 +172,6 @@
     "pretty-ms": "7.0.0",
     "print-arch": "1.0.0",
     "proxyquire": "2.1.3",
-    "ramda": "0.27.1",
     "semantic-release": "17.2.3",
     "semantic-release-monorepo": "7.0.3",
     "semver": "7.3.2",

packages/launcher/lib/darwin/index.ts

@@ -2,7 +2,6 @@ import { findApp, FindAppParams } from './util'
 import type { Browser, DetectedBrowser } from '../types'
 import * as linuxHelper from '../linux'
 import { log } from '../log'
-import { merge } from 'ramda'
 import { get } from 'lodash'
 
 type Detectors = {
@@ -105,7 +104,7 @@ export function detect (browser: Browser): Promise<DetectedBrowser> {
   }
 
   return findApp(findAppParams)
-  .then(merge({ name: browser.name }))
+  .then((val) => ({ name: browser.name, ...val }))
   .catch(() => {
     log('could not detect %s using traditional Mac methods', browser.name)
     log('trying linux search')

packages/launcher/lib/darwin/util.ts

@@ -1,6 +1,5 @@
 import { log } from '../log'
 import { notInstalledErr } from '../errors'
-import { prop, tap } from 'ramda'
 import { utils } from '../utils'
 import * as fs from 'fs-extra'
 import * as os from 'os'
@@ -27,7 +26,7 @@ export function parsePlist (p: string, property: string): Promise<string> {
   return fs
   .readFile(pl, 'utf8')
   .then(plist.parse)
-  .then(prop(property))
+  .then((val) => val[property])
   .then(String) // explicitly convert value to String type
   .catch(failed) // to make TS compiler happy
 }
@@ -50,8 +49,14 @@ export function mdfind (id: string): Promise<string> {
   }
 
   return utils.execa(cmd)
-  .then(prop('stdout'))
-  .then(tap(logFound))
+  .then((val) => {
+    return val.stdout
+  })
+  .then((val) => {
+    logFound(val)
+
+    return val
+  })
   .catch(failedToFind)
 }
 

packages/launcher/lib/detect.ts

@@ -1,7 +1,6 @@
 import Bluebird from 'bluebird'
-import { compact, extend, find } from 'lodash'
+import _, { compact, extend, find } from 'lodash'
 import os from 'os'
-import { flatten, merge, pick, props, tap, uniqBy } from 'ramda'
 import { browsers } from './browsers'
 import * as darwinHelper from './darwin'
 import { needsDarwinWorkaround, darwinDetectionWorkaround } from './darwin/util'
@@ -17,7 +16,7 @@ import type {
 } from './types'
 import * as windowsHelper from './windows'
 
-type HasVersion = Partial<FoundBrowser> & {
+type HasVersion = Omit<Partial<FoundBrowser>, 'version' | 'name'> & {
   version: string
   name: string
 }
@@ -85,7 +84,7 @@ function lookup (
  * one for each binary. If Windows is detected, only one `checkOneBrowser` will be called, because
  * we don't use the `binary` field on Windows.
  */
-function checkBrowser (browser: Browser): Bluebird<(boolean | FoundBrowser)[]> {
+function checkBrowser (browser: Browser): Bluebird<(boolean | HasVersion)[]> {
   if (Array.isArray(browser.binary) && os.platform() !== 'win32') {
     return Bluebird.map(browser.binary, (binary: string) => {
       return checkOneBrowser(extend({}, browser, { binary }))
@@ -95,9 +94,9 @@ function checkBrowser (browser: Browser): Bluebird<(boolean | FoundBrowser)[]> {
   return Bluebird.map([browser], checkOneBrowser)
 }
 
-function checkOneBrowser (browser: Browser): Promise<boolean | FoundBrowser> {
+function checkOneBrowser (browser: Browser): Promise<boolean | HasVersion> {
   const platform = os.platform()
-  const pickBrowserProps = pick([
+  const pickBrowserProps = [
     'name',
     'family',
     'channel',
@@ -111,7 +110,7 @@ function checkOneBrowser (browser: Browser): Promise<boolean | FoundBrowser> {
     'info',
     'minSupportedVersion',
     'unsupportedVersion',
-  ])
+  ] as const
 
   const logBrowser = (props: any) => {
     log('setting major version for %j', props)
@@ -130,9 +129,13 @@ function checkOneBrowser (browser: Browser): Promise<boolean | FoundBrowser> {
   log('checking one browser %s', browser.name)
 
   return lookup(platform, browser)
-  .then(merge(browser))
-  .then(pickBrowserProps)
-  .then(tap(logBrowser))
+  .then((val) => ({ ...browser, ...val }))
+  .then((val) => _.pick(val, pickBrowserProps) as HasVersion)
+  .then((val) => {
+    logBrowser(val)
+
+    return val
+  })
   .then((browser) => setMajorVersion(browser))
   .catch(failed)
 }
@@ -176,17 +179,19 @@ export const detect = (goalBrowsers?: Browser[], useDarwinWorkaround = true): Bl
     })
   }
 
-  const removeDuplicates = uniqBy((browser: FoundBrowser) => {
-    return props(['name', 'version'], browser)
-  })
+  const removeDuplicates = (val) => {
+    return _.uniqBy(val, (browser: FoundBrowser) => {
+      return `${browser.name}-${browser.version}`
+    })
+  }
   const compactFalse = (browsers: any[]) => {
     return compact(browsers) as FoundBrowser[]
   }
 
   log('detecting if the following browsers are present %o', goalBrowsers)
 
   return Bluebird.mapSeries(goalBrowsers, checkBrowser)
-  .then(flatten)
+  .then((val) => _.flatten(val))
   .then(compactFalse)
   .then(removeDuplicates)
 }

packages/launcher/lib/linux/index.ts

@@ -1,5 +1,4 @@
 import { log } from '../log'
-import { partial, trim, tap, prop } from 'ramda'
 import type { FoundBrowser, Browser, PathData } from '../types'
 import { notInstalledErr } from '../errors'
 import { utils } from '../utils'
@@ -68,9 +67,13 @@ export function getVersionString (path: string) {
 
   return Bluebird.resolve(utils.getOutput(path, ['--version']))
   .timeout(30000, `Timed out after 30 seconds getting browser version for ${path}`)
-  .then(prop('stdout'))
-  .then(trim)
-  .then(tap(partial(log, ['stdout: "%s"'])))
+  .then((val) => val.stdout)
+  .then((val) => val.trim())
+  .then((val) => {
+    log('stdout: %s', val)
+
+    return val
+  })
 }
 
 export function getVersionNumber (version: string, browser: Browser) {