diff --git a/.github/workflows/benchmark-cloud.yml b/.github/workflows/benchmark-cloud.yml index 0521aeb..65b5de3 100644 --- a/.github/workflows/benchmark-cloud.yml +++ b/.github/workflows/benchmark-cloud.yml @@ -27,6 +27,9 @@ jobs: node-version: "16" cache: "npm" + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install dependencies run: npm install diff --git a/.github/workflows/benchmark-cy.yml b/.github/workflows/benchmark-cy.yml index c4931e3..51b14ad 100644 --- a/.github/workflows/benchmark-cy.yml +++ b/.github/workflows/benchmark-cy.yml @@ -27,6 +27,9 @@ jobs: node-version: "16" cache: "npm" + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install dependencies run: npm install diff --git a/.github/workflows/e2e-config-esm-cjs.yml b/.github/workflows/e2e-config-esm-cjs.yml index 75d8b78..f7ebe59 100644 --- a/.github/workflows/e2e-config-esm-cjs.yml +++ b/.github/workflows/e2e-config-esm-cjs.yml @@ -26,6 +26,9 @@ jobs: with: node-version: ${{ matrix.node-version }} + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install dependencies run: npm ci diff --git a/.github/workflows/e2e-config-esm-js.yml b/.github/workflows/e2e-config-esm-js.yml index 4d0a8a8..eefb768 100644 --- a/.github/workflows/e2e-config-esm-js.yml +++ b/.github/workflows/e2e-config-esm-js.yml @@ -26,6 +26,9 @@ jobs: with: node-version: ${{ matrix.node-version }} + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install dependencies run: npm ci diff --git a/.github/workflows/e2e-config-esm-mjs.yml b/.github/workflows/e2e-config-esm-mjs.yml index e1a32ab..90d3d69 100644 --- a/.github/workflows/e2e-config-esm-mjs.yml +++ b/.github/workflows/e2e-config-esm-mjs.yml @@ -26,6 +26,9 @@ jobs: with: node-version: ${{ matrix.node-version }} + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install dependencies run: npm ci diff --git a/.github/workflows/e2e-config-noesm-js.yml b/.github/workflows/e2e-config-noesm-js.yml index 4a8742c..9ad8cc9 100644 --- a/.github/workflows/e2e-config-noesm-js.yml +++ b/.github/workflows/e2e-config-noesm-js.yml @@ -26,6 +26,9 @@ jobs: with: node-version: ${{ matrix.node-version }} + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install dependencies run: npm ci diff --git a/.github/workflows/e2e-cypress-compatibility.yml b/.github/workflows/e2e-cypress-compatibility.yml index 321308b..424beb9 100644 --- a/.github/workflows/e2e-cypress-compatibility.yml +++ b/.github/workflows/e2e-cypress-compatibility.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - cypress-version: ["13", "12"] + cypress-version: ["12"]# cypress-version: ["13", "12"] steps: - uses: actions/checkout@v3 @@ -17,6 +17,9 @@ jobs: with: node-version: "18" + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install dependencies run: npm ci diff --git a/.github/workflows/e2e-exports.yml b/.github/workflows/e2e-exports.yml index e5bc1f5..a1c83c6 100644 --- a/.github/workflows/e2e-exports.yml +++ b/.github/workflows/e2e-exports.yml @@ -20,6 +20,9 @@ jobs: with: node-version: ${{ matrix.node-version }} + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install npm (node14) run: npm install -g npm@8.19.4 diff --git a/.github/workflows/e2e-monorepo.yml b/.github/workflows/e2e-monorepo.yml index f25c0d5..98c867a 100644 --- a/.github/workflows/e2e-monorepo.yml +++ b/.github/workflows/e2e-monorepo.yml @@ -26,6 +26,9 @@ jobs: with: node-version: ${{ matrix.node-version }} + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install dependencies run: npm ci diff --git a/.github/workflows/e2e-smoke-api.yml b/.github/workflows/e2e-smoke-api.yml index 96ea248..050a345 100644 --- a/.github/workflows/e2e-smoke-api.yml +++ b/.github/workflows/e2e-smoke-api.yml @@ -22,6 +22,9 @@ jobs: with: node-version: "16" + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install dependencies run: npm ci diff --git a/.github/workflows/e2e-smoke-component.yml b/.github/workflows/e2e-smoke-component.yml index 9cad368..0355ba4 100644 --- a/.github/workflows/e2e-smoke-component.yml +++ b/.github/workflows/e2e-smoke-component.yml @@ -22,6 +22,9 @@ jobs: with: node-version: "16" + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install dependencies run: npm ci diff --git a/.github/workflows/e2e-smoke-linux.yml b/.github/workflows/e2e-smoke-linux.yml index 4fbe577..91fdfa6 100644 --- a/.github/workflows/e2e-smoke-linux.yml +++ b/.github/workflows/e2e-smoke-linux.yml @@ -22,6 +22,9 @@ jobs: with: node-version: "16" + - name: Install alternative cypress binaries + run: CYPRESS_DOWNLOAD_MIRROR=https://cy-cdn.currents.dev npx cypress install --force + - name: Install dependencies run: npm ci diff --git a/CHANGELOG.md b/CHANGELOG.md index f470b22..b24fed9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,8 @@ - - # [2.0.0-beta.1](https://github.com/currents-dev/cypress-cloud/compare/v2.0.0-beta.0...v2.0.0-beta.1) (2023-09-22) - ### Bug Fixes -* debugging fixes ([d502b12](https://github.com/currents-dev/cypress-cloud/commit/d502b121b4a5bb85921fa26b6b04a12274be3b19)) +- debugging fixes ([d502b12](https://github.com/currents-dev/cypress-cloud/commit/d502b121b4a5bb85921fa26b6b04a12274be3b19)) # [2.0.0-beta.0](https://github.com/currents-dev/cypress-cloud/compare/v1.10.0-beta.1...v2.0.0-beta.0) (2023-09-19) @@ -339,4 +336,4 @@ - implement generic http client with retries ([a9711bd](https://github.com/currents-dev/cypress-cloud/commit/a9711bde1fbb2cd37dbc8979593159d183bfa866)) - improve setup steps ([9bf16fe](https://github.com/currents-dev/cypress-cloud/commit/9bf16fe5f3773db4aa2f169515303ea6d0973da6)) - separate stdout per spec file ([a9d01c3](https://github.com/currents-dev/cypress-cloud/commit/a9d01c349cbfe140a568a452b0e7163e6d27f2db)) -- setup github actions ([d439f56](https://github.com/currents-dev/cypress-cloud/commit/d439f5660698177087fcc2e7a61c64ea263816f6)) \ No newline at end of file +- setup github actions ([d439f56](https://github.com/currents-dev/cypress-cloud/commit/d439f5660698177087fcc2e7a61c64ea263816f6)) diff --git a/examples/webapp/package.json b/examples/webapp/package.json index 9eccbad..64a4b96 100644 --- a/examples/webapp/package.json +++ b/examples/webapp/package.json @@ -10,7 +10,7 @@ "cypress:script:esm": "node scripts/currents-script.mjs" }, "dependencies": { - "cypress": "^12.17.4", + "cypress": "12.17.4", "cypress-cloud": "*", "cypress-terminal-report": "^5.3.3", "next": "^13.2.1", diff --git a/package-lock.json b/package-lock.json index 1aaae37..1b59e39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -67,7 +67,7 @@ "@types/chai": "^4.3.6", "@types/node": "^17.0.12", "chai": "^4.3.8", - "cypress": "^12.17.4", + "cypress": "12.17.4", "tsconfig": "*", "typescript": "^5.2.2" } @@ -319,7 +319,7 @@ "name": "web", "version": "0.0.0", "dependencies": { - "cypress": "^12.17.4", + "cypress": "12.17.4", "cypress-cloud": "*", "cypress-terminal-report": "^5.3.3", "next": "^13.2.1", @@ -2555,87 +2555,14 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, - "node_modules/@cypress/code-coverage": { - "version": "3.11.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@cypress/webpack-preprocessor": "^5.11.0", - "chalk": "4.1.2", - "dayjs": "1.11.9", - "debug": "4.3.4", - "execa": "4.1.0", - "globby": "11.0.4", - "istanbul-lib-coverage": "3.0.0", - "js-yaml": "4.1.0", - "nyc": "15.1.0" - }, - "peerDependencies": { - "cypress": "*" - } - }, - "node_modules/@cypress/code-coverage/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "license": "Python-2.0" - }, - "node_modules/@cypress/code-coverage/node_modules/globby": { - "version": "11.0.4", - "dev": true, - "license": "MIT", - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@cypress/code-coverage/node_modules/ignore": { - "version": "5.2.4", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4" - } - }, - "node_modules/@cypress/code-coverage/node_modules/istanbul-lib-coverage": { - "version": "3.0.0", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=8" - } - }, - "node_modules/@cypress/code-coverage/node_modules/js-yaml": { - "version": "4.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/@cypress/commit-info": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@cypress/commit-info/-/commit-info-2.2.0.tgz", - "integrity": "sha512-A7CYS0Iqp/u52JTnSWlDFjWMKx7rIfd+mk0Fdksrcs4Wdf5HXPsoZO475VJ+xL7LPhJrjKhgyl/TPKO3worZyQ==", - "license": "MIT", + "node_modules/@currents/commit-info": { + "version": "1.0.1-beta.0", + "resolved": "https://registry.npmjs.org/@currents/commit-info/-/commit-info-1.0.1-beta.0.tgz", + "integrity": "sha512-gkn8E3UC+F4/fCla7QAGMGgGPzxZUL9bU9+4I+KZf9PtCU3DdQCdy7a+er2eg4ewfUzZ2Ic1HcfnHuPkuLPKIw==", "dependencies": { "bluebird": "3.5.5", "check-more-types": "2.24.0", - "debug": "4.1.1", + "debug": "4.3.4", "execa": "1.0.0", "lazy-ass": "1.6.0", "ramda": "0.26.1" @@ -2644,17 +2571,15 @@ "node": ">=6" } }, - "node_modules/@cypress/commit-info/node_modules/bluebird": { + "node_modules/@currents/commit-info/node_modules/bluebird": { "version": "3.5.5", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", - "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==", - "license": "MIT" + "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" }, - "node_modules/@cypress/commit-info/node_modules/cross-spawn": { + "node_modules/@currents/commit-info/node_modules/cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "license": "MIT", "dependencies": { "nice-try": "^1.0.4", "path-key": "^2.0.1", @@ -2666,11 +2591,10 @@ "node": ">=4.8" } }, - "node_modules/@cypress/commit-info/node_modules/execa": { + "node_modules/@currents/commit-info/node_modules/execa": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "license": "MIT", "dependencies": { "cross-spawn": "^6.0.0", "get-stream": "^4.0.0", @@ -2684,11 +2608,10 @@ "node": ">=6" } }, - "node_modules/@cypress/commit-info/node_modules/get-stream": { + "node_modules/@currents/commit-info/node_modules/get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "license": "MIT", "dependencies": { "pump": "^3.0.0" }, @@ -2696,20 +2619,18 @@ "node": ">=6" } }, - "node_modules/@cypress/commit-info/node_modules/is-stream": { + "node_modules/@currents/commit-info/node_modules/is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", - "license": "MIT", "engines": { "node": ">=0.10.0" } }, - "node_modules/@cypress/commit-info/node_modules/npm-run-path": { + "node_modules/@currents/commit-info/node_modules/npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==", - "license": "MIT", "dependencies": { "path-key": "^2.0.0" }, @@ -2717,18 +2638,18 @@ "node": ">=4" } }, - "node_modules/@cypress/commit-info/node_modules/semver": { - "version": "5.7.1", - "license": "ISC", + "node_modules/@currents/commit-info/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } }, - "node_modules/@cypress/commit-info/node_modules/shebang-command": { + "node_modules/@currents/commit-info/node_modules/shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", - "license": "MIT", "dependencies": { "shebang-regex": "^1.0.0" }, @@ -2736,15 +2657,86 @@ "node": ">=0.10.0" } }, - "node_modules/@cypress/commit-info/node_modules/shebang-regex": { + "node_modules/@currents/commit-info/node_modules/shebang-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", - "license": "MIT", "engines": { "node": ">=0.10.0" } }, + "node_modules/@cypress/code-coverage": { + "version": "3.11.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@cypress/webpack-preprocessor": "^5.11.0", + "chalk": "4.1.2", + "dayjs": "1.11.9", + "debug": "4.3.4", + "execa": "4.1.0", + "globby": "11.0.4", + "istanbul-lib-coverage": "3.0.0", + "js-yaml": "4.1.0", + "nyc": "15.1.0" + }, + "peerDependencies": { + "cypress": "*" + } + }, + "node_modules/@cypress/code-coverage/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/@cypress/code-coverage/node_modules/globby": { + "version": "11.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@cypress/code-coverage/node_modules/ignore": { + "version": "5.2.4", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/@cypress/code-coverage/node_modules/istanbul-lib-coverage": { + "version": "3.0.0", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/@cypress/code-coverage/node_modules/js-yaml": { + "version": "4.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/@cypress/grep": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/@cypress/grep/-/grep-3.1.5.tgz", @@ -2764,6 +2756,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", + "peer": true, "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -2792,6 +2785,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "peer": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -8357,6 +8351,7 @@ "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz", "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==", "hasInstallScript": true, + "peer": true, "dependencies": { "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", @@ -18290,7 +18285,7 @@ "version": "2.0.0-beta.1", "license": "GPL-3.0-or-later", "dependencies": { - "@cypress/commit-info": "^2.2.0", + "@currents/commit-info": "1.0.1-beta.0", "axios": "^1.2.0", "axios-retry": "^3.4.0", "bluebird": "^3.7.2", @@ -18330,7 +18325,7 @@ "@types/jest": "^29.2.4", "@types/lodash": "^4.14.191", "@types/ws": "^8.5.4", - "cypress": "^13.2.0", + "cypress": "12.17.4", "esbuild": "^0.16.5", "eslint": "^7.32.0", "eslint-config-custom": "latest", @@ -18346,6 +18341,35 @@ "node": ">=14.7.0" } }, + "packages/cypress-cloud/node_modules/@cypress/request": { + "version": "2.88.12", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", + "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", + "dev": true, + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "http-signature": "~1.3.6", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "performance-now": "^2.1.0", + "qs": "~6.10.3", + "safe-buffer": "^5.1.2", + "tough-cookie": "^4.1.3", + "tunnel-agent": "^0.6.0", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">= 6" + } + }, "packages/cypress-cloud/node_modules/@next/eslint-plugin-next": { "version": "12.3.4", "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-12.3.4.tgz", @@ -18523,6 +18547,12 @@ "tslib": "^2.4.0" } }, + "packages/cypress-cloud/node_modules/@types/node": { + "version": "16.18.74", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.74.tgz", + "integrity": "sha512-eEn8RkzZFcT0gb8qyi0CcfSOQnLE+NbGLIIaxGGmjn/N35v/C3M8ohxcpSlNlCv+H8vPpMGmrGDdCkzr8xu2tQ==", + "dev": true + }, "packages/cypress-cloud/node_modules/agent-base": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", @@ -18820,23 +18850,233 @@ "url": "https://github.com/sponsors/d-fischer" } }, - "packages/cypress-cloud/node_modules/define-lazy-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", - "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "packages/cypress-cloud/node_modules/cypress": { + "version": "12.17.4", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", + "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", "dev": true, - "engines": { - "node": ">=12" + "hasInstallScript": true, + "dependencies": { + "@cypress/request": "2.88.12", + "@cypress/xvfb": "^1.2.4", + "@types/node": "^16.18.39", + "@types/sinonjs__fake-timers": "8.1.1", + "@types/sizzle": "^2.3.2", + "arch": "^2.2.0", + "blob-util": "^2.0.2", + "bluebird": "^3.7.2", + "buffer": "^5.6.0", + "cachedir": "^2.3.0", + "chalk": "^4.1.0", + "check-more-types": "^2.24.0", + "cli-cursor": "^3.1.0", + "cli-table3": "~0.6.1", + "commander": "^6.2.1", + "common-tags": "^1.8.0", + "dayjs": "^1.10.4", + "debug": "^4.3.4", + "enquirer": "^2.3.6", + "eventemitter2": "6.4.7", + "execa": "4.1.0", + "executable": "^4.1.1", + "extract-zip": "2.0.1", + "figures": "^3.2.0", + "fs-extra": "^9.1.0", + "getos": "^3.2.1", + "is-ci": "^3.0.0", + "is-installed-globally": "~0.4.0", + "lazy-ass": "^1.6.0", + "listr2": "^3.8.3", + "lodash": "^4.17.21", + "log-symbols": "^4.0.0", + "minimist": "^1.2.8", + "ospath": "^1.2.2", + "pretty-bytes": "^5.6.0", + "process": "^0.11.10", + "proxy-from-env": "1.0.0", + "request-progress": "^3.0.0", + "semver": "^7.5.3", + "supports-color": "^8.1.1", + "tmp": "~0.2.1", + "untildify": "^4.0.0", + "yauzl": "^2.10.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "bin": { + "cypress": "bin/cypress" + }, + "engines": { + "node": "^14.0.0 || ^16.0.0 || >=18.0.0" } }, - "packages/cypress-cloud/node_modules/degenerator": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", - "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", - "dev": true, + "packages/cypress-cloud/node_modules/cypress/node_modules/commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "packages/cypress-cloud/node_modules/cypress/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "packages/cypress-cloud/node_modules/cypress/node_modules/execa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "packages/cypress-cloud/node_modules/cypress/node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "packages/cypress-cloud/node_modules/cypress/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "packages/cypress-cloud/node_modules/cypress/node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "packages/cypress-cloud/node_modules/cypress/node_modules/human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "dev": true, + "engines": { + "node": ">=8.12.0" + } + }, + "packages/cypress-cloud/node_modules/cypress/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "packages/cypress-cloud/node_modules/cypress/node_modules/proxy-from-env": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", + "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==", + "dev": true + }, + "packages/cypress-cloud/node_modules/cypress/node_modules/semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "packages/cypress-cloud/node_modules/cypress/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "packages/cypress-cloud/node_modules/cypress/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "packages/cypress-cloud/node_modules/define-lazy-prop": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", + "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "packages/cypress-cloud/node_modules/degenerator": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz", + "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==", + "dev": true, "dependencies": { "ast-types": "^0.13.4", "escodegen": "^2.1.0", @@ -18998,6 +19238,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "packages/cypress-cloud/node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, "packages/cypress-cloud/node_modules/fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -21163,64 +21417,14 @@ } } }, - "@cypress/code-coverage": { - "version": "3.11.0", - "dev": true, - "requires": { - "@cypress/webpack-preprocessor": "^5.11.0", - "chalk": "4.1.2", - "dayjs": "1.11.9", - "debug": "4.3.4", - "execa": "4.1.0", - "globby": "11.0.4", - "istanbul-lib-coverage": "3.0.0", - "js-yaml": "4.1.0", - "nyc": "15.1.0" - }, - "dependencies": { - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "globby": { - "version": "11.0.4", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" - } - }, - "ignore": { - "version": "5.2.4", - "dev": true - }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "dev": true - }, - "js-yaml": { - "version": "4.1.0", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - } - } - }, - "@cypress/commit-info": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@cypress/commit-info/-/commit-info-2.2.0.tgz", - "integrity": "sha512-A7CYS0Iqp/u52JTnSWlDFjWMKx7rIfd+mk0Fdksrcs4Wdf5HXPsoZO475VJ+xL7LPhJrjKhgyl/TPKO3worZyQ==", + "@currents/commit-info": { + "version": "1.0.1-beta.0", + "resolved": "https://registry.npmjs.org/@currents/commit-info/-/commit-info-1.0.1-beta.0.tgz", + "integrity": "sha512-gkn8E3UC+F4/fCla7QAGMGgGPzxZUL9bU9+4I+KZf9PtCU3DdQCdy7a+er2eg4ewfUzZ2Ic1HcfnHuPkuLPKIw==", "requires": { "bluebird": "3.5.5", "check-more-types": "2.24.0", - "debug": "4.1.1", + "debug": "4.3.4", "execa": "1.0.0", "lazy-ass": "1.6.0", "ramda": "0.26.1" @@ -21279,7 +21483,9 @@ } }, "semver": { - "version": "5.7.1" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" }, "shebang-command": { "version": "1.2.0", @@ -21296,6 +21502,56 @@ } } }, + "@cypress/code-coverage": { + "version": "3.11.0", + "dev": true, + "requires": { + "@cypress/webpack-preprocessor": "^5.11.0", + "chalk": "4.1.2", + "dayjs": "1.11.9", + "debug": "4.3.4", + "execa": "4.1.0", + "globby": "11.0.4", + "istanbul-lib-coverage": "3.0.0", + "js-yaml": "4.1.0", + "nyc": "15.1.0" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "globby": { + "version": "11.0.4", + "dev": true, + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + } + }, + "ignore": { + "version": "5.2.4", + "dev": true + }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "dev": true + }, + "js-yaml": { + "version": "4.1.0", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + } + } + }, "@cypress/grep": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/@cypress/grep/-/grep-3.1.5.tgz", @@ -21311,6 +21567,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", + "peer": true, "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -21336,6 +21593,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "peer": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -24971,6 +25229,7 @@ "version": "13.2.0", "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz", "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==", + "peer": true, "requires": { "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", @@ -25039,7 +25298,7 @@ "cypress-cloud": { "version": "file:packages/cypress-cloud", "requires": { - "@cypress/commit-info": "^2.2.0", + "@currents/commit-info": "1.0.1-beta.0", "@release-it/conventional-changelog": "^7.0.0", "@swc/core": "^1.3.86", "@swc/jest": "^0.2.29", @@ -25057,7 +25316,7 @@ "commander": "^10.0.0", "common-path-prefix": "^3.0.0", "cy2": "^3.4.2", - "cypress": "^13.2.0", + "cypress": "12.17.4", "date-fns": "^2.30.0", "debug": "^4.3.4", "esbuild": "^0.16.5", @@ -25087,6 +25346,32 @@ "ws": "^8.13.0" }, "dependencies": { + "@cypress/request": { + "version": "2.88.12", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", + "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", + "dev": true, + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "http-signature": "~1.3.6", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "performance-now": "^2.1.0", + "qs": "~6.10.3", + "safe-buffer": "^5.1.2", + "tough-cookie": "^4.1.3", + "tunnel-agent": "^0.6.0", + "uuid": "^8.3.2" + } + }, "@next/eslint-plugin-next": { "version": "12.3.4", "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-12.3.4.tgz", @@ -25213,6 +25498,12 @@ "tslib": "^2.4.0" } }, + "@types/node": { + "version": "16.18.74", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.74.tgz", + "integrity": "sha512-eEn8RkzZFcT0gb8qyi0CcfSOQnLE+NbGLIIaxGGmjn/N35v/C3M8ohxcpSlNlCv+H8vPpMGmrGDdCkzr8xu2tQ==", + "dev": true + }, "agent-base": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", @@ -25430,6 +25721,164 @@ "path-type": "^4.0.0" } }, + "cypress": { + "version": "12.17.4", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", + "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", + "dev": true, + "requires": { + "@cypress/request": "2.88.12", + "@cypress/xvfb": "^1.2.4", + "@types/node": "^16.18.39", + "@types/sinonjs__fake-timers": "8.1.1", + "@types/sizzle": "^2.3.2", + "arch": "^2.2.0", + "blob-util": "^2.0.2", + "bluebird": "^3.7.2", + "buffer": "^5.6.0", + "cachedir": "^2.3.0", + "chalk": "^4.1.0", + "check-more-types": "^2.24.0", + "cli-cursor": "^3.1.0", + "cli-table3": "~0.6.1", + "commander": "^6.2.1", + "common-tags": "^1.8.0", + "dayjs": "^1.10.4", + "debug": "^4.3.4", + "enquirer": "^2.3.6", + "eventemitter2": "6.4.7", + "execa": "4.1.0", + "executable": "^4.1.1", + "extract-zip": "2.0.1", + "figures": "^3.2.0", + "fs-extra": "^9.1.0", + "getos": "^3.2.1", + "is-ci": "^3.0.0", + "is-installed-globally": "~0.4.0", + "lazy-ass": "^1.6.0", + "listr2": "^3.8.3", + "lodash": "^4.17.21", + "log-symbols": "^4.0.0", + "minimist": "^1.2.8", + "ospath": "^1.2.2", + "pretty-bytes": "^5.6.0", + "process": "^0.11.10", + "proxy-from-env": "1.0.0", + "request-progress": "^3.0.0", + "semver": "^7.5.3", + "supports-color": "^8.1.1", + "tmp": "~0.2.1", + "untildify": "^4.0.0", + "yauzl": "^2.10.0" + }, + "dependencies": { + "commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true + }, + "execa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "dev": true + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "proxy-from-env": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", + "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==", + "dev": true + }, + "semver": { + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true + } + } + }, "define-lazy-prop": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", @@ -25560,6 +26009,17 @@ "is-unicode-supported": "^1.2.0" } }, + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, "fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -32620,7 +33080,7 @@ "@types/node": "^17.0.12", "@types/react": "^18.0.28", "@types/react-dom": "^18.0.11", - "cypress": "^12.17.4", + "cypress": "12.17.4", "cypress-cloud": "*", "cypress-terminal-report": "^5.3.3", "eslint": "7.32.0", diff --git a/packages/cypress-cloud/lib/ciProvider.ts b/packages/cypress-cloud/lib/ciProvider.ts index f4d5533..e9fbd0e 100644 --- a/packages/cypress-cloud/lib/ciProvider.ts +++ b/packages/cypress-cloud/lib/ciProvider.ts @@ -31,6 +31,7 @@ import debugFn from "debug"; import _ from "lodash"; import { ValidationError } from "./errors"; +import { GhaEventData } from "./git"; const debug = debugFn("currents:ci"); @@ -650,6 +651,7 @@ type CiProviderData = { defaultBranch?: string; remoteBranch?: string; runAttempt?: string; + ghaEventData?: GhaEventData; }; interface ProviderCommitParamsRes { diff --git a/packages/cypress-cloud/lib/git.ts b/packages/cypress-cloud/lib/git.ts index 067dcc9..fd7742d 100644 --- a/packages/cypress-cloud/lib/git.ts +++ b/packages/cypress-cloud/lib/git.ts @@ -1,15 +1,28 @@ // @ts-ignore -import git from "@cypress/commit-info"; +import { commitInfo } from "@currents/commit-info"; import { getCommitDefaults } from "./ciProvider"; -export const getGitInfo = async (projectRoot: string) => { - const commitInfo = await git.commitInfo(projectRoot); +export type GhaEventData = { + headRef: string; + headSha: string; + baseRef: string; + baseSha: string; + issueUrl: string; + htmlUrl: string; + prTitle: string; + senderAvatarUrl: string; + senderHtmlUrl: string; +}; + +export const getGitInfo = async () => { + const commit = await commitInfo(); return getCommitDefaults({ - branch: commitInfo.branch, - remoteOrigin: commitInfo.remote, - authorEmail: commitInfo.email, - authorName: commitInfo.author, - message: commitInfo.message, - sha: commitInfo.sha, + branch: commit.branch, + remoteOrigin: commit.remote, + authorEmail: commit.email, + authorName: commit.author, + message: commit.message, + sha: commit.sha, + ghaEventData: commit.ghaEventData, }); }; diff --git a/packages/cypress-cloud/package.json b/packages/cypress-cloud/package.json index 7b1f799..ca92d52 100644 --- a/packages/cypress-cloud/package.json +++ b/packages/cypress-cloud/package.json @@ -40,7 +40,7 @@ "@types/jest": "^29.2.4", "@types/lodash": "^4.14.191", "@types/ws": "^8.5.4", - "cypress": "^13.2.0", + "cypress": "12.17.4", "esbuild": "^0.16.5", "eslint": "^7.32.0", "eslint-config-custom": "latest", @@ -53,7 +53,7 @@ "typescript": "^4.7.4" }, "dependencies": { - "@cypress/commit-info": "^2.2.0", + "@currents/commit-info": "1.0.1-beta.0", "axios": "^1.2.0", "axios-retry": "^3.4.0", "bluebird": "^3.7.2",