Merge branch 'develop' into issue-2115-suite-failure

Author: jennifer-shehane

.eslintignore

@@ -7,7 +7,12 @@
 **/dist
 **/dist-test
 **/node_modules
-**/support/fixtures
+**/support/fixtures/*
+!**/support/fixtures/projects
+**/support/fixtures/projects/**/_fixtures/*
+**/support/fixtures/projects/**/*.jsx
+**/support/fixtures/projects/**/jquery.js
+**/support/fixtures/projects/**/fail.js
 **/test/fixtures
 **/vendor
 
@@ -26,3 +31,5 @@ packages/launcher/lib/**/*.js
 **/package-lock.json
 **/tsconfig.json
 **/.vscode
+**/.history
+**/.cy

.eslintrc.decaffeinate.js

@@ -0,0 +1,13 @@
+const _ = require('lodash')
+const baseConfig = require('./.eslintrc.json')
+
+module.exports = _.defaultsDeep({}, baseConfig, {
+  rules: {
+    // auto-fix removing some common unnecessary returns
+    '@cypress/dev/no-return-before': 'error',
+    // make sure we use arrow callback
+    'prefer-arrow-callback': 'error',
+    // since our jscodemod scripts will format one-line-body functions as single line
+    'arrow-body-style': ['error', 'always'],
+  },
+})

.eslintrc .eslintrc.json

@@ -5,5 +5,7 @@
   "extends": [
     "plugin:@cypress/dev/general"
   ],
-  "rules": {}
+  "rules": {
+    "prefer-spread": "off"
+  }
 }

ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE.md

@@ -0,0 +1,43 @@
+<!--
+  this comment will be posted automatically by Cypress bot whenever someone opens a pull request,
+  and it helps the reviewer from Cypress team to ensure the change is solid.
+-->
+Thanks for the contribution! Below are some guidelines Cypress uses when doing PR reviews.
+
+- Please write \`[WIP]\` in the title of your Pull Request if your PR is not ready for review - someone will review your PR as soon as the \`[WIP]\` is removed.
+- Please familiarize yourself with the PR Review Checklist and feel free to make updates on your PR based on these guidelines.
+
+## PR Review Checklist
+
+If any of the following requirements can't be met, leave a comment in the review selecting 'Request changes', otherwise 'Approve'.
+
+### User Experience
+
+- The feature/bugfix is self-documenting from within the product.
+- The change provides the end user with a way to fix their problem (no dead ends).
+
+### Functionality
+
+- The code works and performs its intended function with the correct logic.
+- Performance has been factored in (for example, the code cleans up after itself to not cause memory leaks).
+- The code guards against edge cases and invalid input and has tests to cover it.
+
+### Maintainability
+
+- The code is readable (too many nested 'if's are a bad sign).
+- Names used for variables, methods, etc, clearly describe their function.
+- The code is easy to understood and there are relevant comments explaining.
+- New algorithms are documented in the code with link(s) to external docs (flowcharts, w3c, chrome, firefox).
+- There are comments containing link(s) to the addressed issue (in tests and code).
+
+### Quality
+
+- The change does not reimplement code.
+- There's not a module from the ecosystem that should be used instead.
+- There is no redundant or duplicate code.
+- There are no irrelevant comments left in the code.
+- Tests are testing the code’s intended functionality in the best way possible.
+
+### Internal
+
+- The original issue has been tagged with a release in ZenHub.

.github/PULL_REQUEST_REVIEW_COMMENT.md

@@ -0,0 +1,18 @@
+<!--
+  this comment will be posted automatically by Cypress bot whenever a dependency update pull request is opened,
+  and it helps the reviewer from Cypress team to ensure the update won't have unexpected consequences.
+-->
+Below are some guidelines Cypress uses when reviewing dependency updates.
+
+## Dependency Update Instructions
+
+- Read through the entire changelog of the dependency's changes. If a changelog is not available, check every commit made to the dependency. **NOTE** - do not rely on semver to indicate breaking changes - every product does not follow this standard.
+- Add a PR review comment noting any relevant changes in the dependency.
+- If any of the following requirements cannot be met, leave a comment in the review selecting 'Request changes', otherwise 'Approve'.
+
+## Dependency Updates Checklist
+
+- Code using the dependency has been updated to accommodate any breaking changes
+- The dependency still supports the version of Node that the package requires.
+- The PR been tagged with a release in ZenHub.
+- Appropriate labels have been added to the PR (for example: label \`type: breaking change\` if it is a breaking change)

.github/PULL_REQUEST_REVIEW_COMMENT_FOR_DEPENDENCY_UPDATE.md

@@ -0,0 +1,44 @@
+<!-- 
+Thanks for contributing!
+Read our contribution guidelines here: 
+https://github.com/cypress-io/cypress/blob/develop/.github/CONTRIBUTING.md 
+-->
+
+<!-- Example: "Closes #1234" -->
+
+- Closes <!-- issue number here -->
+
+### User facing changelog
+
+<!--
+Explain the change(s) for every user to read in our changelog.
+-->
+
+### Additional details
+
+<!--
+Examples:
+- Why was this change necessary?
+- What is affected by this change?
+- Any implementation details to explain?
+-->
+
+### How has the user experience changed?
+
+<!--
+Provide before and after examples of the change.
+Screenshots or GIFs are preferred.
+-->
+
+### PR Tasks
+
+<!-- 
+These tasks must be completed before a PR is merged.
+Delete tasks if they are not applicable. 
+-->
+
+- [ ] Have tests been added/updated?
+- [ ] Has the original issue been tagged with a release in ZenHub? <!-- (internal team only)-->
+- [ ] Has a PR for user-facing changes been opened in [`cypress-documentation`](https://github.com/cypress-io/cypress-documentation)? <!-- Link to PR here -->
+- [ ] Have API changes been updated in the [`type definitions`](cli/types/index.d.ts)?
+- [ ] Have new configuration options been added to the [`cypress.schema.json`](cli/schema/cypress.schema.json)?

.github/PULL_REQUEST_TEMPLATE.md

@@ -22,21 +22,13 @@ Cached Theme Material Design.pak
 packages/https-proxy/ca/
 
 # from desktop-gui
+packages/desktop-gui/cypress/videos
 packages/desktop-gui/src/jsconfig.json
 
-# from driver
-packages/driver/test/cypress/videos
-
 # from example
 packages/example/app
 packages/example/build
-packages/example/cypress/screenshots
-packages/example/cypress/videos
-packages/example/cypress/fixtures/profile.json
-packages/example/cypress/fixtures/users.json
-
-# from driver
-packages/driver/test/cypress/videos
+packages/example/cypress
 
 # from server
 packages/server/.cy
@@ -64,3 +56,6 @@ scripts/support
 package-lock.json
 yarn.lock
 binary-url.json
+
+# Allows us to dynamically create eslint rules that override the default for Decaffeinate scripts
+.eslintrc.js

.gitignore

@@ -1 +1 @@
-8.9.3
+12.0.0

.node-version

@@ -1,3 +1,4 @@
 loglevel=warn
 progress=false
 package-lock=false
+save-exact=true

.npmrc

@@ -1,6 +1,8 @@
 {
+  "eslint.alwaysShowStatus": true,
+  "eslint.autoFixOnSave": true,
   "eslint.validate": [
-    { 
+    {
       "language": "javascript",
       "autoFix": true
     },
@@ -25,4 +27,15 @@
       "autoFix": false
     },
   ],
+  "eslint.enable": true,
+  // this project does not use Prettier
+  // thus set all settings to disable accidentally running Prettier
+  "prettier.requireConfig": true,
+  "prettier.disableLanguages": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact",
+    "json"
+  ]
 }

.vscode/settings.json

@@ -6,24 +6,20 @@
     {
       "label": "decaffeinate-bulk file",
       "type": "shell",
-      "command": "npm run decaffeinate-bulk -- --file ${file} convert",
+      "command": "npm run decaffeinate-bulk -- convert --file ${file}",
       "problemMatcher": []
     },
     {
-      "label": "decaffeinate-bulk dir",
+      "label": "decaffeinate-bulk multiple files",
       "type": "shell",
-      "command": "npm run decaffeinate-bulk -- --dir ${fileDirname} convert",
+      "command": "npm run decaffeinate-bulk -- convert --file ${file} ${file}",
       "problemMatcher": []
     },
     {
-      "label": "decaffeinate",
-      "type": "shell",
-      "command": "npm run decaffeinate -- ${file}"
-    },
-    {
-      "label": "jscodeshift",
+      "label": "decaffeinate-bulk dir",
       "type": "shell",
-      "command": "npm run jscodeshift -- ${file}"
+      "command": "npm run decaffeinate-bulk -- --dir ${fileDirname} convert",
+      "problemMatcher": []
     }
   ]
 }

.vscode/tasks.json

@@ -29,7 +29,7 @@
       "onlySingle": true,
       "execute": false,
       "cwd": "[cwd]/packages/server",
-      "command": "npm run test-e2e -- --spec name"
+      "command": "npm run test-e2e -- --spec [fileBasename]"
     },
     {
       "name": "packages/runner watch",