Merge branch 'develop' of github.com:cypress-io/cypress into develop

sagarrajput · Oct 14, 2020 · 1ac7c49 · 1ac7c49
2 parents 6ec4a71 + 05edb4e
commit 1ac7c49
Show file tree

Hide file tree

Showing 124 changed files with 36,860 additions and 9 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -2,6 +2,7 @@
 !.*
 
 **/__snapshots__
+**/_test-output
 **/build
 **/cypress/fixtures
 **/dist

diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,9 @@ packages/desktop-gui/src/jsconfig.json
 packages/driver/cypress/videos
 packages/driver/cypress/screenshots
 
+# npm packages
+npm/**/cypress/screenshots
+
 # from example
 packages/example/app
 packages/example/build

diff --git a/npm/react/CHANGELOG.md b/npm/react/CHANGELOG.md
@@ -0,0 +1,6 @@
+# [@cypress/react-v4.15.12](https://github.com/cypress-io/cypress/compare/@cypress/react-v4.15.11...@cypress/react-v4.15.12) (2020-10-14)
+
+
+### Bug Fixes
+
+* make imported @cypress/react working and pass CI ([#8718](https://github.com/cypress-io/cypress/issues/8718)) ([5e4b638](https://github.com/cypress-io/cypress/commit/5e4b6383854a78d10249621ffea9e4e20effe192))
diff --git a/npm/react/node_modules/@babel/core/node_modules/semver/CHANGELOG.md b/npm/react/node_modules/@babel/core/node_modules/semver/CHANGELOG.md
diff --git a/...de_modules/@babel/plugin-syntax-dynamic-import/node_modules/semver/CHANGELOG.md b/...de_modules/@babel/plugin-syntax-dynamic-import/node_modules/semver/CHANGELOG.md
diff --git a/npm/react/node_modules/@babel/plugin-syntax-jsx/node_modules/semver/CHANGELOG.md b/npm/react/node_modules/@babel/plugin-syntax-jsx/node_modules/semver/CHANGELOG.md