Merge branch 'develop' into 9b967e0-master-into-develop

.gitattributes

@@ -1,3 +1,5 @@
 * text=auto
 
 *.json text eol=lf
+
+packages/errors/__snapshot-html__/** linguist-generated=true

.github/workflows/merge-master-into-develop.yml

@@ -11,7 +11,8 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
+          # the default `GITHUB_TOKEN` cannot push to protected branches, so use `cypress-app-bot`'s token instead
+          token: ${{ secrets.BOT_GITHUB_TOKEN }}
       - name: Set committer info
         run: |
           git config --local user.email "$(git log --format='%ae' HEAD^!)"

.github/workflows/semantic-pull-request.yml

@@ -0,0 +1,21 @@
+name: "Semantic Pull Request"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+jobs:
+  main:
+    name: Lint Title
+    runs-on: ubuntu-latest
+    steps:
+      # use a fork of the GitHub action - we cannot pull in untrusted third party actions
+      # see https://github.com/cypress-io/cypress/pull/20091#discussion_r801799647
+      - uses: cypress-io/action-semantic-pull-request@v4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          validateSingleCommit: true

.gitignore

@@ -18,6 +18,8 @@ packages/config/lib/*.js
 
 # from data-context, compiled .js files
 packages/data-context/src/**/*.js
+packages/errors/src/**/*.js
+packages/errors/test/**/*.js
 
 # from desktop-gui
 packages/desktop-gui/cypress/videos
@@ -68,6 +70,7 @@ packages/socket/lib/*.js
 
 # from system-tests
 system-tests/.projects
+system-tests/.http-mitm-proxy
 system-tests/fixtures/large-img
 
 # from npm/react
@@ -83,6 +86,11 @@ system-tests/fixtures/large-img
 # from runner-ct
 /packages/runner-ct/cypress/screenshots
 
+# from errors
+/packages/errors/__snapshot-images__
+/packages/errors/__snapshot-md__
+/packages/errors/__snapshot-html-local__
+
 # graphql, auto-generated
 /packages/launchpad/src/generated
 /packages/app/src/generated

.vscode/settings.json

@@ -36,6 +36,6 @@
   "i18n-ally.keystyle": "nested",
 
   // Volar is the main extension that powers Vue's language features.
-  "volar.autoCompleteRefs": false,
-  "volar.takeOverMode.enabled": true
+  // "volar.autoCompleteRefs": false,
+  "volar.takeOverMode.enabled": true,
 }

__snapshots__/bump-spec.js

@@ -1,19 +1,9 @@
 exports['list of all projects'] = [
-  {
-    "repo": "cypress-io/cypress-test-tiny",
-    "provider": "circle",
-    "platform": "win32"
-  },
   {
     "repo": "cypress-io/cypress-test-example-repos",
     "provider": "circle",
     "platform": "win32"
   },
-  {
-    "repo": "cypress-io/cypress-test-tiny",
-    "provider": "circle",
-    "platform": "linux"
-  },
   {
     "repo": "cypress-io/cypress-test-module-api",
     "provider": "circle",
@@ -24,11 +14,6 @@ exports['list of all projects'] = [
     "provider": "circle",
     "platform": "linux"
   },
-  {
-    "repo": "cypress-io/cypress-test-nested-projects",
-    "provider": "circle",
-    "platform": "linux"
-  },
   {
     "repo": "cypress-io/cypress-test-ci-environments",
     "provider": "circle",
@@ -39,11 +24,6 @@ exports['list of all projects'] = [
     "provider": "circle",
     "platform": "linux"
   },
-  {
-    "repo": "cypress-io/cypress-test-tiny",
-    "provider": "circle",
-    "platform": "darwin"
-  },
   {
     "repo": "cypress-io/cypress-test-example-repos",
     "provider": "circle",
@@ -52,11 +32,6 @@ exports['list of all projects'] = [
 ]
 
 exports['should have just circle and darwin projects'] = [
-  {
-    "repo": "cypress-io/cypress-test-tiny",
-    "provider": "circle",
-    "platform": "darwin"
-  },
   {
     "repo": "cypress-io/cypress-test-example-repos",
     "provider": "circle",

browser-versions.json

@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "98.0.4758.74",
-  "chrome:stable": "97.0.4692.99"
+  "chrome:beta": "99.0.4844.27",
+  "chrome:stable": "98.0.4758.80"
 }