merge 'develop' into 'remove-decaffeinate-tasks'

.eslintignore

@@ -11,8 +11,8 @@
 **/support/fixtures/*
 !**/support/fixtures/projects
 **/support/fixtures/projects/**/_fixtures/*
+**/support/fixtures/projects/**/static/*
 **/support/fixtures/projects/**/*.jsx
-**/support/fixtures/projects/**/jquery.js
 **/support/fixtures/projects/**/fail.js
 **/test/fixtures
 **/vendor
@@ -41,4 +41,4 @@ npm/webpack-preprocessor/examples/use-babelrc/cypress/integration/spec.js
 **/.cy
 **/.git
 
-/npm/react/bin/*
+/npm/react/bin/*

.eslintrc.json

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,6 +2,7 @@
 - Read our contributing guidelines: https://github.com/cypress-io/cypress/blob/develop/CONTRIBUTING.md 
 - Read our Code Review Checklist on coding standards and what needs to be done before a PR can be merged: https://github.com/cypress-io/cypress/blob/develop/CONTRIBUTING.md#Code-Review-Checklist
 - Mark this PR as "Draft" if it is not ready for review.
+- Make sure you set the correct base branch based on what packages you're changing: https://github.com/cypress-io/cypress/blob/develop/CONTRIBUTING.md#branches
 -->
 
 - Closes <!-- issue number here. e.g. "Closes #1234" -->

.node-version

@@ -1 +1 @@
-12.14.1
+12.18.3

.releaserc.js

@@ -2,5 +2,6 @@ module.exports = {
   ...require('./.releaserc.base'),
   branches: [
     'master',
+    { name: 'chore/webpack-5', channel: 'channel-next' },
   ],
 }

CONTRIBUTING.md

@@ -11,8 +11,8 @@ Thanks for taking the time to contribute! :smile:
 
 **Want to dive deeper into how Cypress works? There are several ways you can help with the development of Cypress:**
 
-- [Report bugs](https://github.com/cypress-io/cypress/issues/new) by opening an issue.
-- [Request features](https://github.com/cypress-io/cypress/issues/new) by opening an issue.
+- [Report bugs](https://github.com/cypress-io/cypress/issues/new?template=1-bug-report.md) by opening an issue.
+- [Request features](https://github.com/cypress-io/cypress/issues/new?template=3-feature.md) by opening an issue.
 - [Help triage existing issue](#triaging-issues).
 - Write code to address an issue. We have some issues labeled as [`first-timers-only`](https://github.com/cypress-io/cypress/labels/first-timers-only) that are good place to start. [Please thoroughly read our writing code guide](#writing-code).
 
@@ -34,7 +34,6 @@ Thanks for taking the time to contribute! :smile:
 - [Committing Code](#committing-code)
   - [Branches](#branches)
   - [Pull Requests](#pull-requests)
-  - [Testing](#testing)
   - [Dependencies](#dependencies)
 - [Reviewing Code](#reviewing-code)
   - [Some rules about Code Review](#Some-rules-about-Code-Review)
@@ -73,7 +72,7 @@ All contributors are expecting to abide by our [Code of Conduct](./CODE_OF_CONDU
 - [Describe your problem, not your solution](#describe-problems)
 - [Explain how to reproduce the issue](#reproducibility).
 
-Finally, if you are up to date, supported, have collected information about the problem, and have the best reproduction instructions you can give, you are ready to [open an issue](https://github.com/cypress-io/cypress/issues/new).
+Finally, if you are up to date, supported, have collected information about the problem, and have the best reproduction instructions you can give, you are ready to [open an issue](https://github.com/cypress-io/cypress/issues/new/choose).
 
 ### Update Cypress
 
@@ -93,7 +92,7 @@ For some issues, there are places you can check for more information. This may h
 
 ### Fill out our Issue Template
 
-When opening an issue, there is a provided [issue template](./.github/ISSUE_TEMPLATE.md). Fill out the information according to the template. This is information needed for Cypress to continue forward with your problem. Any issues that do not follow the issue template will be closed.
+When opening an issue, there is a provided [issue template](./.github/ISSUE_TEMPLATE). Fill out the information according to the template. This is information needed for Cypress to continue forward with your problem. Any issues that do not follow the issue template will be closed.
 
 ### Describe Problems
 
@@ -174,9 +173,9 @@ If an issue already exists you should:
 
 ### Does the issue provide all the information from our issue template?
 
-When opening an issue, there is a provided [issue template](./.github/ISSUE_TEMPLATE.md). If the opened issue does not provide enough information asked from the issue template you should:
+When opening an issue, there is a provided [issue template](./.github/ISSUE_TEMPLATE). If the opened issue does not provide enough information asked from the issue template you should:
 
-- Explain that we require new issues follow our provided [issue template](./.github/ISSUE_TEMPLATE.md) and that issues that are opened without this information are automatically closed per our [contributing guidelines](#fill-out-our-issue-template).
+- Explain that we require new issues follow our provided [issue template](./.github/ISSUE_TEMPLATE) and that issues that are opened without this information are automatically closed per our [contributing guidelines](#fill-out-our-issue-template).
 - Close the issue.
 
 ### Are they running the current version of Cypress?
@@ -496,29 +495,6 @@ There is a script [scripts/run-docker-local.sh](scripts/run-docker-local.sh) tha
 
 The image will start and will map the root of the repository to `/cypress` inside the image. Now you can modify the files using your favorite environment and rerun tests inside the docker environment.
 
-##### Troubleshooting
-
-Sometimes building inside the image has problems with `node-sass` library. This generally only happens when installing packages locally (in a non-linux environment), and then trying to use these packages in the docker container (linux). The same can happen if packages are installed via the docker container and then trying to run locally; i.e. installed node_modules were for the docker linux environment, but cypress is running in a non-linux environment.
-
-```text
-Error: Missing binding /cypress/packages/desktop-gui/node_modules/node-sass/vendor/linux-x64-48/binding.node
-Node Sass could not find a binding for your current environment: Linux 64-bit with Node.js 6.x
-
-Found bindings for the following environments:
- - OS X 64-bit with Node.js 6.x
-
-This usually happens because your environment has changed since running `npm install`.
-Run `npm rebuild node-sass` to build the binding for your current environment.
-```
-
-In order to resolve this issue, remove all node_modules via `yarn clean-deps` and then reinstall them in the correct environment via `yarn`. If using/running from a docker container, this is done from within the container; however if running locally, then run from your local shell.
-
-```bash
-$ yarn docker
-yarn clean-deps
-yarn
-```
-
 #### Docker for built binary
 
 You can also use Docker to simulate and debug the built binary. In a temporary folder (for example from the folder `/tmp/test-folder/`) start a Docker image:
@@ -616,7 +592,7 @@ You can read more about our CI design decisions in [#8730](https://github.com/cy
 
 ### Pull Requests
 
-- When opening a PR for a specific issue already open, please name the branch you are working on using the convention `issue-[issue number]`. For example, if your PR fixes Issue #803, name your branch `issue-803`. If the PR is a larger issue, you can add more context like `issue-803-new-scrollable-area` If there is not an associated open issue, **create an issue using our [Issue Template](./.github/ISSUE_TEMPLATE.md)**.
+- When opening a PR for a specific issue already open, please name the branch you are working on using the convention `issue-[issue number]`. For example, if your PR fixes Issue #803, name your branch `issue-803`. If the PR is a larger issue, you can add more context like `issue-803-new-scrollable-area` If there is not an associated open issue, **create an issue using our [Issue Template](./.github/ISSUE_TEMPLATE)**.
 - PR's can be opened before all the work is finished. In fact we encourage this! Please create a [Draft Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests) if your PR is not ready for review. [Mark the PR as **Ready for Review**](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/changing-the-stage-of-a-pull-request#marking-a-pull-request-as-ready-for-review) when you're ready for a Cypress team member to review the PR.
 - Prefix the title of the Pull Request using [semantic-release](https://github.com/semantic-release/semantic-release)'s format as defined [here](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#type). For example, if your PR is fixing a bug, you should prefix the PR title with `fix:`.
 - Fill out the [Pull Request Template](./.github/PULL_REQUEST_TEMPLATE.md) completely within the body of the PR. If you feel some areas are not relevant add `N/A` as opposed to deleting those sections. PR's will not be reviewed if this template is not filled in.

DEPLOY.md

@@ -32,7 +32,7 @@ The steps above:
 
 The npm package requires a corresponding binary of the same version. In production, it will try to retrieve the binary from the Cypress CDN if it is not cached locally.
 
-You can build the Cypress binary locally by running `yarn binary-build`. You can use Docker to build a Linux binary by running `yarn binary-build-linux`.
+You can build the Cypress binary locally by running `yarn binary-build`. You can use Linux to build the Cypress binary (just like it is in CI) by running `yarn binary-build` inside of  `yarn docker`.
 
 `yarn binary-zip` can be used to zip the built binary together.
 

__snapshots__/mocha-snapshot-spec.js

@@ -1,4 +1,4 @@
-exports['captures mocha output 1'] = `
+exports['mocha snapshot captures mocha output 1'] = `
 
   command: npm run test-mocha
   code: 0

appveyor.yml

@@ -2,12 +2,13 @@ branches:
   only:
     - master
     - develop
+    - revert-create-cypress-tests
     - /win*/
 
 # https://www.appveyor.com/docs/lang/nodejs-iojs/
 environment:
   # use matching version of Node.js
-  nodejs_version: "12.14.1"
+  nodejs_version: "12.18.3"
   # encode secure variables which will NOT be used
   # in pull requests
   # https://www.appveyor.com/docs/build-configuration/#secure-variables