From f6812d29276754f03076ee49d8111d478c062685 Mon Sep 17 00:00:00 2001 From: Miguel Langarano Date: Fri, 15 Sep 2023 13:58:51 -0500 Subject: [PATCH] chore: .. --- .../benchmark-cloud.yml | 0 .../benchmark-cy.yml | 0 .../e2e-config-esm-cjs.yml | 0 .../e2e-config-esm-js.yml | 0 .../e2e-config-esm-mjs.yml | 0 .../e2e-config-noesm-js.yml | 0 .../_workflows/e2e-cypress-12-ccy-1.10.yml | 41 ++++++++++ .../e2e-cypress-13-ccy-1.10.yml | 0 .../{workflows => _workflows}/e2e-exports.yml | 0 .../e2e-monorepo.yml | 0 .../e2e-smoke-api.yml | 0 .../e2e-smoke-component.yml | 0 .../e2e-smoke-linux.yml | 0 .../e2e-smoke-windows.yaml | 0 .github/{workflows => _workflows}/lint.yml | 0 .../{workflows => _workflows}/unit-tests.yml | 0 package-lock.json | 76 ++++++++++++------- package.json | 3 + packages/cypress-cloud/lib/cypress/cypress.ts | 2 + packages/cypress-cloud/package.json | 1 - 20 files changed, 95 insertions(+), 28 deletions(-) rename .github/{workflows => _workflows}/benchmark-cloud.yml (100%) rename .github/{workflows => _workflows}/benchmark-cy.yml (100%) rename .github/{workflows => _workflows}/e2e-config-esm-cjs.yml (100%) rename .github/{workflows => _workflows}/e2e-config-esm-js.yml (100%) rename .github/{workflows => _workflows}/e2e-config-esm-mjs.yml (100%) rename .github/{workflows => _workflows}/e2e-config-noesm-js.yml (100%) create mode 100644 .github/_workflows/e2e-cypress-12-ccy-1.10.yml rename .github/{workflows => _workflows}/e2e-cypress-13-ccy-1.10.yml (100%) rename .github/{workflows => _workflows}/e2e-exports.yml (100%) rename .github/{workflows => _workflows}/e2e-monorepo.yml (100%) rename .github/{workflows => _workflows}/e2e-smoke-api.yml (100%) rename .github/{workflows => _workflows}/e2e-smoke-component.yml (100%) rename .github/{workflows => _workflows}/e2e-smoke-linux.yml (100%) rename .github/{workflows => _workflows}/e2e-smoke-windows.yaml (100%) rename .github/{workflows => _workflows}/lint.yml (100%) rename .github/{workflows => _workflows}/unit-tests.yml (100%) diff --git a/.github/workflows/benchmark-cloud.yml b/.github/_workflows/benchmark-cloud.yml similarity index 100% rename from .github/workflows/benchmark-cloud.yml rename to .github/_workflows/benchmark-cloud.yml diff --git a/.github/workflows/benchmark-cy.yml b/.github/_workflows/benchmark-cy.yml similarity index 100% rename from .github/workflows/benchmark-cy.yml rename to .github/_workflows/benchmark-cy.yml diff --git a/.github/workflows/e2e-config-esm-cjs.yml b/.github/_workflows/e2e-config-esm-cjs.yml similarity index 100% rename from .github/workflows/e2e-config-esm-cjs.yml rename to .github/_workflows/e2e-config-esm-cjs.yml diff --git a/.github/workflows/e2e-config-esm-js.yml b/.github/_workflows/e2e-config-esm-js.yml similarity index 100% rename from .github/workflows/e2e-config-esm-js.yml rename to .github/_workflows/e2e-config-esm-js.yml diff --git a/.github/workflows/e2e-config-esm-mjs.yml b/.github/_workflows/e2e-config-esm-mjs.yml similarity index 100% rename from .github/workflows/e2e-config-esm-mjs.yml rename to .github/_workflows/e2e-config-esm-mjs.yml diff --git a/.github/workflows/e2e-config-noesm-js.yml b/.github/_workflows/e2e-config-noesm-js.yml similarity index 100% rename from .github/workflows/e2e-config-noesm-js.yml rename to .github/_workflows/e2e-config-noesm-js.yml diff --git a/.github/_workflows/e2e-cypress-12-ccy-1.10.yml b/.github/_workflows/e2e-cypress-12-ccy-1.10.yml new file mode 100644 index 0000000..19f2046 --- /dev/null +++ b/.github/_workflows/e2e-cypress-12-ccy-1.10.yml @@ -0,0 +1,41 @@ +name: e2e-cypress-12-ccy-1_10 + +on: + push: + +jobs: + e2e-cypress-12-ccy-1_10: + if: "!contains(toJSON(github.event.commits.*.message), '[skip ci]')" + runs-on: ubuntu-latest + env: + DEBUG: currents:* + + strategy: + matrix: + node-version: ["18"] + + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + + - name: Install dependencies + run: npm ci + + - name: Install Cypress 12.17.4 + run: npm install cypress@12.17.4 + + - name: Build + run: npm run build + + - name: Run compatibility tests + working-directory: ./e2e/cypress-12-demo + env: + CURRENTS_API_KEY: ${{ secrets.CURRENTS_API_KEY }} + CURRENTS_RUN_BASE_URL: ${{ secrets.CURRENTS_RUN_BASE_URL }} + CURRENTS_PROJECT_ID: ${{ secrets.CURRENTS_PROJECT_ID }} + CURRENTS_RECORD_KEY: ${{ secrets.CURRENTS_RECORD_KEY }} + + run: > + npm run test diff --git a/.github/workflows/e2e-cypress-13-ccy-1.10.yml b/.github/_workflows/e2e-cypress-13-ccy-1.10.yml similarity index 100% rename from .github/workflows/e2e-cypress-13-ccy-1.10.yml rename to .github/_workflows/e2e-cypress-13-ccy-1.10.yml diff --git a/.github/workflows/e2e-exports.yml b/.github/_workflows/e2e-exports.yml similarity index 100% rename from .github/workflows/e2e-exports.yml rename to .github/_workflows/e2e-exports.yml diff --git a/.github/workflows/e2e-monorepo.yml b/.github/_workflows/e2e-monorepo.yml similarity index 100% rename from .github/workflows/e2e-monorepo.yml rename to .github/_workflows/e2e-monorepo.yml diff --git a/.github/workflows/e2e-smoke-api.yml b/.github/_workflows/e2e-smoke-api.yml similarity index 100% rename from .github/workflows/e2e-smoke-api.yml rename to .github/_workflows/e2e-smoke-api.yml diff --git a/.github/workflows/e2e-smoke-component.yml b/.github/_workflows/e2e-smoke-component.yml similarity index 100% rename from .github/workflows/e2e-smoke-component.yml rename to .github/_workflows/e2e-smoke-component.yml diff --git a/.github/workflows/e2e-smoke-linux.yml b/.github/_workflows/e2e-smoke-linux.yml similarity index 100% rename from .github/workflows/e2e-smoke-linux.yml rename to .github/_workflows/e2e-smoke-linux.yml diff --git a/.github/workflows/e2e-smoke-windows.yaml b/.github/_workflows/e2e-smoke-windows.yaml similarity index 100% rename from .github/workflows/e2e-smoke-windows.yaml rename to .github/_workflows/e2e-smoke-windows.yaml diff --git a/.github/workflows/lint.yml b/.github/_workflows/lint.yml similarity index 100% rename from .github/workflows/lint.yml rename to .github/_workflows/lint.yml diff --git a/.github/workflows/unit-tests.yml b/.github/_workflows/unit-tests.yml similarity index 100% rename from .github/workflows/unit-tests.yml rename to .github/_workflows/unit-tests.yml diff --git a/package-lock.json b/package-lock.json index 8085552..983d00c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,9 @@ "examples/*", "packages/*" ], + "dependencies": { + "cypress": "^13.1.0" + }, "devDependencies": { "eslint-config-custom": "latest", "prettier": "latest", @@ -163,9 +166,9 @@ } }, "e2e/cypress-12-demo/node_modules/cypress/node_modules/@types/node": { - "version": "16.18.48", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.48.tgz", - "integrity": "sha512-mlaecDKQ7rIZrYD7iiKNdzFb6e/qD5I9U1rAhq+Fd+DWvYVs+G2kv74UFHmSOlg5+i/vF3XxuR522V4u8BqO+Q==", + "version": "16.18.50", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.50.tgz", + "integrity": "sha512-OiDU5xRgYTJ203v4cprTs0RwOCd5c5Zjv+K5P8KSqfiCsB1W3LcamTUMcnQarpq5kOYbhHfSOgIEJvdPyb5xyw==", "dev": true }, "e2e/cypress-12-demo/node_modules/form-data": { @@ -203,7 +206,7 @@ }, "devDependencies": { "@types/node": "^17.0.12", - "cypress": "13.1.0", + "cypress": "^13.1.0", "tsconfig": "*", "typescript": "^4.7.4" } @@ -549,9 +552,9 @@ } }, "examples/webapp/node_modules/cypress/node_modules/@types/node": { - "version": "16.18.48", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.48.tgz", - "integrity": "sha512-mlaecDKQ7rIZrYD7iiKNdzFb6e/qD5I9U1rAhq+Fd+DWvYVs+G2kv74UFHmSOlg5+i/vF3XxuR522V4u8BqO+Q==" + "version": "16.18.50", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.50.tgz", + "integrity": "sha512-OiDU5xRgYTJ203v4cprTs0RwOCd5c5Zjv+K5P8KSqfiCsB1W3LcamTUMcnQarpq5kOYbhHfSOgIEJvdPyb5xyw==" }, "examples/webapp/node_modules/cypress/node_modules/semver": { "version": "7.5.4", @@ -2869,9 +2872,9 @@ } }, "node_modules/@cypress/request": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", - "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", + "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -2886,7 +2889,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.10.3", + "qs": "6.10.4", "safe-buffer": "^5.1.2", "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", @@ -2940,6 +2943,14 @@ "lodash.once": "^4.1.1" } }, + "node_modules/@cypress/xvfb/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dependencies": { + "ms": "^2.1.1" + } + }, "node_modules/@esbuild/darwin-arm64": { "version": "0.16.17", "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz", @@ -5496,8 +5507,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "18.11.17", - "license": "MIT" + "version": "18.17.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.15.tgz", + "integrity": "sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==" }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", @@ -17940,7 +17952,6 @@ "@types/jest": "^29.2.4", "@types/lodash": "^4.14.191", "@types/ws": "^8.5.4", - "cypress": "^13.1.0", "esbuild": "^0.16.5", "eslint": "^7.32.0", "eslint-config-custom": "latest", @@ -20840,9 +20851,9 @@ } }, "@cypress/request": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", - "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", + "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", @@ -20857,7 +20868,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.10.3", + "qs": "6.10.4", "safe-buffer": "^5.1.2", "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", @@ -20898,6 +20909,16 @@ "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" + } + } } }, "@esbuild/darwin-arm64": { @@ -22598,7 +22619,9 @@ "dev": true }, "@types/node": { - "version": "18.11.17" + "version": "18.17.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.15.tgz", + "integrity": "sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==" }, "@types/normalize-package-data": { "version": "2.4.1", @@ -24451,9 +24474,9 @@ }, "dependencies": { "@types/node": { - "version": "16.18.48", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.48.tgz", - "integrity": "sha512-mlaecDKQ7rIZrYD7iiKNdzFb6e/qD5I9U1rAhq+Fd+DWvYVs+G2kv74UFHmSOlg5+i/vF3XxuR522V4u8BqO+Q==", + "version": "16.18.50", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.50.tgz", + "integrity": "sha512-OiDU5xRgYTJ203v4cprTs0RwOCd5c5Zjv+K5P8KSqfiCsB1W3LcamTUMcnQarpq5kOYbhHfSOgIEJvdPyb5xyw==", "dev": true } } @@ -24482,7 +24505,7 @@ "requires": { "@types/node": "^17.0.12", "colors": "^1.4.0", - "cypress": "13.1.0", + "cypress": "^13.1.0", "cypress-cloud": "*", "tsconfig": "*", "typescript": "^4.7.4" @@ -24517,7 +24540,6 @@ "commander": "^10.0.0", "common-path-prefix": "^3.0.0", "cy2": "^3.4.2", - "cypress": "^13.1.0", "date-fns": "^2.30.0", "debug": "^4.3.4", "esbuild": "^0.16.5", @@ -32090,9 +32112,9 @@ }, "dependencies": { "@types/node": { - "version": "16.18.48", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.48.tgz", - "integrity": "sha512-mlaecDKQ7rIZrYD7iiKNdzFb6e/qD5I9U1rAhq+Fd+DWvYVs+G2kv74UFHmSOlg5+i/vF3XxuR522V4u8BqO+Q==" + "version": "16.18.50", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.50.tgz", + "integrity": "sha512-OiDU5xRgYTJ203v4cprTs0RwOCd5c5Zjv+K5P8KSqfiCsB1W3LcamTUMcnQarpq5kOYbhHfSOgIEJvdPyb5xyw==" }, "semver": { "version": "7.5.4", diff --git a/package.json b/package.json index 6a1d42a..6a71fcc 100644 --- a/package.json +++ b/package.json @@ -29,5 +29,8 @@ }, "resolutions": { "debug": "^4.3.4" + }, + "dependencies": { + "cypress": "^13.1.0" } } diff --git a/packages/cypress-cloud/lib/cypress/cypress.ts b/packages/cypress-cloud/lib/cypress/cypress.ts index d3c0874..d682376 100644 --- a/packages/cypress-cloud/lib/cypress/cypress.ts +++ b/packages/cypress-cloud/lib/cypress/cypress.ts @@ -1,4 +1,6 @@ import cypress from "cypress"; +console.log("resolve:", require.resolve("cypress")); +console.log(import.meta.resolve && import.meta.resolve("cypress")); import { CurrentsRunParameters, CypressResult, diff --git a/packages/cypress-cloud/package.json b/packages/cypress-cloud/package.json index d730bcc..8196859 100644 --- a/packages/cypress-cloud/package.json +++ b/packages/cypress-cloud/package.json @@ -40,7 +40,6 @@ "@types/jest": "^29.2.4", "@types/lodash": "^4.14.191", "@types/ws": "^8.5.4", - "cypress": "^13.1.0", "esbuild": "^0.16.5", "eslint": "^7.32.0", "eslint-config-custom": "latest",