Revert "secure cookie error crash (cypress-io#2685)"

This reverts commit 2333d04.

Author: kuceb

.eslintrc

@@ -2,67 +2,8 @@
   "extends": [
     "plugin:cypress-dev/general"
   ],
-  "rules": {
-    "no-multiple-empty-lines": ["error", { "max": 1 } ],
-    "no-else-return": [ "error", { "allowElseIf": false } ],
-    "brace-style": ["error", "1tbs", { "allowSingleLine": false }],
-    "no-unneeded-ternary": ["error"],
-    "array-bracket-newline": ["error", "consistent"],
-    "arrow-body-style": ["error", "always"],
-    "padding-line-between-statements": [
-      "error",
-      {
-        "blankLine": "always",
-        "prev": "*",
-        "next": "return"
-      },
-      {
-        "blankLine": "always",
-        "prev": [
-          "const",
-          "let",
-          "var",
-          "if",
-          "while",
-          "export",
-          "cjs-export",
-          "import",
-          "cjs-import"
-        ],
-        "next": "*"
-      },
-      {
-        "blankLine": "any",
-        "prev": [
-          "const",
-          "let",
-          "var",
-          "import",
-          "cjs-import"
-        ],
-        "next": [
-          "const",
-          "let",
-          "var",
-          "import",
-          "cjs-import"
-        ]
-      }
-    ]
-  },
   "env": {
     "es6": true,
     "node": true
-  },
-  "parserOptions": {
-    "ecmaFeatures": {
-      "legacyDecorators": true
-    }
-  },
-  "overrides": {
-    "files": ["**/*.jsx"],
-    "rules": {
-      "arrow-body-style": "off",
-    }
   }
 }

.gitignore

@@ -8,12 +8,12 @@ dist
 dist-*
 build
 .history
+.vscode
 .publish
 _test-output
 cypress.zip
 tmp/
 .nyc_output
-.vscode/settings.json
 
 # from extension
 Cached Theme.pak

.vscode/launch.json

@@ -10,7 +10,6 @@ const cache = require('./tasks/cache')
 // we want to print help for the current command and exit with an error
 function unknownOption (flag, type = 'option') {
   if (this._allowUnknownOption) return
-
   logger.error()
   logger.error(`  error: unknown ${type}:`, flag)
   logger.error()
@@ -88,7 +87,6 @@ function includesVersion (args) {
 
 function showVersions () {
   debug('printing Cypress version')
-
   return require('./exec/versions')
   .getVersions()
   .then((versions = {}) => {
@@ -189,7 +187,6 @@ module.exports = {
       const defaultOpts = { force: true, welcomeMessage: false }
       const parsedOpts = parseOpts(opts)
       const options = _.extend(parsedOpts, defaultOpts)
-
       require('./tasks/verify')
       .start(options)
       .catch(util.logErrorExit1)
@@ -206,7 +203,6 @@ module.exports = {
       if (opts.command || !_.includes(['list', 'path', 'clear'], opts)) {
         unknownOption.call(this, `cache ${opts}`, 'sub-command')
       }
-
       cache[opts]()
     })
 
@@ -223,12 +219,10 @@ module.exports = {
     // Deprecated Catches
 
     const firstCommand = args[2]
-
     if (!_.includes(knownCommands, firstCommand)) {
       debug('unknown command %s', firstCommand)
       logger.error('Unknown command', `"${firstCommand}"`)
       program.outputHelp()
-
       return util.exit(1)
     }
 
@@ -239,9 +233,7 @@ module.exports = {
       // so we have to manually catch '-v, --version'
       return showVersions()
     }
-
     debug('program parsing arguments')
-
     return program.parse(args)
   },
 }

.vscode/tasks.json

@@ -11,7 +11,6 @@ const util = require('./util')
 const cypressModuleApi = {
   open (options = {}) {
     options = util.normalizeModuleOptions(options)
-
     return open.start(options)
   },
 
@@ -32,7 +31,6 @@ const cypressModuleApi = {
               message: 'Could not find Cypress test run results',
             }
           }
-
           return output
         })
       })

.vscode/terminals.json

@@ -25,33 +25,29 @@ const failedUnzip = {
   `,
 }
 
-const missingApp = (binaryDir) => {
-  return {
-    description: `No version of Cypress is installed in: ${chalk.cyan(binaryDir)}`,
-    solution: stripIndent`
+const missingApp = (binaryDir) => ({
+  description: `No version of Cypress is installed in: ${chalk.cyan(binaryDir)}`,
+  solution: stripIndent`
     \nPlease reinstall Cypress by running: ${chalk.cyan('cypress install')}
   `,
-  }
-}
+})
 
-const binaryNotExecutable = (executable) => {
-  return {
-    description: `Cypress cannot run because the binary does not have executable permissions: ${executable}`,
-    solution: stripIndent`\n
+const binaryNotExecutable = (executable) => ({
+  description: `Cypress cannot run because the binary does not have executable permissions: ${executable}`,
+  solution: stripIndent`\n
     Reasons this may happen:
       
     - node was installed as 'root' or with 'sudo'
     - the cypress npm package as 'root' or with 'sudo'
     
     Please check that you have the appropriate user permissions.
   `,
-  }
-}
+})
+
 
-const notInstalledCI = (executable) => {
-  return {
-    description: 'The cypress npm package is installed, but the Cypress binary is missing.',
-    solution: stripIndent`\n
+const notInstalledCI = (executable) => ({
+  description: 'The cypress npm package is installed, but the Cypress binary is missing.',
+  solution: stripIndent`\n
     We expected the binary to be installed here: ${chalk.cyan(executable)}
  
     Reasons it may be missing:
@@ -65,8 +61,7 @@ const notInstalledCI = (executable) => {
 
     ${chalk.blue('https://on.cypress.io/not-installed-ci-error')}
   `,
-  }
-}
+})
 
 const nonZeroExitCodeXvfb = {
   description: 'XVFB exited with a non zero exit code.',
@@ -151,7 +146,6 @@ const removed = {
 const CYPRESS_RUN_BINARY = {
   notValid: (value) => {
     const properFormat = `**/${state.getPlatformExecutable()}`
-
     return {
       description: `Could not run binary set by environment variable CYPRESS_RUN_BINARY=${value}`,
       solution: `Ensure the environment variable is a path to the Cypress binary, matching ${properFormat}`,
@@ -161,19 +155,15 @@ const CYPRESS_RUN_BINARY = {
 
 function getPlatformInfo () {
   return util.getOsVersionAsync()
-  .then((version) => {
-    return stripIndent`
+  .then((version) => stripIndent`
     Platform: ${os.platform()} (${version})
     Cypress Version: ${util.pkgVersion()}
-  `
-  })
+  `)
 }
 
 function addPlatformInformation (info) {
   return getPlatformInfo()
-  .then((platform) => {
-    return merge(info, { platform })
-  })
+  .then((platform) => merge(info, { platform }))
 }
 
 function formErrorText (info, msg) {
@@ -226,16 +216,13 @@ function formErrorText (info, msg) {
 
 const raise = (text) => {
   const err = new Error(text)
-
   err.known = true
   throw err
 }
 
-const throwFormErrorText = (info) => {
-  return (msg) => {
-    return formErrorText(info, msg)
-    .then(raise)
-  }
+const throwFormErrorText = (info) => (msg) => {
+  return formErrorText(info, msg)
+  .then(raise)
 }
 
 module.exports = {