From 038005a339a8bd6f4b4db7a18848d19eab8b5435 Mon Sep 17 00:00:00 2001 From: Andrew Goldis Date: Fri, 25 Aug 2023 23:47:45 -0700 Subject: [PATCH 1/6] chore: fix coverage example [skip ci] --- examples/coverage/package.json | 2 +- package-lock.json | 137 +-------------------------------- 2 files changed, 3 insertions(+), 136 deletions(-) diff --git a/examples/coverage/package.json b/examples/coverage/package.json index 4a261cbb..901fed5b 100644 --- a/examples/coverage/package.json +++ b/examples/coverage/package.json @@ -21,7 +21,7 @@ "cli": "npx cypress-cloud run --ci-build-id $(date \"+%s\") --parallel --record --experimental-coverage-recording" }, "dependencies": { - "cypress-cloud": "^1.9.2", + "cypress-cloud": "*", "lodash": "^4.17.21" } } diff --git a/package-lock.json b/package-lock.json index ae9dbb5e..c3c40ed6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -236,7 +236,7 @@ "examples/coverage": { "name": "example-frontend", "dependencies": { - "cypress-cloud": "^1.9.2", + "cypress-cloud": "*", "lodash": "^4.17.21" }, "devDependencies": { @@ -249,82 +249,6 @@ "start-server-and-test": "^2.0.0" } }, - "examples/coverage/node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", - "engines": { - "node": ">=14" - } - }, - "examples/coverage/node_modules/cypress-cloud": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/cypress-cloud/-/cypress-cloud-1.9.3.tgz", - "integrity": "sha512-SSS7olSrtX3UQ7OwmLSf2zcapyUD33l1i8gKbRxRLSybUK3Mi4NlEFK8i3lvJXBbo6T5UVQLMM+UTg5KbbflOA==", - "dependencies": { - "@cypress/commit-info": "^2.2.0", - "axios": "^1.2.0", - "axios-retry": "^3.4.0", - "bluebird": "^3.7.2", - "chalk": "^4.1.2", - "commander": "^10.0.0", - "common-path-prefix": "^3.0.0", - "cy2": "^3.4.2", - "debug": "^4.3.4", - "execa": "^5.1.1", - "getos": "^3.2.1", - "globby": "^11.1.0", - "is-absolute": "^1.0.0", - "lil-http-terminator": "^1.2.3", - "lodash": "^4.17.21", - "nanoid": "^3.3.4", - "pretty-ms": "^7.0.1", - "source-map-support": "^0.5.21", - "table": "^6.8.1", - "tmp-promise": "^3.0.3", - "ts-pattern": "^4.3.0", - "ws": "^8.13.0" - }, - "bin": { - "cypress-cloud": "bin/cli.js" - }, - "engines": { - "node": ">=14.7.0" - }, - "peerDependencies": { - "cypress": ">=10.0.0" - } - }, - "examples/coverage/node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "examples/coverage/node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "engines": { - "node": ">=10.17.0" - } - }, "examples/webapp": { "name": "web", "version": "0.0.0", @@ -24097,68 +24021,11 @@ "@cypress/code-coverage": "^3.11.0", "babel-plugin-istanbul": "^6.1.1", "check-code-coverage": "^1.10.5", - "cypress-cloud": "^1.9.2", + "cypress-cloud": "*", "lodash": "^4.17.21", "nyc": "^15.1.0", "parcel": "^2.9.3", "start-server-and-test": "^2.0.0" - }, - "dependencies": { - "commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==" - }, - "cypress-cloud": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/cypress-cloud/-/cypress-cloud-1.9.3.tgz", - "integrity": "sha512-SSS7olSrtX3UQ7OwmLSf2zcapyUD33l1i8gKbRxRLSybUK3Mi4NlEFK8i3lvJXBbo6T5UVQLMM+UTg5KbbflOA==", - "requires": { - "@cypress/commit-info": "^2.2.0", - "axios": "^1.2.0", - "axios-retry": "^3.4.0", - "bluebird": "^3.7.2", - "chalk": "^4.1.2", - "commander": "^10.0.0", - "common-path-prefix": "^3.0.0", - "cy2": "^3.4.2", - "debug": "^4.3.4", - "execa": "^5.1.1", - "getos": "^3.2.1", - "globby": "^11.1.0", - "is-absolute": "^1.0.0", - "lil-http-terminator": "^1.2.3", - "lodash": "^4.17.21", - "nanoid": "^3.3.4", - "pretty-ms": "^7.0.1", - "source-map-support": "^0.5.21", - "table": "^6.8.1", - "tmp-promise": "^3.0.3", - "ts-pattern": "^4.3.0", - "ws": "^8.13.0" - } - }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" - } } }, "execa": { From adf857e46bb0e0a45b3a447d26d8eabffabcf705 Mon Sep 17 00:00:00 2001 From: Andrew Goldis Date: Wed, 6 Sep 2023 16:36:39 -0700 Subject: [PATCH 2/6] fix: export support file --- package-lock.json | 2 +- packages/cypress-cloud/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index c3c40ed6..ab10a9dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16117,7 +16117,7 @@ } }, "packages/cypress-cloud": { - "version": "1.10.0-beta.0", + "version": "1.9.3", "license": "GPL-3.0-or-later", "dependencies": { "@cypress/commit-info": "^2.2.0", diff --git a/packages/cypress-cloud/package.json b/packages/cypress-cloud/package.json index 52347f36..a77acccc 100644 --- a/packages/cypress-cloud/package.json +++ b/packages/cypress-cloud/package.json @@ -1,6 +1,6 @@ { "name": "cypress-cloud", - "version": "1.10.0-beta.0", + "version": "1.9.3", "main": "./dist/index.js", "author": "Currents Software Inc", "homepage": "https://github.com/currents-dev/cypress-cloud", From aa2a2bbf97ca85dea7e19652cd2a4d672c3db6c5 Mon Sep 17 00:00:00 2001 From: Andrew Goldis Date: Wed, 6 Sep 2023 16:37:10 -0700 Subject: [PATCH 3/6] chore: release v1.9.4 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- packages/cypress-cloud/package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c04092a..d8bfa3b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ +## [1.9.4](https://github.com/currents-dev/cypress-cloud/compare/v1.10.0-beta.0...v1.9.4) (2023-09-06) + + +### Bug Fixes + +* export support file ([adf857e](https://github.com/currents-dev/cypress-cloud/commit/adf857e46bb0e0a45b3a447d26d8eabffabcf705)) + # [1.10.0-beta.0](https://github.com/currents-dev/cypress-cloud/compare/v1.9.3...v1.10.0-beta.0) (2023-08-25) diff --git a/package-lock.json b/package-lock.json index ab10a9dc..c3218608 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16117,7 +16117,7 @@ } }, "packages/cypress-cloud": { - "version": "1.9.3", + "version": "1.9.4", "license": "GPL-3.0-or-later", "dependencies": { "@cypress/commit-info": "^2.2.0", diff --git a/packages/cypress-cloud/package.json b/packages/cypress-cloud/package.json index a77acccc..3087bf6e 100644 --- a/packages/cypress-cloud/package.json +++ b/packages/cypress-cloud/package.json @@ -1,6 +1,6 @@ { "name": "cypress-cloud", - "version": "1.9.3", + "version": "1.9.4", "main": "./dist/index.js", "author": "Currents Software Inc", "homepage": "https://github.com/currents-dev/cypress-cloud", From 8de1475ec1b716110b47e967a072228933f5f884 Mon Sep 17 00:00:00 2001 From: Andrew Goldis Date: Wed, 6 Sep 2023 16:44:44 -0700 Subject: [PATCH 4/6] chore: update installation --- .github/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/README.md b/.github/README.md index c01c122c..3a3dd22f 100644 --- a/.github/README.md +++ b/.github/README.md @@ -57,6 +57,12 @@ module.exports = defineConfig({ }); ``` +Add `cypress-cloud/support` to Cypress Support file (matching your test type - e2e or component, or both) + +```ts +import `cypress-cloud/support` +``` + ## Usage ```sh From f7ff5745e3ba428abcf0d80718d7493effe29a49 Mon Sep 17 00:00:00 2001 From: Andrew Goldis Date: Wed, 13 Sep 2023 00:02:16 -0700 Subject: [PATCH 5/6] fix: support coverage reports --- packages/cypress-cloud/lib/artifacts.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/cypress-cloud/lib/artifacts.ts b/packages/cypress-cloud/lib/artifacts.ts index 748d4a31..ed6accc5 100644 --- a/packages/cypress-cloud/lib/artifacts.ts +++ b/packages/cypress-cloud/lib/artifacts.ts @@ -32,7 +32,8 @@ export async function uploadArtifacts({ coverageUploadUrl, }); - const totalUploads = (videoPath ? 1 : 0) + screenshots.length; + const totalUploads = + (videoPath ? 1 : 0) + screenshots.length + (coverageFilePath ? 1 : 0); if (totalUploads === 0) { // info("Nothing to upload"); return; From 6b8ac731284d395d958dd8af5fe6660b377e0452 Mon Sep 17 00:00:00 2001 From: Andrew Goldis Date: Wed, 13 Sep 2023 00:03:06 -0700 Subject: [PATCH 6/6] chore: release v1.9.5 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- packages/cypress-cloud/package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8bfa3b9..9dd661b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ +## [1.9.5](https://github.com/currents-dev/cypress-cloud/compare/v1.9.4...v1.9.5) (2023-09-13) + + +### Bug Fixes + +* support coverage reports ([f7ff574](https://github.com/currents-dev/cypress-cloud/commit/f7ff5745e3ba428abcf0d80718d7493effe29a49)) + ## [1.9.4](https://github.com/currents-dev/cypress-cloud/compare/v1.10.0-beta.0...v1.9.4) (2023-09-06) diff --git a/package-lock.json b/package-lock.json index c3218608..8fc32fd1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16117,7 +16117,7 @@ } }, "packages/cypress-cloud": { - "version": "1.9.4", + "version": "1.9.5", "license": "GPL-3.0-or-later", "dependencies": { "@cypress/commit-info": "^2.2.0", diff --git a/packages/cypress-cloud/package.json b/packages/cypress-cloud/package.json index 3087bf6e..e357709f 100644 --- a/packages/cypress-cloud/package.json +++ b/packages/cypress-cloud/package.json @@ -1,6 +1,6 @@ { "name": "cypress-cloud", - "version": "1.9.4", + "version": "1.9.5", "main": "./dist/index.js", "author": "Currents Software Inc", "homepage": "https://github.com/currents-dev/cypress-cloud",