Merge branch 'develop'

cypress-io · Mar 15, 2021 · 1491ab0 · 1491ab0 · cypress-bot · Mar 15, 2021
2 parents 07b235d + 9b77c49
commit 1491ab0
Show file tree

Hide file tree

Showing 423 changed files with 17,249 additions and 52,297 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -42,3 +42,7 @@ npm/webpack-preprocessor/examples/use-babelrc/cypress/integration/spec.js
 **/.git
 
 /npm/react/bin/*
+/npm/react/**/coverage
+**/.next/**
+/npm/create-cypress-tests/initial-template
+/npm/create-cypress-tests/**/*.template.*
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ build
 .publish
 _test-output
 cypress.zip
+.babel-cache
 
 # from extension
 Cached Theme.pak
@@ -38,10 +39,20 @@ packages/server/test/support/fixtures/server/libs
 # from npm/react
 /npm/react/bin/*
 /npm/react/cypress/videos
+/npm/react/.babel-cache
+
+# from npm/design-system
+/npm/design-system/bin/*
+/npm/design-system/cypress/videos
+/npm/design-system/.babel-cache
 
 # from runner-ct
 /packages/runner-ct/cypress/screenshots
 
+# from npm/create-cypress-tests
+/npm/create-cypress-tests/initial-template
+/npm/create-cypress-tests/src/test-output
+
 # Building app binary
 scripts/support
 package-lock.json

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Cypress.io
+Copyright (c) 2021 Cypress.io
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,6 +4,7 @@ branches:
     - develop
     - sem-next-ver
     - /win*/
+    - feature/cross-platform-wizard
 
 # https://www.appveyor.com/docs/lang/nodejs-iojs/
 environment:
@@ -78,11 +79,6 @@ test_script:
   - echo *** System info ***
   - node cli/bin/cypress info --dev
 
-  - echo *** Kitchensink tests run on Chrome browser ***
-  - npm run dev -- --run-project %CD%/packages/example --browser chrome
-  - echo *** Kitchensink tests run on Edge browser ***
-  - npm run dev -- --run-project %CD%/packages/example --browser edge
-
   # make sure mocha runs
   - yarn test-mocha
   # make sure our snapshots are compared correctly
@@ -99,5 +95,10 @@ test_script:
 
   - node ./scripts/win-appveyor-build.js
 
+  - echo *** Kitchensink tests run on Chrome browser ***
+  - npm run dev -- --run-project %CD%/packages/example --browser chrome
+  - echo *** Kitchensink tests run on Edge browser ***
+  - npm run dev -- --run-project %CD%/packages/example --browser edge
+
 # Don't actually build.
 build: off