From 553cd5905f2bbc6a4fba86a7db338160949a442b Mon Sep 17 00:00:00 2001 From: Andrew Goldis Date: Tue, 17 Oct 2023 15:19:19 -0700 Subject: [PATCH] chore: .. --- CHANGELOG.md | 7 +- examples/webapp/cypress.config.ts | 2 +- examples/webapp/cypress/support/e2e.ts | 2 +- examples/webapp/package.json | 2 +- package-lock.json | 957 +++++++++--------- packages/cc-est/bin/lib/cli.ts | 2 +- packages/cc-est/bin/lib/program.ts | 8 +- packages/cc-est/legal.ts | 2 +- .../fixtures/api/failed.spec.js/payload.ts | 4 +- .../fixtures/api/passed.spec.js/payload.ts | 2 +- .../fixtures/api/retries.spec.js/payload.ts | 8 +- .../fixtures/api/skipped.spec.js/payload.ts | 4 +- .../cc-est/lib/api/__tests__/api.run.test.ts | 6 +- packages/cc-est/lib/api/__tests__/api.test.ts | 6 +- .../cc-est/lib/api/__tests__/fixtures/run.ts | 2 +- packages/cc-est/lib/api/types/instance.ts | 2 +- packages/cc-est/lib/api/types/run.ts | 5 +- packages/cc-est/lib/bootstrap/bootstrap.ts | 6 +- .../config/__tests__/validateParams.test.ts | 6 +- packages/cc-est/lib/config/params.ts | 2 +- packages/cc-est/lib/cypress.types/12.ts | 2 +- packages/cc-est/lib/cypress.types/13.ts | 2 +- .../lib/cypress/__tests__/runSpecFile.spec.ts | 2 +- packages/cc-est/lib/cypress/cypress.ts | 2 +- .../__tests__/httpClient.errors.test.ts | 4 +- .../__tests__/httpClient.retries.test.ts | 4 +- packages/cc-est/lib/httpClient/httpClient.ts | 2 +- packages/cc-est/lib/init.ts | 2 +- .../cc-est/lib/results/specAfterResult.ts | 3 +- packages/cc-est/lib/run.ts | 2 +- .../lib/runner/__tests__/cancellable.test.ts | 6 +- packages/cc-est/package.json | 4 +- packages/cc-est/plugin/index.ts | 2 +- packages/cc-est/types.ts | 2 +- 34 files changed, 538 insertions(+), 536 deletions(-) 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/cypress.config.ts b/examples/webapp/cypress.config.ts index dca322d..5ccc1dc 100644 --- a/examples/webapp/cypress.config.ts +++ b/examples/webapp/cypress.config.ts @@ -1,4 +1,4 @@ -import currents from "cc-est/plugin"; +import currents from "@currents/cc-est/plugin"; import { defineConfig } from "cypress"; module.exports = defineConfig({ diff --git a/examples/webapp/cypress/support/e2e.ts b/examples/webapp/cypress/support/e2e.ts index b171ad6..4c3446b 100644 --- a/examples/webapp/cypress/support/e2e.ts +++ b/examples/webapp/cypress/support/e2e.ts @@ -1,5 +1,5 @@ import registerCypressGrep from "@cypress/grep/src/support"; -require("cc-est/support"); +require("@currents/cc-est/support"); require("./commands"); registerCypressGrep(); diff --git a/examples/webapp/package.json b/examples/webapp/package.json index 36077bc..52eff59 100644 --- a/examples/webapp/package.json +++ b/examples/webapp/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "cypress": "^12.17.4", - "cc-est": "*", + "@currents/cc-est": "*", "cypress-terminal-report": "^5.3.3", "next": "^13.2.1", "react": "^18.2.0", diff --git a/package-lock.json b/package-lock.json index 6d11d6d..44e18df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -319,7 +319,7 @@ "name": "web", "version": "0.0.0", "dependencies": { - "cc-est": "*", + "@currents/cc-est": "*", "cypress": "^12.17.4", "cypress-terminal-report": "^5.3.3", "next": "^13.2.1", @@ -2555,6 +2555,10 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@currents/cc-est": { + "resolved": "packages/cc-est", + "link": true + }, "node_modules/@cypress/code-coverage": { "version": "3.11.0", "dev": true, @@ -7486,10 +7490,6 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" }, - "node_modules/cc-est": { - "resolved": "packages/cc-est", - "link": true - }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -19377,6 +19377,7 @@ } }, "packages/cc-est": { + "name": "@currents/cc-est", "version": "2.0.0-beta.1", "license": "GPL-3.0-or-later", "dependencies": { @@ -21479,218 +21480,516 @@ } } }, - "@cypress/code-coverage": { - "version": "3.11.0", - "dev": true, + "@currents/cc-est": { + "version": "file:packages/cc-est", "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" + "@cypress/commit-info": "^2.2.0", + "@release-it/conventional-changelog": "^7.0.0", + "@swc/core": "^1.3.86", + "@swc/jest": "^0.2.29", + "@types/bluebird": "^3.5.38", + "@types/debug": "^4.1.7", + "@types/getos": "^3.0.1", + "@types/is-ci": "^3.0.0", + "@types/jest": "^29.2.4", + "@types/lodash": "^4.14.191", + "@types/ws": "^8.5.4", + "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", + "cypress": "^13.2.0", + "date-fns": "^2.30.0", + "debug": "^4.3.4", + "esbuild": "^0.16.5", + "eslint": "^7.32.0", + "eslint-config-custom": "latest", + "execa": "^5.1.1", + "fast-safe-stringify": "^2.1.1", + "getos": "^3.2.1", + "globby": "^11.1.0", + "is-absolute": "^1.0.0", + "jest": "^29.3.1", + "lil-http-terminator": "^1.2.3", + "lodash": "^4.17.21", + "nanoid": "^3.3.4", + "nock": "^13.2.9", + "plur": "^4.0.0", + "pretty-ms": "^7.0.1", + "release-it": "^16.1.5", + "rimraf": "^3.0.2", + "source-map-support": "^0.5.21", + "table": "^6.8.1", + "tmp-promise": "^3.0.3", + "ts-pattern": "^4.3.0", + "tsconfig": "*", + "tsup": "^7.0.0", + "typescript": "^4.7.4", + "ws": "^8.13.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 + "@next/eslint-plugin-next": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-12.3.4.tgz", + "integrity": "sha512-BFwj8ykJY+zc1/jWANsDprDIu2MgwPOIKxNVnrKvPs+f5TPegrVnem8uScND+1veT4B7F6VeqgaNLFW1Hzl9Og==", + "dev": true, + "requires": { + "glob": "7.1.7" + } }, - "globby": { - "version": "11.0.4", + "@swc/core": { + "version": "1.3.93", + "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.93.tgz", + "integrity": "sha512-690GRr1wUGmGYZHk7fUduX/JUwViMF2o74mnZYIWEcJaCcd9MQfkhsxPBtjeg6tF+h266/Cf3RPYhsFBzzxXcA==", "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" + "@swc/core-darwin-arm64": "1.3.93", + "@swc/core-darwin-x64": "1.3.93", + "@swc/core-linux-arm-gnueabihf": "1.3.93", + "@swc/core-linux-arm64-gnu": "1.3.93", + "@swc/core-linux-arm64-musl": "1.3.93", + "@swc/core-linux-x64-gnu": "1.3.93", + "@swc/core-linux-x64-musl": "1.3.93", + "@swc/core-win32-arm64-msvc": "1.3.93", + "@swc/core-win32-ia32-msvc": "1.3.93", + "@swc/core-win32-x64-msvc": "1.3.93", + "@swc/counter": "^0.1.1", + "@swc/types": "^0.1.5" } }, - "ignore": { - "version": "5.2.4", - "dev": true + "@swc/core-darwin-arm64": { + "version": "1.3.93", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.93.tgz", + "integrity": "sha512-gEKgk7FVIgltnIfDO6GntyuQBBlAYg5imHpRgLxB1zSI27ijVVkksc6QwISzFZAhKYaBWIsFSVeL9AYSziAF7A==", + "dev": true, + "optional": true }, - "istanbul-lib-coverage": { - "version": "3.0.0", - "dev": true + "@swc/core-darwin-x64": { + "version": "1.3.93", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.93.tgz", + "integrity": "sha512-ZQPxm/fXdDQtn3yrYSL/gFfA8OfZ5jTi33yFQq6vcg/Y8talpZ+MgdSlYM0FkLrZdMTYYTNFiuBQuuvkA+av+Q==", + "dev": true, + "optional": true }, - "js-yaml": { - "version": "4.1.0", + "@swc/core-linux-arm-gnueabihf": { + "version": "1.3.93", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.93.tgz", + "integrity": "sha512-OYFMMI2yV+aNe3wMgYhODxHdqUB/jrK0SEMHHS44GZpk8MuBXEF+Mcz4qjkY5Q1EH7KVQqXb/gVWwdgTHpjM2A==", "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==", - "requires": { - "bluebird": "3.5.5", - "check-more-types": "2.24.0", - "debug": "4.1.1", - "execa": "1.0.0", - "lazy-ass": "1.6.0", - "ramda": "0.26.1" - }, - "dependencies": { - "bluebird": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", - "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" + "optional": true }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } + "@swc/core-linux-arm64-gnu": { + "version": "1.3.93", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.93.tgz", + "integrity": "sha512-BT4dT78odKnJMNiq5HdjBsv29CiIdcCcImAPxeFqAeFw1LL6gh9nzI8E96oWc+0lVT5lfhoesCk4Qm7J6bty8w==", + "dev": true, + "optional": true }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } + "@swc/core-linux-arm64-musl": { + "version": "1.3.93", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.93.tgz", + "integrity": "sha512-yH5fWEl1bktouC0mhh0Chuxp7HEO4uCtS/ly1Vmf18gs6wZ8DOOkgAEVv2dNKIryy+Na++ljx4Ym7C8tSJTrLw==", + "dev": true, + "optional": true }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "requires": { - "pump": "^3.0.0" - } + "@swc/core-linux-x64-gnu": { + "version": "1.3.93", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.93.tgz", + "integrity": "sha512-OFUdx64qvrGJhXKEyxosHxgoUVgba2ztYh7BnMiU5hP8lbI8G13W40J0SN3CmFQwPP30+3oEbW7LWzhKEaYjlg==", + "dev": true, + "optional": true }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==" + "@swc/core-linux-x64-musl": { + "version": "1.3.93", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.93.tgz", + "integrity": "sha512-4B8lSRwEq1XYm6xhxHhvHmKAS7pUp1Q7E33NQ2TlmFhfKvCOh86qvThcjAOo57x8DRwmpvEVrqvpXtYagMN6Ig==", + "dev": true, + "optional": true }, - "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==", - "requires": { - "path-key": "^2.0.0" - } + "@swc/core-win32-arm64-msvc": { + "version": "1.3.93", + "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.93.tgz", + "integrity": "sha512-BHShlxtkven8ZjjvZ5QR6sC5fZCJ9bMujEkiha6W4cBUTY7ce7qGFyHmQd+iPC85d9kD/0cCiX/Xez8u0BhO7w==", + "dev": true, + "optional": true }, - "semver": { - "version": "5.7.1" + "@swc/core-win32-ia32-msvc": { + "version": "1.3.93", + "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.93.tgz", + "integrity": "sha512-nEwNWnz4JzYAK6asVvb92yeylfxMYih7eMQOnT7ZVlZN5ba9WF29xJ6kcQKs9HRH6MvWhz9+wRgv3FcjlU6HYA==", + "dev": true, + "optional": true }, - "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==", + "@swc/core-win32-x64-msvc": { + "version": "1.3.93", + "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.93.tgz", + "integrity": "sha512-jibQ0zUr4kwJaQVwgmH+svS04bYTPnPw/ZkNInzxS+wFAtzINBYcU8s2PMWbDb2NGYiRSEeoSGyAvS9H+24JFA==", + "dev": true, + "optional": true + }, + "@swc/helpers": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.3.tgz", + "integrity": "sha512-FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A==", + "dev": true, + "optional": true, + "peer": true, "requires": { - "shebang-regex": "^1.0.0" + "tslib": "^2.4.0" } }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==" - } - } - }, - "@cypress/grep": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/@cypress/grep/-/grep-3.1.5.tgz", - "integrity": "sha512-dbLKP9wGLId+TwTRFDcWVcr9AvJ06W3K7dVeJzLONiPbI5/XJh2mDZvnoyJlAz+VZxdwe0+nejk/CPmuphuzkQ==", - "dev": true, - "requires": { - "debug": "^4.3.4", - "find-test-names": "^1.19.0", - "globby": "^11.0.4" - } - }, - "@cypress/request": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", - "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", - "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.4", - "safe-buffer": "^5.1.2", - "tough-cookie": "^4.1.3", - "tunnel-agent": "^0.6.0", - "uuid": "^8.3.2" - }, - "dependencies": { - "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==", + "commander": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", + "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==" + }, + "eslint-config-custom": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-custom/-/eslint-config-custom-0.0.0.tgz", + "integrity": "sha512-kwCw78yisbgKdJBJ5qooPmpBYDphDfM2oxSROmtfOwBXBwXuRiSV3suO01W3mVLEFpmQZxMWd/qajKpJhkKSug==", + "dev": true, "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" + "eslint-config-next": "^12.0.8", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-react": "7.28.0" + }, + "dependencies": { + "eslint-config-next": { + "version": "12.3.4", + "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-12.3.4.tgz", + "integrity": "sha512-WuT3gvgi7Bwz00AOmKGhOeqnyA5P29Cdyr0iVjLyfDbk+FANQKcOjFUTZIdyYfe5Tq1x4TGcmoe4CwctGvFjHQ==", + "dev": true, + "requires": { + "@next/eslint-plugin-next": "12.3.4", + "@rushstack/eslint-patch": "^1.1.3", + "@typescript-eslint/parser": "^5.21.0", + "eslint-import-resolver-node": "^0.3.6", + "eslint-import-resolver-typescript": "^2.7.1", + "eslint-plugin-import": "^2.26.0", + "eslint-plugin-jsx-a11y": "^6.5.1", + "eslint-plugin-react": "^7.31.7", + "eslint-plugin-react-hooks": "^4.5.0" + }, + "dependencies": { + "eslint-plugin-react": { + "version": "7.33.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", + "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", + "dev": true, + "requires": { + "array-includes": "^3.1.6", + "array.prototype.flatmap": "^1.3.1", + "array.prototype.tosorted": "^1.1.1", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.0.12", + "estraverse": "^5.3.0", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.6", + "object.fromentries": "^2.0.6", + "object.hasown": "^1.1.2", + "object.values": "^1.1.6", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.4", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.8" + } + } + } + }, + "eslint-plugin-react": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz", + "integrity": "sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw==", + "dev": true, + "requires": { + "array-includes": "^3.1.4", + "array.prototype.flatmap": "^1.2.5", + "doctrine": "^2.1.0", + "estraverse": "^5.3.0", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.0.4", + "object.entries": "^1.1.5", + "object.fromentries": "^2.0.5", + "object.hasown": "^1.1.0", + "object.values": "^1.1.5", + "prop-types": "^15.7.2", + "resolve": "^2.0.0-next.3", + "semver": "^6.3.0", + "string.prototype.matchall": "^4.0.6" + } + } + } + }, + "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" + } + }, + "glob": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.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==" + }, + "resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "requires": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" } + }, + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true } } }, - "@cypress/webpack-preprocessor": { - "version": "5.17.1", + "@cypress/code-coverage": { + "version": "3.11.0", "dev": true, "requires": { - "bluebird": "3.7.1", - "debug": "^4.3.4", - "lodash": "^4.17.20" + "@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": { - "bluebird": { - "version": "3.7.1", + "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/xvfb": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz", - "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==", + "@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==", "requires": { - "debug": "^3.1.0", - "lodash.once": "^4.1.1" + "bluebird": "3.5.5", + "check-more-types": "2.24.0", + "debug": "4.1.1", + "execa": "1.0.0", + "lazy-ass": "1.6.0", + "ramda": "0.26.1" }, "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "bluebird": { + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", + "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" + }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "requires": { - "ms": "^2.1.1" - } + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "requires": { + "pump": "^3.0.0" + } + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==" + }, + "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==", + "requires": { + "path-key": "^2.0.0" + } + }, + "semver": { + "version": "5.7.1" + }, + "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==", + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==" + } + } + }, + "@cypress/grep": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/@cypress/grep/-/grep-3.1.5.tgz", + "integrity": "sha512-dbLKP9wGLId+TwTRFDcWVcr9AvJ06W3K7dVeJzLONiPbI5/XJh2mDZvnoyJlAz+VZxdwe0+nejk/CPmuphuzkQ==", + "dev": true, + "requires": { + "debug": "^4.3.4", + "find-test-names": "^1.19.0", + "globby": "^11.0.4" + } + }, + "@cypress/request": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", + "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", + "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.4", + "safe-buffer": "^5.1.2", + "tough-cookie": "^4.1.3", + "tunnel-agent": "^0.6.0", + "uuid": "^8.3.2" + }, + "dependencies": { + "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==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + } + } + }, + "@cypress/webpack-preprocessor": { + "version": "5.17.1", + "dev": true, + "requires": { + "bluebird": "3.7.1", + "debug": "^4.3.4", + "lodash": "^4.17.20" + }, + "dependencies": { + "bluebird": { + "version": "3.7.1", + "dev": true + } + } + }, + "@cypress/xvfb": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz", + "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==", + "requires": { + "debug": "^3.1.0", + "lodash.once": "^4.1.1" + }, + "dependencies": { + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "requires": { + "ms": "^2.1.1" + } } } }, @@ -24724,304 +25023,6 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==" }, - "cc-est": { - "version": "file:packages/cc-est", - "requires": { - "@cypress/commit-info": "^2.2.0", - "@release-it/conventional-changelog": "^7.0.0", - "@swc/core": "^1.3.86", - "@swc/jest": "^0.2.29", - "@types/bluebird": "^3.5.38", - "@types/debug": "^4.1.7", - "@types/getos": "^3.0.1", - "@types/is-ci": "^3.0.0", - "@types/jest": "^29.2.4", - "@types/lodash": "^4.14.191", - "@types/ws": "^8.5.4", - "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", - "cypress": "^13.2.0", - "date-fns": "^2.30.0", - "debug": "^4.3.4", - "esbuild": "^0.16.5", - "eslint": "^7.32.0", - "eslint-config-custom": "latest", - "execa": "^5.1.1", - "fast-safe-stringify": "^2.1.1", - "getos": "^3.2.1", - "globby": "^11.1.0", - "is-absolute": "^1.0.0", - "jest": "^29.3.1", - "lil-http-terminator": "^1.2.3", - "lodash": "^4.17.21", - "nanoid": "^3.3.4", - "nock": "^13.2.9", - "plur": "^4.0.0", - "pretty-ms": "^7.0.1", - "release-it": "^16.1.5", - "rimraf": "^3.0.2", - "source-map-support": "^0.5.21", - "table": "^6.8.1", - "tmp-promise": "^3.0.3", - "ts-pattern": "^4.3.0", - "tsconfig": "*", - "tsup": "^7.0.0", - "typescript": "^4.7.4", - "ws": "^8.13.0" - }, - "dependencies": { - "@next/eslint-plugin-next": { - "version": "12.3.4", - "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-12.3.4.tgz", - "integrity": "sha512-BFwj8ykJY+zc1/jWANsDprDIu2MgwPOIKxNVnrKvPs+f5TPegrVnem8uScND+1veT4B7F6VeqgaNLFW1Hzl9Og==", - "dev": true, - "requires": { - "glob": "7.1.7" - } - }, - "@swc/core": { - "version": "1.3.93", - "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.3.93.tgz", - "integrity": "sha512-690GRr1wUGmGYZHk7fUduX/JUwViMF2o74mnZYIWEcJaCcd9MQfkhsxPBtjeg6tF+h266/Cf3RPYhsFBzzxXcA==", - "dev": true, - "requires": { - "@swc/core-darwin-arm64": "1.3.93", - "@swc/core-darwin-x64": "1.3.93", - "@swc/core-linux-arm-gnueabihf": "1.3.93", - "@swc/core-linux-arm64-gnu": "1.3.93", - "@swc/core-linux-arm64-musl": "1.3.93", - "@swc/core-linux-x64-gnu": "1.3.93", - "@swc/core-linux-x64-musl": "1.3.93", - "@swc/core-win32-arm64-msvc": "1.3.93", - "@swc/core-win32-ia32-msvc": "1.3.93", - "@swc/core-win32-x64-msvc": "1.3.93", - "@swc/counter": "^0.1.1", - "@swc/types": "^0.1.5" - } - }, - "@swc/core-darwin-arm64": { - "version": "1.3.93", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.93.tgz", - "integrity": "sha512-gEKgk7FVIgltnIfDO6GntyuQBBlAYg5imHpRgLxB1zSI27ijVVkksc6QwISzFZAhKYaBWIsFSVeL9AYSziAF7A==", - "dev": true, - "optional": true - }, - "@swc/core-darwin-x64": { - "version": "1.3.93", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.93.tgz", - "integrity": "sha512-ZQPxm/fXdDQtn3yrYSL/gFfA8OfZ5jTi33yFQq6vcg/Y8talpZ+MgdSlYM0FkLrZdMTYYTNFiuBQuuvkA+av+Q==", - "dev": true, - "optional": true - }, - "@swc/core-linux-arm-gnueabihf": { - "version": "1.3.93", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.93.tgz", - "integrity": "sha512-OYFMMI2yV+aNe3wMgYhODxHdqUB/jrK0SEMHHS44GZpk8MuBXEF+Mcz4qjkY5Q1EH7KVQqXb/gVWwdgTHpjM2A==", - "dev": true, - "optional": true - }, - "@swc/core-linux-arm64-gnu": { - "version": "1.3.93", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.93.tgz", - "integrity": "sha512-BT4dT78odKnJMNiq5HdjBsv29CiIdcCcImAPxeFqAeFw1LL6gh9nzI8E96oWc+0lVT5lfhoesCk4Qm7J6bty8w==", - "dev": true, - "optional": true - }, - "@swc/core-linux-arm64-musl": { - "version": "1.3.93", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.93.tgz", - "integrity": "sha512-yH5fWEl1bktouC0mhh0Chuxp7HEO4uCtS/ly1Vmf18gs6wZ8DOOkgAEVv2dNKIryy+Na++ljx4Ym7C8tSJTrLw==", - "dev": true, - "optional": true - }, - "@swc/core-linux-x64-gnu": { - "version": "1.3.93", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.93.tgz", - "integrity": "sha512-OFUdx64qvrGJhXKEyxosHxgoUVgba2ztYh7BnMiU5hP8lbI8G13W40J0SN3CmFQwPP30+3oEbW7LWzhKEaYjlg==", - "dev": true, - "optional": true - }, - "@swc/core-linux-x64-musl": { - "version": "1.3.93", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.93.tgz", - "integrity": "sha512-4B8lSRwEq1XYm6xhxHhvHmKAS7pUp1Q7E33NQ2TlmFhfKvCOh86qvThcjAOo57x8DRwmpvEVrqvpXtYagMN6Ig==", - "dev": true, - "optional": true - }, - "@swc/core-win32-arm64-msvc": { - "version": "1.3.93", - "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.93.tgz", - "integrity": "sha512-BHShlxtkven8ZjjvZ5QR6sC5fZCJ9bMujEkiha6W4cBUTY7ce7qGFyHmQd+iPC85d9kD/0cCiX/Xez8u0BhO7w==", - "dev": true, - "optional": true - }, - "@swc/core-win32-ia32-msvc": { - "version": "1.3.93", - "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.93.tgz", - "integrity": "sha512-nEwNWnz4JzYAK6asVvb92yeylfxMYih7eMQOnT7ZVlZN5ba9WF29xJ6kcQKs9HRH6MvWhz9+wRgv3FcjlU6HYA==", - "dev": true, - "optional": true - }, - "@swc/core-win32-x64-msvc": { - "version": "1.3.93", - "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.93.tgz", - "integrity": "sha512-jibQ0zUr4kwJaQVwgmH+svS04bYTPnPw/ZkNInzxS+wFAtzINBYcU8s2PMWbDb2NGYiRSEeoSGyAvS9H+24JFA==", - "dev": true, - "optional": true - }, - "@swc/helpers": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.3.tgz", - "integrity": "sha512-FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A==", - "dev": true, - "optional": true, - "peer": true, - "requires": { - "tslib": "^2.4.0" - } - }, - "commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==" - }, - "eslint-config-custom": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-custom/-/eslint-config-custom-0.0.0.tgz", - "integrity": "sha512-kwCw78yisbgKdJBJ5qooPmpBYDphDfM2oxSROmtfOwBXBwXuRiSV3suO01W3mVLEFpmQZxMWd/qajKpJhkKSug==", - "dev": true, - "requires": { - "eslint-config-next": "^12.0.8", - "eslint-config-prettier": "^8.3.0", - "eslint-plugin-react": "7.28.0" - }, - "dependencies": { - "eslint-config-next": { - "version": "12.3.4", - "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-12.3.4.tgz", - "integrity": "sha512-WuT3gvgi7Bwz00AOmKGhOeqnyA5P29Cdyr0iVjLyfDbk+FANQKcOjFUTZIdyYfe5Tq1x4TGcmoe4CwctGvFjHQ==", - "dev": true, - "requires": { - "@next/eslint-plugin-next": "12.3.4", - "@rushstack/eslint-patch": "^1.1.3", - "@typescript-eslint/parser": "^5.21.0", - "eslint-import-resolver-node": "^0.3.6", - "eslint-import-resolver-typescript": "^2.7.1", - "eslint-plugin-import": "^2.26.0", - "eslint-plugin-jsx-a11y": "^6.5.1", - "eslint-plugin-react": "^7.31.7", - "eslint-plugin-react-hooks": "^4.5.0" - }, - "dependencies": { - "eslint-plugin-react": { - "version": "7.33.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", - "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", - "dev": true, - "requires": { - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "array.prototype.tosorted": "^1.1.1", - "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.0.12", - "estraverse": "^5.3.0", - "jsx-ast-utils": "^2.4.1 || ^3.0.0", - "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "object.hasown": "^1.1.2", - "object.values": "^1.1.6", - "prop-types": "^15.8.1", - "resolve": "^2.0.0-next.4", - "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.8" - } - } - } - }, - "eslint-plugin-react": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz", - "integrity": "sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw==", - "dev": true, - "requires": { - "array-includes": "^3.1.4", - "array.prototype.flatmap": "^1.2.5", - "doctrine": "^2.1.0", - "estraverse": "^5.3.0", - "jsx-ast-utils": "^2.4.1 || ^3.0.0", - "minimatch": "^3.0.4", - "object.entries": "^1.1.5", - "object.fromentries": "^2.0.5", - "object.hasown": "^1.1.0", - "object.values": "^1.1.5", - "prop-types": "^15.7.2", - "resolve": "^2.0.0-next.3", - "semver": "^6.3.0", - "string.prototype.matchall": "^4.0.6" - } - } - } - }, - "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" - } - }, - "glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.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==" - }, - "resolve": { - "version": "2.0.0-next.5", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", - "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", - "dev": true, - "requires": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - } - } - }, "chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -33084,11 +33085,11 @@ "web": { "version": "file:examples/webapp", "requires": { + "@currents/cc-est": "*", "@cypress/grep": "^3.1.5", "@types/node": "^17.0.12", "@types/react": "^18.0.28", "@types/react-dom": "^18.0.11", - "cc-est": "*", "cypress": "^12.17.4", "cypress-terminal-report": "^5.3.3", "eslint": "7.32.0", diff --git a/packages/cc-est/bin/lib/cli.ts b/packages/cc-est/bin/lib/cli.ts index 37477a8..197ed63 100644 --- a/packages/cc-est/bin/lib/cli.ts +++ b/packages/cc-est/bin/lib/cli.ts @@ -1,4 +1,4 @@ -import { CurrentsRunParameters, TestingType } from "cc-est/types"; +import { CurrentsRunParameters, TestingType } from "@currents/cc-est/types"; import Debug from "debug"; import { activateDebug } from "../../lib/debug"; import { sanitizeAndConvertNestedArgs } from "./parser"; diff --git a/packages/cc-est/bin/lib/program.ts b/packages/cc-est/bin/lib/program.ts index 521ca47..84f8563 100644 --- a/packages/cc-est/bin/lib/program.ts +++ b/packages/cc-est/bin/lib/program.ts @@ -1,4 +1,4 @@ -// https://github.com/currents-dev/cc-est/issues/71 +// https://github.com/currents-dev/@currents/cc-est/issues/71 // keep the local copy to prevent from importing // commander.js from the global node_modules import { getLegalNotice } from "../../legal"; @@ -7,7 +7,7 @@ import { Command, Option } from "./@commander-js/extra-typings"; export const createProgram = (command: Command = new Command()) => command - .name("cc-est") + .name("@currents/cc-est") .description( ` Run Cypress tests on CI using https://currents.dev or https://sorry-cypress.dev as an orchestration and reporting service @@ -107,13 +107,13 @@ ${getLegalNotice()} .addOption( new Option( "--cc-config-file ", - "Specify the config file for cc-est, defaults to 'currents.config.js' and will be searched in the project root, unless an aboslue path is provided" + "Specify the config file for @currents/cc-est, defaults to 'currents.config.js' and will be searched in the project root, unless an aboslue path is provided" ).default(undefined) ) .addOption( new Option( `--cloud-debug [true | string]`, - `Enable debug mode for cc-est, this will print out logs for troubleshooting. Values: [true | ${Object.values( + `Enable debug mode for @currents/cc-est, this will print out logs for troubleshooting. Values: [true | ${Object.values( DebugMode ).join( " | " diff --git a/packages/cc-est/legal.ts b/packages/cc-est/legal.ts index 4c8ca18..1a4ac6d 100644 --- a/packages/cc-est/legal.ts +++ b/packages/cc-est/legal.ts @@ -4,6 +4,6 @@ Copyright (C) ${new Date().getFullYear()} Currents Software Inc https://currents This is free software, and you are welcome to redistribute it under certain conditions. This program comes with no warranty. Parts of this program are MIT licensed. Refer to the license for details -https://github.com/currents-dev/cc-est/blob/main/LICENSE.md +https://github.com/currents-dev/@currents/cc-est/blob/main/LICENSE.md `; } diff --git a/packages/cc-est/lib/__tests__/fixtures/api/failed.spec.js/payload.ts b/packages/cc-est/lib/__tests__/fixtures/api/failed.spec.js/payload.ts index ebcc89f..2173766 100644 --- a/packages/cc-est/lib/__tests__/fixtures/api/failed.spec.js/payload.ts +++ b/packages/cc-est/lib/__tests__/fixtures/api/failed.spec.js/payload.ts @@ -46,7 +46,7 @@ export const results = { testId: "r0", testAttemptIndex: 0, takenAt: expect.any(String), - path: "/Users/agoldis/cc-est/examples/webapp/cypress/screenshots/failed.spec.js/Failed -- should fail (failed).png", + path: "/Users/agoldis/@currents/cc-est/examples/webapp/cypress/screenshots/failed.spec.js/Failed -- should fail (failed).png", height: 1440, width: 2560, }, @@ -70,7 +70,7 @@ export const results = { originalFile: "cypress/e2e/failed.spec.js", relativeFile: "examples/webapp/cypress/e2e/failed.spec.js", absoluteFile: - "/Users/agoldis/cc-est/examples/webapp/cypress/e2e/failed.spec.js", + "/Users/agoldis/@currents/cc-est/examples/webapp/cypress/e2e/failed.spec.js", frame: ' 1 | describe("Failed", function () {\n 2 | it("should fail", function () {\n> 3 | expect(fail).to.be.true;\n | ^\n 4 | });\n 5 | });\n 6 | ', language: "js", diff --git a/packages/cc-est/lib/__tests__/fixtures/api/passed.spec.js/payload.ts b/packages/cc-est/lib/__tests__/fixtures/api/passed.spec.js/payload.ts index b25fe95..2cb8a00 100644 --- a/packages/cc-est/lib/__tests__/fixtures/api/passed.spec.js/payload.ts +++ b/packages/cc-est/lib/__tests__/fixtures/api/passed.spec.js/payload.ts @@ -46,7 +46,7 @@ export const results = { height: 1320, width: 2000, name: "custom-screenshot", - path: "/Users/agoldis/cc-est/examples/webapp/cypress/screenshots/passed.spec.js/Passed -- should pass.png", + path: "/Users/agoldis/@currents/cc-est/examples/webapp/cypress/screenshots/passed.spec.js/Passed -- should pass.png", takenAt: expect.any(String), testAttemptIndex: 0, testId: "r0", diff --git a/packages/cc-est/lib/__tests__/fixtures/api/retries.spec.js/payload.ts b/packages/cc-est/lib/__tests__/fixtures/api/retries.spec.js/payload.ts index 4781424..1490106 100644 --- a/packages/cc-est/lib/__tests__/fixtures/api/retries.spec.js/payload.ts +++ b/packages/cc-est/lib/__tests__/fixtures/api/retries.spec.js/payload.ts @@ -45,7 +45,7 @@ export const results = { height: 1440, width: 2560, name: null, - path: "/Users/agoldis/cc-est/examples/webapp/cypress/screenshots/retries.spec.js/Retries -- Runs a test with retries (failed).png", + path: "/Users/agoldis/@currents/cc-est/examples/webapp/cypress/screenshots/retries.spec.js/Retries -- Runs a test with retries (failed).png", takenAt: expect.any(String), testAttemptIndex: 0, testId: "r0", @@ -55,7 +55,7 @@ export const results = { height: 1440, width: 2560, name: null, - path: "/Users/agoldis/cc-est/examples/webapp/cypress/screenshots/retries.spec.js/Retries -- Runs a test with retries (failed) (attempt 2).png", + path: "/Users/agoldis/@currents/cc-est/examples/webapp/cypress/screenshots/retries.spec.js/Retries -- Runs a test with retries (failed) (attempt 2).png", takenAt: expect.any(String), testAttemptIndex: 1, testId: "r0", @@ -80,7 +80,7 @@ export const results = { originalFile: "cypress/e2e/retries.spec.js", relativeFile: "examples/webapp/cypress/e2e/retries.spec.js", absoluteFile: - "/Users/agoldis/cc-est/examples/webapp/cypress/e2e/retries.spec.js", + "/Users/agoldis/@currents/cc-est/examples/webapp/cypress/e2e/retries.spec.js", frame: ' 9 | if (i > 1) {\n 10 | i--;\n> 11 | throw new Error("oh no!");\n | ^\n 12 | }\n 13 | return;\n 14 | }', language: "js", @@ -102,7 +102,7 @@ export const results = { originalFile: "cypress/e2e/retries.spec.js", relativeFile: "examples/webapp/cypress/e2e/retries.spec.js", absoluteFile: - "/Users/agoldis/cc-est/examples/webapp/cypress/e2e/retries.spec.js", + "/Users/agoldis/@currents/cc-est/examples/webapp/cypress/e2e/retries.spec.js", frame: ' 9 | if (i > 1) {\n 10 | i--;\n> 11 | throw new Error("oh no!");\n | ^\n 12 | }\n 13 | return;\n 14 | }', language: "js", diff --git a/packages/cc-est/lib/__tests__/fixtures/api/skipped.spec.js/payload.ts b/packages/cc-est/lib/__tests__/fixtures/api/skipped.spec.js/payload.ts index 88da468..860fe02 100644 --- a/packages/cc-est/lib/__tests__/fixtures/api/skipped.spec.js/payload.ts +++ b/packages/cc-est/lib/__tests__/fixtures/api/skipped.spec.js/payload.ts @@ -51,7 +51,7 @@ export const results = { height: 1440, width: 2560, name: null, - path: "/Users/agoldis/cc-est/examples/webapp/cypress/screenshots/skipped.spec.js/Skipped -- should not be skipped -- before each hook (failed).png", + path: "/Users/agoldis/@currents/cc-est/examples/webapp/cypress/screenshots/skipped.spec.js/Skipped -- should not be skipped -- before each hook (failed).png", takenAt: expect.any(String), testAttemptIndex: 0, testId: "r0", @@ -78,7 +78,7 @@ export const results = { originalFile: "cypress/e2e/skipped.spec.js", relativeFile: "examples/webapp/cypress/e2e/skipped.spec.js", absoluteFile: - "/Users/agoldis/cc-est/examples/webapp/cypress/e2e/skipped.spec.js", + "/Users/agoldis/@currents/cc-est/examples/webapp/cypress/e2e/skipped.spec.js", frame: ' 1 | describe("Skipped", function () {\n 2 | beforeEach(function () {\n> 3 | throw new Error("before each exception");\n | ^\n 4 | });\n 5 | it("should not be skipped", function () {\n 6 | expect(true).to.be.true;', language: "js", diff --git a/packages/cc-est/lib/api/__tests__/api.run.test.ts b/packages/cc-est/lib/api/__tests__/api.run.test.ts index 965907d..bd9642e 100644 --- a/packages/cc-est/lib/api/__tests__/api.run.test.ts +++ b/packages/cc-est/lib/api/__tests__/api.run.test.ts @@ -1,11 +1,11 @@ -import { createRun, CreateRunResponse } from "cc-est/lib/api"; -import { getAPIBaseUrl } from "cc-est/lib/httpClient/config"; +import { createRun, CreateRunResponse } from "@currents/cc-est/lib/api"; +import { getAPIBaseUrl } from "@currents/cc-est/lib/httpClient/config"; import nock from "nock"; import { printWarnings } from "../warnings"; import { createRunPayload, createRunResponse } from "./fixtures/run"; jest.mock("../warnings"); -jest.mock("cc-est/lib/httpClient/config", () => ({ +jest.mock("@currents/cc-est/lib/httpClient/config", () => ({ getAPIBaseUrl: jest.fn().mockReturnValue("http://localhost:1234"), })); diff --git a/packages/cc-est/lib/api/__tests__/api.test.ts b/packages/cc-est/lib/api/__tests__/api.test.ts index 1872b22..939371c 100644 --- a/packages/cc-est/lib/api/__tests__/api.test.ts +++ b/packages/cc-est/lib/api/__tests__/api.test.ts @@ -7,12 +7,12 @@ import { setInstanceTests, updateInstanceResults, updateInstanceStdout, -} from "cc-est/lib/api"; -import { getAPIBaseUrl } from "cc-est/lib/httpClient/config"; +} from "@currents/cc-est/lib/api"; +import { getAPIBaseUrl } from "@currents/cc-est/lib/httpClient/config"; import _ from "lodash"; import nock from "nock"; -jest.mock("cc-est/lib/httpClient/config", () => ({ +jest.mock("@currents/cc-est/lib/httpClient/config", () => ({ getAPIBaseUrl: jest.fn().mockReturnValue("http://localhost:1234"), })); diff --git a/packages/cc-est/lib/api/__tests__/fixtures/run.ts b/packages/cc-est/lib/api/__tests__/fixtures/run.ts index 8ea7eef..b31055c 100644 --- a/packages/cc-est/lib/api/__tests__/fixtures/run.ts +++ b/packages/cc-est/lib/api/__tests__/fixtures/run.ts @@ -1,4 +1,4 @@ -import { CreateRunPayload, CreateRunResponse } from "cc-est/lib/api/"; +import { CreateRunPayload, CreateRunResponse } from "@currents/cc-est/lib/api/"; export const createRunPayload: CreateRunPayload = { ci: { diff --git a/packages/cc-est/lib/api/types/instance.ts b/packages/cc-est/lib/api/types/instance.ts index 9534928..d81de83 100644 --- a/packages/cc-est/lib/api/types/instance.ts +++ b/packages/cc-est/lib/api/types/instance.ts @@ -1,4 +1,4 @@ -import { Platform, ScreenshotArtifact } from "cc-est/types"; +import { Platform, ScreenshotArtifact } from "@currents/cc-est/types"; import { Standard } from "../../cypress.types"; import { TestAttemptState, TestState } from "../../cypress.types/shared"; diff --git a/packages/cc-est/lib/api/types/run.ts b/packages/cc-est/lib/api/types/run.ts index d04e492..0b1a673 100644 --- a/packages/cc-est/lib/api/types/run.ts +++ b/packages/cc-est/lib/api/types/run.ts @@ -1,4 +1,7 @@ -import { Platform, ValidatedCurrentsParameters } from "cc-est-est/types"; +import { + Platform, + ValidatedCurrentsParameters, +} from "@currents/cc-est-est/types"; import { CiParams, CiProvider } from "../../ciProvider"; export type CreateRunPayload = { diff --git a/packages/cc-est/lib/bootstrap/bootstrap.ts b/packages/cc-est/lib/bootstrap/bootstrap.ts index 2d85b16..96165d8 100644 --- a/packages/cc-est/lib/bootstrap/bootstrap.ts +++ b/packages/cc-est/lib/bootstrap/bootstrap.ts @@ -1,4 +1,4 @@ -import { ValidatedCurrentsParameters } from "cc-est/types"; +import { ValidatedCurrentsParameters } from "@currents/cc-est/types"; import { getBinPath } from "cy2"; import Debug from "debug"; import execa, { ExecaError } from "execa"; @@ -31,7 +31,7 @@ export const bootCypress = async (params: ValidatedCurrentsParameters) => { try { const f = fs.readFileSync(tempFilePath, "utf-8"); if (!f) { - throw new Error("Is cc-est/plugin installed?"); + throw new Error("Is @currents/cc-est/plugin installed?"); } debug("cypress config '%s': '%s'", tempFilePath, f); return JSON.parse(f); @@ -41,7 +41,7 @@ export const bootCypress = async (params: ValidatedCurrentsParameters) => { info(bold("Cypress stderr:\n"), stderr); throw new ValidationError(`Unable to resolve cypress configuration -- make sure that 'cc-est/plugin' is installed +- make sure that '@currents/cc-est/plugin' is installed - report the issue together with cypress stdout and stderr `); } diff --git a/packages/cc-est/lib/config/__tests__/validateParams.test.ts b/packages/cc-est/lib/config/__tests__/validateParams.test.ts index 0b1d0b3..887c73a 100644 --- a/packages/cc-est/lib/config/__tests__/validateParams.test.ts +++ b/packages/cc-est/lib/config/__tests__/validateParams.test.ts @@ -1,6 +1,6 @@ +import { ValidationError } from "@currents/cc-est/lib/errors"; +import { CurrentsRunParameters } from "@currents/cc-est/types"; import { describe, expect, it } from "@jest/globals"; -import { ValidationError } from "cc-est/lib/errors"; -import { CurrentsRunParameters } from "cc-est/types"; import { getCurrentsConfig } from "../config"; import { cloudServiceInvalidUrlError, @@ -10,7 +10,7 @@ import { validateParams, } from "../params"; -jest.mock("cc-est/lib/log"); +jest.mock("@currents/cc-est/lib/log"); jest.mock("../config", () => ({ getCurrentsConfig: jest.fn(() => ({ e2e: { diff --git a/packages/cc-est/lib/config/params.ts b/packages/cc-est/lib/config/params.ts index c0d22f2..107f7f8 100644 --- a/packages/cc-est/lib/config/params.ts +++ b/packages/cc-est/lib/config/params.ts @@ -2,7 +2,7 @@ import { CurrentsRunParameters, CypressRunParameters, ValidatedCurrentsParameters, -} from "cc-est/types"; +} from "@currents/cc-est/types"; import Debug from "debug"; import _ from "lodash"; import { shouldEnablePluginDebug } from "../debug"; diff --git a/packages/cc-est/lib/cypress.types/12.ts b/packages/cc-est/lib/cypress.types/12.ts index 2b5b739..30adb00 100644 --- a/packages/cc-est/lib/cypress.types/12.ts +++ b/packages/cc-est/lib/cypress.types/12.ts @@ -26,7 +26,7 @@ export namespace Cypress12 { } export interface Spec { - absolute: string; // /Users/agoldis/cc-est/examples/webapp/cypress/e2e/crash.spec.js + absolute: string; // /Users/agoldis/@currents/cc-est/examples/webapp/cypress/e2e/crash.spec.js baseName: string; // crash.spec.js fileExtension: string; // .js fileName: string; // crash diff --git a/packages/cc-est/lib/cypress.types/13.ts b/packages/cc-est/lib/cypress.types/13.ts index 18923c3..fb4faaf 100644 --- a/packages/cc-est/lib/cypress.types/13.ts +++ b/packages/cc-est/lib/cypress.types/13.ts @@ -15,7 +15,7 @@ export namespace Cypress13 { } export interface Spec { - absolute: string; // /Users/agoldis/cc-est/examples/webapp/cypress/e2e/crash.spec.js + absolute: string; // /Users/agoldis/@currents/cc-est/examples/webapp/cypress/e2e/crash.spec.js fileExtension: string; // .js fileName: string; // crash name: string; // crash.spec.js diff --git a/packages/cc-est/lib/cypress/__tests__/runSpecFile.spec.ts b/packages/cc-est/lib/cypress/__tests__/runSpecFile.spec.ts index fc726aa..e4ce86f 100644 --- a/packages/cc-est/lib/cypress/__tests__/runSpecFile.spec.ts +++ b/packages/cc-est/lib/cypress/__tests__/runSpecFile.spec.ts @@ -1,5 +1,5 @@ +import { ValidatedCurrentsParameters } from "@currents/cc-est/types"; import { expect } from "@jest/globals"; -import { ValidatedCurrentsParameters } from "cc-est/types"; import { run } from "cypress"; import { runSpecFile } from "../cypress"; jest.mock("cypress", () => ({ diff --git a/packages/cc-est/lib/cypress/cypress.ts b/packages/cc-est/lib/cypress/cypress.ts index a5ad3e7..9c6cb70 100644 --- a/packages/cc-est/lib/cypress/cypress.ts +++ b/packages/cc-est/lib/cypress/cypress.ts @@ -1,7 +1,7 @@ import { CurrentsRunParameters, ValidatedCurrentsParameters, -} from "cc-est/types"; +} from "@currents/cc-est/types"; import cypress from "cypress"; import Debug from "debug"; import _ from "lodash"; diff --git a/packages/cc-est/lib/httpClient/__tests__/httpClient.errors.test.ts b/packages/cc-est/lib/httpClient/__tests__/httpClient.errors.test.ts index 8894b66..b4c9f9f 100644 --- a/packages/cc-est/lib/httpClient/__tests__/httpClient.errors.test.ts +++ b/packages/cc-est/lib/httpClient/__tests__/httpClient.errors.test.ts @@ -1,10 +1,10 @@ +import * as log from "@currents/cc-est/lib/log"; import { expect } from "@jest/globals"; -import * as log from "cc-est/lib/log"; import nock from "nock"; import { makeRequest } from "../httpClient"; import { formatGenericError } from "../printErrors"; -jest.mock("cc-est/lib/log"); +jest.mock("@currents/cc-est/lib/log"); const apiMock = nock("https://cy.currents.dev"); diff --git a/packages/cc-est/lib/httpClient/__tests__/httpClient.retries.test.ts b/packages/cc-est/lib/httpClient/__tests__/httpClient.retries.test.ts index b0d1a7b..012ba72 100644 --- a/packages/cc-est/lib/httpClient/__tests__/httpClient.retries.test.ts +++ b/packages/cc-est/lib/httpClient/__tests__/httpClient.retries.test.ts @@ -1,10 +1,10 @@ -import * as log from "cc-est/lib/log"; +import * as log from "@currents/cc-est/lib/log"; import nock from "nock"; import { getAPIBaseUrl, getDelay, isRetriableError } from "../config"; import { makeRequest } from "../httpClient"; jest.mock("../config"); -jest.mock("cc-est/lib/log"); +jest.mock("@currents/cc-est/lib/log"); (getAPIBaseUrl as jest.Mock).mockReturnValue("http://localhost:1234"); const apiMock = nock(getAPIBaseUrl()).persist(); diff --git a/packages/cc-est/lib/httpClient/httpClient.ts b/packages/cc-est/lib/httpClient/httpClient.ts index 69dddd9..55c0af3 100644 --- a/packages/cc-est/lib/httpClient/httpClient.ts +++ b/packages/cc-est/lib/httpClient/httpClient.ts @@ -40,7 +40,7 @@ export async function getClient() { "x-cypress-request-attempt": config["axios-retry"]?.retryCount ?? 0, "x-cypress-version": _cypressVersion ?? "0.0.0", "x-ccy-version": ccyVerson, - "User-Agent": `cc-est/${ccyVerson}`, + "User-Agent": `@currents/cc-est/${ccyVerson}`, }; if (_runId) { headers["x-cypress-run-id"] = _runId; diff --git a/packages/cc-est/lib/init.ts b/packages/cc-est/lib/init.ts index b63f411..33e6f5c 100644 --- a/packages/cc-est/lib/init.ts +++ b/packages/cc-est/lib/init.ts @@ -3,7 +3,7 @@ import "./stdout"; import "./ws"; const cypressPkg = require("cypress/package.json"); -const pkg = require("cc-est/package.json"); +const pkg = require("@currents/cc-est/package.json"); import { initCapture } from "./capture"; import { setCurrentsVersion, setCypressVersion } from "./state/global"; diff --git a/packages/cc-est/lib/results/specAfterResult.ts b/packages/cc-est/lib/results/specAfterResult.ts index 8060d6c..a0f5c45 100644 --- a/packages/cc-est/lib/results/specAfterResult.ts +++ b/packages/cc-est/lib/results/specAfterResult.ts @@ -80,7 +80,8 @@ export class SpecAfterResult { return match(attemptState) .with("failed", () => ({ name: "Error", - message: "[cc-est] Could not get cypress attempt error details", + message: + "[@currents/cc-est] Could not get cypress attempt error details", stack: "", codeFrame: null, })) diff --git a/packages/cc-est/lib/run.ts b/packages/cc-est/lib/run.ts index dd9c54d..e3f1d7f 100644 --- a/packages/cc-est/lib/run.ts +++ b/packages/cc-est/lib/run.ts @@ -83,7 +83,7 @@ export async function run(params: CurrentsRunParameters = {}) { browser: validatedParams.browser, }); - info(`cc-est version: ${dim(_currentsVersion)}`); + info(`@currents/cc-est version: ${dim(_currentsVersion)}`); info(`Cypress version: ${dim(_cypressVersion)}`); info("Discovered %d spec files", specs.length); info( diff --git a/packages/cc-est/lib/runner/__tests__/cancellable.test.ts b/packages/cc-est/lib/runner/__tests__/cancellable.test.ts index f5aa05b..acdb735 100644 --- a/packages/cc-est/lib/runner/__tests__/cancellable.test.ts +++ b/packages/cc-est/lib/runner/__tests__/cancellable.test.ts @@ -1,6 +1,6 @@ +import { warn } from "@currents/cc-est/lib/log"; +import { Event, getPubSub } from "@currents/cc-est/lib/pubsub"; import { describe, expect, it } from "@jest/globals"; -import { warn } from "cc-est/lib/log"; -import { Event, getPubSub } from "cc-est/lib/pubsub"; import { random } from "lodash"; import { runTillDoneOrCancelled } from "../cancellable"; import { runTillDone } from "../runner"; @@ -8,7 +8,7 @@ import { runTillDone } from "../runner"; jest.mock("../runner", () => ({ runTillDone: jest.fn().mockResolvedValue({}), })); -jest.mock("cc-est/lib/log", () => ({ +jest.mock("@currents/cc-est/lib/log", () => ({ warn: jest.fn(), })); diff --git a/packages/cc-est/package.json b/packages/cc-est/package.json index dc94fa0..5e0d653 100644 --- a/packages/cc-est/package.json +++ b/packages/cc-est/package.json @@ -1,5 +1,5 @@ { - "name": "cc-est", + "name": "@currents/cc-est", "version": "2.0.0-beta.1", "main": "./dist/index.js", "license": "GPL-3.0-or-later", @@ -67,7 +67,7 @@ "ws": "^8.13.0" }, "bin": { - "cc-est": "./dist/bin/cli.js" + "@currents/cc-est": "./dist/bin/cli.js" }, "files": [ "dist" diff --git a/packages/cc-est/plugin/index.ts b/packages/cc-est/plugin/index.ts index 0097f80..b4e4942 100644 --- a/packages/cc-est/plugin/index.ts +++ b/packages/cc-est/plugin/index.ts @@ -23,7 +23,7 @@ export async function cloudPlugin( warn( `Currents plugin is not installed properly - missing required variables in ${dim( "cypress.env" - )}. Please refer to: https://github.com/currents-dev/cc-est#setup-with-existing-plugins` + )}. Please refer to: https://github.com/currents-dev/@currents/cc-est#setup-with-existing-plugins` ); } diff --git a/packages/cc-est/types.ts b/packages/cc-est/types.ts index 994a675..b9a283b 100644 --- a/packages/cc-est/types.ts +++ b/packages/cc-est/types.ts @@ -166,7 +166,7 @@ export type CurrentsRunParameters = StrippedCypressModuleAPIOptions & { ccConfigFile?: string; /** - * Enable debug mode for cc-est, this will print out logs for troubleshooting. + * Enable debug mode for @currents/cc-est, this will print out logs for troubleshooting. */ cloudDebug?: DebugMode | true | string | string[];