Merge branch 'develop' into 10.0-release

* develop: (52 commits) feat: use hoisted yarn install in binary build (#17285) fix: compile npm packages for node 12 (#18989) fix: show call count even if `cy.stub().log(false)`. (#18907) chore: Update TypeScript to 4.4.4 (#18930) fix: wrap playground selectors in double quotes if not included (#18442) fix: flaky settings_spec test (#18979) chore: Update Chrome (stable) to 96.0.4664.45 (#18931) fix: Loading of specs with % in the filename (#18877) chore: refactor `create` into class `$Cy` (#18715) chore: Update Chrome (beta) to 96.0.4664.45 (#18891) fix: flaky `system-tests-firefox` job (#18848) chore: release @cypress/webpack-preprocessor-v5.10.0 chore: release @cypress/vue-v3.0.5 chore: release @cypress/schematic-v1.6.0 chore: release create-cypress-tests-v1.2.0 release 9.0.0 feat: ensure major release have conduit app wait on localhost:3000 fix install-required-node use --legacy-peer-deps ...
cypress-io · Nov 20, 2021 · 7c339d4 · 7c339d4
2 parents d65e570 + e4f5b10
commit 7c339d4
Show file tree

Hide file tree

Showing 248 changed files with 9,448 additions and 4,925 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -34,6 +34,7 @@ system-tests/projects/e2e/cypress/integration/typescript_syntax_error_spec.ts
 
 # cli/types is linted by tslint/dtslint
 cli/types
+
 # packages/example is not linted (think about changing this)
 packages/example
 

diff --git a/.gitignore b/.gitignore
@@ -13,14 +13,16 @@ cypress.zip
 Cached Theme.pak
 Cached Theme Material Design.pak
 
+# from config, compiled .js files
+packages/config/lib/*.js
+
 # from data-context, compiled .js files
 packages/data-context/src/**/*.js
 
 # from desktop-gui
 packages/desktop-gui/cypress/videos
 packages/desktop-gui/src/jsconfig.json
 
-
 # from driver
 packages/driver/cypress/videos
 packages/driver/cypress/screenshots

diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-14.17.0
+16.5.0
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,6 +1,8 @@
 {
 	// To see these extensions in VS Code:
-	// 1. Open the Command Palette (Ctrl+Shift+P)
+	// 1. Open the Command Palette:
+	//      - Non-Mac Users: (Ctrl+Shift+P)
+	//      - Mac Users: (Cmd+Shift+P)
 	// 2. Select "Extensions: Show Recommended Extensions"
 
 	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -327,10 +327,6 @@ The project utilizes [yarn workspaces](https://yarnpkg.com/lang/en/docs/workspac
 > **⚠ Running on Windows?**
 >
 > Many of the NPM scripts used during development use commands designed for a Linux-like shell.If you are running a Windows operating system, you may encounter many commands that are not working. To fix this behavior, you have to set a Linux-like shell as the default `npm` script shell. If you have Git for Windows installed, you can set Git Bash as the default script shell by using the following command:
-> ```bash
-> yarn config set script-shell "C:\\Program Files (x86)\\git\\bin\\bash.exe"
-> ```
-> Git Bash may be installed in `Program Files`, if so, use the following command:
 >```bash
 > yarn config set script-shell "C:\\Program Files\\git\\bin\\bash.exe"
 >```

diff --git a/__snapshots__/packages-spec.js b/__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": {

diff --git a/__snapshots__/upload-spec.js b/__snapshots__/upload-spec.js
@@ -5,18 +5,12 @@ exports['test runner manifest'] = {
     "mac": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/darwin-x64/cypress.zip"
     },
-    "win": {
-      "url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
-    },
     "linux64": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
     },
     "darwin": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/darwin-x64/cypress.zip"
     },
-    "win32": {
-      "url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
-    },
     "linux": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
     },
@@ -26,9 +20,6 @@ exports['test runner manifest'] = {
     "linux-x64": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
     },
-    "win32-ia32": {
-      "url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
-    },
     "win32-x64": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/win32-x64/cypress.zip"
     }

diff --git a/__snapshots__/util-upload-spec.js b/__snapshots__/util-upload-spec.js
@@ -9,10 +9,6 @@ exports['upload util isValidPlatformArch checks given strings second 1'] = {
       "given": "linux-x64",
       "expect": true
     },
-    {
-      "given": "win32-ia32",
-      "expect": true
-    },
     {
       "given": "win32-x64",
       "expect": true

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,13 +2,14 @@ branches:
   only:
     - master
     - develop
-    - fix-test-other-projects
+    - windows-code-signing
+    - 9.0-release
     - /win*/
 
 # https://www.appveyor.com/docs/lang/nodejs-iojs/
 environment:
   # use matching version of Node.js
-  nodejs_version: "14.17.0"
+  nodejs_version: "16.5.0"
   # encode secure variables which will NOT be used
   # in pull requests
   # https://www.appveyor.com/docs/build-configuration/#secure-variables
@@ -38,7 +39,6 @@ environment:
 
 platform:
   - x64
-  - x86
 
 # https://www.appveyor.com/docs/build-cache/
 # hmm, seems there is NPM on windows problem

diff --git a/browser-versions.json b/browser-versions.json
@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "96.0.4664.27",
-  "chrome:stable": "95.0.4638.69"
+  "chrome:beta": "96.0.4664.45",
+  "chrome:stable": "96.0.4664.45"
 }
diff --git a/circle.yml b/circle.yml
@@ -44,15 +44,14 @@ onlyMainBranches: &onlyMainBranches
       only:
         - develop
         - 10.0-release
-        - tgriesser/chore/fix-release
   requires:
     - create-build-artifacts
 
 executors:
   # the Docker image with Cypress dependencies and Chrome browser
   cy-doc:
     docker:
-      - image: cypress/browsers:node14.17.0-chrome91-ff89
+      - image: cypress/browsers:node16.5.0-chrome94-ff93
     # by default, we use "small" to save on CI costs. bump on a per-job basis if needed.
     resource_class: small
     environment:
@@ -61,7 +60,7 @@ executors:
   # Docker image with non-root "node" user
   non-root-docker-user:
     docker:
-      - image: cypress/browsers:node14.17.0-chrome91-ff89
+      - image: cypress/browsers:node16.5.0-chrome94-ff93
         user: node
     environment:
       PLATFORM: linux
@@ -72,7 +71,7 @@ executors:
   mac:
     macos:
       # Executor should have Node >= required version
-      xcode: "12.2.0"
+      xcode: "13.0.0"
     environment:
       PLATFORM: mac
 
@@ -271,27 +270,29 @@ commands:
 
   install-required-node:
     # https://discuss.circleci.com/t/switch-nodejs-version-on-machine-executor-solved/26675/2
-    description: Install Node version matching .node-version
+    description: Install Node version
+    parameters:
+      version:
+        type: string
+        default: ""
     steps:
       - run:
-          name: Install NVM
+          name: Install NVM + Node
           # TODO: determine why we get the missing .nvmrc file error
           command: |
-            export NODE_VERSION=$(cat .node-version)
+            export NODE_VERSION=<<parameters.version>>
+            export NODE_VERSION=${NODE_VERSION:-$(cat .node-version)}
             echo "Installing Node $NODE_VERSION"
+            echo $NODE_VERSION > .node-version
             cp .node-version .nvmrc
             curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.35.3/install.sh | bash
-      - run:
-          # https://github.com/nvm-sh/nvm#nvmrc
-          name: Install Node
-          command: |
             . ./scripts/load-nvm.sh
             echo "before nvm install"
-            nvm install
+            nvm install $NODE_VERSION
             echo "before nvm use"
-            nvm use
+            nvm use $NODE_VERSION
             echo "before nvm alias default"
-            nvm alias default
+            nvm alias default $NODE_VERSION
             node --version
 
   install-chrome:
@@ -611,7 +612,7 @@ commands:
           working_directory: /tmp/<<parameters.repo>>
           # force installing the freshly built binary
           command: |
-            CYPRESS_INSTALL_BINARY=~/cypress/cypress.zip npm i ~/cypress/cypress.tgz && [[ -f yarn.lock ]] && yarn
+            CYPRESS_INSTALL_BINARY=~/cypress/cypress.zip npm i --legacy-peer-deps ~/cypress/cypress.tgz && [[ -f yarn.lock ]] && yarn
       - run:
           name: Print Cypress version
           working_directory: /tmp/<<parameters.repo>>
@@ -732,7 +733,7 @@ commands:
               CYPRESS_INSTALL_BINARY=~/cypress/cypress.zip yarn add -D ~/cypress/cypress.tgz
             else
               npm install
-              CYPRESS_INSTALL_BINARY=~/cypress/cypress.zip npm install ~/cypress/cypress.tgz
+              CYPRESS_INSTALL_BINARY=~/cypress/cypress.zip npm install --legacy-peer-deps ~/cypress/cypress.tgz
             fi
           working_directory: /tmp/<<parameters.repo>>
       - run:
@@ -894,7 +895,7 @@ commands:
           paths:
             - cypress/binary-url.json
 
-  build-npm-package:
+  build-cypress-npm-package:
     steps:
       - run:
           name: bump NPM version
@@ -913,13 +914,12 @@ commands:
       - run:
           name: pack NPM package
           working_directory: cli/build
-          command: yarn pack
+          command: yarn pack --filename cypress.tgz
       - run:
           name: list created NPM package
           working_directory: cli/build
           command: ls -l
-      # created file should have filename cypress-<version>.tgz
-      - run: cp cli/build/cypress-v*.tgz cypress.tgz
+      - run: cp cli/build/cypress.tgz cypress.tgz
       - store-npm-logs
       - run: pwd
       - run: ls -l
@@ -1585,20 +1585,27 @@ jobs:
       <<: *defaults
       steps:
         - restore_cached_workspace
+        - install-required-node:
+            version: "16.10"
         - run:
-            name: Build
-            command: yarn workspace @cypress/schematic build:all
-        - run:
-            name: Install @angular/cli
-            command: yarn add:angular-cli
+            name: Build + Install
+            command: |
+              . ../../scripts/load-nvm.sh
+              yarn workspace @cypress/schematic build:all
+              yarn policies set-version 1.19.0
+              yarn add --dev @angular/cli
             working_directory: npm/cypress-schematic
         - run:
             name: Launch
-            command: yarn launch:test
+            command: |
+              . ../../scripts/load-nvm.sh
+              yarn launch:test
             working_directory: npm/cypress-schematic
         - run:
             name: Run unit tests
-            command: yarn test
+            command: |
+              . ../../scripts/load-nvm.sh
+              yarn test
             working_directory: npm/cypress-schematic
         - store-npm-logs
 
@@ -1618,7 +1625,7 @@ jobs:
     steps:
       - restore_cached_workspace
       - build-binary
-      - build-npm-package
+      - build-cypress-npm-package
       - run:
           name: Check current branch to persist artifacts
           command: |
@@ -1947,7 +1954,7 @@ jobs:
           name: Install Cypress
           working_directory: /tmp/cypress-test-tiny
           # force installing the freshly built binary
-          command: CYPRESS_INSTALL_BINARY=~/cypress/cypress.zip npm i ~/cypress/cypress.tgz
+          command: CYPRESS_INSTALL_BINARY=~/cypress/cypress.zip npm i --legacy-peer-deps ~/cypress/cypress.tgz
       - run:
           name: Run test project
           working_directory: /tmp/cypress-test-tiny
@@ -2047,6 +2054,7 @@ jobs:
           repo: cypress-example-conduit-app
           browser: chrome
           command: "npm run cypress:run"
+          wait-on: http://localhost:3000
 
   "test-binary-against-api-testing-firefox":
     <<: *defaults
@@ -2329,7 +2337,6 @@ linux-workflow: &linux-workflow
             only:
               - develop
               - 10.0-release
-              - tgriesser/chore/fix-release
         requires:
           - build
     - test-kitchensink:
@@ -2342,7 +2349,6 @@ linux-workflow: &linux-workflow
             only:
               - develop
               - 10.0-release
-              - tgriesser/chore/fix-release
         requires:
           - build
     - create-build-artifacts:
@@ -2393,7 +2399,6 @@ linux-workflow: &linux-workflow
             only:
               - develop
               - 10.0-release
-              - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
     - test-npm-module-and-verify-binary:
@@ -2402,7 +2407,6 @@ linux-workflow: &linux-workflow
             only:
               - develop
               - 10.0-release
-              - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
     - test-binary-against-staging:
@@ -2412,7 +2416,6 @@ linux-workflow: &linux-workflow
             only:
               - develop
               - 10.0-release
-              - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
 
@@ -2438,7 +2441,6 @@ linux-workflow: &linux-workflow
             only:
               - develop
               - 10.0-release
-              - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
 
@@ -2511,7 +2513,6 @@ mac-workflow: &mac-workflow
             only:
               - develop
               - 10.0-release
-              - tgriesser/chore/fix-release
         requires:
           - darwin-create-build-artifacts
 
@@ -2524,7 +2525,6 @@ mac-workflow: &mac-workflow
             only:
               - develop
               - 10.0-release
-              - tgriesser/chore/fix-release
         requires:
           - darwin-create-build-artifacts
 

diff --git a/cli/__snapshots__/download_spec.js b/cli/__snapshots__/download_spec.js
@@ -28,7 +28,7 @@ URL: https://download.cypress.io/desktop?platform=OS&arch=ARCH
 
 ----------
 
-Platform: darwin (Foo-OsVersion)
+Platform: darwin-x64 (Foo-OsVersion)
 Cypress Version: 1.2.3
 
 `
-Original file line number
+Diff line change
@@ Expand Up @@
     ----------
-    Platform: darwin (Foo-OsVersion)
+    Platform: darwin-x64 (Foo-OsVersion)
     Cypress Version: 1.2.3
     `
@@ Expand Down @@