Merge branch 'develop' into master

__snapshots__/packages-spec.js

@@ -15,18 +15,19 @@ exports['packages can copy files from package.json 1'] = {
   "tmp": {
     "packages": {
       "coffee": {
-        "package.json": "{\"main\":\"src/main.js\", \"name\": \"foo\", \"files\": [\"lib\"]}",
+        "lib": {
+          "foo.js": "{}"
+        },
         "src": {
           "main.js": "console.log()"
         },
-        "lib": {
-          "foo.js": "{}"
-        }
+        "package.json": "{\n  \"main\": \"src/main.js\",\n  \"name\": \"foo\",\n  \"files\": [\n    \"lib\"\n  ]\n}\n"
       }
     }
   }
 }
 
+
 exports['transformRequires can find and replace symlink requires 1'] = {
   "[cwd]": {
     "build": {

appveyor.yml

@@ -2,6 +2,7 @@ branches:
   only:
     - master
     - develop
+    - windows-code-signing
     - 9.0-release
     - /win*/
 

browser-versions.json

@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "96.0.4664.35",
-  "chrome:stable": "95.0.4638.69"
+  "chrome:beta": "96.0.4664.45",
+  "chrome:stable": "96.0.4664.45"
 }

circle.yml

@@ -8,7 +8,6 @@ macBuildFilters: &macBuildFilters
     branches:
       only:
         - develop
-        - 9.0-release
 
 defaults: &defaults
   parallelism: 1
@@ -42,7 +41,6 @@ onlyMainBranches: &onlyMainBranches
     branches:
       only:
         - develop
-        - 9.0-release
   requires:
     - create-build-artifacts
 
@@ -1513,7 +1511,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "9.0-release" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "tgriesser/build/root-yarn-install" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -2155,7 +2153,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - build
     - test-kitchensink:
@@ -2167,7 +2164,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - build
     - create-build-artifacts:
@@ -2217,15 +2213,13 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
     - test-npm-module-and-verify-binary:
         filters:
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
     - test-binary-against-staging:
@@ -2234,7 +2228,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
 
@@ -2259,7 +2252,6 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - create-build-artifacts
 
@@ -2331,7 +2323,6 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - darwin-create-build-artifacts
 
@@ -2343,7 +2334,6 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - 9.0-release
         requires:
           - darwin-create-build-artifacts
 

cli/lib/tasks/install.js

@@ -38,6 +38,10 @@ const getNpmArgv = () => {
 const getVersionSpecifier = (startDir = path.resolve(__dirname, '../..')) => {
   const argv = getNpmArgv()
 
+  if ((process.env.npm_package_resolved || '').endsWith('cypress.tgz')) {
+    return process.env.npm_package_resolved
+  }
+
   if (argv) {
     const tgz = _.find(argv, (t) => t.endsWith('cypress.tgz'))
 
@@ -81,7 +85,7 @@ const getVersionSpecifier = (startDir = path.resolve(__dirname, '../..')) => {
   })
 }
 
-const betaNpmUrlRe = /^\/beta\/npm\/(?<version>[0-9.]+)\/(?<artifactSlug>[^/]+)\/cypress\.tgz$/
+const betaNpmUrlRe = /^\/beta\/npm\/(?<version>[0-9.]+)\/(?<artifactSlug>.+?)\/cypress\.tgz$/
 
 // convert a prerelease NPM package .tgz URL to the corresponding binary .zip URL
 const getBinaryUrlFromPrereleaseNpmUrl = (npmUrl) => {

cli/package.json

@@ -4,6 +4,7 @@
   "private": true,
   "main": "index.js",
   "scripts": {
+    "clean": "node ./scripts/clean.js",
     "prebuild": "yarn postinstall && node ./scripts/start-build.js",
     "build": "node ./scripts/build.js",
     "dtslint": "dtslint types",
@@ -27,7 +28,7 @@
     "@types/sizzle": "^2.3.2",
     "arch": "^2.2.0",
     "blob-util": "^2.0.2",
-    "bluebird": "^3.7.2",
+    "bluebird": "3.7.2",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.0",
     "check-more-types": "^2.24.0",

cli/scripts/clean.js

@@ -0,0 +1,8 @@
+const shelljs = require('shelljs')
+const { includeTypes } = require('./utils')
+
+shelljs.rm('-rf', 'build')
+
+includeTypes.map((m) => {
+  shelljs.rm('-rf', `types/${m}`)
+})

cli/scripts/post-install.js

@@ -89,7 +89,9 @@ filesToUncomment.forEach((file) => {
   const filePath = join(__dirname, '../types', file)
   const str = fs.readFileSync(filePath).toString()
 
-  const result = str.split('\n').map((line) => line.substring(3)).join('\n')
+  const result = str.split('\n').map((line) => {
+    return line.startsWith('// ') ? line.substring(3) : line
+  }).join('\n')
 
   fs.writeFileSync(filePath, result)
 })

cli/test/lib/tasks/install_spec.js

@@ -472,6 +472,9 @@ describe('/lib/tasks/install', function () {
 
       expect(install._getBinaryUrlFromPrereleaseNpmUrl('https://cdn.cypress.io/beta/npm/5.1.1/circle-develop-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.tgz'))
       .to.eq('https://cdn.cypress.io/beta/binary/5.1.1/linux-x64/circle-develop-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.zip')
+
+      expect(install._getBinaryUrlFromPrereleaseNpmUrl('https://cdn.cypress.io/beta/npm/5.1.1/circle-develop/some/branch-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.tgz'))
+      .to.eq('https://cdn.cypress.io/beta/binary/5.1.1/linux-x64/circle-develop/some/branch-3fdfc3b453eb38ad3c0b079531e4dde6668e3dd0-436710/cypress.zip')
     })
 
     it('returns nothing for an invalid url', function () {
@@ -502,6 +505,14 @@ describe('/lib/tasks/install', function () {
       expect(await install._getVersionSpecifier('/foo/bar/baz')).to.eq('https://foo.com/cypress.tgz')
     })
 
+    it('resolves with cypress.tgz URL if specified in npm env npm_package_resolved', async function () {
+      restoreEnv = mockedEnv({
+        npm_package_resolved: 'https://foo.com/cypress.tgz',
+      })
+
+      expect(await install._getVersionSpecifier('/foo/bar/baz')).to.eq('https://foo.com/cypress.tgz')
+    })
+
     it('resolves with versionSpecifier from parent pkg.json', async function () {
       fs.readJSON.withArgs('/foo/bar/baz/package.json').resolves({
         dependencies: {

electron-builder.json

@@ -9,19 +9,7 @@
     "hardenedRuntime": true,
     "entitlements": "./scripts/entitlements.mac.inherit.plist",
     "entitlementsInherit": "./scripts/entitlements.mac.inherit.plist",
-    "type": "distribution",
-    "binaries": [
-      "./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/babel-plugin-add-module-exports/node_modules/fsevents/build/Release/.node",
-      "./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/babel-plugin-add-module-exports/node_modules/fsevents/build/Release/fse.node",
-      "./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/@ffmpeg-installer/darwin-x64/ffmpeg",
-      "./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/watchpack-chokidar2/node_modules/fsevents/build/Release/.node",
-      "./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/watchpack-chokidar2/node_modules/fsevents/build/Release/fse.node",
-      "./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/registry-js/build/Release/registry.node",
-      "./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/term-size/vendor/macos/term-size",
-      "./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/trash/lib/macos-trash",
-      "./build/mac/Cypress.app/Contents/Resources/app/packages/server/node_modules/fsevents/fsevents.node",
-      "./build/mac/Cypress.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Helpers/chrome_crashpad_handler"
-    ]
+    "type": "distribution"
   },
   "linux": {
     "target": "dir",

npm/angular/package.json

@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@cypress/mount-utils": "0.0.0-development",
-    "debug": "4.3.2"
+    "debug": "^4.3.2"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "0.1102.12",

npm/create-cypress-tests/package.json

@@ -17,7 +17,7 @@
     "@babel/plugin-transform-typescript": "^7.2.0",
     "@babel/template": "^7.5.4",
     "@babel/types": "^7.5.0",
-    "bluebird": "^3.7.2",
+    "bluebird": "3.7.2",
     "chalk": "4.1.0",
     "cli-highlight": "2.1.10",
     "commander": "6.1.0",

npm/eslint-plugin-dev/package.json

@@ -10,7 +10,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "bluebird": "^3.5.5",
+    "bluebird": "3.5.5",
     "chalk": "^2.4.2",
     "eslint-rule-composer": "^0.3.0",
     "lodash": "^4.17.15",

npm/react/README.md

@@ -138,7 +138,7 @@ Spec | Description
 [css modules](cypress/component/basic/css-modules) | Shows that component that using css modules styles works
 [network](cypress/component/basic/network) | Confirms we can use `cy.route` to stub / spy on component's network calls
 [no-visit](cypress/component/basic/no-visit) | Component specs cannot call `cy.visit`
-[re-render](cypress/component/basic/re-render) | Checking how the component re-renders when its props change
+[rerender](cypress/component/basic/rerender) | Checking how the component re-renders when its props change
 [react-book-by-chris-noring](cypress/component/basic/react-book-by-chris-noring) | Copied test examples from [React Book](https://softchris.github.io/books/react) and adapted for Cypress component tests
 [react-tutorial](cypress/component/basic/react-tutorial) | Tests from official [ReactJS tutorial](https://reactjs.org/tutorial/tutorial.html) copied and adapted for Cypress component tests
 [stub-example](cypress/component/basic/stub-example) | Uses `cy.stub` as component props

npm/react/package.json

@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@cypress/mount-utils": "0.0.0-development",
-    "debug": "4.3.2",
+    "debug": "^4.3.2",
     "find-webpack": "2.2.1",
     "find-yarn-workspace-root": "2.0.0"
   },
@@ -66,7 +66,7 @@
     "date-fns": "2.13.0",
     "framer-motion": "2.6.13",
     "i18next": "19.7.0",
-    "lodash": "4.17.15",
+    "lodash": "^4.17.15",
     "mobx": "6.0.0",
     "mobx-react-lite": "3.0.0",
     "mocha-junit-reporter": "^2.0.0",

npm/vue/package.json

@@ -37,7 +37,7 @@
     "babel-preset-typescript-vue3": "^2.0.14",
     "css-loader": "3.4.2",
     "cypress": "0.0.0-development",
-    "debug": "4.3.2",
+    "debug": "^4.3.2",
     "eslint-plugin-vue": "^6.2.2",
     "find-webpack": "2.1.0",
     "mocha": "7.1.1",

npm/webpack-dev-server/package.json

@@ -11,7 +11,7 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "debug": "4.3.2",
+    "debug": "^4.3.2",
     "semver": "^7.3.4",
     "webpack-merge": "^5.4.0"
   },

npm/webpack-preprocessor/package.json

@@ -20,8 +20,8 @@
     "watch": "yarn build --watch"
   },
   "dependencies": {
-    "bluebird": "^3.7.1",
-    "debug": "4.3.2",
+    "bluebird": "3.7.1",
+    "debug": "^4.3.2",
     "lodash": "^4.17.20"
   },
   "devDependencies": {

package.json

@@ -35,15 +35,15 @@
     "effective:circle:config": "circleci config process circle.yml | sed /^#/d",
     "ensure-deps": "./scripts/ensure-dependencies.sh",
     "get-next-version": "node scripts/get-next-version.js",
-    "postinstall": "yarn-deduplicate --strategy=highest && patch-package && ./scripts/run-if-not-ci.sh yarn build",
+    "postinstall": "patch-package && ./scripts/run-if-not-ci.sh yarn-deduplicate --strategy=highest && ./scripts/run-if-not-ci.sh yarn build",
     "jscodeshift": "jscodeshift -t ./node_modules/js-codemod/transforms/arrow-function-arguments.js",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json .",
     "lint-changed": "lint-changed",
     "move-binaries": "node ./scripts/binary.js move-binaries",
     "npm-release": "node scripts/npm-release.js",
     "prestart": "yarn ensure-deps",
     "start": "cypress open --dev --global",
-    "stop-only": "npx stop-only --skip .cy,.publish,.projects,node_modules,dist,dist-test,fixtures,lib,bower_components,src,__snapshots__ --exclude e2e.ts,cypress-tests.ts",
+    "stop-only": "npx stop-only --skip .cy,.publish,.projects,node_modules,dist,dist-test,fixtures,lib,bower_components,src,__snapshots__ --exclude e2e.ts,cypress-tests.ts,*only_spec.js",
     "stop-only-all": "yarn stop-only --folder packages",
     "pretest": "yarn ensure-deps",
     "test": "yarn lerna exec yarn test --scope cypress --scope \"'@packages/{config,electron,extension,https-proxy,launcher,net-stubbing,network,proxy,rewriter,runner,runner-shared,socket}'\"",
@@ -88,7 +88,7 @@
     "@types/execa": "0.9.0",
     "@types/fs-extra": "^8.0.1",
     "@types/glob": "7.1.1",
-    "@types/lodash": "4.14.168",
+    "@types/lodash": "^4.14.168",
     "@types/markdown-it": "0.0.9",
     "@types/mini-css-extract-plugin": "1.2.3",
     "@types/mocha": "8.0.3",
@@ -103,7 +103,7 @@
     "ansi-styles": "3.2.1",
     "arg": "4.1.2",
     "ascii-table": "0.0.9",
-    "aws-sdk": "2.447.0",
+    "aws-sdk": "2.814.0",
     "babel-eslint": "10.1.0",
     "bluebird": "3.5.3",
     "bluebird-retry": "0.11.0",
@@ -115,10 +115,10 @@
     "commander": "6.2.1",
     "common-tags": "1.8.0",
     "conventional-recommended-bump": "6.1.0",
-    "debug": "4.3.2",
+    "debug": "^4.3.2",
     "del": "3.0.0",
-    "electron-builder": "22.9.1",
-    "electron-notarize": "1.0.0",
+    "electron-builder": "^22.13.1",
+    "electron-notarize": "^1.1.1",
     "enzyme-adapter-react-16": "1.12.1",
     "eslint": "7.22.0",
     "eslint-plugin-cypress": "2.11.2",
@@ -154,15 +154,14 @@
     "lerna": "3.20.2",
     "lint-staged": "11.1.2",
     "listr2": "3.8.3",
-    "lodash": "4.17.21",
+    "lodash": "^4.17.21",
     "make-empty-github-commit": "cypress-io/make-empty-github-commit#4a592aedb776ba2f4cc88979055315a53eec42ee",
     "minimist": "1.2.5",
     "mocha": "3.5.3",
     "mocha-banner": "1.1.2",
     "mocha-junit-reporter": "2.0.0",
     "mocha-multi-reporters": "1.1.7",
     "mock-fs": "5.1.1",
-    "odiff-bin": "2.1.0",
     "parse-github-repo-url": "1.4.1",
     "patch-package": "6.4.7",
     "plist": "3.0.1",
@@ -186,7 +185,7 @@
     "terminal-banner": "1.1.0",
     "through": "2.3.8",
     "ts-node": "8.3.0",
-    "typescript": "^4.2.3",
+    "typescript": "^4.4.4",
     "yarn-deduplicate": "3.1.0"
   },
   "engines": {
@@ -226,8 +225,6 @@
       "system-tests"
     ],
     "nohoist": [
-      "**/@ffmpeg-installer",
-      "**/@ffmpeg-installer/**",
       "**/webpack-preprocessor/babel-loader",
       "**/webpack-batteries-included-preprocessor/ts-loader",
       "**/@vue/runtime-dom",