Merge remote-tracking branch 'origin/develop' into cy-intercept-overr…

…ides

.eslintrc.json

@@ -8,7 +8,8 @@
   ],
   "rules": {
     "prefer-spread": "off",
-    "prefer-rest-params": "off"
+    "prefer-rest-params": "off",
+    "no-useless-constructor": "off"
   },
   "settings": {
     "react": {

.vscode/settings.json

@@ -1,6 +1,12 @@
 {
   "eslint.alwaysShowStatus": true,
-  "eslint.validate": ["json"],
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact",
+    "json"
+  ],
   "eslint.enable": true,
   // this project does not use Prettier
   // thus set all settings to disable accidentally running Prettier

.vscode/tasks.json

@@ -0,0 +1,39 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "rename yarn workspace packages",
+      "type": "shell",
+      "command": "node ./scripts/rename-workspace-packages --file ${file}",
+      "presentation": {
+        "echo": true,
+        "reveal": "silent",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": false
+      },
+      "problemMatcher": []
+    },
+    {
+      "label": "decaffeinate-bulk file",
+      "type": "shell",
+      "command": "yarn decaffeinate-bulk convert --file ${file}",
+      "problemMatcher": []
+    },
+    {
+      "label": "decaffeinate-bulk multiple files",
+      "type": "shell",
+      "command": "yarn decaffeinate-bulk convert --file ${file} ${file}",
+      "problemMatcher": []
+    },
+    {
+      "label": "decaffeinate-bulk dir",
+      "type": "shell",
+      "command": "yarn decaffeinate-bulk --dir ${fileDirname} convert",
+      "problemMatcher": []
+    }
+  ]
+}

.vscode/terminals.json

@@ -2,19 +2,43 @@
   "autorun": false,
   "terminals": [
     {
-      "name": "cypress open",
+      "name": "yarn",
+      "focus": true,
+      "onlySingle": true,
+      "execute": true,
+      "cwd": "[cwd]",
+      "command": "yarn"
+    },
+    {
+      "name": "cypress open (E2E)",
       "focus": true,
       "onlySingle": true,
       "execute": true,
       "command": "yarn cypress:open"
     },
     {
-      "name": "cypress run",
+      "name": "cypress run (E2E)",
       "focus": true,
       "onlySingle": true,
       "execute": false,
       "command": "yarn cypress:run --project ../project"
     },
+    {
+      "name": "cypress open (CT)",
+      "focus": true,
+      "onlySingle": true,
+      "execute": true,
+      "cwd": "[cwd]/packages/server-ct",
+      "command": "yarn cypress:open"
+    },
+    {
+      "name": "packages/server test-e2e",
+      "focus": true,
+      "onlySingle": true,
+      "execute": false,
+      "cwd": "[cwd]/packages/server",
+      "command": "yarn test-e2e [fileBasename]"
+    },
     {
       "name": "packages/server test-watch",
       "focus": true,
@@ -38,6 +62,13 @@
       "cwd": "[cwd]/packages/runner",
       "command": "yarn watch"
     },
+    {
+      "name": "packages/runner-ct watch",
+      "focus": true,
+      "onlySingle": true,
+      "cwd": "[cwd]/packages/runner-ct",
+      "command": "yarn watch"
+    },
     {
       "name": "packages/driver cypress open",
       "focus": true,

DEPLOY.md

@@ -43,7 +43,6 @@ You can build the Cypress binary locally by running `yarn binary-build`. You can
 - Ensure you have the following permissions set up:
     - An AWS account with permission to create AWS access keys for the Cypress CDN.
     - Permissions for your npm account to publish the `cypress` package.
-    - Permissions to modify environment variables for `cypress` on CircleCI and AppVeyor.
     - Permissions to update releases in ZenHub.
 
 - Set up the following environment variables:
@@ -142,11 +141,10 @@ In the following instructions, "X.Y.Z" is used to denote the version of Cypress
     npm dist-tag add cypress@X.Y.Z
     ```
 
-9. Run `binary-release` to update the [download server's manifest](https://download.cypress.io/desktop.json) and set the next CI version:
+9. Run `binary-release` to update the [download server's manifest](https://download.cypress.io/desktop.json):
     ```shell
     yarn run binary-release --version X.Y.Z
     ```
-    > Note: Currently, there is an [issue setting the next CI version](https://github.com/cypress-io/cypress/issues/7176) that will cause this command to fail after setting the download manifest. You will need to manually update NEXT_DEV_VERSION by logging in to CircleCI and AppVeyor. This is noted in Step 16 below.
 
 10. If needed, push out any updated changes to the links manifest to [`on.cypress.io`](https://github.com/cypress-io/cypress-services/tree/develop/packages/on).
 
@@ -185,9 +183,7 @@ In the following instructions, "X.Y.Z" is used to denote the version of Cypress
 
 16. Publish a new docker image in [`cypress-docker-images`](https://github.com/cypress-io/cypress-docker-images) under `included` for the new cypress version.
 
-17. Decide on the next version that we will work on. For example, if we have just released `3.7.0` we probably will work on `3.7.1` next. Set it on [CI machines](#set-next-version-on-cis).
-
-18. Update example projects to the new version. For most projects, you can go to the Renovate dependency issue and check the box next to `Update dependency cypress to X.Y.Z`. It will automatically create a PR. Once it passes, you can merge it. Try updating at least the following projects:
+17. Update example projects to the new version. For most projects, you can go to the Renovate dependency issue and check the box next to `Update dependency cypress to X.Y.Z`. It will automatically create a PR. Once it passes, you can merge it. Try updating at least the following projects:
     - [cypress-example-todomvc](https://github.com/cypress-io/cypress-example-todomvc/issues/99)
     - [cypress-example-todomvc-redux](https://github.com/cypress-io/cypress-example-todomvc-redux/issues/1)
     - [cypress-example-realworld](https://github.com/cypress-io/cypress-example-realworld/issues/2)
@@ -199,7 +195,7 @@ In the following instructions, "X.Y.Z" is used to denote the version of Cypress
     - [cypress-documentation](https://github.com/cypress-io/cypress-documentation/issues/1313)
     - [cypress-example-docker-compose](https://github.com/cypress-io/cypress-example-docker-compose) - Doesn't have a Renovate issue, but will auto-create and auto-merge non-major Cypress updates as long as the tests pass.
 
-19. Check if any test or example repositories have a branch for testing the features or fixes from the newly published version `x.y.z`. The branch should also be named `x.y.z`. Check all `cypress-test-*` and `cypress-example-*` repositories, and if there is a branch named `x.y.z`, merge it into `master`.
+18. Check if any test or example repositories have a branch for testing the features or fixes from the newly published version `x.y.z`. The branch should also be named `x.y.z`. Check all `cypress-test-*` and `cypress-example-*` repositories, and if there is a branch named `x.y.z`, merge it into `master`.
 
     **Test Repos**
 

appveyor.yml

@@ -2,7 +2,7 @@ branches:
   only:
     - master
     - develop
-    - revert-create-cypress-tests
+    - sem-next-ver
     - /win*/
 
 # https://www.appveyor.com/docs/lang/nodejs-iojs/
@@ -54,7 +54,6 @@ install:
   - node --version
   - node --print process.arch
   - yarn --version
-  - yarn check-next-dev-version
   # prints all public variables relevant to the build
   - print-env Platform
   - yarn check-node-version
@@ -89,8 +88,8 @@ test_script:
   # make sure our snapshots are compared correctly
   # - npm run test-mocha-snapshot
   # the other larger tests
-  - echo *** Building Windows NPM package %NEXT_DEV_VERSION% ***
-  - npm --no-git-tag-version version %NEXT_DEV_VERSION%
+  - echo *** Building Windows NPM package ***
+  - yarn get-next-version --npm
   - cd cli
   - yarn
   - yarn build