Merge remote-tracking branch 'origin/develop' into deprecate-cy.route…

…-remove-experimentalNetworkStubbing

.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/*

.github/ISSUE_TEMPLATE/1-bug-report.md

@@ -8,6 +8,8 @@ assignees: ''
 
 <!-- 👋 Use the template below to report a bug. Fill in as much info as possible. 
 
+Have a question? Start a new discussion 👉 https://github.com/cypress-io/cypress/discussions
+
 As an open source project with a small maintainer team, it may take some time for your issue to be addressed. Please be patient and we will respond as soon as we can. 🙏 -->
 
 ### Current behavior

.github/ISSUE_TEMPLATE/2-install-issue.md

@@ -8,6 +8,8 @@ assignees: ''
 
 <!-- 👋 Use the template below to report an issue with installing Cypress 👉 https://on.cypress.io/installing-cypress
 
+Have a question? Start a new discussion 👉 https://github.com/cypress-io/cypress/discussions
+
 Fill in as much info as possible. As an open source project with a small maintainer team, it may take some time for your issue to be addressed. Please be patient and we will respond as soon as we can. 🙏 -->
 
 ### Current behavior

.github/ISSUE_TEMPLATE/3-feature.md

@@ -8,6 +8,8 @@ assignees: ''
 
 <!-- 👋 Use the template below to request a feature. 
 
+Have a question? Start a new discussion 👉 https://github.com/cypress-io/cypress/discussions
+
 Please be patient and we will respond as soon as we can. 🙏 -->
 
 ### What would you like?

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: 🤔 Questions and Help
-    url: https://www.cypress.io/support
-    about: This issue tracker is not for support questions. Please refer to the Cypress community's support.
+    url: https://github.com/cypress-io/cypress/discussions
+    about: This issue tracker is not for support questions. Please refer to our Discussions.
   - name: 📊 Cypress Dashboard Feature
     url: https://portal.productboard.com/cypress-io/1-cypress-dashboard
     about: This issue tracker is not for requesting Cypress Dashboard features. Please express interest here.

.releaserc.js

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

CONTRIBUTING.md

@@ -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)