From 115956622db908cdc4f05f46958d1641f867b646 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 9 Oct 2024 20:35:44 -0500 Subject: [PATCH 01/88] chore: upgrade electron to 32.2.0 -- run ci --- .circleci/workflows.yml | 6 +- .github/ISSUE_TEMPLATE/1-bug-report.yml | 2 +- .github/ISSUE_TEMPLATE/2-memory-issue.yml | 2 +- .github/ISSUE_TEMPLATE/3-install-issue.yml | 2 +- .github/workflows/snyk_sca_scan.yaml | 4 +- .../workflows/snyk_static_analysis_scan.yaml | 2 +- .github/workflows/update-browser-versions.yml | 2 +- .../workflows/update_v8_snapshot_cache.yml | 2 +- .node-version | 2 +- cli/CHANGELOG.md | 6 + docker-compose.yml | 2 +- npm/cypress-schematic/package.json | 2 +- npm/puppeteer/package.json | 2 +- npm/webpack-dev-server/package.json | 2 +- package.json | 8 +- packages/data-context/src/DataContext.ts | 2 +- packages/electron/README.md | 3 - packages/errors/package.json | 2 +- .../packherd-require/src/sourcemap-support.ts | 2 +- packages/server/package.json | 6 +- packages/types/package.json | 2 +- .../binary/trigger-publish-binary-pipeline.js | 2 +- system-tests/lib/dep-installer/yarn.ts | 5 - system-tests/projects/angular-13/package.json | 2 +- .../issue-25951-next-app/package.json | 2 +- system-tests/test-binary/module_api_spec.ts | 2 +- .../test-binary/node_versions_spec.ts | 6 +- tooling/electron-mksnapshot/package.json | 2 +- .../cache/darwin/snapshot-meta.json | 4 +- .../src/generator/snapshot-generator.ts | 4 +- yarn.lock | 546 ++++++++++-------- 31 files changed, 343 insertions(+), 295 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index e524e22e59cd..9925d9aa294e 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -85,7 +85,7 @@ executors: # the Docker image with Cypress dependencies and Chrome browser cy-doc: docker: - - image: cypress/browsers-internal:node18.17.1-chrome128-ff130 + - image: cypress/browsers-internal:node20.18.0-chrome129-ff131 # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -94,7 +94,7 @@ executors: kitchensink-executor: docker: - - image: cypress/browsers-internal:node20.15.0-chrome126-ff127 + - image: cypress/browsers-internal:node20.18.0-chrome129-ff131 # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -104,7 +104,7 @@ executors: # Docker image with non-root "node" user non-root-docker-user: docker: - - image: cypress/browsers-internal:node18.17.1-chrome128-ff130 + - image: cypress/browsers-internal:node20.18.0-chrome129-ff131 user: node environment: PLATFORM: linux diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml index 2f269318a1d8..50b3b350d544 100644 --- a/.github/ISSUE_TEMPLATE/1-bug-report.yml +++ b/.github/ISSUE_TEMPLATE/1-bug-report.yml @@ -43,7 +43,7 @@ body: attributes: label: Node version description: What version of node.js are you using to run Cypress? - placeholder: ex. v18.17.0 + placeholder: ex. v20.18.0 validations: required: true - type: input diff --git a/.github/ISSUE_TEMPLATE/2-memory-issue.yml b/.github/ISSUE_TEMPLATE/2-memory-issue.yml index 28e5bbabb1a2..9af01f83121d 100644 --- a/.github/ISSUE_TEMPLATE/2-memory-issue.yml +++ b/.github/ISSUE_TEMPLATE/2-memory-issue.yml @@ -51,7 +51,7 @@ body: attributes: label: Node version description: What version of node.js are you using to run Cypress? - placeholder: ex. v18.17.0 + placeholder: ex. v20.18.0 validations: required: true - type: input diff --git a/.github/ISSUE_TEMPLATE/3-install-issue.yml b/.github/ISSUE_TEMPLATE/3-install-issue.yml index 6e513901e5fc..5298df42b260 100644 --- a/.github/ISSUE_TEMPLATE/3-install-issue.yml +++ b/.github/ISSUE_TEMPLATE/3-install-issue.yml @@ -38,7 +38,7 @@ body: attributes: label: Node version description: What version of node.js are you using to run Cypress? - placeholder: ex. v18.17.0 + placeholder: ex. v20.18.0 validations: required: true - type: dropdown diff --git a/.github/workflows/snyk_sca_scan.yaml b/.github/workflows/snyk_sca_scan.yaml index 45f504bf3a4f..608be5ec7a83 100644 --- a/.github/workflows/snyk_sca_scan.yaml +++ b/.github/workflows/snyk_sca_scan.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [18.x] + node-version: [20.x] steps: - name: Checkout uses: actions/checkout@v4 @@ -28,7 +28,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - name: Run yarn run: yarn diff --git a/.github/workflows/snyk_static_analysis_scan.yaml b/.github/workflows/snyk_static_analysis_scan.yaml index 58596a407c8f..b0e0087f1ddb 100644 --- a/.github/workflows/snyk_static_analysis_scan.yaml +++ b/.github/workflows/snyk_static_analysis_scan.yaml @@ -21,7 +21,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - name: Run yarn run: yarn diff --git a/.github/workflows/update-browser-versions.yml b/.github/workflows/update-browser-versions.yml index 330464273fbb..935ffc247c4a 100644 --- a/.github/workflows/update-browser-versions.yml +++ b/.github/workflows/update-browser-versions.yml @@ -30,7 +30,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - name: Check for new Chrome versions id: get-versions uses: actions/github-script@v7 diff --git a/.github/workflows/update_v8_snapshot_cache.yml b/.github/workflows/update_v8_snapshot_cache.yml index fc36072a2606..2e0dd9df6913 100644 --- a/.github/workflows/update_v8_snapshot_cache.yml +++ b/.github/workflows/update_v8_snapshot_cache.yml @@ -82,7 +82,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - name: Run yarn run: yarn diff --git a/.node-version b/.node-version index 4a1f488b6c3b..2a393af592b8 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -18.17.1 +20.18.0 diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index c357ee1adcbe..aeea16fef0ad 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -8,6 +8,12 @@ _Released 12/3/2024 (PENDING)_ - Removed support for Node.js 16 and Node.js 21. Addresses [#29930](https://github.com/cypress-io/cypress/issues/29930). - Prebuilt binaries for Linux are no longer compatible with Linux distributions based on glibc <2.28, for example: Ubuntu 14-18, RHEL 7, CentOS 7, Amazon Linux 2. Addresses [#29601](https://github.com/cypress-io/cypress/issues/29601). - The undocumented methods `Cypress.backend('firefox:force:gc')` and `Cypress.backend('log:memory:pressure')` were removed. Addresses [#30222](https://github.com/cypress-io/cypress/issues/30222). +- Upgraded bundled Node.js version from `18.17.0` to `20.16.0`. + +**Dependency Updates:** + +- Upgraded `electron` from `27.3.10` to `32.2.0`. +- Upgraded bundled Chromium version from `118.0.5993.159` to `128.0.6613.178`. ## 13.15.1 diff --git a/docker-compose.yml b/docker-compose.yml index 3f3c200c3658..f7fc505d1a1e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: - .:/opt/cypress ci: # This should mirror the image used in workflows.yml - image: cypress/browsers-internal:node18.17.1-chrome118-ff115 + image: cypress/browsers-internal:node20.18.0-chrome129-ff131 ports: - 5566:5566 - 5567:5567 diff --git a/npm/cypress-schematic/package.json b/npm/cypress-schematic/package.json index 30bf1ceee0e1..95d5585dee65 100644 --- a/npm/cypress-schematic/package.json +++ b/npm/cypress-schematic/package.json @@ -22,7 +22,7 @@ "@schematics/angular": "^14.2.1", "@types/chai-enzyme": "0.6.7", "@types/mocha": "8.0.3", - "@types/node": "^18.17.5", + "@types/node": "^20.16.0", "chai": "4.2.0", "mocha": "3.5.3", "typescript": "^5.4.5" diff --git a/npm/puppeteer/package.json b/npm/puppeteer/package.json index adb61b29fb8c..e12a174c3104 100644 --- a/npm/puppeteer/package.json +++ b/npm/puppeteer/package.json @@ -21,7 +21,7 @@ "puppeteer-core": "^21.2.1" }, "devDependencies": { - "@types/node": "^18.17.5", + "@types/node": "^20.16.0", "chai-as-promised": "^7.1.1", "chokidar": "^3.5.3", "express": "4.19.2", diff --git a/npm/webpack-dev-server/package.json b/npm/webpack-dev-server/package.json index 58104344a9e4..17829d8450d4 100644 --- a/npm/webpack-dev-server/package.json +++ b/npm/webpack-dev-server/package.json @@ -29,7 +29,7 @@ "webpack-merge": "^5.4.0" }, "devDependencies": { - "@types/node": "18.17.5", + "@types/node": "20.16.0", "@types/proxyquire": "^1.3.28", "@types/speed-measure-webpack-plugin": "^1.3.4", "@types/webpack-dev-server-3": "npm:@types/webpack-dev-server@^3", diff --git a/package.json b/package.json index 8f6aeb311e83..d9e2708cd416 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "@types/lodash": "^4.14.168", "@types/markdown-it": "12.2.3", "@types/mocha": "8.0.3", - "@types/node": "18.17.5", + "@types/node": "20.16.0", "@types/prismjs": "1.16.0", "@types/react": "16.9.50", "@types/react-dom": "16.9.8", @@ -140,8 +140,8 @@ "dedent": "^0.7.0", "del": "3.0.0", "detect-port": "^1.6.1", - "electron": "27.3.10", - "electron-builder": "^23.6.0", + "electron": "32.2.0", + "electron-builder": "^25.1.7", "enzyme-adapter-react-16": "1.12.1", "eslint": "^8.56.0", "eslint-plugin-cypress": "3.5.0", @@ -206,7 +206,7 @@ "yarn-deduplicate": "3.1.0" }, "engines": { - "node": ">=18.17.0", + "node": ">=20.18.0", "yarn": ">=1.22.17" }, "productName": "Cypress", diff --git a/packages/data-context/src/DataContext.ts b/packages/data-context/src/DataContext.ts index 3b4db97e276a..6585fcd1944f 100644 --- a/packages/data-context/src/DataContext.ts +++ b/packages/data-context/src/DataContext.ts @@ -181,7 +181,7 @@ export class DataContext { @cached get cloud () { return new CloudDataSource({ - fetch: (...args) => this.util.fetch(...args), + fetch: (input: RequestInfo | URL, init?: RequestInit) => this.util.fetch(input, init), getUser: () => this.coreData.user, logout: () => this.actions.auth.logout().catch(this.logTraceError), invalidateClientUrqlCache: () => this.graphql.invalidateClientUrqlCache(this), diff --git a/packages/electron/README.md b/packages/electron/README.md index 638c308bfaba..208a609b2810 100644 --- a/packages/electron/README.md +++ b/packages/electron/README.md @@ -55,9 +55,6 @@ Upgrading `electron` involves more than just bumping this package's `package.jso - [ ] [`/package.json`](../../package.json) - update `engines` - [ ] [`docker-compose.yml`](../../docker-compose.yml) - update Docker image to the new matching `browsers` image - [ ] [`/system-tests/test-binary/*`](../../system-tests/test-binary) - update binary system tests to use the newly published Ubuntu and Node images mentioned above, if applicable - - [ ] [`/.circleci/config.yml`](../../.circleci/config.yml) - - Update the Docker `image`s to the new matching `browsers` image. - - Update the `xcode` version to one with the same major Node.js version bundled. There is usually not an exact match, this is ok as long as the major version number as the same. - [ ] Do a global search for the old Node.js version to identify any new areas that may need updating/unification, and update those locations (and this document!) - [ ] **Update `cypress-publish-binary`** For **binary publishing**, make sure the `electron` version that we updated in [`/package.json`](../../package.json) matches the `electron` version inside the [publish binary project](https://github.com/cypress-io/cypress-publish-binary/blob/main/package.json). This is to make sure add-on tests inside the publish-binary repository work locally, but are not required to install the correct version of `electron` in CI when publishing the binary. Ensure the `electron` target in this project's `.circleci` configuration is updated as well. Set the Remove this before merging, and ensure that branch is merged as well. diff --git a/packages/errors/package.json b/packages/errors/package.json index eecbeffad99b..6f502cde01e8 100644 --- a/packages/errors/package.json +++ b/packages/errors/package.json @@ -26,7 +26,7 @@ "@packages/types": "0.0.0-development", "@types/chai": "4.2.15", "@types/mocha": "8.2.2", - "@types/node": "18.17.5", + "@types/node": "20.16.0", "@types/pngjs": "^6.0.1", "ansi-styles": "^5", "chai": "4.2.0", diff --git a/packages/packherd-require/src/sourcemap-support.ts b/packages/packherd-require/src/sourcemap-support.ts index e4f1130bca9b..ca63598a64e0 100644 --- a/packages/packherd-require/src/sourcemap-support.ts +++ b/packages/packherd-require/src/sourcemap-support.ts @@ -225,7 +225,7 @@ class SourcemapSupport { } frame.getScriptNameOrSourceURL = function getScriptNameOrSourceURL () { - return pos.source || pos.name + return pos.source || pos.name || '' } frame.codeFrames = pos.codeFrames diff --git a/packages/server/package.json b/packages/server/package.json index 47a2aa6f338d..dbfbf12a42d3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -38,7 +38,7 @@ "ansi_up": "5.0.0", "ast-types": "0.13.3", "base64url": "^3.0.1", - "better-sqlite3": "9.2.2", + "better-sqlite3": "11.3.0", "black-hole-stream": "0.0.1", "bluebird": "3.7.2", "bundle-require": "3.0.4", @@ -139,7 +139,7 @@ "@cypress/debugging-proxy": "2.0.1", "@cypress/sinon-chai": "2.9.1", "@cypress/webpack-dev-server": "0.0.0-development", - "@electron/rebuild": "3.2.10", + "@electron/rebuild": "3.7.0", "@ffprobe-installer/ffprobe": "1.1.0", "@packages/config": "0.0.0-development", "@packages/data-context": "0.0.0-development", @@ -163,7 +163,7 @@ "@types/chrome-remote-interface": "0.31.14", "@types/http-proxy": "1.17.4", "@types/mime": "3.0.1", - "@types/node": "18.17.5", + "@types/node": "20.16.0", "@types/request-promise": "^4.1.48", "babel-loader": "9.1.3", "chai": "1.10.0", diff --git a/packages/types/package.json b/packages/types/package.json index 275c35d911e5..0be1cb2846e9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -12,7 +12,7 @@ }, "dependencies": {}, "devDependencies": { - "@types/node": "18.17.5", + "@types/node": "20.16.0", "devtools-protocol": "0.0.1346313", "typescript": "^5.4.5" }, diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index 1b3924fe386b..b4b2820a2fbb 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -10,7 +10,7 @@ const { getNextVersionForBinary } = require('../get-next-version') const { nextVersion } = await getNextVersionForBinary() const body = JSON.stringify({ - branch: 'release/14.0.0', + branch: 'ryanm/chore/electron-upgrade', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1, diff --git a/system-tests/lib/dep-installer/yarn.ts b/system-tests/lib/dep-installer/yarn.ts index eea69862ebed..3e5b7be26dfa 100644 --- a/system-tests/lib/dep-installer/yarn.ts +++ b/system-tests/lib/dep-installer/yarn.ts @@ -29,11 +29,6 @@ export function getYarnCommand (opts: { // @see https://github.com/yarnpkg/yarn/issues/6407 cmd += ' --update-checksums' - // FIXME: Currently with Electron 27, we use Node 18.17.1. Angular 18 dependencies need at least Node 18.19.1 - // which throws an install error on incompatible node version. Once we upgrade to Electron 29, the below line can be removed. - // Remove this flag when https://github.com/cypress-io/cypress/issues/29547 is complete. - cmd += ' --ignore-engines' - // in CircleCI, this offline cache can be used if (opts.isCI) cmd += ` --cache-folder=${homedir()}/.yarn` else cmd += ` --cache-folder=${path.join(tempDir, 'cy-system-tests-yarn-cache', String(Date.now()))}` diff --git a/system-tests/projects/angular-13/package.json b/system-tests/projects/angular-13/package.json index a7865e885716..41243ac8251b 100644 --- a/system-tests/projects/angular-13/package.json +++ b/system-tests/projects/angular-13/package.json @@ -25,7 +25,7 @@ "@angular-devkit/build-angular": "~13.3.6", "@angular/cli": "~13.3.6", "@angular/compiler-cli": "~13.3.0", - "@types/node": "^18.17.5", + "@types/node": "^20.16.0", "typescript": "~4.6.2" }, "projectFixtureDirectory": "angular" diff --git a/system-tests/projects/issue-25951-next-app/package.json b/system-tests/projects/issue-25951-next-app/package.json index 260c7206a125..9316ffabdd7e 100644 --- a/system-tests/projects/issue-25951-next-app/package.json +++ b/system-tests/projects/issue-25951-next-app/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "@types/node": "18.17.5", + "@types/node": "20.16.0", "@types/react": "18.0.32", "@types/react-dom": "18.0.11", "next": "13.2.4", diff --git a/system-tests/test-binary/module_api_spec.ts b/system-tests/test-binary/module_api_spec.ts index 186b8e8b6e21..6479e41d5291 100644 --- a/system-tests/test-binary/module_api_spec.ts +++ b/system-tests/test-binary/module_api_spec.ts @@ -3,7 +3,7 @@ import systemTests from '../lib/system-tests' describe('module API', () => { systemTests.it('can run module API Mocha spec', { timeout: 240000, - dockerImage: 'cypress/base-internal:18.17.1', + dockerImage: 'cypress/base-internal:20.18.0', withBinary: true, project: 'module-api', browser: 'electron', diff --git a/system-tests/test-binary/node_versions_spec.ts b/system-tests/test-binary/node_versions_spec.ts index 32c0d7574a2b..f9deb4e6fb0b 100644 --- a/system-tests/test-binary/node_versions_spec.ts +++ b/system-tests/test-binary/node_versions_spec.ts @@ -26,8 +26,7 @@ function smokeTestDockerImage (dockerImage: string) { describe('binary node versions', () => { [ - 'cypress/base:18.16.1', - 'cypress/base:20.12.2', + 'cypress/base:20.18.0', 'cypress/base:22.0.0', 'cypress/base:22.7.0', ].forEach(smokeTestDockerImage) @@ -35,8 +34,7 @@ describe('binary node versions', () => { describe('type: module', () => { [ - 'cypress/base:18.16.1', - 'cypress/base:20.12.2', + 'cypress/base:20.18.0', 'cypress/base:22.0.0', 'cypress/base:22.7.0', ].forEach((dockerImage) => { diff --git a/tooling/electron-mksnapshot/package.json b/tooling/electron-mksnapshot/package.json index 6e65fdf4fdfe..a17bab1febcc 100644 --- a/tooling/electron-mksnapshot/package.json +++ b/tooling/electron-mksnapshot/package.json @@ -15,7 +15,7 @@ "watch": "tsc --watch" }, "dependencies": { - "@electron/get": "^2.0.2", + "@electron/get": "^3.0.0", "debug": "^4.3.4", "extract-zip": "^2.0.1", "fs-extra": "^10.0.0", diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index 170e1d77f344..6709519e40dc 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -1576,6 +1576,7 @@ "./node_modules/browserslist/index.js", "./node_modules/browserslist/node.js", "./node_modules/browserslist/parse.js", + "./node_modules/buffer-equal/index.js", "./node_modules/bytes/index.js", "./node_modules/call-bind/callBound.js", "./node_modules/call-bind/index.js", @@ -2293,7 +2294,6 @@ "./node_modules/lazy-ass/index.js", "./node_modules/load-bmfont/index.js", "./node_modules/load-bmfont/lib/is-binary.js", - "./node_modules/load-bmfont/node_modules/buffer-equal/index.js", "./node_modules/lodash._baseassign/index.js", "./node_modules/lodash._basecopy/index.js", "./node_modules/lodash._basecreate/index.js", @@ -4196,5 +4196,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "f170955b504058c9220ca27cc0e8cdc5ba4672137e3c373a2fca8fa058215acd" + "deferredHash": "9ec4491895b8b6e85c225906c9a63362b259dbc9975af9bc38e2570a7e941fd1" } \ No newline at end of file diff --git a/tooling/v8-snapshot/src/generator/snapshot-generator.ts b/tooling/v8-snapshot/src/generator/snapshot-generator.ts index a1549cadae55..61eb611e1133 100644 --- a/tooling/v8-snapshot/src/generator/snapshot-generator.ts +++ b/tooling/v8-snapshot/src/generator/snapshot-generator.ts @@ -475,7 +475,9 @@ export class SnapshotGenerator { // 2. Run the `mksnapshot` binary providing it the path to our snapshot // script - const args = [this.snapshotScriptPath, '--output_dir', this.snapshotBinDir] + // --no-use-ic flag is a workaround + // see https://issues.chromium.org/issues/345280736#comment12 + const args = [this.snapshotScriptPath, '--output_dir', this.snapshotBinDir, '--no-use-ic'] try { const { snapshotBlobFile, v8ContextFile } = await syncAndRun( diff --git a/yarn.lock b/yarn.lock index 31ccf4af0895..7427089d5fa4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"7zip-bin@~5.1.1": - version "5.1.1" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" - integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== +"7zip-bin@~5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.2.0.tgz#7a03314684dd6572b7dfa89e68ce31d60286854d" + integrity sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A== "@aashutoshrathi/word-wrap@^1.2.3": version "1.2.6" @@ -2964,7 +2964,7 @@ fs-extra "^9.0.1" minimist "^1.2.5" -"@electron/get@^2.0.0", "@electron/get@^2.0.2": +"@electron/get@^2.0.0": version "2.0.2" resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g== @@ -2994,19 +2994,34 @@ optionalDependencies: global-agent "^3.0.0" -"@electron/notarize@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.1.0.tgz#76aaec10c8687225e8d0a427cc9df67611c46ff3" - integrity sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA== +"@electron/node-gyp@https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2": + version "10.2.0-electron.1" + resolved "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2" + dependencies: + env-paths "^2.2.0" + exponential-backoff "^3.1.1" + glob "^8.1.0" + graceful-fs "^4.2.6" + make-fetch-happen "^10.2.1" + nopt "^6.0.0" + proc-log "^2.0.1" + semver "^7.3.5" + tar "^6.2.1" + which "^2.0.2" + +"@electron/notarize@2.5.0", "@electron/notarize@^2.1.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.5.0.tgz#d4d25356adfa29df4a76bd64a8bd347237cd251e" + integrity sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A== dependencies: debug "^4.1.1" fs-extra "^9.0.1" promise-retry "^2.0.1" -"@electron/osx-sign@^1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.5.tgz#0af7149f2fce44d1a8215660fd25a9fb610454d8" - integrity sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww== +"@electron/osx-sign@1.3.1", "@electron/osx-sign@^1.0.5": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.3.1.tgz#faf7eeca7ca004a6be541dc4cf7a1bd59ec59b1c" + integrity sha512-BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw== dependencies: compare-version "^0.1.2" debug "^4.3.4" @@ -3040,10 +3055,10 @@ semver "^7.1.3" yargs-parser "^21.1.1" -"@electron/rebuild@3.2.10": - version "3.2.10" - resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.2.10.tgz#adc9443179709d4e4b93a68fac6a08b9a3b9e5e6" - integrity sha512-SUBM6Mwi3yZaDFQjZzfGKpYTtOp9m60glounwX6tfGeVc/ZOl4jbquktUcyy7gYSLDWFLtKkftkY2xgMJZLQgg== +"@electron/rebuild@3.6.1": + version "3.6.1" + resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.6.1.tgz#59e8e36c3f6e6b94a699425dfb61f0394c3dd4df" + integrity sha512-f6596ZHpEq/YskUd8emYvOUne89ij8mQgjYFA5ru25QwbrRO+t1SImofdDv7kKOuWCmVOuU5tvfkbgGxIl3E/w== dependencies: "@malept/cross-spawn-promise" "^2.0.0" chalk "^4.0.0" @@ -3051,29 +3066,36 @@ detect-libc "^2.0.1" fs-extra "^10.0.0" got "^11.7.0" - lzma-native "^8.0.5" - node-abi "^3.0.0" - node-api-version "^0.1.4" + node-abi "^3.45.0" + node-api-version "^0.2.0" node-gyp "^9.0.0" ora "^5.1.0" + read-binary-file-arch "^1.0.6" semver "^7.3.5" tar "^6.0.5" yargs "^17.0.1" -"@electron/universal@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339" - integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== +"@electron/rebuild@3.7.0": + version "3.7.0" + resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.7.0.tgz#82e20c467ddedbb295d7f641592c52e68c141e9f" + integrity sha512-VW++CNSlZwMYP7MyXEbrKjpzEwhB5kDNbzGtiPEjwYysqyTCF+YbNJ210Dj3AjWsGSV4iEEwNkmJN9yGZmVvmw== dependencies: - "@malept/cross-spawn-promise" "^1.1.0" - asar "^3.1.0" - debug "^4.3.1" - dir-compare "^2.4.0" - fs-extra "^9.0.1" - minimatch "^3.0.4" - plist "^3.0.4" + "@electron/node-gyp" "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2" + "@malept/cross-spawn-promise" "^2.0.0" + chalk "^4.0.0" + debug "^4.1.1" + detect-libc "^2.0.1" + fs-extra "^10.0.0" + got "^11.7.0" + node-abi "^3.45.0" + node-api-version "^0.2.0" + ora "^5.1.0" + read-binary-file-arch "^1.0.6" + semver "^7.3.5" + tar "^6.0.5" + yargs "^17.0.1" -"@electron/universal@^2.0.1": +"@electron/universal@2.0.1", "@electron/universal@^2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-2.0.1.tgz#7b070ab355e02957388f3dbd68e2c3cd08c448ae" integrity sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA== @@ -4767,13 +4789,6 @@ write-pkg "4.0.0" yargs "16.2.0" -"@malept/cross-spawn-promise@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" - integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== - dependencies: - cross-spawn "^7.0.1" - "@malept/cross-spawn-promise@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" @@ -7514,6 +7529,13 @@ dependencies: "@types/node" "*" +"@types/fs-extra@9.0.13", "@types/fs-extra@^9.0.11", "@types/fs-extra@^9.0.13": + version "9.0.13" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" + integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== + dependencies: + "@types/node" "*" + "@types/fs-extra@^8.0.1": version "8.1.1" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068" @@ -7521,13 +7543,6 @@ dependencies: "@types/node" "*" -"@types/fs-extra@^9.0.11", "@types/fs-extra@^9.0.13": - version "9.0.13" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" - integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== - dependencies: - "@types/node" "*" - "@types/getenv@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/getenv/-/getenv-1.0.0.tgz#fa5e6901e9fb84bfb40205d4952fd06c8afcf006" @@ -7763,20 +7778,24 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@>=10.0.0", "@types/node@^18.11.18", "@types/node@^18.17.5": - version "18.18.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.3.tgz#e5188135fc2909b46530c798ef49be65083be3fd" - integrity sha512-0OVfGupTl3NBFr8+iXpfZ8NR7jfFO+P1Q+IO/q0wbo02wYkP5gy36phojeYWpLQ6WAMjl+VfmqUk2YbUfp0irA== +"@types/node@*", "@types/node@>=10.0.0", "@types/node@^20.16.0", "@types/node@^20.9.0": + version "20.16.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.11.tgz#9b544c3e716b1577ac12e70f9145193f32750b33" + integrity sha512-y+cTCACu92FyA5fgQSAI8A1H429g7aSK2HsO7K4XYUWc4dY5IUz55JSDIYT6/VsOLfGy8vmvQYC2hfb0iF16Uw== + dependencies: + undici-types "~6.19.2" "@types/node@16.9.1": version "16.9.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708" integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g== -"@types/node@18.17.5": - version "18.17.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.5.tgz#c58b12bca8c2a437b38c15270615627e96dd0bc5" - integrity sha512-xNbS75FxH6P4UXTPUJp/zNPq6/xsfdJKussCWNOnz4aULWIRwMgP1LgaB5RiBnMX1DPCYenuqGZfnIAx5mbFLA== +"@types/node@20.16.0": + version "20.16.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.0.tgz#02e5cd414f76bf345874ee65a1e5590d755d894f" + integrity sha512-vDxceJcoZhIVh67S568bm1UGZO0DX0hpplJZxzeXMKwIPLn190ec5RRxQ69BKhX44SUGIxxgMdDY557lGLKprQ== + dependencies: + undici-types "~6.19.2" "@types/node@^12.12.29", "@types/node@^12.12.7": version "12.20.55" @@ -8270,13 +8289,6 @@ dependencies: "@types/yargs-parser" "*" -"@types/yargs@^17.0.1": - version "17.0.7" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz#44a484c634761da4391477515a98772b82b5060f" - integrity sha512-OvLKmpKdea1aWtqHv9bxVVcMoT6syAeK+198dfETIFkAevYRGwqh4H+KFxfjUETZuUuE5sQCAFwdOdoHUdo8eg== - dependencies: - "@types/yargs-parser" "*" - "@types/yauzl@^2.9.1": version "2.9.1" resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af" @@ -9608,41 +9620,47 @@ anymatch@^3.0.0, anymatch@^3.1.1, anymatch@~3.1.1, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" - integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== +app-builder-bin@5.0.0-alpha.10: + version "5.0.0-alpha.10" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz#cf12e593b6b847fb9d04027fa755c6c6610d778b" + integrity sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw== -app-builder-lib@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" - integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== +app-builder-lib@25.1.7: + version "25.1.7" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-25.1.7.tgz#f8ce8e2edc6d91becbe956b1205da1f3849cafe9" + integrity sha512-JxmN+D/Dn7BLQoN+cTFO+zbMHcpI10v/xjyjFO1FKpHbApOG+OQt/xUyVjKWp4FYplIfuHdpxqTXo1PN/Wzm/A== dependencies: - "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.2.1" + "@electron/notarize" "2.5.0" + "@electron/osx-sign" "1.3.1" + "@electron/rebuild" "3.6.1" + "@electron/universal" "2.0.1" "@malept/flatpak-bundler" "^0.4.0" + "@types/fs-extra" "9.0.13" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "23.6.0" - builder-util-runtime "9.1.1" + builder-util "25.1.7" + builder-util-runtime "9.2.10" chromium-pickle-js "^0.2.0" + config-file-ts "0.2.8-rc1" debug "^4.3.4" - ejs "^3.1.7" - electron-osx-sign "^0.6.0" - electron-publish "23.6.0" + dotenv "^16.4.5" + dotenv-expand "^11.0.6" + ejs "^3.1.8" + electron-publish "25.1.7" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" is-ci "^3.0.0" - isbinaryfile "^4.0.10" + isbinaryfile "^5.0.0" js-yaml "^4.1.0" + json5 "^2.2.3" lazy-val "^1.0.5" - minimatch "^3.1.2" - read-config-file "6.2.0" + minimatch "^10.0.0" + resedit "^1.7.0" sanitize-filename "^1.6.3" - semver "^7.3.7" - tar "^6.1.11" + semver "^7.3.8" + tar "^6.1.12" temp-file "^3.4.0" append-buffer@^1.0.2: @@ -9970,18 +9988,6 @@ asap@^2.0.0, asap@~2.0.3: resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= -asar@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" - integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== - dependencies: - chromium-pickle-js "^0.2.0" - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - optionalDependencies: - "@types/glob" "^7.1.1" - ascii-table@0.0.9: version "0.0.9" resolved "https://registry.yarnpkg.com/ascii-table/-/ascii-table-0.0.9.tgz#06a6604d6a55d4bf41a9a47d9872d7a78da31e73" @@ -10499,10 +10505,10 @@ before-after-hook@^2.2.0: resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e" integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ== -better-sqlite3@9.2.2: - version "9.2.2" - resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-9.2.2.tgz#3ce1ed24f327ed8c9b0c39b825cdc2341aeb249f" - integrity sha512-qwjWB46il0lsDkeB4rSRI96HyDQr8sxeu1MkBVLMrwusq1KRu4Bpt1TMI+8zIJkDUtZ3umjAkaEjIlokZKWCQw== +better-sqlite3@11.3.0: + version "11.3.0" + resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-11.3.0.tgz#f10b32ddff665c33176d148e707bd1e57dfd0284" + integrity sha512-iHt9j8NPYF3oKCNOO5ZI4JwThjt3Z6J6XrcwG85VNMVzv1ByqrHWv5VILEbCMFWDsoHhXvQ7oC8vgRXFAKgl9w== dependencies: bindings "^1.5.0" prebuild-install "^7.1.1" @@ -10929,7 +10935,7 @@ buffer-alloc-unsafe@^1.1.0: resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== -buffer-alloc@^1.1.0, buffer-alloc@^1.2.0: +buffer-alloc@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== @@ -10952,7 +10958,7 @@ buffer-equal@0.0.1: resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b" integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs= -buffer-equal@1.0.0, buffer-equal@^1.0.0: +buffer-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= @@ -11012,31 +11018,30 @@ buildcheck@~0.0.6: resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238" integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A== -builder-util-runtime@9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" - integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== +builder-util-runtime@9.2.10: + version "9.2.10" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz#a0f7d9e214158402e78b74a745c8d9f870c604bc" + integrity sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" - integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== +builder-util@25.1.7: + version "25.1.7" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-25.1.7.tgz#a07b404f0cb1a635aa165902be65297d58932ff8" + integrity sha512-7jPjzBwEGRbwNcep0gGNpLXG9P94VA3CPAZQCzxkFXiV2GMQKlziMbY//rXPI7WKfhsvGgFXjTcXdBEwgXw9ww== dependencies: - "7zip-bin" "~5.1.1" + "7zip-bin" "~5.2.0" "@types/debug" "^4.1.6" - "@types/fs-extra" "^9.0.11" - app-builder-bin "4.0.0" + app-builder-bin "5.0.0-alpha.10" bluebird-lst "^1.0.9" - builder-util-runtime "9.1.1" - chalk "^4.1.1" + builder-util-runtime "9.2.10" + chalk "^4.1.2" cross-spawn "^7.0.3" debug "^4.3.4" - fs-extra "^10.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" + fs-extra "^10.1.0" + http-proxy-agent "^7.0.0" + https-proxy-agent "^7.0.0" is-ci "^3.0.0" js-yaml "^4.1.0" source-map-support "^0.5.19" @@ -12170,11 +12175,6 @@ colorette@^2.0.10, colorette@^2.0.14: resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== -colors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= - colors@^1.1.2, colors@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" @@ -12417,6 +12417,14 @@ config-chain@^1.1.11, config-chain@^1.1.13: ini "^1.3.4" proto-list "~1.2.1" +config-file-ts@0.2.8-rc1: + version "0.2.8-rc1" + resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz#fb7fc6ccb2e313f69dbeb78f1db0b00038049de0" + integrity sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg== + dependencies: + glob "^10.3.12" + typescript "^5.4.3" + connect-history-api-fallback@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" @@ -13835,16 +13843,6 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dir-compare@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" - integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== - dependencies: - buffer-equal "1.0.0" - colors "1.0.3" - commander "2.9.0" - minimatch "3.0.4" - dir-compare@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-4.2.0.tgz#d1d4999c14fbf55281071fdae4293b3b9ce86f19" @@ -13896,15 +13894,15 @@ dlv@^1.1.3: resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== -dmg-builder@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" - integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== +dmg-builder@25.1.7: + version "25.1.7" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-25.1.7.tgz#a3bb8e1dc790faec04503568480db80f5077a2cb" + integrity sha512-Hac0AfXQrAV62JT99Had6bvUJb/f7vjJTaLOsmA/gAQcrc/cLmNAqCJ0ZZDqwKy2+LKXnxx45TvMXvovKd4iMg== dependencies: - app-builder-lib "23.6.0" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - fs-extra "^10.0.0" + app-builder-lib "25.1.7" + builder-util "25.1.7" + builder-util-runtime "9.2.10" + fs-extra "^10.1.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" optionalDependencies: @@ -14127,20 +14125,22 @@ dot-prop@^5.1.0: dependencies: is-obj "^2.0.0" -dotenv-expand@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" - integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== +dotenv-expand@^11.0.6: + version "11.0.6" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-11.0.6.tgz#f2c840fd924d7c77a94eff98f153331d876882d3" + integrity sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g== + dependencies: + dotenv "^16.4.4" dotenv@^10.0.0, dotenv@~10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== -dotenv@^9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" - integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== +dotenv@^16.4.4, dotenv@^16.4.5: + version "16.4.5" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f" + integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== drange@^1.0.2: version "1.1.1" @@ -14265,30 +14265,28 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -ejs@^3.1.10, ejs@^3.1.7: +ejs@^3.1.10, ejs@^3.1.7, ejs@^3.1.8: version "3.1.10" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== dependencies: jake "^10.8.5" -electron-builder@^23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b" - integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw== +electron-builder@^25.1.7: + version "25.1.7" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-25.1.7.tgz#b3d1504925a4d3693d97c76c0d2f2906613ffe4b" + integrity sha512-lsKtX93GSHWnmuteNRvBzgJIjRiiYB0qrJVRjShwBi75Ns+mRdWeOGZiXItqOWj+3g5UyY722kgoq2WlqCB87A== dependencies: - "@types/yargs" "^17.0.1" - app-builder-lib "23.6.0" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - dmg-builder "23.6.0" - fs-extra "^10.0.0" + app-builder-lib "25.1.7" + builder-util "25.1.7" + builder-util-runtime "9.2.10" + chalk "^4.1.2" + dmg-builder "25.1.7" + fs-extra "^10.1.0" is-ci "^3.0.0" lazy-val "^1.0.5" - read-config-file "6.2.0" - simple-update-notifier "^1.0.7" - yargs "^17.5.1" + simple-update-notifier "2.0.0" + yargs "^17.6.2" electron-context-menu@3.6.1: version "3.6.1" @@ -14313,28 +14311,16 @@ electron-is-dev@^2.0.0: resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz#833487a069b8dad21425c67a19847d9064ab19bd" integrity sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA== -electron-osx-sign@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" - integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== - dependencies: - bluebird "^3.5.0" - compare-version "^0.1.2" - debug "^2.6.8" - isbinaryfile "^3.0.2" - minimist "^1.2.0" - plist "^3.0.1" - -electron-publish@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" - integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== +electron-publish@25.1.7: + version "25.1.7" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-25.1.7.tgz#14e50c2a3fafdc1c454eadbbc47ead89a48bb554" + integrity sha512-+jbTkR9m39eDBMP4gfbqglDd6UvBC7RLh5Y0MhFSsc6UkGHj9Vj9TWobxevHYMMqmoujL11ZLjfPpMX+Pt6YEg== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - fs-extra "^10.0.0" + builder-util "25.1.7" + builder-util-runtime "9.2.10" + chalk "^4.1.2" + fs-extra "^10.1.0" lazy-val "^1.0.5" mime "^2.5.2" @@ -14343,13 +14329,13 @@ electron-to-chromium@^1.5.4: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6" integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q== -electron@27.3.10: - version "27.3.10" - resolved "https://registry.yarnpkg.com/electron/-/electron-27.3.10.tgz#3c9a3c918a644bb3ba07e4d4744f277636a54e58" - integrity sha512-fwJRWVP8/U42D5rk/xLvxN94zbM8P14PisJIWkOX6wctXOLGDTUFZb4jrkZA3/Fzuo8pzwXrXJmBL9FTwXzP3Q== +electron@32.2.0: + version "32.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-32.2.0.tgz#40b17864be5f88c89f71045ac6f61b5d4a9c1919" + integrity sha512-Xy82QBQrEiQysoxsv6lnhHAcWNNe6vV6QqH3OPFXhEj/T9oAsBHEhZuuYHINSSsUE7zRSj+J9sNwJYOjisT0Vw== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^18.11.18" + "@types/node" "^20.9.0" extract-zip "^2.0.1" elegant-spinner@^1.0.1: @@ -17222,9 +17208,9 @@ glob@7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^10.2.2, glob@^10.3.10, glob@^10.3.7, glob@^10.4.2: +glob@^10.2.2, glob@^10.3.10, glob@^10.3.12, glob@^10.3.7, glob@^10.4.2: version "10.4.5" - resolved "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== dependencies: foreground-child "^3.1.0" @@ -17246,7 +17232,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.1, glob@^8.0.3: +glob@^8.0.1, glob@^8.0.3, glob@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== @@ -19563,18 +19549,16 @@ isarray@^2.0.5: resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== -isbinaryfile@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" - integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== - dependencies: - buffer-alloc "^1.2.0" - -isbinaryfile@^4.0.0, isbinaryfile@^4.0.10, isbinaryfile@^4.0.8: +isbinaryfile@^4.0.0, isbinaryfile@^4.0.8: version "4.0.10" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== +isbinaryfile@^5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.2.tgz#fe6e4dfe2e34e947ffa240c113444876ba393ae0" + integrity sha512-GvcjojwonMjWbTkfMpnVHVqXW/wKMYDfEpY94/8zy8HFMOqb/VL6oeONq9v87q4ttVlaTLnGXnJD4B5B1OTGIg== + isbuffer@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/isbuffer/-/isbuffer-0.0.0.tgz#38c146d9df528b8bf9b0701c3d43cf12df3fc39b" @@ -20221,7 +20205,7 @@ lazy-cache@^1.0.3: resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4= -lazy-val@^1.0.4, lazy-val@^1.0.5: +lazy-val@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== @@ -21241,15 +21225,6 @@ lz-string@^1.4.4: resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY= -lzma-native@^8.0.5: - version "8.0.6" - resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz#3ea456209d643bafd9b5d911781bdf0b396b2665" - integrity sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA== - dependencies: - node-addon-api "^3.1.0" - node-gyp-build "^4.2.1" - readable-stream "^3.6.0" - magic-string@0.26.2: version "0.26.2" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.2.tgz#5331700e4158cd6befda738bb6b0c7b93c0d4432" @@ -21305,10 +21280,10 @@ make-error@^1, make-error@^1.1.1: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6: - version "10.1.7" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.1.7.tgz#b1402cb3c9fad92b380ff3a863cdae5414a42f76" - integrity sha512-J/2xa2+7zlIUKqfyXDCXFpH3ypxO4k3rgkZHPSZkyUYcBT/hM80M3oyKLM/9dVriZFiGeGGS2Ei+0v2zfhqj3Q== +make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6, make-fetch-happen@^10.2.1: + version "10.2.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" + integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== dependencies: agentkeepalive "^4.2.1" cacache "^16.1.0" @@ -21818,6 +21793,13 @@ minimatch@9.0.3: dependencies: brace-expansion "^2.0.1" +minimatch@^10.0.0: + version "10.0.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b" + integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ== + dependencies: + brace-expansion "^2.0.1" + minimatch@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" @@ -22066,7 +22048,7 @@ mobx@5.15.4: resolved "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz#9da1a84e97ba624622f4e55a0bf3300fb931c2ab" integrity sha512-xRFJxSU2Im3nrGCdjSuOTFmxVDGeqOHL+TyADCGbT0k4HHqGmx5u2yaHNryvoORpI4DfbzjJ5jPmuv+d7sioFw== -"mocha-7.0.1@npm:mocha@7.0.1", mocha@7.0.1: +"mocha-7.0.1@npm:mocha@7.0.1": version "7.0.1" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== @@ -22183,6 +22165,36 @@ mocha@6.2.2: yargs-parser "13.1.1" yargs-unparser "1.6.0" +mocha@7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" + integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== + dependencies: + ansi-colors "3.2.3" + browser-stdout "1.3.1" + chokidar "3.3.0" + debug "3.2.6" + diff "3.5.0" + escape-string-regexp "1.0.5" + find-up "3.0.0" + glob "7.1.3" + growl "1.10.5" + he "1.2.0" + js-yaml "3.13.1" + log-symbols "2.2.0" + minimatch "3.0.4" + mkdirp "0.5.1" + ms "2.1.1" + node-environment-flags "1.0.6" + object.assign "4.1.0" + strip-json-comments "2.0.1" + supports-color "6.0.0" + which "1.3.1" + wide-align "1.1.3" + yargs "13.3.0" + yargs-parser "13.1.1" + yargs-unparser "1.6.0" + mocha@7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.0.tgz#c784f579ad0904d29229ad6cb1e2514e4db7d249" @@ -22829,10 +22841,10 @@ node-abi@^2.7.0: dependencies: semver "^5.4.1" -node-abi@^3.0.0, node-abi@^3.3.0: - version "3.47.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.47.0.tgz#6cbfa2916805ae25c2b7156ca640131632eb05e8" - integrity sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A== +node-abi@^3.3.0, node-abi@^3.45.0: + version "3.68.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.68.0.tgz#8f37fb02ecf4f43ebe694090dcb52e0c4cc4ba25" + integrity sha512-7vbj10trelExNjFSBm5kTvZXXa7pZyKWx9RCKIyqe6I9Ev3IzGpQoqBP3a+cOdxY+pWj6VkP28n/2wWysBHD/A== dependencies: semver "^7.3.5" @@ -22851,10 +22863,10 @@ node-addon-api@^4.2.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== -node-api-version@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080" - integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g== +node-api-version@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.0.tgz#5177441da2b1046a4d4547ab9e0972eed7b1ac1d" + integrity sha512-fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg== dependencies: semver "^7.3.5" @@ -22947,7 +22959,7 @@ node-forge@^1: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== -node-gyp-build@^4.2.1, node-gyp-build@^4.3.0: +node-gyp-build@^4.3.0: version "4.6.1" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e" integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ== @@ -24931,6 +24943,11 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" +pe-library@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/pe-library/-/pe-library-0.4.1.tgz#e269be0340dcb13aa6949d743da7d658c3e2fbea" + integrity sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw== + pe-library@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/pe-library/-/pe-library-1.0.1.tgz#02735430885a622576a53cd8827658b7d2fada0e" @@ -25129,7 +25146,7 @@ please-upgrade-node@^3.2.0: dependencies: semver-compare "^1.0.0" -plist@3.1.0, plist@^3.0.0, plist@^3.0.1, plist@^3.0.4, plist@^3.0.5, plist@^3.1.0: +plist@3.1.0, plist@^3.0.0, plist@^3.0.4, plist@^3.0.5, plist@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9" integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ== @@ -26164,6 +26181,13 @@ react@^16, react@^16.0.0, react@^16.13.1: object-assign "^4.1.1" prop-types "^15.6.2" +read-binary-file-arch@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz#959c4637daa932280a9b911b1a6766a7e44288fc" + integrity sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg== + dependencies: + debug "^4.3.4" + read-cache@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" @@ -26186,17 +26210,6 @@ read-cmd-shim@^4.0.0: resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz#640a08b473a49043e394ae0c7a34dd822c73b9bb" integrity sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q== -read-config-file@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" - integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== - dependencies: - dotenv "^9.0.2" - dotenv-expand "^5.1.0" - js-yaml "^4.1.0" - json5 "^2.2.0" - lazy-val "^1.0.4" - read-package-json-fast@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83" @@ -26809,6 +26822,13 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= +resedit@^1.7.0: + version "1.7.2" + resolved "https://registry.yarnpkg.com/resedit/-/resedit-1.7.2.tgz#b1041170b99811710c13f949c7d225871de4cc78" + integrity sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA== + dependencies: + pe-library "^0.4.1" + resedit@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/resedit/-/resedit-2.0.2.tgz#875adfb3eb975e27e4d0bec1214b8ccc37509d5d" @@ -27511,11 +27531,6 @@ semver@~2.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" integrity sha1-uYSPJdbPNjMwc+ye+IVtQvEjPlI= -semver@~7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - send@0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" @@ -27916,12 +27931,12 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" -simple-update-notifier@^1.0.7: - version "1.1.0" - resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82" - integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg== +simple-update-notifier@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb" + integrity sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w== dependencies: - semver "~7.0.0" + semver "^7.5.3" sinon-as-promised@4.0.3: version "4.0.3" @@ -28949,7 +28964,7 @@ string-template@~0.2.1: resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -28975,6 +28990,15 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -29076,7 +29100,7 @@ stringify-object@^3.0.0, stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -29097,6 +29121,13 @@ strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -29596,7 +29627,7 @@ tar@6.1.15: mkdirp "^1.0.3" yallist "^4.0.0" -tar@6.2.1, tar@^6.0.5, tar@^6.1.11, tar@^6.1.2, tar@^6.2.1: +tar@6.2.1, tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2, tar@^6.2.1: version "6.2.1" resolved "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== @@ -30527,7 +30558,7 @@ typescript@5.3.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== -typescript@5.4.5, typescript@^5.4.5, typescript@~5.4.5: +typescript@5.4.5, typescript@~5.4.5: version "5.4.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== @@ -30537,6 +30568,11 @@ typescript@5.4.5, typescript@^5.4.5, typescript@~5.4.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== +typescript@^5.4.3, typescript@^5.4.5: + version "5.6.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b" + integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw== + ua-parser-js@0.7.33, ua-parser-js@^0.7.18: version "0.7.33" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" @@ -30644,6 +30680,11 @@ undertaker@^1.2.1: object.reduce "^1.0.0" undertaker-registry "^1.0.0" +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== + unfetch@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db" @@ -32051,7 +32092,7 @@ workerpool@6.2.0: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b" integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -32094,6 +32135,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 5b587a23e11695b472828dfb255975a9f0dc518c Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 10 Oct 2024 09:11:23 -0500 Subject: [PATCH 02/88] fix node versions --- .github/workflows/snyk_sca_scan.yaml | 4 ++-- .github/workflows/snyk_static_analysis_scan.yaml | 2 +- .github/workflows/update-browser-versions.yml | 2 +- .github/workflows/update_v8_snapshot_cache.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/snyk_sca_scan.yaml b/.github/workflows/snyk_sca_scan.yaml index 608be5ec7a83..b5561c0e9178 100644 --- a/.github/workflows/snyk_sca_scan.yaml +++ b/.github/workflows/snyk_sca_scan.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20.x] + node-version: [20.18.x] steps: - name: Checkout uses: actions/checkout@v4 @@ -28,7 +28,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 20.18 cache: 'yarn' - name: Run yarn run: yarn diff --git a/.github/workflows/snyk_static_analysis_scan.yaml b/.github/workflows/snyk_static_analysis_scan.yaml index b0e0087f1ddb..c2a158fa6a63 100644 --- a/.github/workflows/snyk_static_analysis_scan.yaml +++ b/.github/workflows/snyk_static_analysis_scan.yaml @@ -21,7 +21,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 20.18 cache: 'yarn' - name: Run yarn run: yarn diff --git a/.github/workflows/update-browser-versions.yml b/.github/workflows/update-browser-versions.yml index 935ffc247c4a..a663177c34f8 100644 --- a/.github/workflows/update-browser-versions.yml +++ b/.github/workflows/update-browser-versions.yml @@ -30,7 +30,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 20.18 - name: Check for new Chrome versions id: get-versions uses: actions/github-script@v7 diff --git a/.github/workflows/update_v8_snapshot_cache.yml b/.github/workflows/update_v8_snapshot_cache.yml index 2e0dd9df6913..d34236e1e0cd 100644 --- a/.github/workflows/update_v8_snapshot_cache.yml +++ b/.github/workflows/update_v8_snapshot_cache.yml @@ -82,7 +82,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 20.18 cache: 'yarn' - name: Run yarn run: yarn From ab7504d63a3467dc412ddce35faf3f0923951012 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 10 Oct 2024 11:07:41 -0500 Subject: [PATCH 03/88] fix build --- .circleci/workflows.yml | 6 +- docker-compose.yml | 2 +- packages/server/package.json | 2 +- system-tests/test-binary/module_api_spec.ts | 2 +- .../test-binary/node_versions_spec.ts | 4 +- .../cache/darwin/snapshot-meta.json | 2 +- yarn.lock | 81 +++---------------- 7 files changed, 22 insertions(+), 77 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 9925d9aa294e..00435d3a5820 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -85,7 +85,7 @@ executors: # the Docker image with Cypress dependencies and Chrome browser cy-doc: docker: - - image: cypress/browsers-internal:node20.18.0-chrome129-ff131 + - image: cypress/browsers-internal:node20.18.0-bullseye-chrome129-ff131 # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -94,7 +94,7 @@ executors: kitchensink-executor: docker: - - image: cypress/browsers-internal:node20.18.0-chrome129-ff131 + - image: cypress/browsers-internal:node20.18.0-bullseye-chrome129-ff131 # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -104,7 +104,7 @@ executors: # Docker image with non-root "node" user non-root-docker-user: docker: - - image: cypress/browsers-internal:node20.18.0-chrome129-ff131 + - image: cypress/browsers-internal:node20.18.0-bullseye-chrome129-ff131 user: node environment: PLATFORM: linux diff --git a/docker-compose.yml b/docker-compose.yml index f7fc505d1a1e..93a193a5cb83 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: - .:/opt/cypress ci: # This should mirror the image used in workflows.yml - image: cypress/browsers-internal:node20.18.0-chrome129-ff131 + image: cypress/browsers-internal:node20.18.0-bullseye-chrome129-ff131 ports: - 5566:5566 - 5567:5567 diff --git a/packages/server/package.json b/packages/server/package.json index dbfbf12a42d3..6df81c0713af 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -59,7 +59,7 @@ "dayjs": "^1.9.3", "debug": "^4.3.4", "dirt-simple-file-cache": "^0.4.0", - "duplexify": "4.1.2", + "duplexify": "4.1.3", "electron-context-menu": "3.6.1", "errorhandler": "1.5.1", "evil-dns": "0.2.0", diff --git a/system-tests/test-binary/module_api_spec.ts b/system-tests/test-binary/module_api_spec.ts index 6479e41d5291..1d4126765c90 100644 --- a/system-tests/test-binary/module_api_spec.ts +++ b/system-tests/test-binary/module_api_spec.ts @@ -3,7 +3,7 @@ import systemTests from '../lib/system-tests' describe('module API', () => { systemTests.it('can run module API Mocha spec', { timeout: 240000, - dockerImage: 'cypress/base-internal:20.18.0', + dockerImage: 'cypress/base-internal:20.18.0-bullseye', withBinary: true, project: 'module-api', browser: 'electron', diff --git a/system-tests/test-binary/node_versions_spec.ts b/system-tests/test-binary/node_versions_spec.ts index f9deb4e6fb0b..8d65a95b2ccf 100644 --- a/system-tests/test-binary/node_versions_spec.ts +++ b/system-tests/test-binary/node_versions_spec.ts @@ -26,7 +26,7 @@ function smokeTestDockerImage (dockerImage: string) { describe('binary node versions', () => { [ - 'cypress/base:20.18.0', + 'cypress/base:20.18.0-bullseye', 'cypress/base:22.0.0', 'cypress/base:22.7.0', ].forEach(smokeTestDockerImage) @@ -34,7 +34,7 @@ describe('binary node versions', () => { describe('type: module', () => { [ - 'cypress/base:20.18.0', + 'cypress/base:20.18.0-bullseye', 'cypress/base:22.0.0', 'cypress/base:22.7.0', ].forEach((dockerImage) => { diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index 6709519e40dc..f3f5087e21cf 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -4196,5 +4196,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "9ec4491895b8b6e85c225906c9a63362b259dbc9975af9bc38e2570a7e941fd1" + "deferredHash": "465d9ea33d6e01dac0e0ca57388ef83127db6d7824f874482431c6a2bb37e2ed" } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 7427089d5fa4..3f982ff36112 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14192,15 +14192,15 @@ duplexer@^0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -duplexify@4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0" - integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw== +duplexify@4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.3.tgz#a07e1c0d0a2c001158563d32592ba58bddb0236f" + integrity sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA== dependencies: end-of-stream "^1.4.1" inherits "^2.0.3" readable-stream "^3.1.1" - stream-shift "^1.0.0" + stream-shift "^1.0.2" duplexify@^3.4.2, duplexify@^3.6.0: version "3.7.1" @@ -22048,7 +22048,7 @@ mobx@5.15.4: resolved "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz#9da1a84e97ba624622f4e55a0bf3300fb931c2ab" integrity sha512-xRFJxSU2Im3nrGCdjSuOTFmxVDGeqOHL+TyADCGbT0k4HHqGmx5u2yaHNryvoORpI4DfbzjJ5jPmuv+d7sioFw== -"mocha-7.0.1@npm:mocha@7.0.1": +"mocha-7.0.1@npm:mocha@7.0.1", mocha@7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== @@ -22165,36 +22165,6 @@ mocha@6.2.2: yargs-parser "13.1.1" yargs-unparser "1.6.0" -mocha@7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" - integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== - dependencies: - ansi-colors "3.2.3" - browser-stdout "1.3.1" - chokidar "3.3.0" - debug "3.2.6" - diff "3.5.0" - escape-string-regexp "1.0.5" - find-up "3.0.0" - glob "7.1.3" - growl "1.10.5" - he "1.2.0" - js-yaml "3.13.1" - log-symbols "2.2.0" - minimatch "3.0.4" - mkdirp "0.5.1" - ms "2.1.1" - node-environment-flags "1.0.6" - object.assign "4.1.0" - strip-json-comments "2.0.1" - supports-color "6.0.0" - which "1.3.1" - wide-align "1.1.3" - yargs "13.3.0" - yargs-parser "13.1.1" - yargs-unparser "1.6.0" - mocha@7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.0.tgz#c784f579ad0904d29229ad6cb1e2514e4db7d249" @@ -28901,10 +28871,10 @@ stream-http@^3.2.0: dependencies: debug "2" -stream-shift@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" - integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== +stream-shift@^1.0.0, stream-shift@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b" + integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ== stream-to-buffer@^0.1.0: version "0.1.0" @@ -28964,7 +28934,7 @@ string-template@~0.2.1: resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -28990,15 +28960,6 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -29100,7 +29061,7 @@ stringify-object@^3.0.0, stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -29121,13 +29082,6 @@ strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -32092,7 +32046,7 @@ workerpool@6.2.0: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b" integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -32135,15 +32089,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 7ac19534cc48d12e823a255c9f4f31c82f624022 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 10 Oct 2024 12:14:10 -0500 Subject: [PATCH 04/88] fix evil-dns --- package.json | 4 +- packages/network/lib/agent.ts | 1 + packages/server/lib/gui/windows.ts | 2 +- patches/evil-dns+0.2.0.patch | 21 +++++++++ yarn.lock | 73 ++++++++++++++++++++++++++---- 5 files changed, 89 insertions(+), 12 deletions(-) create mode 100644 patches/evil-dns+0.2.0.patch diff --git a/package.json b/package.json index d9e2708cd416..11751d2dad5d 100644 --- a/package.json +++ b/package.json @@ -76,8 +76,8 @@ "@babel/eslint-parser": "7.25.1", "@cypress/request": "^3.0.4", "@cypress/request-promise": "^5.0.0", - "@electron/fuses": "1.6.1", - "@electron/notarize": "^2.1.0", + "@electron/fuses": "1.8.0", + "@electron/notarize": "^2.5.0", "@fellow/eslint-plugin-coffee": "0.4.13", "@graphql-codegen/add": "3.1.0", "@graphql-codegen/cli": "2.2.0", diff --git a/packages/network/lib/agent.ts b/packages/network/lib/agent.ts index 36fea530ed7c..19acbb49447d 100644 --- a/packages/network/lib/agent.ts +++ b/packages/network/lib/agent.ts @@ -280,6 +280,7 @@ class HttpAgent extends http.Agent { } } + // console.log('addRequest called %o', req, options) super.addRequest(req, options) } diff --git a/packages/server/lib/gui/windows.ts b/packages/server/lib/gui/windows.ts index 12e2908e291c..3f6fc7674088 100644 --- a/packages/server/lib/gui/windows.ts +++ b/packages/server/lib/gui/windows.ts @@ -185,7 +185,7 @@ export function create (projectRoot, _options: WindowOptions, newBrowserWindow = }) } - win.webContents.on('crashed', function (...args) { + win.webContents.on('render-process-gone', function (...args) { return options.onCrashed.apply(win, args) }) diff --git a/patches/evil-dns+0.2.0.patch b/patches/evil-dns+0.2.0.patch new file mode 100644 index 000000000000..ab71307a17b8 --- /dev/null +++ b/patches/evil-dns+0.2.0.patch @@ -0,0 +1,21 @@ +diff --git a/node_modules/evil-dns/evil-dns.js b/node_modules/evil-dns/evil-dns.js +index 740f40d..83986c7 100644 +--- a/node_modules/evil-dns/evil-dns.js ++++ b/node_modules/evil-dns/evil-dns.js +@@ -25,10 +25,12 @@ dns.lookup = function(domain, options, callback) { + + for (i = 0; i < domains.length; i++) { + var entry = domains[i]; +- if (domain.match(entry.domain)) { +- if (!family || family === entry.family) { +- return callback(null, entry.ip, entry.family); +- } ++ if (domain.match(entry.domain) && (!family || family === entry.family)) { ++ return process.nextTick( ++ options.all ++ ? () => callback(null, [{ address: entry.ip, family: entry.family }]) ++ : () => callback(null, entry.ip, entry.family) ++ ); + } + } + diff --git a/yarn.lock b/yarn.lock index 3f982ff36112..845ee357f6a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2955,10 +2955,10 @@ glob "^7.1.6" minimatch "^3.0.4" -"@electron/fuses@1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@electron/fuses/-/fuses-1.6.1.tgz#c639e018202a59e3cd8911fa943e22c63dd3e6fc" - integrity sha512-J7kRMlc0vP03uzUuhHNEqffqZMZ6FRe0YGMOJO4kJObmYkOg38mMTvbbktEj+oteH5nfyhbQUkHIYnMSh7T/CQ== +"@electron/fuses@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@electron/fuses/-/fuses-1.8.0.tgz#ad34d3cc4703b1258b83f6989917052cfc1490a0" + integrity sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw== dependencies: chalk "^4.1.1" fs-extra "^9.0.1" @@ -3009,7 +3009,7 @@ tar "^6.2.1" which "^2.0.2" -"@electron/notarize@2.5.0", "@electron/notarize@^2.1.0": +"@electron/notarize@2.5.0", "@electron/notarize@^2.1.0", "@electron/notarize@^2.5.0": version "2.5.0" resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.5.0.tgz#d4d25356adfa29df4a76bd64a8bd347237cd251e" integrity sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A== @@ -22048,7 +22048,7 @@ mobx@5.15.4: resolved "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz#9da1a84e97ba624622f4e55a0bf3300fb931c2ab" integrity sha512-xRFJxSU2Im3nrGCdjSuOTFmxVDGeqOHL+TyADCGbT0k4HHqGmx5u2yaHNryvoORpI4DfbzjJ5jPmuv+d7sioFw== -"mocha-7.0.1@npm:mocha@7.0.1", mocha@7.0.1: +"mocha-7.0.1@npm:mocha@7.0.1": version "7.0.1" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== @@ -22165,6 +22165,36 @@ mocha@6.2.2: yargs-parser "13.1.1" yargs-unparser "1.6.0" +mocha@7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" + integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== + dependencies: + ansi-colors "3.2.3" + browser-stdout "1.3.1" + chokidar "3.3.0" + debug "3.2.6" + diff "3.5.0" + escape-string-regexp "1.0.5" + find-up "3.0.0" + glob "7.1.3" + growl "1.10.5" + he "1.2.0" + js-yaml "3.13.1" + log-symbols "2.2.0" + minimatch "3.0.4" + mkdirp "0.5.1" + ms "2.1.1" + node-environment-flags "1.0.6" + object.assign "4.1.0" + strip-json-comments "2.0.1" + supports-color "6.0.0" + which "1.3.1" + wide-align "1.1.3" + yargs "13.3.0" + yargs-parser "13.1.1" + yargs-unparser "1.6.0" + mocha@7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.0.tgz#c784f579ad0904d29229ad6cb1e2514e4db7d249" @@ -28934,7 +28964,7 @@ string-template@~0.2.1: resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -28960,6 +28990,15 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -29061,7 +29100,7 @@ stringify-object@^3.0.0, stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -29082,6 +29121,13 @@ strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -32046,7 +32092,7 @@ workerpool@6.2.0: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b" integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -32089,6 +32135,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 1c206eb572b2ba86cd22e8cd2478a10e14dfb389 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 10 Oct 2024 14:54:14 -0500 Subject: [PATCH 05/88] various fixes --- package.json | 2 +- packages/app/src/runner/aut-iframe.ts | 3 +- packages/app/src/runner/index.ts | 1 + packages/driver/src/cypress/utils.ts | 2 + yarn.lock | 369 ++++++++++++++------------ 5 files changed, 204 insertions(+), 173 deletions(-) diff --git a/package.json b/package.json index 11751d2dad5d..ea79148f3052 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "del": "3.0.0", "detect-port": "^1.6.1", "electron": "32.2.0", - "electron-builder": "^25.1.7", + "electron-builder": "^23.6.0", "enzyme-adapter-react-16": "1.12.1", "eslint": "^8.56.0", "eslint-plugin-cypress": "3.5.0", diff --git a/packages/app/src/runner/aut-iframe.ts b/packages/app/src/runner/aut-iframe.ts index 65030131559f..cb3caab106c0 100644 --- a/packages/app/src/runner/aut-iframe.ts +++ b/packages/app/src/runner/aut-iframe.ts @@ -120,6 +120,7 @@ export class AutIframe { */ removeSrcAttribute = () => { this.$iframe?.removeAttr('src') + this.$iframe?.removeAttr('srcdoc') } visitBlankPage = (testIsolation?: boolean) => { @@ -128,7 +129,7 @@ export class AutIframe { return } - this.$iframe[0].src = 'about:blank' + this.$iframe[0].srcdoc = '' this.$iframe.one('load', () => { if (testIsolation) { diff --git a/packages/app/src/runner/index.ts b/packages/app/src/runner/index.ts index 3d6655838919..17e798d22a71 100644 --- a/packages/app/src/runner/index.ts +++ b/packages/app/src/runner/index.ts @@ -258,6 +258,7 @@ function runSpecCT (config, spec: SpecFile) { }) autIframe._showInitialBlankPage() + $autIframe.removeAttr('srcdoc') $autIframe.prop('src', specSrc) // initialize Cypress (driver) with the AUT! diff --git a/packages/driver/src/cypress/utils.ts b/packages/driver/src/cypress/utils.ts index acae05df80da..29459192d6c3 100644 --- a/packages/driver/src/cypress/utils.ts +++ b/packages/driver/src/cypress/utils.ts @@ -322,6 +322,8 @@ export default { }, iframeSrc ($autIframe, url) { + $autIframe.removeAttr('srcdoc') + return $autIframe.prop('src', url) }, diff --git a/yarn.lock b/yarn.lock index 845ee357f6a0..7075ebf6c753 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"7zip-bin@~5.2.0": - version "5.2.0" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.2.0.tgz#7a03314684dd6572b7dfa89e68ce31d60286854d" - integrity sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A== +"7zip-bin@~5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" + integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== "@aashutoshrathi/word-wrap@^1.2.3": version "1.2.6" @@ -3009,7 +3009,7 @@ tar "^6.2.1" which "^2.0.2" -"@electron/notarize@2.5.0", "@electron/notarize@^2.1.0", "@electron/notarize@^2.5.0": +"@electron/notarize@^2.1.0", "@electron/notarize@^2.5.0": version "2.5.0" resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.5.0.tgz#d4d25356adfa29df4a76bd64a8bd347237cd251e" integrity sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A== @@ -3018,7 +3018,7 @@ fs-extra "^9.0.1" promise-retry "^2.0.1" -"@electron/osx-sign@1.3.1", "@electron/osx-sign@^1.0.5": +"@electron/osx-sign@^1.0.5": version "1.3.1" resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.3.1.tgz#faf7eeca7ca004a6be541dc4cf7a1bd59ec59b1c" integrity sha512-BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw== @@ -3055,26 +3055,6 @@ semver "^7.1.3" yargs-parser "^21.1.1" -"@electron/rebuild@3.6.1": - version "3.6.1" - resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.6.1.tgz#59e8e36c3f6e6b94a699425dfb61f0394c3dd4df" - integrity sha512-f6596ZHpEq/YskUd8emYvOUne89ij8mQgjYFA5ru25QwbrRO+t1SImofdDv7kKOuWCmVOuU5tvfkbgGxIl3E/w== - dependencies: - "@malept/cross-spawn-promise" "^2.0.0" - chalk "^4.0.0" - debug "^4.1.1" - detect-libc "^2.0.1" - fs-extra "^10.0.0" - got "^11.7.0" - node-abi "^3.45.0" - node-api-version "^0.2.0" - node-gyp "^9.0.0" - ora "^5.1.0" - read-binary-file-arch "^1.0.6" - semver "^7.3.5" - tar "^6.0.5" - yargs "^17.0.1" - "@electron/rebuild@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.7.0.tgz#82e20c467ddedbb295d7f641592c52e68c141e9f" @@ -3095,7 +3075,20 @@ tar "^6.0.5" yargs "^17.0.1" -"@electron/universal@2.0.1", "@electron/universal@^2.0.1": +"@electron/universal@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339" + integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== + dependencies: + "@malept/cross-spawn-promise" "^1.1.0" + asar "^3.1.0" + debug "^4.3.1" + dir-compare "^2.4.0" + fs-extra "^9.0.1" + minimatch "^3.0.4" + plist "^3.0.4" + +"@electron/universal@^2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-2.0.1.tgz#7b070ab355e02957388f3dbd68e2c3cd08c448ae" integrity sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA== @@ -4789,6 +4782,13 @@ write-pkg "4.0.0" yargs "16.2.0" +"@malept/cross-spawn-promise@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" + integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== + dependencies: + cross-spawn "^7.0.1" + "@malept/cross-spawn-promise@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" @@ -7529,13 +7529,6 @@ dependencies: "@types/node" "*" -"@types/fs-extra@9.0.13", "@types/fs-extra@^9.0.11", "@types/fs-extra@^9.0.13": - version "9.0.13" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" - integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== - dependencies: - "@types/node" "*" - "@types/fs-extra@^8.0.1": version "8.1.1" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068" @@ -7543,6 +7536,13 @@ dependencies: "@types/node" "*" +"@types/fs-extra@^9.0.11", "@types/fs-extra@^9.0.13": + version "9.0.13" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" + integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== + dependencies: + "@types/node" "*" + "@types/getenv@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/getenv/-/getenv-1.0.0.tgz#fa5e6901e9fb84bfb40205d4952fd06c8afcf006" @@ -8289,6 +8289,13 @@ dependencies: "@types/yargs-parser" "*" +"@types/yargs@^17.0.1": + version "17.0.33" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d" + integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA== + dependencies: + "@types/yargs-parser" "*" + "@types/yauzl@^2.9.1": version "2.9.1" resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af" @@ -9620,47 +9627,41 @@ anymatch@^3.0.0, anymatch@^3.1.1, anymatch@~3.1.1, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@5.0.0-alpha.10: - version "5.0.0-alpha.10" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz#cf12e593b6b847fb9d04027fa755c6c6610d778b" - integrity sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw== +app-builder-bin@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" + integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== -app-builder-lib@25.1.7: - version "25.1.7" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-25.1.7.tgz#f8ce8e2edc6d91becbe956b1205da1f3849cafe9" - integrity sha512-JxmN+D/Dn7BLQoN+cTFO+zbMHcpI10v/xjyjFO1FKpHbApOG+OQt/xUyVjKWp4FYplIfuHdpxqTXo1PN/Wzm/A== +app-builder-lib@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" + integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== dependencies: + "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" - "@electron/notarize" "2.5.0" - "@electron/osx-sign" "1.3.1" - "@electron/rebuild" "3.6.1" - "@electron/universal" "2.0.1" + "@electron/universal" "1.2.1" "@malept/flatpak-bundler" "^0.4.0" - "@types/fs-extra" "9.0.13" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "25.1.7" - builder-util-runtime "9.2.10" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chromium-pickle-js "^0.2.0" - config-file-ts "0.2.8-rc1" debug "^4.3.4" - dotenv "^16.4.5" - dotenv-expand "^11.0.6" - ejs "^3.1.8" - electron-publish "25.1.7" + ejs "^3.1.7" + electron-osx-sign "^0.6.0" + electron-publish "23.6.0" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" is-ci "^3.0.0" - isbinaryfile "^5.0.0" + isbinaryfile "^4.0.10" js-yaml "^4.1.0" - json5 "^2.2.3" lazy-val "^1.0.5" - minimatch "^10.0.0" - resedit "^1.7.0" + minimatch "^3.1.2" + read-config-file "6.2.0" sanitize-filename "^1.6.3" - semver "^7.3.8" - tar "^6.1.12" + semver "^7.3.7" + tar "^6.1.11" temp-file "^3.4.0" append-buffer@^1.0.2: @@ -9988,6 +9989,18 @@ asap@^2.0.0, asap@~2.0.3: resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= +asar@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221" + integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + optionalDependencies: + "@types/glob" "^7.1.1" + ascii-table@0.0.9: version "0.0.9" resolved "https://registry.yarnpkg.com/ascii-table/-/ascii-table-0.0.9.tgz#06a6604d6a55d4bf41a9a47d9872d7a78da31e73" @@ -10935,7 +10948,7 @@ buffer-alloc-unsafe@^1.1.0: resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== -buffer-alloc@^1.1.0: +buffer-alloc@^1.1.0, buffer-alloc@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== @@ -10958,10 +10971,10 @@ buffer-equal@0.0.1: resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b" integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs= -buffer-equal@^1.0.0: +buffer-equal@1.0.0, buffer-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" - integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= + integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ== buffer-es6@^4.9.2: version "4.9.3" @@ -11018,30 +11031,31 @@ buildcheck@~0.0.6: resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238" integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A== -builder-util-runtime@9.2.10: - version "9.2.10" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz#a0f7d9e214158402e78b74a745c8d9f870c604bc" - integrity sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw== +builder-util-runtime@9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" + integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@25.1.7: - version "25.1.7" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-25.1.7.tgz#a07b404f0cb1a635aa165902be65297d58932ff8" - integrity sha512-7jPjzBwEGRbwNcep0gGNpLXG9P94VA3CPAZQCzxkFXiV2GMQKlziMbY//rXPI7WKfhsvGgFXjTcXdBEwgXw9ww== +builder-util@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" + integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== dependencies: - "7zip-bin" "~5.2.0" + "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" - app-builder-bin "5.0.0-alpha.10" + "@types/fs-extra" "^9.0.11" + app-builder-bin "4.0.0" bluebird-lst "^1.0.9" - builder-util-runtime "9.2.10" - chalk "^4.1.2" + builder-util-runtime "9.1.1" + chalk "^4.1.1" cross-spawn "^7.0.3" debug "^4.3.4" - fs-extra "^10.1.0" - http-proxy-agent "^7.0.0" - https-proxy-agent "^7.0.0" + fs-extra "^10.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" is-ci "^3.0.0" js-yaml "^4.1.0" source-map-support "^0.5.19" @@ -12175,6 +12189,11 @@ colorette@^2.0.10, colorette@^2.0.14: resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== +colors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== + colors@^1.1.2, colors@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" @@ -12417,14 +12436,6 @@ config-chain@^1.1.11, config-chain@^1.1.13: ini "^1.3.4" proto-list "~1.2.1" -config-file-ts@0.2.8-rc1: - version "0.2.8-rc1" - resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz#fb7fc6ccb2e313f69dbeb78f1db0b00038049de0" - integrity sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg== - dependencies: - glob "^10.3.12" - typescript "^5.4.3" - connect-history-api-fallback@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" @@ -13843,6 +13854,16 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" +dir-compare@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" + integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== + dependencies: + buffer-equal "1.0.0" + colors "1.0.3" + commander "2.9.0" + minimatch "3.0.4" + dir-compare@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-4.2.0.tgz#d1d4999c14fbf55281071fdae4293b3b9ce86f19" @@ -13894,15 +13915,15 @@ dlv@^1.1.3: resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== -dmg-builder@25.1.7: - version "25.1.7" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-25.1.7.tgz#a3bb8e1dc790faec04503568480db80f5077a2cb" - integrity sha512-Hac0AfXQrAV62JT99Had6bvUJb/f7vjJTaLOsmA/gAQcrc/cLmNAqCJ0ZZDqwKy2+LKXnxx45TvMXvovKd4iMg== +dmg-builder@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" + integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== dependencies: - app-builder-lib "25.1.7" - builder-util "25.1.7" - builder-util-runtime "9.2.10" - fs-extra "^10.1.0" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + fs-extra "^10.0.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" optionalDependencies: @@ -14125,22 +14146,20 @@ dot-prop@^5.1.0: dependencies: is-obj "^2.0.0" -dotenv-expand@^11.0.6: - version "11.0.6" - resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-11.0.6.tgz#f2c840fd924d7c77a94eff98f153331d876882d3" - integrity sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g== - dependencies: - dotenv "^16.4.4" +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== dotenv@^10.0.0, dotenv@~10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== -dotenv@^16.4.4, dotenv@^16.4.5: - version "16.4.5" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f" - integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== +dotenv@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" + integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== drange@^1.0.2: version "1.1.1" @@ -14265,28 +14284,30 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -ejs@^3.1.10, ejs@^3.1.7, ejs@^3.1.8: +ejs@^3.1.10, ejs@^3.1.7: version "3.1.10" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== dependencies: jake "^10.8.5" -electron-builder@^25.1.7: - version "25.1.7" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-25.1.7.tgz#b3d1504925a4d3693d97c76c0d2f2906613ffe4b" - integrity sha512-lsKtX93GSHWnmuteNRvBzgJIjRiiYB0qrJVRjShwBi75Ns+mRdWeOGZiXItqOWj+3g5UyY722kgoq2WlqCB87A== +electron-builder@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b" + integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw== dependencies: - app-builder-lib "25.1.7" - builder-util "25.1.7" - builder-util-runtime "9.2.10" - chalk "^4.1.2" - dmg-builder "25.1.7" - fs-extra "^10.1.0" + "@types/yargs" "^17.0.1" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + chalk "^4.1.1" + dmg-builder "23.6.0" + fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" - simple-update-notifier "2.0.0" - yargs "^17.6.2" + read-config-file "6.2.0" + simple-update-notifier "^1.0.7" + yargs "^17.5.1" electron-context-menu@3.6.1: version "3.6.1" @@ -14311,16 +14332,28 @@ electron-is-dev@^2.0.0: resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz#833487a069b8dad21425c67a19847d9064ab19bd" integrity sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA== -electron-publish@25.1.7: - version "25.1.7" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-25.1.7.tgz#14e50c2a3fafdc1c454eadbbc47ead89a48bb554" - integrity sha512-+jbTkR9m39eDBMP4gfbqglDd6UvBC7RLh5Y0MhFSsc6UkGHj9Vj9TWobxevHYMMqmoujL11ZLjfPpMX+Pt6YEg== +electron-osx-sign@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" + integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== + dependencies: + bluebird "^3.5.0" + compare-version "^0.1.2" + debug "^2.6.8" + isbinaryfile "^3.0.2" + minimist "^1.2.0" + plist "^3.0.1" + +electron-publish@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" + integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "25.1.7" - builder-util-runtime "9.2.10" - chalk "^4.1.2" - fs-extra "^10.1.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + chalk "^4.1.1" + fs-extra "^10.0.0" lazy-val "^1.0.5" mime "^2.5.2" @@ -17208,7 +17241,7 @@ glob@7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^10.2.2, glob@^10.3.10, glob@^10.3.12, glob@^10.3.7, glob@^10.4.2: +glob@^10.2.2, glob@^10.3.10, glob@^10.3.7, glob@^10.4.2: version "10.4.5" resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== @@ -18328,9 +18361,9 @@ https-proxy-agent@3.0.1: debug "^3.1.0" https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" debug "4" @@ -19549,16 +19582,18 @@ isarray@^2.0.5: resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== -isbinaryfile@^4.0.0, isbinaryfile@^4.0.8: +isbinaryfile@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" + integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== + dependencies: + buffer-alloc "^1.2.0" + +isbinaryfile@^4.0.0, isbinaryfile@^4.0.10, isbinaryfile@^4.0.8: version "4.0.10" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== -isbinaryfile@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.2.tgz#fe6e4dfe2e34e947ffa240c113444876ba393ae0" - integrity sha512-GvcjojwonMjWbTkfMpnVHVqXW/wKMYDfEpY94/8zy8HFMOqb/VL6oeONq9v87q4ttVlaTLnGXnJD4B5B1OTGIg== - isbuffer@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/isbuffer/-/isbuffer-0.0.0.tgz#38c146d9df528b8bf9b0701c3d43cf12df3fc39b" @@ -20205,7 +20240,7 @@ lazy-cache@^1.0.3: resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4= -lazy-val@^1.0.5: +lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== @@ -21793,17 +21828,10 @@ minimatch@9.0.3: dependencies: brace-expansion "^2.0.1" -minimatch@^10.0.0: - version "10.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b" - integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ== - dependencies: - brace-expansion "^2.0.1" - minimatch@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" - integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== dependencies: brace-expansion "^2.0.1" @@ -24943,11 +24971,6 @@ pbkdf2@^3.0.3: safe-buffer "^5.0.1" sha.js "^2.4.8" -pe-library@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/pe-library/-/pe-library-0.4.1.tgz#e269be0340dcb13aa6949d743da7d658c3e2fbea" - integrity sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw== - pe-library@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/pe-library/-/pe-library-1.0.1.tgz#02735430885a622576a53cd8827658b7d2fada0e" @@ -25146,7 +25169,7 @@ please-upgrade-node@^3.2.0: dependencies: semver-compare "^1.0.0" -plist@3.1.0, plist@^3.0.0, plist@^3.0.4, plist@^3.0.5, plist@^3.1.0: +plist@3.1.0, plist@^3.0.0, plist@^3.0.1, plist@^3.0.4, plist@^3.0.5, plist@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9" integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ== @@ -26210,6 +26233,17 @@ read-cmd-shim@^4.0.0: resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz#640a08b473a49043e394ae0c7a34dd822c73b9bb" integrity sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q== +read-config-file@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" + integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== + dependencies: + dotenv "^9.0.2" + dotenv-expand "^5.1.0" + js-yaml "^4.1.0" + json5 "^2.2.0" + lazy-val "^1.0.4" + read-package-json-fast@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83" @@ -26822,13 +26856,6 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -resedit@^1.7.0: - version "1.7.2" - resolved "https://registry.yarnpkg.com/resedit/-/resedit-1.7.2.tgz#b1041170b99811710c13f949c7d225871de4cc78" - integrity sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA== - dependencies: - pe-library "^0.4.1" - resedit@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/resedit/-/resedit-2.0.2.tgz#875adfb3eb975e27e4d0bec1214b8ccc37509d5d" @@ -27531,6 +27558,11 @@ semver@~2.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" integrity sha1-uYSPJdbPNjMwc+ye+IVtQvEjPlI= +semver@~7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + send@0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" @@ -27931,12 +27963,12 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" -simple-update-notifier@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb" - integrity sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w== +simple-update-notifier@^1.0.7: + version "1.1.0" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82" + integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg== dependencies: - semver "^7.5.3" + semver "~7.0.0" sinon-as-promised@4.0.3: version "4.0.3" @@ -29627,7 +29659,7 @@ tar@6.1.15: mkdirp "^1.0.3" yallist "^4.0.0" -tar@6.2.1, tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2, tar@^6.2.1: +tar@6.2.1, tar@^6.0.5, tar@^6.1.11, tar@^6.1.2, tar@^6.2.1: version "6.2.1" resolved "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== @@ -30558,7 +30590,7 @@ typescript@5.3.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== -typescript@5.4.5, typescript@~5.4.5: +typescript@5.4.5, typescript@^5.4.5, typescript@~5.4.5: version "5.4.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== @@ -30568,11 +30600,6 @@ typescript@5.4.5, typescript@~5.4.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== -typescript@^5.4.3, typescript@^5.4.5: - version "5.6.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b" - integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw== - ua-parser-js@0.7.33, ua-parser-js@^0.7.18: version "0.7.33" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" From df17f1e584ff4f396e81a97f1d950b4edc67d1d3 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 10:12:52 -0500 Subject: [PATCH 06/88] fix srcdoc --- packages/driver/src/cy/commands/navigation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/driver/src/cy/commands/navigation.ts b/packages/driver/src/cy/commands/navigation.ts index fc636fd04744..fee084c22edd 100644 --- a/packages/driver/src/cy/commands/navigation.ts +++ b/packages/driver/src/cy/commands/navigation.ts @@ -69,7 +69,7 @@ const navigationChanged = async (Cypress, cy, state, source, arg) => { debug('navigation changed:', url) // don't trigger for empty url's or about:blank - if (_.isEmpty(url) || (url === 'about:blank')) { + if (_.isEmpty(url) || (url === 'about:blank') || (url === 'about:srcdoc')) { return } From e98805a9b876009662d19a89c5408bb0e4c6927b Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 12:01:31 -0500 Subject: [PATCH 07/88] various fixes --- packages/driver/src/cy/commands/navigation.ts | 6 ++-- scripts/gulp/tasks/gulpRegistry.ts | 36 ++++++++++++------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/packages/driver/src/cy/commands/navigation.ts b/packages/driver/src/cy/commands/navigation.ts index fee084c22edd..71259ddbdde7 100644 --- a/packages/driver/src/cy/commands/navigation.ts +++ b/packages/driver/src/cy/commands/navigation.ts @@ -277,8 +277,8 @@ const stabilityChanged = async (Cypress, state, config, stable) => { state('onPageLoadErr', onPageLoadErr) const getRedirectionCount = (href) => { - // redirecting to about:blank should not count towards the redirection limit. - if (href === 'about:blank') { + // redirecting to about:blank or about:srcdoc should not count towards the redirection limit. + if (href === 'about:blank' || href === 'about:srcdoc') { return 0 } @@ -341,7 +341,7 @@ const stabilityChanged = async (Cypress, state, config, stable) => { cy.state('onPageLoadErr', null) - if (url === 'about:blank') { + if (url === 'about:blank' || url === 'about:srcdoc') { // we treat this as a system log since navigating to about:blank must have been caused by Cypress options._log?.set({ message: '', name: 'Clear page', type: 'system' }).snapshot().end() } else { diff --git a/scripts/gulp/tasks/gulpRegistry.ts b/scripts/gulp/tasks/gulpRegistry.ts index 74460b9bdb45..65094d827612 100644 --- a/scripts/gulp/tasks/gulpRegistry.ts +++ b/scripts/gulp/tasks/gulpRegistry.ts @@ -71,24 +71,36 @@ export async function exitAfterAll () { process.stdin.pause() } -function exitHandler (msg: string) { - return async function _exitHandler (exitCode: number) { - hasExited = true - console.log(`Exiting due to ${msg} => code ${exitCode}`) - await exitAllProcesses() - process.exit(exitCode) - } +async function exitHandler (exitCode: number) { + hasExited = true + console.log(`Exiting with code ${exitCode}`) + await exitAllProcesses() + process.exit(exitCode) +} + +async function signalHandler (signal: NodeJS.Signals, code: number) { + hasExited = true + console.log(`Exiting due to ${signal}`) + await exitAllProcesses() + process.exit(128 + code) +} + +async function uncaughtExceptionHandler (error: Error) { + hasExited = true + console.log(`Uncaught exception ${error.message}`) + await exitAllProcesses() + process.exit(6) } // do something when app is closing -process.on('exit', exitHandler('exit')) +process.on('exit', exitHandler) // catches ctrl+c event -process.on('SIGINT', exitHandler('SIGINT')) +process.on('SIGINT', signalHandler) // catches "kill pid" (for example: nodemon restart) -process.on('SIGUSR1', exitHandler('SIGUSR1')) -process.on('SIGUSR2', exitHandler('SIGUSR2')) +process.on('SIGUSR1', signalHandler) +process.on('SIGUSR2', signalHandler) // catches uncaught exceptions -process.on('uncaughtException', exitHandler('uncaughtException')) +process.on('uncaughtException', uncaughtExceptionHandler) From 851f1f2a1d356f712e4c2c176ac1d7e6dc86be4b Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 12:33:45 -0500 Subject: [PATCH 08/88] update package.json --- system-tests/projects/vuecli4-vue2/package.json | 2 +- system-tests/projects/vuecli4-vue3/package.json | 2 +- system-tests/projects/vuecli5-vue3-type-module/package.json | 2 +- system-tests/projects/vuecli5-vue3/package.json | 2 +- system-tests/projects/vuecli5vue3-unconfigured/package.json | 2 +- system-tests/projects/vueclivue2-configured/package.json | 2 +- system-tests/projects/vueclivue2-unconfigured/package.json | 2 +- system-tests/projects/vueclivue3-unconfigured/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/system-tests/projects/vuecli4-vue2/package.json b/system-tests/projects/vuecli4-vue2/package.json index 6c0523941314..40bdd28b3b4c 100644 --- a/system-tests/projects/vuecli4-vue2/package.json +++ b/system-tests/projects/vuecli4-vue2/package.json @@ -7,7 +7,7 @@ "vue-template-compiler": "^2.6.11" }, "resolutions": { - "@achrinza/node-ipc": "9.2.5" + "@achrinza/node-ipc": "9.2.9" }, "projectFixtureDirectory": "vue2-cli" } diff --git a/system-tests/projects/vuecli4-vue3/package.json b/system-tests/projects/vuecli4-vue3/package.json index 29a3ed3bd75e..69955c2cdc84 100644 --- a/system-tests/projects/vuecli4-vue3/package.json +++ b/system-tests/projects/vuecli4-vue3/package.json @@ -7,7 +7,7 @@ "@vue/compiler-sfc": "^3.0.0" }, "resolutions": { - "@achrinza/node-ipc": "9.2.5" + "@achrinza/node-ipc": "9.2.9" }, "projectFixtureDirectory": "vue-cli" } diff --git a/system-tests/projects/vuecli5-vue3-type-module/package.json b/system-tests/projects/vuecli5-vue3-type-module/package.json index 53a15845596b..fcba59a5ee9f 100644 --- a/system-tests/projects/vuecli5-vue3-type-module/package.json +++ b/system-tests/projects/vuecli5-vue3-type-module/package.json @@ -7,7 +7,7 @@ }, "type": "module", "resolutions": { - "@achrinza/node-ipc": "9.2.5" + "@achrinza/node-ipc": "9.2.9" }, "projectFixtureDirectory": "vue-cli" } diff --git a/system-tests/projects/vuecli5-vue3/package.json b/system-tests/projects/vuecli5-vue3/package.json index 10ed666b2dd9..617f9ee7bd1b 100644 --- a/system-tests/projects/vuecli5-vue3/package.json +++ b/system-tests/projects/vuecli5-vue3/package.json @@ -6,7 +6,7 @@ "@vue/cli-service": "~5.0.0" }, "resolutions": { - "@achrinza/node-ipc": "9.2.5" + "@achrinza/node-ipc": "9.2.9" }, "projectFixtureDirectory": "vue-cli" } diff --git a/system-tests/projects/vuecli5vue3-unconfigured/package.json b/system-tests/projects/vuecli5vue3-unconfigured/package.json index 4d313d306a90..8d99e6f9e3ed 100644 --- a/system-tests/projects/vuecli5vue3-unconfigured/package.json +++ b/system-tests/projects/vuecli5vue3-unconfigured/package.json @@ -19,6 +19,6 @@ "not ie 11" ], "resolutions": { - "@achrinza/node-ipc": "9.2.5" + "@achrinza/node-ipc": "9.2.9" } } diff --git a/system-tests/projects/vueclivue2-configured/package.json b/system-tests/projects/vueclivue2-configured/package.json index 82c5dbcc2ce7..ea2355fca285 100644 --- a/system-tests/projects/vueclivue2-configured/package.json +++ b/system-tests/projects/vueclivue2-configured/package.json @@ -19,6 +19,6 @@ "not dead" ], "resolutions": { - "@achrinza/node-ipc": "9.2.5" + "@achrinza/node-ipc": "9.2.9" } } diff --git a/system-tests/projects/vueclivue2-unconfigured/package.json b/system-tests/projects/vueclivue2-unconfigured/package.json index 82c5dbcc2ce7..ea2355fca285 100644 --- a/system-tests/projects/vueclivue2-unconfigured/package.json +++ b/system-tests/projects/vueclivue2-unconfigured/package.json @@ -19,6 +19,6 @@ "not dead" ], "resolutions": { - "@achrinza/node-ipc": "9.2.5" + "@achrinza/node-ipc": "9.2.9" } } diff --git a/system-tests/projects/vueclivue3-unconfigured/package.json b/system-tests/projects/vueclivue3-unconfigured/package.json index 6e2f672c5aa6..1499f323c5a8 100644 --- a/system-tests/projects/vueclivue3-unconfigured/package.json +++ b/system-tests/projects/vueclivue3-unconfigured/package.json @@ -19,6 +19,6 @@ "not dead" ], "resolutions": { - "@achrinza/node-ipc": "9.2.5" + "@achrinza/node-ipc": "9.2.9" } } From affdd637556d957bba116698b4ae459cf1986f0b Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 13:09:46 -0500 Subject: [PATCH 09/88] update yarn.lock --- .../e2e/commands/sessions/sessions.cy.js | 20 +++++++++---------- system-tests/projects/vuecli4-vue2/yarn.lock | 8 ++++---- system-tests/projects/vuecli4-vue3/yarn.lock | 8 ++++---- .../vuecli5-vue3-type-module/yarn.lock | 8 ++++---- system-tests/projects/vuecli5-vue3/yarn.lock | 8 ++++---- .../vuecli5vue3-unconfigured/yarn.lock | 8 ++++---- .../projects/vueclivue2-configured/yarn.lock | 8 ++++---- .../vueclivue2-unconfigured/yarn.lock | 8 ++++---- .../vueclivue3-unconfigured/yarn.lock | 8 ++++---- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/packages/driver/cypress/e2e/commands/sessions/sessions.cy.js b/packages/driver/cypress/e2e/commands/sessions/sessions.cy.js index e9a6cd07c977..84a230c5ac64 100644 --- a/packages/driver/cypress/e2e/commands/sessions/sessions.cy.js +++ b/packages/driver/cypress/e2e/commands/sessions/sessions.cy.js @@ -65,7 +65,7 @@ describe('cy.session', { retries: 0 }, () => { expect(Cypress.action).to.be.calledWith('cy:visit:blank', { testIsolation: true }) }) .url() - .should('eq', 'about:blank') + .should('eq', 'about:srcdoc') }) it('clears page before the end of each run when nextTestHasTestIsolationOn is undefined', () => { @@ -79,7 +79,7 @@ describe('cy.session', { retries: 0 }, () => { expect(Cypress.action).to.be.calledWith('cy:visit:blank', { testIsolation: true }) }) .url() - .should('eq', 'about:blank') + .should('eq', 'about:srcdoc') }) it('does not clear the page before the end of each run if the next test has test isolation off', () => { @@ -93,7 +93,7 @@ describe('cy.session', { retries: 0 }, () => { expect(Cypress.action).not.to.be.calledWith('cy:visit:blank', { testIsolation: true }) }) .url() - .should('not.eq', 'about:blank') + .should('not.eq', 'about:srcdoc') }) it('clears the browser cookie after each run', () => { @@ -229,7 +229,7 @@ describe('cy.session', { retries: 0 }, () => { }) cy.on('internal:window:load', (args) => { - if (args.window.location.href === 'about:blank') { + if (args.window.location.href === 'about:srcdoc') { clearPageCount++ } }) @@ -245,7 +245,7 @@ describe('cy.session', { retries: 0 }, () => { // test must be first to run before blank page visit between each test it('clears page after command runs', () => { - cy.url().should('eq', 'about:blank') + cy.url().should('eq', 'about:srcdoc') }) it('successfully creates new session', () => { @@ -336,7 +336,7 @@ describe('cy.session', { retries: 0 }, () => { // test must be first to run before blank page visit between each test it('clears page after command runs', () => { - cy.url().should('eq', 'about:blank') + cy.url().should('eq', 'about:srcdoc') }) it('successfully creates new session and validates it', () => { @@ -483,7 +483,7 @@ describe('cy.session', { retries: 0 }, () => { // test must be first to run before blank page visit between each test it('clears page after setup runs', () => { - cy.url().should('eq', 'about:blank') + cy.url().should('eq', 'about:srcdoc') }) it('successfully restores saved session', () => { @@ -547,7 +547,7 @@ describe('cy.session', { retries: 0 }, () => { // test must be first to run before blank page visit between each test it('clears page after command runs', () => { - cy.url().should('eq', 'about:blank') + cy.url().should('eq', 'about:srcdoc') }) it('successfully restores saved session', () => { @@ -630,7 +630,7 @@ describe('cy.session', { retries: 0 }, () => { // test must be first to run before blank page visit between each test it('clears page after command runs', () => { - cy.url().should('eq', 'about:blank') + cy.url().should('eq', 'about:srcdoc') }) it('successfully recreates session', () => { @@ -982,7 +982,7 @@ describe('cy.session', { retries: 0 }, () => { }) cy.on('internal:window:load', (args) => { - if (args.window.location.href === 'about:blank') { + if (args.window.location.href === 'about:srcdoc') { clearPageCount++ } }) diff --git a/system-tests/projects/vuecli4-vue2/yarn.lock b/system-tests/projects/vuecli4-vue2/yarn.lock index c2fab61559c2..03eaef488a89 100644 --- a/system-tests/projects/vuecli4-vue2/yarn.lock +++ b/system-tests/projects/vuecli4-vue2/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.5": - version "9.2.5" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" - integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== +"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.9": + version "9.2.9" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz#ab4815d9b16f1c83a479fe8791522a3abebb1c6a" + integrity sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ== dependencies: "@node-ipc/js-queue" "2.0.3" event-pubsub "4.3.0" diff --git a/system-tests/projects/vuecli4-vue3/yarn.lock b/system-tests/projects/vuecli4-vue3/yarn.lock index 105568089e5f..fdc432fedd94 100644 --- a/system-tests/projects/vuecli4-vue3/yarn.lock +++ b/system-tests/projects/vuecli4-vue3/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.5": - version "9.2.5" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" - integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== +"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.9": + version "9.2.9" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz#ab4815d9b16f1c83a479fe8791522a3abebb1c6a" + integrity sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ== dependencies: "@node-ipc/js-queue" "2.0.3" event-pubsub "4.3.0" diff --git a/system-tests/projects/vuecli5-vue3-type-module/yarn.lock b/system-tests/projects/vuecli5-vue3-type-module/yarn.lock index 3abf63467b92..785c29d61413 100644 --- a/system-tests/projects/vuecli5-vue3-type-module/yarn.lock +++ b/system-tests/projects/vuecli5-vue3-type-module/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.5": - version "9.2.5" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" - integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== +"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.9": + version "9.2.9" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz#ab4815d9b16f1c83a479fe8791522a3abebb1c6a" + integrity sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ== dependencies: "@node-ipc/js-queue" "2.0.3" event-pubsub "4.3.0" diff --git a/system-tests/projects/vuecli5-vue3/yarn.lock b/system-tests/projects/vuecli5-vue3/yarn.lock index 3abf63467b92..785c29d61413 100644 --- a/system-tests/projects/vuecli5-vue3/yarn.lock +++ b/system-tests/projects/vuecli5-vue3/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.5": - version "9.2.5" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" - integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== +"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.9": + version "9.2.9" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz#ab4815d9b16f1c83a479fe8791522a3abebb1c6a" + integrity sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ== dependencies: "@node-ipc/js-queue" "2.0.3" event-pubsub "4.3.0" diff --git a/system-tests/projects/vuecli5vue3-unconfigured/yarn.lock b/system-tests/projects/vuecli5vue3-unconfigured/yarn.lock index 815b07eb608d..6f0288ea060c 100644 --- a/system-tests/projects/vuecli5vue3-unconfigured/yarn.lock +++ b/system-tests/projects/vuecli5vue3-unconfigured/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.5": - version "9.2.5" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" - integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== +"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.9": + version "9.2.9" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz#ab4815d9b16f1c83a479fe8791522a3abebb1c6a" + integrity sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ== dependencies: "@node-ipc/js-queue" "2.0.3" event-pubsub "4.3.0" diff --git a/system-tests/projects/vueclivue2-configured/yarn.lock b/system-tests/projects/vueclivue2-configured/yarn.lock index 4f7fe99a0779..008d129743e6 100644 --- a/system-tests/projects/vueclivue2-configured/yarn.lock +++ b/system-tests/projects/vueclivue2-configured/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.5": - version "9.2.5" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" - integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== +"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.9": + version "9.2.9" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz#ab4815d9b16f1c83a479fe8791522a3abebb1c6a" + integrity sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ== dependencies: "@node-ipc/js-queue" "2.0.3" event-pubsub "4.3.0" diff --git a/system-tests/projects/vueclivue2-unconfigured/yarn.lock b/system-tests/projects/vueclivue2-unconfigured/yarn.lock index 7562fed0dae6..a6bea63729a1 100644 --- a/system-tests/projects/vueclivue2-unconfigured/yarn.lock +++ b/system-tests/projects/vueclivue2-unconfigured/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.5": - version "9.2.5" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" - integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== +"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.9": + version "9.2.9" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz#ab4815d9b16f1c83a479fe8791522a3abebb1c6a" + integrity sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ== dependencies: "@node-ipc/js-queue" "2.0.3" event-pubsub "4.3.0" diff --git a/system-tests/projects/vueclivue3-unconfigured/yarn.lock b/system-tests/projects/vueclivue3-unconfigured/yarn.lock index 67195997a7b7..0eb6f976f2d9 100644 --- a/system-tests/projects/vueclivue3-unconfigured/yarn.lock +++ b/system-tests/projects/vueclivue3-unconfigured/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.5": - version "9.2.5" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" - integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== +"@achrinza/node-ipc@9.2.2", "@achrinza/node-ipc@9.2.9": + version "9.2.9" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz#ab4815d9b16f1c83a479fe8791522a3abebb1c6a" + integrity sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ== dependencies: "@node-ipc/js-queue" "2.0.3" event-pubsub "4.3.0" From 8bebe5d58b5f5fb92b1c74c66b356122c615fb85 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 16:38:49 -0500 Subject: [PATCH 10/88] various fixes --- packages/server/lib/socket-base.ts | 14 ++++++++++---- .../cypress/e2e/test-isolation.spec.js | 12 ++++++------ system-tests/projects/no-specs-vue-2/package.json | 9 ++++++--- system-tests/projects/no-specs-vue-2/yarn.lock | 8 ++++---- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/packages/server/lib/socket-base.ts b/packages/server/lib/socket-base.ts index 055b5ffd62f2..0d9b844ea745 100644 --- a/packages/server/lib/socket-base.ts +++ b/packages/server/lib/socket-base.ts @@ -38,6 +38,12 @@ const retry = (fn: (res: any) => void) => { return Bluebird.delay(25).then(fn) } +type GenericHandler = { on: (event: string, listener: (...args: any[]) => void) => void } +type ExtendedSocketIoServer = socketIo.SocketIOServer & GenericHandler +type ExtendedSocketIoNamespace = socketIo.SocketIONamespace & GenericHandler + +type ExtendedCDPSocketServer = CDPSocketServer & GenericHandler + export class SocketBase { private _sendResetBrowserTabsForNextSpecMessage private _sendResetBrowserStateMessage @@ -48,8 +54,8 @@ export class SocketBase { protected inRunMode: boolean protected supportsRunEvents: boolean protected ended: boolean - protected _socketIo?: socketIo.SocketIOServer - protected _cdpIo?: CDPSocketServer + protected _socketIo?: ExtendedSocketIoServer + protected _cdpIo?: ExtendedCDPSocketServer localBus: EventEmitter constructor (config: Record) { @@ -154,7 +160,7 @@ export class SocketBase { const { socketIoRoute, socketIoCookie } = config - const socketIo = this._socketIo = this.createSocketIo(server, socketIoRoute, socketIoCookie) + const socketIo = this._socketIo = this.createSocketIo(server, socketIoRoute, socketIoCookie) as ExtendedSocketIoServer const cdpIo = this._cdpIo = this.createCDPIo(socketIoRoute) automation.use({ @@ -594,7 +600,7 @@ export class SocketBase { }) this.getIos().forEach((io) => { - io?.of('/data-context').on('connection', (socket: Socket) => { + (io?.of('/data-context') as ExtendedSocketIoNamespace).on('connection', (socket: Socket) => { socket.on('graphql:request', handleGraphQLSocketRequest) }) }) diff --git a/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation.spec.js b/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation.spec.js index 4fa1dbfb871d..18bb55cd10c9 100644 --- a/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation.spec.js +++ b/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation.spec.js @@ -7,19 +7,19 @@ const shouldAlwaysResetPage = (config) => { const TEST_METADATA = { 'passes 1': { - start: 'about:blank', + start: 'about:srcdoc', firesTestBeforeAfterRunAsync: true, - end: 'about:blank', + end: 'about:srcdoc', }, 'passes 2': { - start: 'about:blank', + start: 'about:srcdoc', firesTestBeforeAfterRunAsync: true, - end: 'about:blank', + end: 'about:srcdoc', }, 'passes 3': { - start: 'about:blank', + start: 'about:srcdoc', firesTestBeforeAfterRunAsync: !Cypress.config('isInteractive'), - end: shouldAlwaysResetPage(Cypress.config) ? 'about:blank' : '/cypress/e2e/dom-content.html', + end: shouldAlwaysResetPage(Cypress.config) ? 'about:srcdoc' : '/cypress/e2e/dom-content.html', }, } diff --git a/system-tests/projects/no-specs-vue-2/package.json b/system-tests/projects/no-specs-vue-2/package.json index 207a0cf204ab..2590fe501bf5 100644 --- a/system-tests/projects/no-specs-vue-2/package.json +++ b/system-tests/projects/no-specs-vue-2/package.json @@ -3,9 +3,9 @@ "version": "0.1.0", "private": true, "scripts": { - "serve": "vue-cli-service serve", "build": "vue-cli-service build", - "lint": "vue-cli-service lint" + "lint": "vue-cli-service lint", + "serve": "vue-cli-service serve" }, "dependencies": { "core-js": "^3.8.3", @@ -22,5 +22,8 @@ "> 1%", "last 2 versions", "not dead" - ] + ], + "resolutions": { + "@achrinza/node-ipc": "9.2.9" + } } diff --git a/system-tests/projects/no-specs-vue-2/yarn.lock b/system-tests/projects/no-specs-vue-2/yarn.lock index de826d87bb92..033d4ff97664 100644 --- a/system-tests/projects/no-specs-vue-2/yarn.lock +++ b/system-tests/projects/no-specs-vue-2/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@achrinza/node-ipc@^9.2.5": - version "9.2.5" - resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz#29788e608ff41121f0543491da723b243266ac28" - integrity sha512-kBX7Ay911iXZ3VZ1pYltj3Rfu7Ow9H7sK4H4RSfWIfWR2JKNB40K808wppoRIEzE2j2hXLU+r6TJgCAliCGhyQ== +"@achrinza/node-ipc@9.2.9", "@achrinza/node-ipc@^9.2.5": + version "9.2.9" + resolved "https://registry.yarnpkg.com/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz#ab4815d9b16f1c83a479fe8791522a3abebb1c6a" + integrity sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ== dependencies: "@node-ipc/js-queue" "2.0.3" event-pubsub "4.3.0" From 4b8b0a2e918ca3fea47b0b32edd5a39b9088a537 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 16:43:16 -0500 Subject: [PATCH 11/88] fix integrity check --- scripts/binary/binary-integrity-check-source.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/binary/binary-integrity-check-source.js b/scripts/binary/binary-integrity-check-source.js index 1f36b2cb0f99..b634a62d2d21 100644 --- a/scripts/binary/binary-integrity-check-source.js +++ b/scripts/binary/binary-integrity-check-source.js @@ -94,7 +94,7 @@ function validateElectron (electron) { function validateFs (fs) { // Hard coded function as this is electron code and there's not an easy way to get the function string at package time. If this fails on an updated version of electron, we'll need to update this. - if (originalToString.call(fs.readFileSync) !== `function(e,s){const n=splitPath(e);if(!n.isAsar)return F.apply(this,arguments);const{asarPath:a,filePath:i}=n,o=getOrCreateArchive(a);if(!o)throw createError("INVALID_ARCHIVE",{asarPath:a});const c=o.getFileInfo(i);if(!c)throw createError("NOT_FOUND",{asarPath:a,filePath:i});if(0===c.size)return s?"":r.Buffer.alloc(0);if(c.unpacked){const e=o.copyFileOut(i);return t.readFileSync(e,s)}if(s){if("string"==typeof s)s={encoding:s};else if("object"!=typeof s)throw new TypeError("Bad arguments")}else s={encoding:null};const{encoding:f}=s,l=r.Buffer.alloc(c.size),u=o.getFdAndValidateIntegrityLater();if(!(u>=0))throw createError("NOT_FOUND",{asarPath:a,filePath:i});return logASARAccess(a,i,c.offset),t.readSync(u,l,0,c.size,c.offset),validateBufferIntegrity(l,c.integrity),f?l.toString(f):l}`) { + if (originalToString.call(fs.readFileSync) !== `function(e,s){const r=splitPath(e);if(!r.isAsar)return F.apply(this,arguments);const{asarPath:n,filePath:i}=r,o=getOrCreateArchive(n);if(!o)throw createError("INVALID_ARCHIVE",{asarPath:n});const c=o.getFileInfo(i);if(!c)throw createError("NOT_FOUND",{asarPath:n,filePath:i});if(0===c.size)return s?"":a.Buffer.alloc(0);if(c.unpacked){const e=o.copyFileOut(i);return t.readFileSync(e,s)}if(s){if("string"==typeof s)s={encoding:s};else if("object"!=typeof s)throw new TypeError("Bad arguments")}else s={encoding:null};const{encoding:f}=s,l=a.Buffer.alloc(c.size),u=o.getFdAndValidateIntegrityLater();if(!(u>=0))throw createError("NOT_FOUND",{asarPath:n,filePath:i});return logASARAccess(n,i,c.offset),t.readSync(u,l,0,c.size,c.offset),validateBufferIntegrity(l,c.integrity),f?l.toString(f):l}`) { console.error(`Integrity check failed for toString.call(fs.readFileSync)`) throw new Error(integrityErrorMessage) } From 37f68c2674250f3b3fb3a184bf3c137c63eb5d98 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 17:13:12 -0500 Subject: [PATCH 12/88] fix binary verification --- scripts/binary/binary-integrity-check-source.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/binary/binary-integrity-check-source.js b/scripts/binary/binary-integrity-check-source.js index b634a62d2d21..27af520baccc 100644 --- a/scripts/binary/binary-integrity-check-source.js +++ b/scripts/binary/binary-integrity-check-source.js @@ -94,7 +94,7 @@ function validateElectron (electron) { function validateFs (fs) { // Hard coded function as this is electron code and there's not an easy way to get the function string at package time. If this fails on an updated version of electron, we'll need to update this. - if (originalToString.call(fs.readFileSync) !== `function(e,s){const r=splitPath(e);if(!r.isAsar)return F.apply(this,arguments);const{asarPath:n,filePath:i}=r,o=getOrCreateArchive(n);if(!o)throw createError("INVALID_ARCHIVE",{asarPath:n});const c=o.getFileInfo(i);if(!c)throw createError("NOT_FOUND",{asarPath:n,filePath:i});if(0===c.size)return s?"":a.Buffer.alloc(0);if(c.unpacked){const e=o.copyFileOut(i);return t.readFileSync(e,s)}if(s){if("string"==typeof s)s={encoding:s};else if("object"!=typeof s)throw new TypeError("Bad arguments")}else s={encoding:null};const{encoding:f}=s,l=a.Buffer.alloc(c.size),u=o.getFdAndValidateIntegrityLater();if(!(u>=0))throw createError("NOT_FOUND",{asarPath:n,filePath:i});return logASARAccess(n,i,c.offset),t.readSync(u,l,0,c.size,c.offset),validateBufferIntegrity(l,c.integrity),f?l.toString(f):l}`) { + if (originalToString.call(fs.readFileSync) !== `function(e,r){const n=splitPath(e);if(!n.isAsar)return w.apply(this,arguments);const{asarPath:i,filePath:a}=n,o=getOrCreateArchive(i);if(!o)throw createError("INVALID_ARCHIVE",{asarPath:i});const c=o.getFileInfo(a);if(!c)throw createError("NOT_FOUND",{asarPath:i,filePath:a});if(0===c.size)return r?"":s.Buffer.alloc(0);if(c.unpacked){const e=o.copyFileOut(a);return t.readFileSync(e,r)}if(r){if("string"==typeof r)r={encoding:r};else if("object"!=typeof r)throw new TypeError("Bad arguments")}else r={encoding:null};const{encoding:f}=r,l=s.Buffer.alloc(c.size),u=o.getFdAndValidateIntegrityLater();if(!(u>=0))throw createError("NOT_FOUND",{asarPath:i,filePath:a});return logASARAccess(i,a,c.offset),t.readSync(u,l,0,c.size,c.offset),validateBufferIntegrity(l,c.integrity),f?l.toString(f):l}`) { console.error(`Integrity check failed for toString.call(fs.readFileSync)`) throw new Error(integrityErrorMessage) } From 9a921d98b6901ff44db394bd517b78a3aa62da5d Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 17:36:15 -0500 Subject: [PATCH 13/88] various fixes --- .../src/graphql/urqlFetchSocketAdapter.ts | 2 +- .../test/unit/browsers/memory/memory_spec.ts | 9 +++++++++ scripts/binary/binary-integrity-check-source.js | 15 ++++++++++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/packages/frontend-shared/src/graphql/urqlFetchSocketAdapter.ts b/packages/frontend-shared/src/graphql/urqlFetchSocketAdapter.ts index 1db4ac9f551b..a9fce77f83b3 100644 --- a/packages/frontend-shared/src/graphql/urqlFetchSocketAdapter.ts +++ b/packages/frontend-shared/src/graphql/urqlFetchSocketAdapter.ts @@ -3,7 +3,7 @@ import type { SocketShape } from '@packages/socket/lib/types' import type { ClientOptions } from '@urql/core' export const urqlFetchSocketAdapter = (io: SocketShape): ClientOptions['fetch'] => { - return (url, fetchOptions = {}) => { + return (url, fetchOptions: RequesstInit = {}) => { return new Promise((resolve, reject) => { // Handle aborted requests if (fetchOptions.signal) { diff --git a/packages/server/test/unit/browsers/memory/memory_spec.ts b/packages/server/test/unit/browsers/memory/memory_spec.ts index 4ef5defafc1c..7e3fd87016bb 100644 --- a/packages/server/test/unit/browsers/memory/memory_spec.ts +++ b/packages/server/test/unit/browsers/memory/memory_spec.ts @@ -7,12 +7,16 @@ import { Automation } from '../../../../lib/automation' describe('lib/browsers/memory', () => { let memory: typeof import('../../../../lib/browsers/memory') + let originalPerformanceNow: () => number before(() => { delete require.cache[require.resolve('../../../../lib/browsers/memory')] process.env.CYPRESS_INTERNAL_MEMORY_SAVE_STATS = 'true' memory = require('../../../../lib/browsers/memory') + + originalPerformanceNow = performance.now + performance.now = () => 0 }) beforeEach(() => { @@ -23,6 +27,11 @@ describe('lib/browsers/memory', () => { await memory.default.endProfiling() }) + after(() => { + sinon.restore() + performance.now = originalPerformanceNow + }) + context('#getJsHeapSizeLimit', () => { it('retrieves the jsHeapSizeLimit from performance.memory', async () => { const automation = sinon.createStubInstance(Automation) diff --git a/scripts/binary/binary-integrity-check-source.js b/scripts/binary/binary-integrity-check-source.js index 27af520baccc..a6892a47d887 100644 --- a/scripts/binary/binary-integrity-check-source.js +++ b/scripts/binary/binary-integrity-check-source.js @@ -155,22 +155,27 @@ function integrityCheck (options) { }, { functionName: 'snapshotRequire', - fileName: 'evalmachine.', + // eslint-disable-next-line no-undef + fileName: [appPath, 'packages', 'server', 'index.jsc'].join(PATH_SEP), }, { functionName: 'runWithSnapshot', - fileName: 'evalmachine.', + // eslint-disable-next-line no-undef + fileName: [appPath, 'packages', 'server', 'index.jsc'].join(PATH_SEP), }, { functionName: 'hookRequire', - fileName: 'evalmachine.', + // eslint-disable-next-line no-undef + fileName: [appPath, 'packages', 'server', 'index.jsc'].join(PATH_SEP), }, { functionName: 'startCypress', - fileName: 'evalmachine.', + // eslint-disable-next-line no-undef + fileName: [appPath, 'packages', 'server', 'index.jsc'].join(PATH_SEP), }, { - fileName: 'evalmachine.', + // eslint-disable-next-line no-undef + fileName: [appPath, 'packages', 'server', 'index.jsc'].join(PATH_SEP), }, { functionName: 'v', From 88f091bd1daa73f149d1f4ba2b9b42aed5afd2b7 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 18:25:38 -0500 Subject: [PATCH 14/88] update yarn.lock --- system-tests/projects/angular-13/yarn.lock | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/system-tests/projects/angular-13/yarn.lock b/system-tests/projects/angular-13/yarn.lock index dacfd030eeb9..581680623b5c 100644 --- a/system-tests/projects/angular-13/yarn.lock +++ b/system-tests/projects/angular-13/yarn.lock @@ -1490,10 +1490,12 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.6.tgz#0ba49ac517ad69abe7a1508bc9b3a5483df9d5d7" integrity sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw== -"@types/node@^18.17.5": - version "18.17.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.5.tgz#c58b12bca8c2a437b38c15270615627e96dd0bc5" - integrity sha512-xNbS75FxH6P4UXTPUJp/zNPq6/xsfdJKussCWNOnz4aULWIRwMgP1LgaB5RiBnMX1DPCYenuqGZfnIAx5mbFLA== +"@types/node@^20.16.0": + version "20.16.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.11.tgz#9b544c3e716b1577ac12e70f9145193f32750b33" + integrity sha512-y+cTCACu92FyA5fgQSAI8A1H429g7aSK2HsO7K4XYUWc4dY5IUz55JSDIYT6/VsOLfGy8vmvQYC2hfb0iF16Uw== + dependencies: + undici-types "~6.19.2" "@types/parse-json@^4.0.0": version "4.0.0" @@ -5831,6 +5833,11 @@ typescript@~4.6.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== + unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" From 35934de4f5feffc44a0adea0199dce429b09b37c Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 18:40:23 -0500 Subject: [PATCH 15/88] fix typo --- packages/frontend-shared/src/graphql/urqlFetchSocketAdapter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend-shared/src/graphql/urqlFetchSocketAdapter.ts b/packages/frontend-shared/src/graphql/urqlFetchSocketAdapter.ts index a9fce77f83b3..c592434196e9 100644 --- a/packages/frontend-shared/src/graphql/urqlFetchSocketAdapter.ts +++ b/packages/frontend-shared/src/graphql/urqlFetchSocketAdapter.ts @@ -3,7 +3,7 @@ import type { SocketShape } from '@packages/socket/lib/types' import type { ClientOptions } from '@urql/core' export const urqlFetchSocketAdapter = (io: SocketShape): ClientOptions['fetch'] => { - return (url, fetchOptions: RequesstInit = {}) => { + return (url, fetchOptions: RequestInit = {}) => { return new Promise((resolve, reject) => { // Handle aborted requests if (fetchOptions.signal) { From ecb0423056099d46615a245c6e0a8e4fcb7c3a0d Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 18:43:54 -0500 Subject: [PATCH 16/88] fix lock file --- .../projects/issue-25951-next-app/yarn.lock | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/system-tests/projects/issue-25951-next-app/yarn.lock b/system-tests/projects/issue-25951-next-app/yarn.lock index 24bf9a4dfdd5..cb0252b29ccb 100644 --- a/system-tests/projects/issue-25951-next-app/yarn.lock +++ b/system-tests/projects/issue-25951-next-app/yarn.lock @@ -79,10 +79,12 @@ dependencies: tslib "^2.4.0" -"@types/node@18.17.5": - version "18.17.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.5.tgz#c58b12bca8c2a437b38c15270615627e96dd0bc5" - integrity sha512-xNbS75FxH6P4UXTPUJp/zNPq6/xsfdJKussCWNOnz4aULWIRwMgP1LgaB5RiBnMX1DPCYenuqGZfnIAx5mbFLA== +"@types/node@20.16.0": + version "20.16.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.0.tgz#02e5cd414f76bf345874ee65a1e5590d755d894f" + integrity sha512-vDxceJcoZhIVh67S568bm1UGZO0DX0hpplJZxzeXMKwIPLn190ec5RRxQ69BKhX44SUGIxxgMdDY557lGLKprQ== + dependencies: + undici-types "~6.19.2" "@types/prop-types@*": version "15.7.5" @@ -224,3 +226,8 @@ typescript@5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.3.tgz#fe976f0c826a88d0a382007681cbb2da44afdedf" integrity sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA== + +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== From 7ccd723d665dae97ad4fe433bfcae134bf430abe Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 19:36:21 -0500 Subject: [PATCH 17/88] fix tests --- packages/app/src/runner/aut-iframe.ts | 2 +- .../e2e/test-isolation-describe-config.spec.js | 16 ++++++++-------- system-tests/test-binary/node_versions_spec.ts | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/app/src/runner/aut-iframe.ts b/packages/app/src/runner/aut-iframe.ts index cb3caab106c0..78ae1337f8f4 100644 --- a/packages/app/src/runner/aut-iframe.ts +++ b/packages/app/src/runner/aut-iframe.ts @@ -129,7 +129,7 @@ export class AutIframe { return } - this.$iframe[0].srcdoc = '' + this.$iframe[0].srcdoc = '' this.$iframe.one('load', () => { if (testIsolation) { diff --git a/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation-describe-config.spec.js b/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation-describe-config.spec.js index da6916e84444..42ccac6d966d 100644 --- a/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation-describe-config.spec.js +++ b/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation-describe-config.spec.js @@ -7,12 +7,12 @@ const shouldAlwaysResetPage = (config) => { const TEST_METADATA = { 'passes 1': { - start: 'about:blank', + start: 'about:srcdoc', firesTestBeforeAfterRunAsync: true, - end: 'about:blank', + end: 'about:srcdoc', }, 'passes 2': { - start: 'about:blank', + start: 'about:srcdoc', firesTestBeforeAfterRunAsync: true, end: '/cypress/e2e/dom-content.html', }, @@ -24,17 +24,17 @@ const TEST_METADATA = { 'passes 4': { start: '/cypress/e2e/dom-content.html', firesTestBeforeAfterRunAsync: true, - end: 'about:blank', + end: 'about:srcdoc', }, 'passes 5': { - start: 'about:blank', + start: 'about:srcdoc', firesTestBeforeAfterRunAsync: true, - end: 'about:blank', + end: 'about:srcdoc', }, 'passes 6': { - start: 'about:blank', + start: 'about:srcdoc', firesTestBeforeAfterRunAsync: true, - end: shouldAlwaysResetPage(Cypress.config) ? 'about:blank' : '/cypress/e2e/dom-content.html', + end: shouldAlwaysResetPage(Cypress.config) ? 'about:srcdoc' : '/cypress/e2e/dom-content.html', }, } diff --git a/system-tests/test-binary/node_versions_spec.ts b/system-tests/test-binary/node_versions_spec.ts index 8d65a95b2ccf..f9deb4e6fb0b 100644 --- a/system-tests/test-binary/node_versions_spec.ts +++ b/system-tests/test-binary/node_versions_spec.ts @@ -26,7 +26,7 @@ function smokeTestDockerImage (dockerImage: string) { describe('binary node versions', () => { [ - 'cypress/base:20.18.0-bullseye', + 'cypress/base:20.18.0', 'cypress/base:22.0.0', 'cypress/base:22.7.0', ].forEach(smokeTestDockerImage) @@ -34,7 +34,7 @@ describe('binary node versions', () => { describe('type: module', () => { [ - 'cypress/base:20.18.0-bullseye', + 'cypress/base:20.18.0', 'cypress/base:22.0.0', 'cypress/base:22.7.0', ].forEach((dockerImage) => { From b4ed44f063e4c5ddc0dd9604ad52d0a7dbd79d96 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 21:21:40 -0500 Subject: [PATCH 18/88] fix tests --- package.json | 2 +- .../cypress/e2e/session/session.cy.js | 34 +++++----- yarn.lock | 68 +++---------------- 3 files changed, 27 insertions(+), 77 deletions(-) diff --git a/package.json b/package.json index ea79148f3052..041519424acc 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "mocha-banner": "1.1.2", "mocha-junit-reporter": "2.2.0", "mocha-multi-reporters": "1.1.7", - "mock-fs": "5.2.0", + "mock-fs": "5.4.0", "p-defer": "^3.0.0", "patch-package": "6.4.7", "playwright-webkit": "1.24.2", diff --git a/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js b/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js index 8152a5652295..d026ba69cf0c 100644 --- a/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js +++ b/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js @@ -91,10 +91,10 @@ describe('clears session data beforeEach test even with no session', () => { }) }) -describe('navigates to about:blank between tests and shows warning about session lifecycle', () => { +describe('navigates to about:srcdoc between tests and shows warning about session lifecycle', () => { it('t1', () => { cy.contains('Default blank page') - cy.contains('This page was cleared by navigating to about:blank.') + cy.contains('This page was cleared by navigating to about:srcdoc.') cy.contains('All active session data (cookies, localStorage and sessionStorage) across all domains are cleared.') cy.visit('https://localhost:4466/cross_origin_iframe/foo') @@ -103,12 +103,12 @@ describe('navigates to about:blank between tests and shows warning about session it('t2', () => { cy.contains('Default blank page') - cy.contains('This page was cleared by navigating to about:blank.') + cy.contains('This page was cleared by navigating to about:srcdoc.') cy.contains('All active session data (cookies, localStorage and sessionStorage) across all domains are cleared.') }) }) -describe('navigates to special about:blank after session', () => { +describe('navigates to special about:srcdoc after session', () => { beforeEach(() => { cy.session('user', () => { cy.visit('https://localhost:4466/cross_origin_iframe/user') @@ -120,7 +120,7 @@ describe('navigates to special about:blank after session', () => { it('t1', () => { cy.contains('Default blank page') - cy.contains('This page was cleared by navigating to about:blank.') + cy.contains('This page was cleared by navigating to about:srcdoc.') cy.visit('https://localhost:4466/cross_origin_iframe/foo') cy.contains('cross_origin_iframe') @@ -128,7 +128,7 @@ describe('navigates to special about:blank after session', () => { it('t2', () => { cy.contains('Default blank page') - cy.contains('This page was cleared by navigating to about:blank.') + cy.contains('This page was cleared by navigating to about:srcdoc.') }) }) @@ -174,7 +174,7 @@ describe('save/restore session with cookies and localStorage', () => { describe('multiple sessions in test', () => { it('switch session during test', () => { sessionUser('alice') - cy.url().should('eq', 'about:blank') + cy.url().should('eq', 'about:srcdoc') cy.visit('https://localhost:4466/form') expectCurrentSessionData({ @@ -187,7 +187,7 @@ describe('multiple sessions in test', () => { sessionUser('bob') - cy.url().should('eq', 'about:blank') + cy.url().should('eq', 'about:srcdoc') expectCurrentSessionData({ cookies: ['/set-localStorage/bob', '/cross_origin_iframe/bob'], @@ -205,7 +205,7 @@ describe('multiple sessions in test - can switch without redefining', () => { sessionUser('bob') sessionUser('alice') - cy.url().should('eq', 'about:blank') + cy.url().should('eq', 'about:srcdoc') cy.visit('https://localhost:4466/form') expectCurrentSessionData({ @@ -226,7 +226,7 @@ describe('multiple sessions in test - can switch without redefining', () => { expect(clearSpy).calledThrice }) - cy.url().should('eq', 'about:blank') + cy.url().should('eq', 'about:srcdoc') expectCurrentSessionData({ cookies: ['/set-localStorage/bob', '/cross_origin_iframe/bob'], @@ -249,7 +249,7 @@ function SuiteWithValidateFn (id, fn) { type: 'parent', }) - // expect(cy.state('window').location.href).eq('about:blank') + // expect(cy.state('window').location.href).eq('about:srcdoc') return fn(validate.callCount) }) @@ -271,22 +271,22 @@ function SuiteWithValidateFn (id, fn) { }) it('t1', () => { - cy.url().should('eq', 'about:blank') + cy.url().should('eq', 'about:srcdoc') expect(setup).calledOnce expect(validate).calledOnce - // (1,2) about:blank before & after session creation + // (1,2) about:srcdoc before & after session creation // (3) after validate runs expect(numPageLoads, 'number of page loads').eq(2) }) it('t2', () => { - cy.url().should('eq', 'about:blank') + cy.url().should('eq', 'about:srcdoc') expect(setup).calledTwice expect(validate).calledThrice - // (4) about:blank before session rehydrating - // (5,6) about:blank before & after setup function - // (7) about:blank after 2nd validate runs + // (4) about:srcdoc before session rehydrating + // (5,6) about:srcdoc before & after setup function + // (7) about:srcdoc after 2nd validate runs expect(numPageLoads, 'number of page loads').eq(5) }) } diff --git a/yarn.lock b/yarn.lock index 7075ebf6c753..547b2dbe9d2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22076,7 +22076,7 @@ mobx@5.15.4: resolved "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz#9da1a84e97ba624622f4e55a0bf3300fb931c2ab" integrity sha512-xRFJxSU2Im3nrGCdjSuOTFmxVDGeqOHL+TyADCGbT0k4HHqGmx5u2yaHNryvoORpI4DfbzjJ5jPmuv+d7sioFw== -"mocha-7.0.1@npm:mocha@7.0.1": +"mocha-7.0.1@npm:mocha@7.0.1", mocha@7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== @@ -22193,36 +22193,6 @@ mocha@6.2.2: yargs-parser "13.1.1" yargs-unparser "1.6.0" -mocha@7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" - integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== - dependencies: - ansi-colors "3.2.3" - browser-stdout "1.3.1" - chokidar "3.3.0" - debug "3.2.6" - diff "3.5.0" - escape-string-regexp "1.0.5" - find-up "3.0.0" - glob "7.1.3" - growl "1.10.5" - he "1.2.0" - js-yaml "3.13.1" - log-symbols "2.2.0" - minimatch "3.0.4" - mkdirp "0.5.1" - ms "2.1.1" - node-environment-flags "1.0.6" - object.assign "4.1.0" - strip-json-comments "2.0.1" - supports-color "6.0.0" - which "1.3.1" - wide-align "1.1.3" - yargs "13.3.0" - yargs-parser "13.1.1" - yargs-unparser "1.6.0" - mocha@7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.0.tgz#c784f579ad0904d29229ad6cb1e2514e4db7d249" @@ -22462,6 +22432,11 @@ mock-fs@5.2.0: resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-5.2.0.tgz#3502a9499c84c0a1218ee4bf92ae5bf2ea9b2b5e" integrity sha512-2dF2R6YMSZbpip1V1WHKGLNjr/k48uQClqMVb5H3MOvwc9qhYis3/IWbj02qIg/Y8MDXKFF4c5v0rxx2o6xTZw== +mock-fs@5.4.0: + version "5.4.0" + resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-5.4.0.tgz#c1d91d6d8dc19269a0fe86e8b777521d990c2ed7" + integrity sha512-3ROPnEMgBOkusBMYQUW2rnT3wZwsgfOKzJDLvx/TZ7FL1WmWvwSwn3j4aDR5fLDGtgcc1WF0Z1y0di7c9L4FKw== + mock-require@3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946" @@ -28996,7 +28971,7 @@ string-template@~0.2.1: resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -29022,15 +28997,6 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -29132,7 +29098,7 @@ stringify-object@^3.0.0, stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -29153,13 +29119,6 @@ strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -32119,7 +32078,7 @@ workerpool@6.2.0: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b" integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -32162,15 +32121,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 8a7dd47b57aaf55581699dc1460688a3e715cec1 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 11 Oct 2024 21:53:50 -0500 Subject: [PATCH 19/88] various fixes --- cli/package.json | 2 +- packages/app/src/runner/aut-iframe.ts | 1 + packages/launcher/package.json | 2 +- packages/server/package.json | 2 +- yarn.lock | 68 +++++++++++++++++++++++---- 5 files changed, 63 insertions(+), 12 deletions(-) diff --git a/cli/package.json b/cli/package.json index 4b0b45a62cf5..fe1ecef6c230 100644 --- a/cli/package.json +++ b/cli/package.json @@ -96,7 +96,7 @@ "execa-wrap": "1.4.0", "hasha": "5.2.2", "mocha": "6.2.2", - "mock-fs": "5.2.0", + "mock-fs": "5.4.0", "mocked-env": "1.3.2", "nock": "13.2.9", "proxyquire": "2.1.3", diff --git a/packages/app/src/runner/aut-iframe.ts b/packages/app/src/runner/aut-iframe.ts index 78ae1337f8f4..b6fa29132e79 100644 --- a/packages/app/src/runner/aut-iframe.ts +++ b/packages/app/src/runner/aut-iframe.ts @@ -129,6 +129,7 @@ export class AutIframe { return } + this.$iframe[0].src = 'about:blank' this.$iframe[0].srcdoc = '' this.$iframe.one('load', () => { diff --git a/packages/launcher/package.json b/packages/launcher/package.json index f56f722e0613..1f060e039e3f 100644 --- a/packages/launcher/package.json +++ b/packages/launcher/package.json @@ -30,7 +30,7 @@ "chai": "3.5.0", "chai-as-promised": "7.1.1", "mocha": "3.5.3", - "mock-fs": "5.2.0", + "mock-fs": "5.4.0", "sinon": "^10.0.0", "sinon-chai": "3.4.0", "typescript": "^5.4.5" diff --git a/packages/server/package.json b/packages/server/package.json index 6df81c0713af..d18c2f87956d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -182,7 +182,7 @@ "mochawesome-1.5.2": "npm:mochawesome@1.5.2", "mochawesome-2.3.1": "npm:mochawesome@2.3.1", "mochawesome-3.0.1": "npm:mochawesome@3.0.1", - "mock-fs": "5.2.0", + "mock-fs": "5.4.0", "mocked-env": "1.2.4", "mockery": "2.1.0", "nock": "13.2.9", diff --git a/yarn.lock b/yarn.lock index 547b2dbe9d2a..7a7c4968db57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22076,7 +22076,7 @@ mobx@5.15.4: resolved "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz#9da1a84e97ba624622f4e55a0bf3300fb931c2ab" integrity sha512-xRFJxSU2Im3nrGCdjSuOTFmxVDGeqOHL+TyADCGbT0k4HHqGmx5u2yaHNryvoORpI4DfbzjJ5jPmuv+d7sioFw== -"mocha-7.0.1@npm:mocha@7.0.1", mocha@7.0.1: +"mocha-7.0.1@npm:mocha@7.0.1": version "7.0.1" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== @@ -22193,6 +22193,36 @@ mocha@6.2.2: yargs-parser "13.1.1" yargs-unparser "1.6.0" +mocha@7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" + integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== + dependencies: + ansi-colors "3.2.3" + browser-stdout "1.3.1" + chokidar "3.3.0" + debug "3.2.6" + diff "3.5.0" + escape-string-regexp "1.0.5" + find-up "3.0.0" + glob "7.1.3" + growl "1.10.5" + he "1.2.0" + js-yaml "3.13.1" + log-symbols "2.2.0" + minimatch "3.0.4" + mkdirp "0.5.1" + ms "2.1.1" + node-environment-flags "1.0.6" + object.assign "4.1.0" + strip-json-comments "2.0.1" + supports-color "6.0.0" + which "1.3.1" + wide-align "1.1.3" + yargs "13.3.0" + yargs-parser "13.1.1" + yargs-unparser "1.6.0" + mocha@7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.0.tgz#c784f579ad0904d29229ad6cb1e2514e4db7d249" @@ -22427,11 +22457,6 @@ mochawesome-report-generator@^3.0.1: validator "^9.1.2" yargs "^10.0.3" -mock-fs@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-5.2.0.tgz#3502a9499c84c0a1218ee4bf92ae5bf2ea9b2b5e" - integrity sha512-2dF2R6YMSZbpip1V1WHKGLNjr/k48uQClqMVb5H3MOvwc9qhYis3/IWbj02qIg/Y8MDXKFF4c5v0rxx2o6xTZw== - mock-fs@5.4.0: version "5.4.0" resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-5.4.0.tgz#c1d91d6d8dc19269a0fe86e8b777521d990c2ed7" @@ -28971,7 +28996,7 @@ string-template@~0.2.1: resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -28997,6 +29022,15 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -29098,7 +29132,7 @@ stringify-object@^3.0.0, stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -29119,6 +29153,13 @@ strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -32078,7 +32119,7 @@ workerpool@6.2.0: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b" integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -32121,6 +32162,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 0a49434ec986c9264037d680840e5681f1d44b9e Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sat, 12 Oct 2024 10:26:17 -0500 Subject: [PATCH 20/88] various fixes --- packages/server/lib/browsers/memory/index.ts | 1 - packages/server/lib/cloud/protocol.ts | 1 - .../server/test/unit/browsers/memory/memory_spec.ts | 5 ----- packages/server/test/unit/cloud/protocol_spec.ts | 4 ++-- packages/types/src/protocol.ts | 3 +-- .../cypress/e2e/session/session.cy.js | 12 ++++++------ 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/packages/server/lib/browsers/memory/index.ts b/packages/server/lib/browsers/memory/index.ts index 7024a7ae0e6d..fcf158492593 100644 --- a/packages/server/lib/browsers/memory/index.ts +++ b/packages/server/lib/browsers/memory/index.ts @@ -3,7 +3,6 @@ import _ from 'lodash' import si from 'systeminformation' import os from 'os' import fs from 'fs-extra' -import { performance } from 'perf_hooks' import path from 'path' import pid from 'pidusage' import { groupCyProcesses, Process } from '../../util/process_profiler' diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts index 1c33e8ed06e4..ffbc1b6fce1c 100644 --- a/packages/server/lib/cloud/protocol.ts +++ b/packages/server/lib/cloud/protocol.ts @@ -9,7 +9,6 @@ import os from 'os' import path from 'path' import { agent } from '@packages/network' import pkg from '@packages/root' -import { performance } from 'perf_hooks' import env from '../util/env' import { putProtocolArtifact } from './api/put_protocol_artifact' diff --git a/packages/server/test/unit/browsers/memory/memory_spec.ts b/packages/server/test/unit/browsers/memory/memory_spec.ts index 7e3fd87016bb..a4ae3c3f1d60 100644 --- a/packages/server/test/unit/browsers/memory/memory_spec.ts +++ b/packages/server/test/unit/browsers/memory/memory_spec.ts @@ -7,16 +7,12 @@ import { Automation } from '../../../../lib/automation' describe('lib/browsers/memory', () => { let memory: typeof import('../../../../lib/browsers/memory') - let originalPerformanceNow: () => number before(() => { delete require.cache[require.resolve('../../../../lib/browsers/memory')] process.env.CYPRESS_INTERNAL_MEMORY_SAVE_STATS = 'true' memory = require('../../../../lib/browsers/memory') - - originalPerformanceNow = performance.now - performance.now = () => 0 }) beforeEach(() => { @@ -29,7 +25,6 @@ describe('lib/browsers/memory', () => { after(() => { sinon.restore() - performance.now = originalPerformanceNow }) context('#getJsHeapSizeLimit', () => { diff --git a/packages/server/test/unit/cloud/protocol_spec.ts b/packages/server/test/unit/cloud/protocol_spec.ts index e68b79a169bb..620a6b284596 100644 --- a/packages/server/test/unit/cloud/protocol_spec.ts +++ b/packages/server/test/unit/cloud/protocol_spec.ts @@ -37,7 +37,7 @@ describe('lib/cloud/protocol', () => { beforeEach(async () => { protocolManager = new ProtocolManager() - await protocolManager.setupProtocol(stubProtocol, { runId: '1', testingType: 'e2e' }) + await protocolManager.setupProtocol(stubProtocol, { runId: '1', testingType: 'e2e', projectId: '1', cloudApi: { url: 'http://localhost:1234', retryWithBackoff: async () => {}, requestPromise: { get: async () => {} } } }) protocol = (protocolManager as any)._protocol expect((protocol as any)).not.to.be.undefined @@ -339,7 +339,7 @@ describe('lib/cloud/protocol', () => { sinon.stub(protocol, 'getDbMetadata').returns({ offset, size }) sinon.stub(fs, 'unlink').withArgs(filePath).resolves() - protocolManager.beforeSpec({ instanceId }) + protocolManager.beforeSpec({ instanceId, absolute: '/path/to/spec', relative: 'spec', relativeToCommonRoot: 'common/root', specFileExtension: '.ts', fileExtension: '.ts', specType: 'integration', baseName: 'spec', name: 'spec', fileName: 'spec.ts' }) expectedAfterSpecTotal = 225 diff --git a/packages/types/src/protocol.ts b/packages/types/src/protocol.ts index 85948e9296c7..3003abbe4095 100644 --- a/packages/types/src/protocol.ts +++ b/packages/types/src/protocol.ts @@ -121,8 +121,7 @@ export interface ProtocolManagerShape extends AppCaptureProtocolCommon { beforeSpec (spec: SpecWithRelativeRoot & { instanceId: string }): void afterSpec (): Promise<{ durations: AfterSpecDurations } | undefined> reportNonFatalErrors (clientMetadata: any): Promise - uploadCaptureArtifact(artifact: CaptureArtifact): Promise - + uploadCaptureArtifact(artifact: CaptureArtifact): Promise } type Response = { diff --git a/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js b/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js index d026ba69cf0c..022ec100a592 100644 --- a/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js +++ b/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js @@ -91,10 +91,10 @@ describe('clears session data beforeEach test even with no session', () => { }) }) -describe('navigates to about:srcdoc between tests and shows warning about session lifecycle', () => { +describe('navigates to about:blank between tests and shows warning about session lifecycle', () => { it('t1', () => { cy.contains('Default blank page') - cy.contains('This page was cleared by navigating to about:srcdoc.') + cy.contains('This page was cleared by navigating to about:blank.') cy.contains('All active session data (cookies, localStorage and sessionStorage) across all domains are cleared.') cy.visit('https://localhost:4466/cross_origin_iframe/foo') @@ -103,12 +103,12 @@ describe('navigates to about:srcdoc between tests and shows warning about sessio it('t2', () => { cy.contains('Default blank page') - cy.contains('This page was cleared by navigating to about:srcdoc.') + cy.contains('This page was cleared by navigating to about:blank.') cy.contains('All active session data (cookies, localStorage and sessionStorage) across all domains are cleared.') }) }) -describe('navigates to special about:srcdoc after session', () => { +describe('navigates to special about:blank after session', () => { beforeEach(() => { cy.session('user', () => { cy.visit('https://localhost:4466/cross_origin_iframe/user') @@ -120,7 +120,7 @@ describe('navigates to special about:srcdoc after session', () => { it('t1', () => { cy.contains('Default blank page') - cy.contains('This page was cleared by navigating to about:srcdoc.') + cy.contains('This page was cleared by navigating to about:blank.') cy.visit('https://localhost:4466/cross_origin_iframe/foo') cy.contains('cross_origin_iframe') @@ -128,7 +128,7 @@ describe('navigates to special about:srcdoc after session', () => { it('t2', () => { cy.contains('Default blank page') - cy.contains('This page was cleared by navigating to about:srcdoc.') + cy.contains('This page was cleared by navigating to about:blank.') }) }) From 2854b2a32d964a0b0456ca4c5e9915414bf8688c Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sat, 12 Oct 2024 18:19:20 -0500 Subject: [PATCH 21/88] various fixes --- packages/app/src/runner/aut-iframe.ts | 7 +++++-- packages/server/test/unit/fixture_spec.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/app/src/runner/aut-iframe.ts b/packages/app/src/runner/aut-iframe.ts index b6fa29132e79..d8a0af6282cb 100644 --- a/packages/app/src/runner/aut-iframe.ts +++ b/packages/app/src/runner/aut-iframe.ts @@ -61,7 +61,11 @@ export class AutIframe { } _showContents (contents) { - this._body()?.html(contents) + if (!this.$iframe) { + return + } + + this.$iframe[0].srcdoc = `${contents}` } _contents () { @@ -130,7 +134,6 @@ export class AutIframe { } this.$iframe[0].src = 'about:blank' - this.$iframe[0].srcdoc = '' this.$iframe.one('load', () => { if (testIsolation) { diff --git a/packages/server/test/unit/fixture_spec.js b/packages/server/test/unit/fixture_spec.js index ddcd9dee73b9..40420bb27698 100644 --- a/packages/server/test/unit/fixture_spec.js +++ b/packages/server/test/unit/fixture_spec.js @@ -69,7 +69,7 @@ describe('lib/fixture', () => { context('json files', () => { it('throws when json is invalid', function () { const e = - `\'bad_json.json\' is not valid JSON.\nUnexpected string in JSON at position 20 while parsing near "{\\n \\"bad\\": \\"json\\"\\n \\"should\\": \\"not parse..."` + `\'bad_json.json\' is not valid JSON.\nExpected ',' or '}' after property value in JSON at position 20 while parsing near "{\\n \\"bad\\": \\"json\\"\\n \\"should\\": \\"not parse..."` return fixture.get(this.fixturesFolder, 'bad_json.json') .then(() => { From ff5034c1f847b737a893f3a70bf156eb069d99f9 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sat, 12 Oct 2024 19:02:33 -0500 Subject: [PATCH 22/88] fix stuff --- packages/app/src/runner/aut-iframe.ts | 8 ++------ packages/app/src/runner/index.ts | 4 ++-- packages/app/src/runner/useEventManager.ts | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/app/src/runner/aut-iframe.ts b/packages/app/src/runner/aut-iframe.ts index d8a0af6282cb..78ae1337f8f4 100644 --- a/packages/app/src/runner/aut-iframe.ts +++ b/packages/app/src/runner/aut-iframe.ts @@ -61,11 +61,7 @@ export class AutIframe { } _showContents (contents) { - if (!this.$iframe) { - return - } - - this.$iframe[0].srcdoc = `${contents}` + this._body()?.html(contents) } _contents () { @@ -133,7 +129,7 @@ export class AutIframe { return } - this.$iframe[0].src = 'about:blank' + this.$iframe[0].srcdoc = '' this.$iframe.one('load', () => { if (testIsolation) { diff --git a/packages/app/src/runner/index.ts b/packages/app/src/runner/index.ts index 17e798d22a71..cbb5f4b48742 100644 --- a/packages/app/src/runner/index.ts +++ b/packages/app/src/runner/index.ts @@ -293,7 +293,7 @@ function setSpecForDriver (spec: SpecFile) { * a Spec IFrame to load the spec's source code, and * initialize Cypress on the AUT. */ -function runSpecE2E (config, spec: SpecFile) { +async function runSpecE2E (config, spec: SpecFile) { const $runnerRoot = getRunnerElement() // clear AUT, if there is one. @@ -316,7 +316,7 @@ function runSpecE2E (config, spec: SpecFile) { el.remove() }) - autIframe.visitBlankPage() + await autIframe.visitBlankPage() // create Spec IFrame const specSrc = getSpecUrl({ diff --git a/packages/app/src/runner/useEventManager.ts b/packages/app/src/runner/useEventManager.ts index 1ef7cd72a603..ff3468006f25 100644 --- a/packages/app/src/runner/useEventManager.ts +++ b/packages/app/src/runner/useEventManager.ts @@ -50,7 +50,7 @@ export function useEventManager () { }) eventManager.on('visit:blank', ({ testIsolation }) => { - getAutIframeModel().visitBlankPage(testIsolation) + return getAutIframeModel().visitBlankPage(testIsolation) }) eventManager.on('run:end', () => { From 686b56cd7ddb7f252f6c7ad785aa0f35f5e503e2 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sat, 12 Oct 2024 21:18:42 -0500 Subject: [PATCH 23/88] fix things --- packages/app/src/runner/aut-iframe.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/app/src/runner/aut-iframe.ts b/packages/app/src/runner/aut-iframe.ts index 78ae1337f8f4..b6fa29132e79 100644 --- a/packages/app/src/runner/aut-iframe.ts +++ b/packages/app/src/runner/aut-iframe.ts @@ -129,6 +129,7 @@ export class AutIframe { return } + this.$iframe[0].src = 'about:blank' this.$iframe[0].srcdoc = '' this.$iframe.one('load', () => { From 2efafbdb4127e361090690ca493cdd2ad32c042f Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 15 Oct 2024 10:30:20 -0500 Subject: [PATCH 24/88] try to fix errors --- .../plugins/child/run_require_async_child.js | 6 ++++- patches/ts-node+10.9.2.patch | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 patches/ts-node+10.9.2.patch diff --git a/packages/server/lib/plugins/child/run_require_async_child.js b/packages/server/lib/plugins/child/run_require_async_child.js index 4528392d6c23..1ad74c27e218 100644 --- a/packages/server/lib/plugins/child/run_require_async_child.js +++ b/packages/server/lib/plugins/child/run_require_async_child.js @@ -193,7 +193,11 @@ function run (ipc, file, projectRoot) { debug('loaded config from %s %o', file, result) } catch (err) { - if (err.name === 'TSError') { + // Starting in Node 20, error objects when occurs occur while doing `node --load` are not properly serialized + // so we need to check both the name and the stack. We also have patched ts-node to ensure that the error is + // of the right form to be serialized. + if (err.name === 'TSError' || err.stack.includes('TSError')) { + err.name = 'TSError' // because of this https://github.com/TypeStrong/ts-node/issues/1418 // we have to do this https://stackoverflow.com/questions/25245716/remove-all-ansi-colors-styles-from-strings/29497680 const cleanMessage = stripAnsi(err.message) diff --git a/patches/ts-node+10.9.2.patch b/patches/ts-node+10.9.2.patch new file mode 100644 index 000000000000..0d78f44bee90 --- /dev/null +++ b/patches/ts-node+10.9.2.patch @@ -0,0 +1,26 @@ +diff --git a/node_modules/ts-node/dist/index.js b/node_modules/ts-node/dist/index.js +index c03afbf..56c45bb 100644 +--- a/node_modules/ts-node/dist/index.js ++++ b/node_modules/ts-node/dist/index.js +@@ -94,7 +94,7 @@ exports.DEFAULTS = { + /** + * TypeScript diagnostics error. + */ +-class TSError extends make_error_1.BaseError { ++class TSError extends Error { + constructor(diagnosticText, diagnosticCodes, diagnostics = []) { + super(`тип Unable to compile TypeScript:\n${diagnosticText}`); + this.diagnosticCodes = diagnosticCodes; +@@ -110,12 +110,6 @@ class TSError extends make_error_1.BaseError { + value: diagnostics, + }); + } +- /** +- * @internal +- */ +- [exports.INSPECT_CUSTOM]() { +- return this.diagnosticText; +- } + } + exports.TSError = TSError; + const TS_NODE_SERVICE_BRAND = Symbol('TS_NODE_SERVICE_BRAND'); From 168cb304a1828a063c42650e58ed94aed3771017 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 15 Oct 2024 15:35:49 -0500 Subject: [PATCH 25/88] fix --- packages/data-context/src/sources/ErrorDataSource.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/data-context/src/sources/ErrorDataSource.ts b/packages/data-context/src/sources/ErrorDataSource.ts index 965b84b1534b..66f859f5a237 100644 --- a/packages/data-context/src/sources/ErrorDataSource.ts +++ b/packages/data-context/src/sources/ErrorDataSource.ts @@ -48,7 +48,7 @@ export class ErrorDataSource { } } - if (!absolute || !_.isNumber(line) || !_.isNumber(column)) { + if (!absolute || !_.isNumber(line) || !_.isNumber(column) || absolute.includes('ts-node')) { return null } From 7f3a243095e9c8635a692b108ff7961db12e1f31 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 15 Oct 2024 18:43:24 -0500 Subject: [PATCH 26/88] updates --- .circleci/workflows.yml | 10 +++++----- packages/network/test/unit/agent_spec.ts | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 00435d3a5820..107432d0463c 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -30,7 +30,7 @@ mainBuildFilters: &mainBuildFilters - /^release\/\d+\.\d+\.\d+$/ # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - 'update-v8-snapshot-cache-on-develop' - - 'misc/remove_marionette_for_geckodriver' + - 'ryanm/chore/electron-upgrade' - 'publish-binary' # usually we don't build Mac app - it takes a long time @@ -42,7 +42,7 @@ macWorkflowFilters: &darwin-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - - equal: [ 'misc/remove_marionette_for_geckodriver', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/electron-upgrade', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -53,7 +53,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - - equal: [ 'misc/remove_marionette_for_geckodriver', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/electron-upgrade', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -76,7 +76,7 @@ windowsWorkflowFilters: &windows-workflow-filters - equal: [ develop, << pipeline.git.branch >> ] # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ] - - equal: [ 'chore/patch_windows_build', << pipeline.git.branch >> ] + - equal: [ 'ryanm/chore/electron-upgrade', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -152,7 +152,7 @@ commands: name: Set environment variable to determine whether or not to persist artifacts command: | echo "Setting SHOULD_PERSIST_ARTIFACTS variable" - echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "misc/remove_marionette_for_geckodriver" ]]; then + echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "ryanm/chore/electron-upgrade" ]]; then export SHOULD_PERSIST_ARTIFACTS=true fi' >> "$BASH_ENV" # You must run `setup_should_persist_artifacts` command and be using bash before running this command diff --git a/packages/network/test/unit/agent_spec.ts b/packages/network/test/unit/agent_spec.ts index 2f39e67cc65d..eb5b606c62d1 100644 --- a/packages/network/test/unit/agent_spec.ts +++ b/packages/network/test/unit/agent_spec.ts @@ -973,7 +973,7 @@ describe('lib/agent', function () { expect(req._header).to.equal([ 'GET / HTTP/1.1', 'host: foo.bar.baz.invalid', - 'Connection: close', + 'Connection: keep-alive', '', '', ].join('\r\n')) @@ -988,7 +988,7 @@ describe('lib/agent', function () { 'GET http://quuz.quux.invalid/abc?def=123 HTTP/1.1', 'Host: foo.fleem.invalid', 'bing: bang', - 'Connection: close', + 'Connection: keep-alive', '', '', ].join('\r\n')) }) From 979715e196e06171c7eedf6f102fa1d340a920f6 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 15 Oct 2024 19:31:02 -0500 Subject: [PATCH 27/88] add yarn berry --- .circleci/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index f19342aee44d..bf5b7cd6a7d7 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -1782,7 +1782,7 @@ jobs: working_directory: ~/cypress docker: # we need an image with yarn 4 berry installed on it to run this test - - image: cypress/base-internal:18.17.1-yarn-berry + - image: cypress/base-internal:20.18.0-yarn-berry environment: # needed to inform the bootstrap-docker-container.sh script to link the binary in the system-test project directory REPO_DIR: /root/cypress From 6c954c2eafc6da14c6287b84cd7e74432e5255ba Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 15 Oct 2024 19:42:09 -0500 Subject: [PATCH 28/88] upgrade electron --- .circleci/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index bf5b7cd6a7d7..9721dae39e9b 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -530,7 +530,7 @@ commands: apt update && apt install -y docker.io docker run -d --name better-sqlite3-builder cypress/base-internal:20.15.0-buster /bin/bash -c "sleep 1000000000" docker cp ~/cypress/node_modules/better-sqlite3 better-sqlite3-builder:/better-sqlite3 - docker exec -it better-sqlite3-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 27.1.3 --include-regex 'better_sqlite3.node$'" + docker exec -it better-sqlite3-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 32.2.0 --include-regex 'better_sqlite3.node$'" docker cp better-sqlite3-builder:/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node docker rm -f better-sqlite3-builder cp ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/better_sqlite3.node From 1bca323cec796331a0715bc544a82f8e4a932961 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 07:16:55 -0500 Subject: [PATCH 29/88] attempt with gcc --- .circleci/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 9721dae39e9b..68de7db56559 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -528,7 +528,7 @@ commands: if [[ ! -f better_sqlite3.node ]]; then set -x apt update && apt install -y docker.io - docker run -d --name better-sqlite3-builder cypress/base-internal:20.15.0-buster /bin/bash -c "sleep 1000000000" + docker run -d --name better-sqlite3-builder cypress/base-internal:20.15.0-buster-python3.8-gcc-10.5 /bin/bash -c "sleep 1000000000" docker cp ~/cypress/node_modules/better-sqlite3 better-sqlite3-builder:/better-sqlite3 docker exec -it better-sqlite3-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 32.2.0 --include-regex 'better_sqlite3.node$'" docker cp better-sqlite3-builder:/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node From 86b440c2369497fb91962d31445da2f96c6a5ca2 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 08:14:56 -0500 Subject: [PATCH 30/88] blank From 9199ec632ab0998cc1658668d921f96d02428e58 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 09:37:54 -0500 Subject: [PATCH 31/88] update arm64 executor --- .circleci/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 68de7db56559..4b23ecd1a69e 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -136,7 +136,7 @@ executors: linux-arm64: &linux-arm64-executor machine: - image: ubuntu-2004:2023.07.1 + image: ubuntu-2004:2024.05.1 resource_class: arm.medium environment: PLATFORM: linux From 7bc49ed1ead3466cc3852db6bf2bfb5c3d4f347d Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 09:53:45 -0500 Subject: [PATCH 32/88] try to fix the arm64 issue --- .circleci/workflows.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 4b23ecd1a69e..9161de0cf838 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -383,6 +383,10 @@ commands: - run: name: Install Node Modules command: | + # if we are on arm64 we need to install setuptools as it no longer comes standard with the latest version of python + if [[ `node ./scripts/get-platform-key.js` == 'linux-arm64' ]]; then + pip install setuptools + fi source ./scripts/ensure-node.sh # avoid installing Percy's Chromium every time we use @percy/cli # https://docs.percy.io/docs/caching-asset-discovery-browser-in-ci From 5f9e470253e16cd2110f63607700ec54e0764e9b Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 10:10:10 -0500 Subject: [PATCH 33/88] fix arm64 --- .circleci/workflows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 9161de0cf838..22d20196612a 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -385,6 +385,7 @@ commands: command: | # if we are on arm64 we need to install setuptools as it no longer comes standard with the latest version of python if [[ `node ./scripts/get-platform-key.js` == 'linux-arm64' ]]; then + sudo apt install gcc-10 g++-10 pip install setuptools fi source ./scripts/ensure-node.sh From bc0f4f1ca53dee6a773911ab6666f828202f2e7c Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 10:14:58 -0500 Subject: [PATCH 34/88] bump cache --- .circleci/cache-version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt index deafa871233e..4817bf825e8e 100644 --- a/.circleci/cache-version.txt +++ b/.circleci/cache-version.txt @@ -1,3 +1,3 @@ # Bump this version to force CI to re-create the cache from scratch. -09-30-24-windows-patch-server-2022 +10-18-2024 From 32773d74188e0b5ae436173dbb0b5a848452c598 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 10:34:30 -0500 Subject: [PATCH 35/88] attempt to fix arm64 again --- .circleci/workflows.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 22d20196612a..898f922693e2 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -383,9 +383,28 @@ commands: - run: name: Install Node Modules command: | - # if we are on arm64 we need to install setuptools as it no longer comes standard with the latest version of python if [[ `node ./scripts/get-platform-key.js` == 'linux-arm64' ]]; then + # Building better-sqlite3 on arm64 requires gcc-10 sudo apt install gcc-10 g++-10 + #Remove the previous alternatives + sudo update-alternatives --remove-all gcc + sudo update-alternatives --remove-all g++ + + #Define the compiler + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 30 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 30 + + sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30 + sudo update-alternatives --set cc /usr/bin/gcc + + sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30 + sudo update-alternatives --set c++ /usr/bin/g++ + + #Confirm and update (You can use the default setting) + sudo update-alternatives --config gcc + sudo update-alternatives --config g++ + + # if we are on arm64 we need to install setuptools as it no longer comes standard with the latest version of python pip install setuptools fi source ./scripts/ensure-node.sh From 3da8d1735708703616ae9d026b90641f4d2f672c Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 10:40:58 -0500 Subject: [PATCH 36/88] attempt to fix arm64 again --- .circleci/workflows.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 898f922693e2..d160ed20ed37 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -386,9 +386,6 @@ commands: if [[ `node ./scripts/get-platform-key.js` == 'linux-arm64' ]]; then # Building better-sqlite3 on arm64 requires gcc-10 sudo apt install gcc-10 g++-10 - #Remove the previous alternatives - sudo update-alternatives --remove-all gcc - sudo update-alternatives --remove-all g++ #Define the compiler sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 30 From 66f3bfb38a383ee4bd6d28b5a518bf0c9b564cdb Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 11:02:04 -0500 Subject: [PATCH 37/88] fix darwin problems --- packages/server/package.json | 2 +- yarn.lock | 92 +++++------------------------------- 2 files changed, 12 insertions(+), 82 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index d18c2f87956d..3026521093b8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -139,7 +139,7 @@ "@cypress/debugging-proxy": "2.0.1", "@cypress/sinon-chai": "2.9.1", "@cypress/webpack-dev-server": "0.0.0-development", - "@electron/rebuild": "3.7.0", + "@electron/rebuild": "3.6.2", "@ffprobe-installer/ffprobe": "1.1.0", "@packages/config": "0.0.0-development", "@packages/data-context": "0.0.0-development", diff --git a/yarn.lock b/yarn.lock index 7a7c4968db57..ceab95b09772 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2994,21 +2994,6 @@ optionalDependencies: global-agent "^3.0.0" -"@electron/node-gyp@https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2": - version "10.2.0-electron.1" - resolved "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2" - dependencies: - env-paths "^2.2.0" - exponential-backoff "^3.1.1" - glob "^8.1.0" - graceful-fs "^4.2.6" - make-fetch-happen "^10.2.1" - nopt "^6.0.0" - proc-log "^2.0.1" - semver "^7.3.5" - tar "^6.2.1" - which "^2.0.2" - "@electron/notarize@^2.1.0", "@electron/notarize@^2.5.0": version "2.5.0" resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.5.0.tgz#d4d25356adfa29df4a76bd64a8bd347237cd251e" @@ -3055,12 +3040,11 @@ semver "^7.1.3" yargs-parser "^21.1.1" -"@electron/rebuild@3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.7.0.tgz#82e20c467ddedbb295d7f641592c52e68c141e9f" - integrity sha512-VW++CNSlZwMYP7MyXEbrKjpzEwhB5kDNbzGtiPEjwYysqyTCF+YbNJ210Dj3AjWsGSV4iEEwNkmJN9yGZmVvmw== +"@electron/rebuild@3.6.2": + version "3.6.2" + resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.6.2.tgz#234f76d08566d558a80a615a78d8735f39bf5e9f" + integrity sha512-fTSoWdbrPTmQOwvct4VnJH45aJg79WRabuNqt7cAWIno5kTXv1QD6qVmR2e8wmHi/xryaiVINl1gcEhKGjREVw== dependencies: - "@electron/node-gyp" "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2" "@malept/cross-spawn-promise" "^2.0.0" chalk "^4.0.0" debug "^4.1.1" @@ -3069,6 +3053,7 @@ got "^11.7.0" node-abi "^3.45.0" node-api-version "^0.2.0" + node-gyp "^9.0.0" ora "^5.1.0" read-binary-file-arch "^1.0.6" semver "^7.3.5" @@ -17265,7 +17250,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.1, glob@^8.0.3, glob@^8.1.0: +glob@^8.0.1, glob@^8.0.3: version "8.1.0" resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== @@ -21315,7 +21300,7 @@ make-error@^1, make-error@^1.1.1: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6, make-fetch-happen@^10.2.1: +make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6: version "10.2.1" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== @@ -22076,7 +22061,7 @@ mobx@5.15.4: resolved "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz#9da1a84e97ba624622f4e55a0bf3300fb931c2ab" integrity sha512-xRFJxSU2Im3nrGCdjSuOTFmxVDGeqOHL+TyADCGbT0k4HHqGmx5u2yaHNryvoORpI4DfbzjJ5jPmuv+d7sioFw== -"mocha-7.0.1@npm:mocha@7.0.1": +"mocha-7.0.1@npm:mocha@7.0.1", mocha@7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== @@ -22193,36 +22178,6 @@ mocha@6.2.2: yargs-parser "13.1.1" yargs-unparser "1.6.0" -mocha@7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce" - integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg== - dependencies: - ansi-colors "3.2.3" - browser-stdout "1.3.1" - chokidar "3.3.0" - debug "3.2.6" - diff "3.5.0" - escape-string-regexp "1.0.5" - find-up "3.0.0" - glob "7.1.3" - growl "1.10.5" - he "1.2.0" - js-yaml "3.13.1" - log-symbols "2.2.0" - minimatch "3.0.4" - mkdirp "0.5.1" - ms "2.1.1" - node-environment-flags "1.0.6" - object.assign "4.1.0" - strip-json-comments "2.0.1" - supports-color "6.0.0" - which "1.3.1" - wide-align "1.1.3" - yargs "13.3.0" - yargs-parser "13.1.1" - yargs-unparser "1.6.0" - mocha@7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.0.tgz#c784f579ad0904d29229ad6cb1e2514e4db7d249" @@ -28996,7 +28951,7 @@ string-template@~0.2.1: resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -29022,15 +28977,6 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -29132,7 +29078,7 @@ stringify-object@^3.0.0, stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -29153,13 +29099,6 @@ strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -32119,7 +32058,7 @@ workerpool@6.2.0: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b" integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -32162,15 +32101,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 650cd446afaeb91a9745ae841bd2a9ef91c20c77 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 16:35:21 -0500 Subject: [PATCH 38/88] merge release/14.0.0 --- .circleci/cache-version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt index 4817bf825e8e..08e129b1c91f 100644 --- a/.circleci/cache-version.txt +++ b/.circleci/cache-version.txt @@ -1,3 +1,3 @@ # Bump this version to force CI to re-create the cache from scratch. -10-18-2024 +10-19-2024 From 851ff6957a1403190702f96e33a4acbd46f4bf24 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 16:50:41 -0500 Subject: [PATCH 39/88] update yarn.lock --- yarn.lock | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index aaf34125e761..daba10fa4c4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7784,10 +7784,10 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@>=10.0.0", "@types/node@^20.16.0", "@types/node@^20.9.0": - version "20.16.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.11.tgz#9b544c3e716b1577ac12e70f9145193f32750b33" - integrity sha512-y+cTCACu92FyA5fgQSAI8A1H429g7aSK2HsO7K4XYUWc4dY5IUz55JSDIYT6/VsOLfGy8vmvQYC2hfb0iF16Uw== +"@types/node@*", "@types/node@>=10.0.0", "@types/node@^20.1.0", "@types/node@^20.16.0", "@types/node@^20.9.0": + version "20.16.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.12.tgz#61cc9be049584b472fa31e465aa0ab3c090dac56" + integrity sha512-LfPFB0zOeCeCNQV3i+67rcoVvoN5n0NVuR2vLG0O5ySQMgchuZlC4lgz546ZOJyDtj5KIgOxy+lacOimfqZAIA== dependencies: undici-types "~6.19.2" @@ -7808,11 +7808,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^18.11.18", "@types/node@^18.17.5": - version "18.18.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.3.tgz#e5188135fc2909b46530c798ef49be65083be3fd" - integrity sha512-0OVfGupTl3NBFr8+iXpfZ8NR7jfFO+P1Q+IO/q0wbo02wYkP5gy36phojeYWpLQ6WAMjl+VfmqUk2YbUfp0irA== - "@types/node@^8.0.7": version "8.10.66" resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3" From dcaf19f670c12717ae909d1c192161772c9aa7e3 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Fri, 18 Oct 2024 18:51:03 -0500 Subject: [PATCH 40/88] blank -- run ci From 26359cf152890d37265cad648c174e4a60162fab Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sat, 19 Oct 2024 06:56:58 -0500 Subject: [PATCH 41/88] blank From da3504c296874f1b9f5a020cb0226fa6558eb9ed Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sat, 19 Oct 2024 07:34:10 -0500 Subject: [PATCH 42/88] blank From 1255cc4aaa669ba9af2dfd3b414373cd43140de4 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sat, 19 Oct 2024 08:20:04 -0500 Subject: [PATCH 43/88] blank From 6cc85876629aa25eb747071b71b33fb1fa8c42db Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sat, 19 Oct 2024 14:35:54 -0500 Subject: [PATCH 44/88] try something --- .circleci/workflows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index d160ed20ed37..82d7351b4eee 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -674,6 +674,8 @@ commands: browser: <> - run: command: | + npx kill-port 4455 + npx kill-port 4456 echo Current working directory is $PWD echo Total containers $CIRCLE_NODE_TOTAL From c1790944b424189e396486c68fb9f3850d38677b Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sat, 19 Oct 2024 16:44:29 -0500 Subject: [PATCH 45/88] try something --- .circleci/workflows.yml | 2 -- packages/driver/cypress.config.ts | 4 ++++ packages/launchpad/cypress.config.ts | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 82d7351b4eee..d160ed20ed37 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -674,8 +674,6 @@ commands: browser: <> - run: command: | - npx kill-port 4455 - npx kill-port 4456 echo Current working directory is $PWD echo Total containers $CIRCLE_NODE_TOTAL diff --git a/packages/driver/cypress.config.ts b/packages/driver/cypress.config.ts index 12f6a552ed72..378b994fd29b 100644 --- a/packages/driver/cypress.config.ts +++ b/packages/driver/cypress.config.ts @@ -3,6 +3,10 @@ import { devServer as cypressWebpackDevServer } from '@cypress/webpack-dev-serve export default defineConfig({ projectId: 'ypt4pf', + retries: { + runMode: 10, + openMode: 0, + }, experimentalStudio: true, experimentalMemoryManagement: true, experimentalWebKitSupport: true, diff --git a/packages/launchpad/cypress.config.ts b/packages/launchpad/cypress.config.ts index 2bdb28218c9c..62e3ee7cbb08 100644 --- a/packages/launchpad/cypress.config.ts +++ b/packages/launchpad/cypress.config.ts @@ -8,7 +8,7 @@ export default defineConfig({ viewportHeight: 850, experimentalMemoryManagement: true, retries: { - runMode: 2, + runMode: 10, openMode: 0, }, reporter: '../../node_modules/cypress-multi-reporters/index.js', From 7d509d19f22400448dd41af5c21441ef68595fc0 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sun, 20 Oct 2024 10:56:48 -0500 Subject: [PATCH 46/88] clean up --- .circleci/workflows.yml | 8 ++----- cli/CHANGELOG.md | 2 +- .../errorWarningChange-subscription.cy.ts | 2 +- packages/app/src/runner/aut-iframe.ts | 2 -- packages/app/src/runner/index.ts | 1 - .../src/sources/ErrorDataSource.ts | 2 +- packages/driver/cypress.config.ts | 4 ---- .../cypress/e2e/commands/net_stubbing.cy.ts | 3 +++ .../e2e/commands/sessions/sessions.cy.js | 20 ++++++++--------- .../driver/cypress/e2e/commands/waiting.cy.js | 20 +++++++++++++++++ packages/driver/src/cy/commands/navigation.ts | 8 +++---- packages/driver/src/cypress/utils.ts | 2 -- packages/launchpad/cypress.config.ts | 2 +- packages/network/lib/agent.ts | 1 - .../plugins/child/run_require_async_child.js | 2 +- .../test-isolation-describe-config.spec.js | 16 +++++++------- .../cypress/e2e/test-isolation.spec.js | 12 +++++----- .../cypress/e2e/session/session.cy.js | 22 +++++++++---------- 18 files changed, 69 insertions(+), 60 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index d160ed20ed37..b18ec94e67a2 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -387,21 +387,17 @@ commands: # Building better-sqlite3 on arm64 requires gcc-10 sudo apt install gcc-10 g++-10 - #Define the compiler + # Update default to gcc-10 and g++-10 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 30 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 30 - sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30 sudo update-alternatives --set cc /usr/bin/gcc - sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30 sudo update-alternatives --set c++ /usr/bin/g++ - - #Confirm and update (You can use the default setting) sudo update-alternatives --config gcc sudo update-alternatives --config g++ - # if we are on arm64 we need to install setuptools as it no longer comes standard with the latest version of python + # If we are on arm64 we need to install setuptools as it no longer comes standard with the latest version of python pip install setuptools fi source ./scripts/ensure-node.sh diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 7736fc97a5dc..f8cb22c3ee83 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -8,7 +8,7 @@ _Released 12/3/2024 (PENDING)_ - Removed support for Node.js 16 and Node.js 21. Addresses [#29930](https://github.com/cypress-io/cypress/issues/29930). - Prebuilt binaries for Linux are no longer compatible with Linux distributions based on glibc <2.28, for example: Ubuntu 14-18, RHEL 7, CentOS 7, Amazon Linux 2. Addresses [#29601](https://github.com/cypress-io/cypress/issues/29601). - The undocumented methods `Cypress.backend('firefox:force:gc')` and `Cypress.backend('log:memory:pressure')` were removed. Addresses [#30222](https://github.com/cypress-io/cypress/issues/30222). -- Upgraded bundled Node.js version from `18.17.0` to `20.16.0`. +- Upgraded bundled Node.js version from `18.17.0` to `20.18.0`. **Dependency Updates:** diff --git a/packages/app/cypress/e2e/subscriptions/errorWarningChange-subscription.cy.ts b/packages/app/cypress/e2e/subscriptions/errorWarningChange-subscription.cy.ts index e4bdc2ab8f78..0ff66adcc14c 100644 --- a/packages/app/cypress/e2e/subscriptions/errorWarningChange-subscription.cy.ts +++ b/packages/app/cypress/e2e/subscriptions/errorWarningChange-subscription.cy.ts @@ -62,7 +62,7 @@ module.exports = { assertLoadingIntoErrorWorks('SyntaxError') cy.contains('Your configFile is invalid').should('be.visible') - cy.contains('Unexpected token \',\'').should('be.visible') + cy.contains('Unexpected token \',\'').scrollIntoView().should('be.visible') cy.withCtx(async (ctx) => { await ctx.actions.file.writeFileInProject('cypress.config.js', ` diff --git a/packages/app/src/runner/aut-iframe.ts b/packages/app/src/runner/aut-iframe.ts index b6fa29132e79..65030131559f 100644 --- a/packages/app/src/runner/aut-iframe.ts +++ b/packages/app/src/runner/aut-iframe.ts @@ -120,7 +120,6 @@ export class AutIframe { */ removeSrcAttribute = () => { this.$iframe?.removeAttr('src') - this.$iframe?.removeAttr('srcdoc') } visitBlankPage = (testIsolation?: boolean) => { @@ -130,7 +129,6 @@ export class AutIframe { } this.$iframe[0].src = 'about:blank' - this.$iframe[0].srcdoc = '' this.$iframe.one('load', () => { if (testIsolation) { diff --git a/packages/app/src/runner/index.ts b/packages/app/src/runner/index.ts index cbb5f4b48742..b150604e09bd 100644 --- a/packages/app/src/runner/index.ts +++ b/packages/app/src/runner/index.ts @@ -258,7 +258,6 @@ function runSpecCT (config, spec: SpecFile) { }) autIframe._showInitialBlankPage() - $autIframe.removeAttr('srcdoc') $autIframe.prop('src', specSrc) // initialize Cypress (driver) with the AUT! diff --git a/packages/data-context/src/sources/ErrorDataSource.ts b/packages/data-context/src/sources/ErrorDataSource.ts index 66f859f5a237..965b84b1534b 100644 --- a/packages/data-context/src/sources/ErrorDataSource.ts +++ b/packages/data-context/src/sources/ErrorDataSource.ts @@ -48,7 +48,7 @@ export class ErrorDataSource { } } - if (!absolute || !_.isNumber(line) || !_.isNumber(column) || absolute.includes('ts-node')) { + if (!absolute || !_.isNumber(line) || !_.isNumber(column)) { return null } diff --git a/packages/driver/cypress.config.ts b/packages/driver/cypress.config.ts index 378b994fd29b..12f6a552ed72 100644 --- a/packages/driver/cypress.config.ts +++ b/packages/driver/cypress.config.ts @@ -3,10 +3,6 @@ import { devServer as cypressWebpackDevServer } from '@cypress/webpack-dev-serve export default defineConfig({ projectId: 'ypt4pf', - retries: { - runMode: 10, - openMode: 0, - }, experimentalStudio: true, experimentalMemoryManagement: true, experimentalWebKitSupport: true, diff --git a/packages/driver/cypress/e2e/commands/net_stubbing.cy.ts b/packages/driver/cypress/e2e/commands/net_stubbing.cy.ts index 81dc0b86e7d5..a0756abd5216 100644 --- a/packages/driver/cypress/e2e/commands/net_stubbing.cy.ts +++ b/packages/driver/cypress/e2e/commands/net_stubbing.cy.ts @@ -26,6 +26,9 @@ describe('network stubbing', { retries: 15 }, function () { beforeEach(function () { cy.spy(Cypress.utils, 'warning') + // Starting in Electron 28, we cannot use fetch or XHR from within about:blank. This is a workaround + // to ensure that we have a valid origin for our tests. + cy.visit('/fixtures/empty.html') }) context('cy.intercept()', function () { diff --git a/packages/driver/cypress/e2e/commands/sessions/sessions.cy.js b/packages/driver/cypress/e2e/commands/sessions/sessions.cy.js index 84a230c5ac64..e9a6cd07c977 100644 --- a/packages/driver/cypress/e2e/commands/sessions/sessions.cy.js +++ b/packages/driver/cypress/e2e/commands/sessions/sessions.cy.js @@ -65,7 +65,7 @@ describe('cy.session', { retries: 0 }, () => { expect(Cypress.action).to.be.calledWith('cy:visit:blank', { testIsolation: true }) }) .url() - .should('eq', 'about:srcdoc') + .should('eq', 'about:blank') }) it('clears page before the end of each run when nextTestHasTestIsolationOn is undefined', () => { @@ -79,7 +79,7 @@ describe('cy.session', { retries: 0 }, () => { expect(Cypress.action).to.be.calledWith('cy:visit:blank', { testIsolation: true }) }) .url() - .should('eq', 'about:srcdoc') + .should('eq', 'about:blank') }) it('does not clear the page before the end of each run if the next test has test isolation off', () => { @@ -93,7 +93,7 @@ describe('cy.session', { retries: 0 }, () => { expect(Cypress.action).not.to.be.calledWith('cy:visit:blank', { testIsolation: true }) }) .url() - .should('not.eq', 'about:srcdoc') + .should('not.eq', 'about:blank') }) it('clears the browser cookie after each run', () => { @@ -229,7 +229,7 @@ describe('cy.session', { retries: 0 }, () => { }) cy.on('internal:window:load', (args) => { - if (args.window.location.href === 'about:srcdoc') { + if (args.window.location.href === 'about:blank') { clearPageCount++ } }) @@ -245,7 +245,7 @@ describe('cy.session', { retries: 0 }, () => { // test must be first to run before blank page visit between each test it('clears page after command runs', () => { - cy.url().should('eq', 'about:srcdoc') + cy.url().should('eq', 'about:blank') }) it('successfully creates new session', () => { @@ -336,7 +336,7 @@ describe('cy.session', { retries: 0 }, () => { // test must be first to run before blank page visit between each test it('clears page after command runs', () => { - cy.url().should('eq', 'about:srcdoc') + cy.url().should('eq', 'about:blank') }) it('successfully creates new session and validates it', () => { @@ -483,7 +483,7 @@ describe('cy.session', { retries: 0 }, () => { // test must be first to run before blank page visit between each test it('clears page after setup runs', () => { - cy.url().should('eq', 'about:srcdoc') + cy.url().should('eq', 'about:blank') }) it('successfully restores saved session', () => { @@ -547,7 +547,7 @@ describe('cy.session', { retries: 0 }, () => { // test must be first to run before blank page visit between each test it('clears page after command runs', () => { - cy.url().should('eq', 'about:srcdoc') + cy.url().should('eq', 'about:blank') }) it('successfully restores saved session', () => { @@ -630,7 +630,7 @@ describe('cy.session', { retries: 0 }, () => { // test must be first to run before blank page visit between each test it('clears page after command runs', () => { - cy.url().should('eq', 'about:srcdoc') + cy.url().should('eq', 'about:blank') }) it('successfully recreates session', () => { @@ -982,7 +982,7 @@ describe('cy.session', { retries: 0 }, () => { }) cy.on('internal:window:load', (args) => { - if (args.window.location.href === 'about:srcdoc') { + if (args.window.location.href === 'about:blank') { clearPageCount++ } }) diff --git a/packages/driver/cypress/e2e/commands/waiting.cy.js b/packages/driver/cypress/e2e/commands/waiting.cy.js index 0e1e935051a4..7281a0688e4b 100644 --- a/packages/driver/cypress/e2e/commands/waiting.cy.js +++ b/packages/driver/cypress/e2e/commands/waiting.cy.js @@ -947,6 +947,10 @@ describe('src/cy/commands/waiting', () => { describe('explicit wait time', function () { it('can turn off logging when protocol is disabled', { protocolEnabled: false }, function () { + // Starting in Electron 28, we cannot use fetch or XHR from within about:blank. This is a workaround + // to ensure that we have a valid origin for our tests. + cy.visit('/fixtures/empty.html') + cy.on('_log:added', (attrs, log) => { this.hiddenLog = log }) @@ -960,6 +964,10 @@ describe('src/cy/commands/waiting', () => { }) it('can send hidden log when protocol is enabled', { protocolEnabled: true }, function () { + // Starting in Electron 28, we cannot use fetch or XHR from within about:blank. This is a workaround + // to ensure that we have a valid origin for our tests. + cy.visit('/fixtures/empty.html') + cy.on('_log:added', (attrs, log) => { this.hiddenLog = log }) @@ -977,6 +985,10 @@ describe('src/cy/commands/waiting', () => { describe('wait for xhr', function () { it('can turn off logging when protocol is disabled', { protocolEnabled: false }, function () { + // Starting in Electron 28, we cannot use fetch or XHR from within about:blank. This is a workaround + // to ensure that we have a valid origin for our tests. + cy.visit('/fixtures/empty.html') + cy.on('_log:added', (attrs, log) => { if (attrs.name === 'wait') { this.hiddenWaitLog = log @@ -1004,6 +1016,10 @@ describe('src/cy/commands/waiting', () => { }) it('can send hidden log when protocol is enabled', { protocolEnabled: true }, function () { + // Starting in Electron 28, we cannot use fetch or XHR from within about:blank. This is a workaround + // to ensure that we have a valid origin for our tests. + cy.visit('/fixtures/empty.html') + cy.on('_log:added', (attrs, log) => { if (attrs.name === 'wait') { this.hiddenWaitLog = log @@ -1035,6 +1051,10 @@ describe('src/cy/commands/waiting', () => { }) it('can turn off logging for wait for xhr', { protocolEnabled: true }, function () { + // Starting in Electron 28, we cannot use fetch or XHR from within about:blank. This is a workaround + // to ensure that we have a valid origin for our tests. + cy.visit('/fixtures/empty.html') + cy.on('_log:added', (attrs, log) => { if (attrs.name === 'wait') { this.hiddenWaitLog = log diff --git a/packages/driver/src/cy/commands/navigation.ts b/packages/driver/src/cy/commands/navigation.ts index 71259ddbdde7..fc636fd04744 100644 --- a/packages/driver/src/cy/commands/navigation.ts +++ b/packages/driver/src/cy/commands/navigation.ts @@ -69,7 +69,7 @@ const navigationChanged = async (Cypress, cy, state, source, arg) => { debug('navigation changed:', url) // don't trigger for empty url's or about:blank - if (_.isEmpty(url) || (url === 'about:blank') || (url === 'about:srcdoc')) { + if (_.isEmpty(url) || (url === 'about:blank')) { return } @@ -277,8 +277,8 @@ const stabilityChanged = async (Cypress, state, config, stable) => { state('onPageLoadErr', onPageLoadErr) const getRedirectionCount = (href) => { - // redirecting to about:blank or about:srcdoc should not count towards the redirection limit. - if (href === 'about:blank' || href === 'about:srcdoc') { + // redirecting to about:blank should not count towards the redirection limit. + if (href === 'about:blank') { return 0 } @@ -341,7 +341,7 @@ const stabilityChanged = async (Cypress, state, config, stable) => { cy.state('onPageLoadErr', null) - if (url === 'about:blank' || url === 'about:srcdoc') { + if (url === 'about:blank') { // we treat this as a system log since navigating to about:blank must have been caused by Cypress options._log?.set({ message: '', name: 'Clear page', type: 'system' }).snapshot().end() } else { diff --git a/packages/driver/src/cypress/utils.ts b/packages/driver/src/cypress/utils.ts index 29459192d6c3..acae05df80da 100644 --- a/packages/driver/src/cypress/utils.ts +++ b/packages/driver/src/cypress/utils.ts @@ -322,8 +322,6 @@ export default { }, iframeSrc ($autIframe, url) { - $autIframe.removeAttr('srcdoc') - return $autIframe.prop('src', url) }, diff --git a/packages/launchpad/cypress.config.ts b/packages/launchpad/cypress.config.ts index 62e3ee7cbb08..2bdb28218c9c 100644 --- a/packages/launchpad/cypress.config.ts +++ b/packages/launchpad/cypress.config.ts @@ -8,7 +8,7 @@ export default defineConfig({ viewportHeight: 850, experimentalMemoryManagement: true, retries: { - runMode: 10, + runMode: 2, openMode: 0, }, reporter: '../../node_modules/cypress-multi-reporters/index.js', diff --git a/packages/network/lib/agent.ts b/packages/network/lib/agent.ts index 19acbb49447d..36fea530ed7c 100644 --- a/packages/network/lib/agent.ts +++ b/packages/network/lib/agent.ts @@ -280,7 +280,6 @@ class HttpAgent extends http.Agent { } } - // console.log('addRequest called %o', req, options) super.addRequest(req, options) } diff --git a/packages/server/lib/plugins/child/run_require_async_child.js b/packages/server/lib/plugins/child/run_require_async_child.js index 1ad74c27e218..a7c5c31a3158 100644 --- a/packages/server/lib/plugins/child/run_require_async_child.js +++ b/packages/server/lib/plugins/child/run_require_async_child.js @@ -193,7 +193,7 @@ function run (ipc, file, projectRoot) { debug('loaded config from %s %o', file, result) } catch (err) { - // Starting in Node 20, error objects when occurs occur while doing `node --load` are not properly serialized + // Starting in Node 20, error objects that are thrown while using `node --load` are not properly serialized // so we need to check both the name and the stack. We also have patched ts-node to ensure that the error is // of the right form to be serialized. if (err.name === 'TSError' || err.stack.includes('TSError')) { diff --git a/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation-describe-config.spec.js b/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation-describe-config.spec.js index 42ccac6d966d..da6916e84444 100644 --- a/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation-describe-config.spec.js +++ b/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation-describe-config.spec.js @@ -7,12 +7,12 @@ const shouldAlwaysResetPage = (config) => { const TEST_METADATA = { 'passes 1': { - start: 'about:srcdoc', + start: 'about:blank', firesTestBeforeAfterRunAsync: true, - end: 'about:srcdoc', + end: 'about:blank', }, 'passes 2': { - start: 'about:srcdoc', + start: 'about:blank', firesTestBeforeAfterRunAsync: true, end: '/cypress/e2e/dom-content.html', }, @@ -24,17 +24,17 @@ const TEST_METADATA = { 'passes 4': { start: '/cypress/e2e/dom-content.html', firesTestBeforeAfterRunAsync: true, - end: 'about:srcdoc', + end: 'about:blank', }, 'passes 5': { - start: 'about:srcdoc', + start: 'about:blank', firesTestBeforeAfterRunAsync: true, - end: 'about:srcdoc', + end: 'about:blank', }, 'passes 6': { - start: 'about:srcdoc', + start: 'about:blank', firesTestBeforeAfterRunAsync: true, - end: shouldAlwaysResetPage(Cypress.config) ? 'about:srcdoc' : '/cypress/e2e/dom-content.html', + end: shouldAlwaysResetPage(Cypress.config) ? 'about:blank' : '/cypress/e2e/dom-content.html', }, } diff --git a/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation.spec.js b/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation.spec.js index 18bb55cd10c9..4fa1dbfb871d 100644 --- a/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation.spec.js +++ b/system-tests/projects/cypress-in-cypress/cypress/e2e/test-isolation.spec.js @@ -7,19 +7,19 @@ const shouldAlwaysResetPage = (config) => { const TEST_METADATA = { 'passes 1': { - start: 'about:srcdoc', + start: 'about:blank', firesTestBeforeAfterRunAsync: true, - end: 'about:srcdoc', + end: 'about:blank', }, 'passes 2': { - start: 'about:srcdoc', + start: 'about:blank', firesTestBeforeAfterRunAsync: true, - end: 'about:srcdoc', + end: 'about:blank', }, 'passes 3': { - start: 'about:srcdoc', + start: 'about:blank', firesTestBeforeAfterRunAsync: !Cypress.config('isInteractive'), - end: shouldAlwaysResetPage(Cypress.config) ? 'about:srcdoc' : '/cypress/e2e/dom-content.html', + end: shouldAlwaysResetPage(Cypress.config) ? 'about:blank' : '/cypress/e2e/dom-content.html', }, } diff --git a/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js b/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js index 022ec100a592..8152a5652295 100644 --- a/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js +++ b/system-tests/projects/session-and-origin-e2e-specs/cypress/e2e/session/session.cy.js @@ -174,7 +174,7 @@ describe('save/restore session with cookies and localStorage', () => { describe('multiple sessions in test', () => { it('switch session during test', () => { sessionUser('alice') - cy.url().should('eq', 'about:srcdoc') + cy.url().should('eq', 'about:blank') cy.visit('https://localhost:4466/form') expectCurrentSessionData({ @@ -187,7 +187,7 @@ describe('multiple sessions in test', () => { sessionUser('bob') - cy.url().should('eq', 'about:srcdoc') + cy.url().should('eq', 'about:blank') expectCurrentSessionData({ cookies: ['/set-localStorage/bob', '/cross_origin_iframe/bob'], @@ -205,7 +205,7 @@ describe('multiple sessions in test - can switch without redefining', () => { sessionUser('bob') sessionUser('alice') - cy.url().should('eq', 'about:srcdoc') + cy.url().should('eq', 'about:blank') cy.visit('https://localhost:4466/form') expectCurrentSessionData({ @@ -226,7 +226,7 @@ describe('multiple sessions in test - can switch without redefining', () => { expect(clearSpy).calledThrice }) - cy.url().should('eq', 'about:srcdoc') + cy.url().should('eq', 'about:blank') expectCurrentSessionData({ cookies: ['/set-localStorage/bob', '/cross_origin_iframe/bob'], @@ -249,7 +249,7 @@ function SuiteWithValidateFn (id, fn) { type: 'parent', }) - // expect(cy.state('window').location.href).eq('about:srcdoc') + // expect(cy.state('window').location.href).eq('about:blank') return fn(validate.callCount) }) @@ -271,22 +271,22 @@ function SuiteWithValidateFn (id, fn) { }) it('t1', () => { - cy.url().should('eq', 'about:srcdoc') + cy.url().should('eq', 'about:blank') expect(setup).calledOnce expect(validate).calledOnce - // (1,2) about:srcdoc before & after session creation + // (1,2) about:blank before & after session creation // (3) after validate runs expect(numPageLoads, 'number of page loads').eq(2) }) it('t2', () => { - cy.url().should('eq', 'about:srcdoc') + cy.url().should('eq', 'about:blank') expect(setup).calledTwice expect(validate).calledThrice - // (4) about:srcdoc before session rehydrating - // (5,6) about:srcdoc before & after setup function - // (7) about:srcdoc after 2nd validate runs + // (4) about:blank before session rehydrating + // (5,6) about:blank before & after setup function + // (7) about:blank after 2nd validate runs expect(numPageLoads, 'number of page loads').eq(5) }) } From 5b1ad948625fad8b06ca3b13d9c9dfaa0946eaf8 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sun, 20 Oct 2024 11:20:57 -0500 Subject: [PATCH 47/88] blank From 12301d8d972e03e7d1fd4fd68b9cbc36d40fe36f Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sun, 20 Oct 2024 12:05:40 -0500 Subject: [PATCH 48/88] try to fix sessions issue --- packages/driver/src/cypress.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/driver/src/cypress.ts b/packages/driver/src/cypress.ts index 994de29d7d05..3a723d41c089 100644 --- a/packages/driver/src/cypress.ts +++ b/packages/driver/src/cypress.ts @@ -374,8 +374,10 @@ class $Cypress { }) .then(() => { return (new Promise((resolve) => { - if (this.$autIframe) { + if (this.$autIframe.prop('contentWindow')) { resolve() + } else if (this.$autIframe) { + this.$autIframe.on('load', resolve) } else { // block initialization if the iframe has not been created yet // Used in CT when async chunks for plugins take their time to download/parse From 8e810e9c9d3216163fce8ff7282ffce0b7426ea2 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sun, 20 Oct 2024 12:38:25 -0500 Subject: [PATCH 49/88] fixes --- packages/app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/package.json b/packages/app/package.json index 3e9989ae4794..ca3694af305e 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -9,7 +9,7 @@ "clean-deps": "rimraf node_modules", "cypress:launch": "yarn cypress:run-cypress-in-cypress gulp open --project .", "cypress:open": "yarn cypress:run-cypress-in-cypress gulp open --project .", - "cypress:run-cypress-in-cypress": "cross-env CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", + "cypress:run-cypress-in-cypress": "cross-env DEBUG=cypress:* CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", "cypress:run:ct": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --component --project .", "cypress:run:e2e": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project .", "cypress:run:e2e:update:snapshots": "CYPRESS_SNAPSHOT_UPDATE=1 yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project . --spec **/*mochaEvents* --browser chrome", From d915c1d34b26618ce9c50997bdd6d27abc0ce20d Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sun, 20 Oct 2024 16:29:32 -0500 Subject: [PATCH 50/88] get more info --- packages/app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/package.json b/packages/app/package.json index ca3694af305e..e439d5157a72 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -9,7 +9,7 @@ "clean-deps": "rimraf node_modules", "cypress:launch": "yarn cypress:run-cypress-in-cypress gulp open --project .", "cypress:open": "yarn cypress:run-cypress-in-cypress gulp open --project .", - "cypress:run-cypress-in-cypress": "cross-env DEBUG=cypress:* CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", + "cypress:run-cypress-in-cypress": "cross-env DEBUG=cypress:network:* CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", "cypress:run:ct": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --component --project .", "cypress:run:e2e": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project .", "cypress:run:e2e:update:snapshots": "CYPRESS_SNAPSHOT_UPDATE=1 yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project . --spec **/*mochaEvents* --browser chrome", From d696673efc34a98f095bfa8d22bbf6536077a39f Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sun, 20 Oct 2024 20:49:25 -0500 Subject: [PATCH 51/88] get more info --- packages/app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/package.json b/packages/app/package.json index e439d5157a72..65495a10f58b 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -9,7 +9,7 @@ "clean-deps": "rimraf node_modules", "cypress:launch": "yarn cypress:run-cypress-in-cypress gulp open --project .", "cypress:open": "yarn cypress:run-cypress-in-cypress gulp open --project .", - "cypress:run-cypress-in-cypress": "cross-env DEBUG=cypress:network:* CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", + "cypress:run-cypress-in-cypress": "cross-env DEBUG=cypress:network:*,cypress:server:server-base CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", "cypress:run:ct": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --component --project .", "cypress:run:e2e": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project .", "cypress:run:e2e:update:snapshots": "CYPRESS_SNAPSHOT_UPDATE=1 yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project . --spec **/*mochaEvents* --browser chrome", From a271c0377f30a61b7a7af8a754bf561ad9ae97be Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sun, 20 Oct 2024 20:54:43 -0500 Subject: [PATCH 52/88] try something --- packages/frontend-shared/cypress/support/e2e.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend-shared/cypress/support/e2e.ts b/packages/frontend-shared/cypress/support/e2e.ts index 260661b4e90d..bc79fac61a12 100644 --- a/packages/frontend-shared/cypress/support/e2e.ts +++ b/packages/frontend-shared/cypress/support/e2e.ts @@ -364,7 +364,7 @@ function visitApp (href?: string, opts?: Partial) { return config.clientRoute }).then((clientRoute) => { - return cy.visit(`http://localhost:${e2e_serverPort}${clientRoute || '/__/'}#${href || ''}`, opts) + return cy.visit(`http://127.0.0.1:${e2e_serverPort}${clientRoute || '/__/'}#${href || ''}`, opts) }) }) } From 4b48b6ed041e201635e02ffe95498d9ef796d118 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sun, 20 Oct 2024 21:19:24 -0500 Subject: [PATCH 53/88] fix --- .circleci/workflows.yml | 7 +++++++ packages/frontend-shared/cypress/support/e2e.ts | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index b18ec94e67a2..538920e093cb 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -666,6 +666,13 @@ commands: - run: name: reinstall dependencies to work around cache issue (Windows only) command: rm -rf node_modules && yarn + - when: + condition: + equal: [ *windows-executor, << parameters.executor >> ] + steps: + - run: + name: reinstall dependencies to work around cache issue (Windows only) + command: netsh interface ipv6 set prefix ::ffff:0:0/96 60 4 - windows-install-chrome: browser: <> - run: diff --git a/packages/frontend-shared/cypress/support/e2e.ts b/packages/frontend-shared/cypress/support/e2e.ts index bc79fac61a12..260661b4e90d 100644 --- a/packages/frontend-shared/cypress/support/e2e.ts +++ b/packages/frontend-shared/cypress/support/e2e.ts @@ -364,7 +364,7 @@ function visitApp (href?: string, opts?: Partial) { return config.clientRoute }).then((clientRoute) => { - return cy.visit(`http://127.0.0.1:${e2e_serverPort}${clientRoute || '/__/'}#${href || ''}`, opts) + return cy.visit(`http://localhost:${e2e_serverPort}${clientRoute || '/__/'}#${href || ''}`, opts) }) }) } From 67f1e78d573f8fca9acb873eb70514e68bac2771 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Sun, 20 Oct 2024 22:16:17 -0500 Subject: [PATCH 54/88] try something --- .circleci/workflows.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 538920e093cb..984931756c31 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -671,8 +671,13 @@ commands: equal: [ *windows-executor, << parameters.executor >> ] steps: - run: - name: reinstall dependencies to work around cache issue (Windows only) - command: netsh interface ipv6 set prefix ::ffff:0:0/96 60 4 + name: default to ipv4 for windows + command: | + ipconfig + netsh interface teredo set state disabled + netsh interface ipv6 6to4 set state state=disabled undoonstop=disabled + netsh interface ipv6 isatap set state state=disabled + ipconfig - windows-install-chrome: browser: <> - run: From 1baf28a4a47142c46c6d3288e45195030ee668f5 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 21 Oct 2024 07:45:09 -0500 Subject: [PATCH 55/88] try something --- .circleci/workflows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 984931756c31..0edd4ed59450 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -677,6 +677,7 @@ commands: netsh interface teredo set state disabled netsh interface ipv6 6to4 set state state=disabled undoonstop=disabled netsh interface ipv6 isatap set state state=disabled + reg add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters\ /t REG_DWORD /v DisabledComponents /d 255 /f ipconfig - windows-install-chrome: browser: <> From 78e0bcd84c80b2421657dd746b31e5b2c30bf1ba Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 21 Oct 2024 09:03:35 -0500 Subject: [PATCH 56/88] try something --- .circleci/workflows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 0edd4ed59450..74b414a7e2f0 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -672,6 +672,7 @@ commands: steps: - run: name: default to ipv4 for windows + shell: cmd.exe command: | ipconfig netsh interface teredo set state disabled From 42627384011849f3193a0b7d1f588d4c65ceb8c6 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 21 Oct 2024 11:37:58 -0500 Subject: [PATCH 57/88] tweak --- .circleci/workflows.yml | 7 +------ packages/app/package.json | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 74b414a7e2f0..6822c4798d28 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -674,12 +674,7 @@ commands: name: default to ipv4 for windows shell: cmd.exe command: | - ipconfig - netsh interface teredo set state disabled - netsh interface ipv6 6to4 set state state=disabled undoonstop=disabled - netsh interface ipv6 isatap set state state=disabled - reg add HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip6\Parameters\ /t REG_DWORD /v DisabledComponents /d 255 /f - ipconfig + echo 127.0.0.1 localhost > %WINDIR%\System32\drivers\etc\hosts - windows-install-chrome: browser: <> - run: diff --git a/packages/app/package.json b/packages/app/package.json index 65495a10f58b..3e9989ae4794 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -9,7 +9,7 @@ "clean-deps": "rimraf node_modules", "cypress:launch": "yarn cypress:run-cypress-in-cypress gulp open --project .", "cypress:open": "yarn cypress:run-cypress-in-cypress gulp open --project .", - "cypress:run-cypress-in-cypress": "cross-env DEBUG=cypress:network:*,cypress:server:server-base CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", + "cypress:run-cypress-in-cypress": "cross-env CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", "cypress:run:ct": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --component --project .", "cypress:run:e2e": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project .", "cypress:run:e2e:update:snapshots": "CYPRESS_SNAPSHOT_UPDATE=1 yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project . --spec **/*mochaEvents* --browser chrome", From 00c52d35c9343a8e27f0b72a5c1ad648f149e55d Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 21 Oct 2024 12:33:08 -0500 Subject: [PATCH 58/88] one more thing --- .circleci/workflows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 6822c4798d28..628c5ba93190 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -675,6 +675,8 @@ commands: shell: cmd.exe command: | echo 127.0.0.1 localhost > %WINDIR%\System32\drivers\etc\hosts + ipconfig /flushdns + nbstat -R - windows-install-chrome: browser: <> - run: From c8a9791e10f7222db83190c8b5e3fbfc4cf8b94d Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 21 Oct 2024 13:24:52 -0500 Subject: [PATCH 59/88] let us see if this works --- packages/app/package.json | 2 +- packages/network/lib/connect.ts | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/app/package.json b/packages/app/package.json index 3e9989ae4794..e439d5157a72 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -9,7 +9,7 @@ "clean-deps": "rimraf node_modules", "cypress:launch": "yarn cypress:run-cypress-in-cypress gulp open --project .", "cypress:open": "yarn cypress:run-cypress-in-cypress gulp open --project .", - "cypress:run-cypress-in-cypress": "cross-env CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", + "cypress:run-cypress-in-cypress": "cross-env DEBUG=cypress:network:* CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", "cypress:run:ct": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --component --project .", "cypress:run:e2e": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project .", "cypress:run:e2e:update:snapshots": "CYPRESS_SNAPSHOT_UPDATE=1 yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project . --spec **/*mochaEvents* --browser chrome", diff --git a/packages/network/lib/connect.ts b/packages/network/lib/connect.ts index 04df4050a001..543a5c77c838 100644 --- a/packages/network/lib/connect.ts +++ b/packages/network/lib/connect.ts @@ -39,6 +39,13 @@ export function getAddress (port: number, hostname: string): Bluebird { debug('got addresses %o', { hostname, port, addresses }) + if (process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT) { + debug('filtering ipv6 addresses %o', { hostname, port, addresses }) + addresses = addresses.filter((address) => { + return address.family === 4 + }) + } + // convert to an array if string return Array.prototype.concat.call(addresses).map(fn) }) From cfd5405935c17c76224eca662006cf37d92480ba Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 21 Oct 2024 15:39:38 -0500 Subject: [PATCH 60/88] blank From 9093d5d5cf456dfceda6d726de98eaa23a1ef854 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:21:38 +0000 Subject: [PATCH 61/88] chore: updating v8 snapshot cache --- .../v8-snapshot/cache/linux/snapshot-meta.json | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json index e37251ffa624..536f72488fb0 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -579,7 +579,6 @@ "./node_modules/uuid/dist/v4.js", "./node_modules/uuid/dist/v5.js", "./node_modules/verror/lib/verror.js", - "./node_modules/wait-port/node_modules/chalk/source/index.js", "./node_modules/ws/index.js", "./node_modules/ws/lib/buffer-util.js", "./node_modules/ws/lib/constants.js", @@ -2703,7 +2702,6 @@ "./node_modules/prettier/parser-yaml.js", "./node_modules/pretty-bytes/index.js", "./node_modules/proxy-addr/index.js", - "./node_modules/proxy-from-env/index.js", "./node_modules/pseudomap/pseudomap.js", "./node_modules/psl/data/rules.json", "./node_modules/psl/index.js", @@ -3493,15 +3491,6 @@ "./node_modules/value-or-promise/build/main/ValueOrPromise.js", "./node_modules/value-or-promise/build/main/index.js", "./node_modules/vary/index.js", - "./node_modules/wait-port/lib/errors/connection-error.js", - "./node_modules/wait-port/lib/errors/validation-error.js", - "./node_modules/wait-port/lib/output-functions/dots.js", - "./node_modules/wait-port/lib/output-functions/index.js", - "./node_modules/wait-port/lib/output-functions/silent.js", - "./node_modules/wait-port/lib/validate-parameters.js", - "./node_modules/wait-port/lib/wait-port.js", - "./node_modules/wait-port/node_modules/chalk/source/templates.js", - "./node_modules/wait-port/node_modules/chalk/source/util.js", "./node_modules/webidl-conversions/lib/index.js", "./node_modules/whatwg-url/lib/URL-impl.js", "./node_modules/whatwg-url/lib/URL.js", @@ -3846,6 +3835,7 @@ "./packages/network/lib/cors.ts", "./packages/network/lib/http-utils.ts", "./packages/network/lib/index.ts", + "./packages/network/node_modules/proxy-from-env/index.js", "./packages/proxy/lib/http/error-middleware.ts", "./packages/proxy/lib/http/util/ast-rewriter.ts", "./packages/proxy/lib/http/util/buffers.ts", @@ -3929,7 +3919,6 @@ "./packages/server/lib/browsers/debug-cdp-connection.ts", "./packages/server/lib/browsers/electron.ts", "./packages/server/lib/browsers/firefox-util.ts", - "./packages/server/lib/browsers/geckodriver/index.ts", "./packages/server/lib/browsers/memory/cgroup-v1.ts", "./packages/server/lib/browsers/memory/default.ts", "./packages/server/lib/browsers/protocol.ts", @@ -4128,7 +4117,6 @@ "./packages/server/node_modules/p-queue/dist/priority-queue.js", "./packages/server/node_modules/path-key/index.js", "./packages/server/node_modules/path-to-regexp/index.js", - "./packages/server/node_modules/pump/index.js", "./packages/server/node_modules/readable-stream/lib/internal/streams/async_iterator.js", "./packages/server/node_modules/readable-stream/lib/internal/streams/destroy.js", "./packages/server/node_modules/readable-stream/lib/internal/streams/end-of-stream.js", @@ -4191,5 +4179,5 @@ "./tooling/v8-snapshot/cache/linux/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "4c1da762a851baab24ef5d1ba9d878ad207147c7703383f4796c0c9c7910240f" + "deferredHash": "8e90942c622942287c1462c6576572943546f0975ee7127573c914adde9fc1d2" } \ No newline at end of file From 07b2b1f703ce2dad90c80586aad981cb6a4a1189 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 14:21:56 +0000 Subject: [PATCH 62/88] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/darwin/snapshot-meta.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index c842042cca8f..c9550af9509e 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -1575,7 +1575,6 @@ "./node_modules/browserslist/index.js", "./node_modules/browserslist/node.js", "./node_modules/browserslist/parse.js", - "./node_modules/buffer-equal/index.js", "./node_modules/bytes/index.js", "./node_modules/call-bind/callBound.js", "./node_modules/call-bind/index.js", @@ -2289,6 +2288,7 @@ "./node_modules/lazy-ass/index.js", "./node_modules/load-bmfont/index.js", "./node_modules/load-bmfont/lib/is-binary.js", + "./node_modules/load-bmfont/node_modules/buffer-equal/index.js", "./node_modules/lodash._baseassign/index.js", "./node_modules/lodash._basecopy/index.js", "./node_modules/lodash._basecreate/index.js", @@ -4180,5 +4180,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "465d9ea33d6e01dac0e0ca57388ef83127db6d7824f874482431c6a2bb37e2ed" + "deferredHash": "8e90942c622942287c1462c6576572943546f0975ee7127573c914adde9fc1d2" } \ No newline at end of file From 2b338c7042337a2e37e6f1d713748f672506095b Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 15:53:31 +0000 Subject: [PATCH 63/88] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/win32/snapshot-meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json index a4f9f192dae6..dbf769416ce9 100644 --- a/tooling/v8-snapshot/cache/win32/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/win32/snapshot-meta.json @@ -4179,5 +4179,5 @@ "./tooling/v8-snapshot/cache/win32/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "d1c313d2c407d58afce66f630c5b96a6923b8cd56d85b5704e3d8ad55b369f0f" + "deferredHash": "687b7b1d4d6a51cc114ec7a068fb71b6cad1ec612f7290188ee1facab3080ca7" } \ No newline at end of file From d3e076b462a82d7d44de9ff6aca5395749d32765 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 13:17:54 -0500 Subject: [PATCH 64/88] Apply suggestions from code review --- .circleci/workflows.yml | 12 +----------- cli/CHANGELOG.md | 1 + packages/app/package.json | 2 +- packages/network/test/unit/agent_spec.ts | 4 ++++ 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 628c5ba93190..f00319a37fc1 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -385,6 +385,7 @@ commands: command: | if [[ `node ./scripts/get-platform-key.js` == 'linux-arm64' ]]; then # Building better-sqlite3 on arm64 requires gcc-10 + # on Arm, CI runs as non-root so we need to use sudo sudo apt install gcc-10 g++-10 # Update default to gcc-10 and g++-10 @@ -666,17 +667,6 @@ commands: - run: name: reinstall dependencies to work around cache issue (Windows only) command: rm -rf node_modules && yarn - - when: - condition: - equal: [ *windows-executor, << parameters.executor >> ] - steps: - - run: - name: default to ipv4 for windows - shell: cmd.exe - command: | - echo 127.0.0.1 localhost > %WINDIR%\System32\drivers\etc\hosts - ipconfig /flushdns - nbstat -R - windows-install-chrome: browser: <> - run: diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index b6e4457e684a..a1401d8c31fc 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -9,6 +9,7 @@ _Released 12/3/2024 (PENDING)_ - Prebuilt binaries for Linux are no longer compatible with Linux distributions based on glibc <2.28, for example: Ubuntu 14-18, RHEL 7, CentOS 7, Amazon Linux 2. Addresses [#29601](https://github.com/cypress-io/cypress/issues/29601). - The undocumented methods `Cypress.backend('firefox:force:gc')` and `Cypress.backend('log:memory:pressure')` were removed. Addresses [#30222](https://github.com/cypress-io/cypress/issues/30222). - Upgraded bundled Node.js version from `18.17.0` to `20.18.0`. +- It is no longer possible to do things like `cy.window().then((win) => win.fetch('')` without doing some form of initial navigation. `cy.request` will still work in this scenario. **Dependency Updates:** diff --git a/packages/app/package.json b/packages/app/package.json index e439d5157a72..3e9989ae4794 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -9,7 +9,7 @@ "clean-deps": "rimraf node_modules", "cypress:launch": "yarn cypress:run-cypress-in-cypress gulp open --project .", "cypress:open": "yarn cypress:run-cypress-in-cypress gulp open --project .", - "cypress:run-cypress-in-cypress": "cross-env DEBUG=cypress:network:* CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", + "cypress:run-cypress-in-cypress": "cross-env CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT=1 HTTP_PROXY_TARGET_FOR_ORIGIN_REQUESTS=http://localhost:4455 CYPRESS_REMOTE_DEBUGGING_PORT=6666 TZ=America/New_York", "cypress:run:ct": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --component --project .", "cypress:run:e2e": "yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project .", "cypress:run:e2e:update:snapshots": "CYPRESS_SNAPSHOT_UPDATE=1 yarn cypress:run-cypress-in-cypress node ../../scripts/cypress run --project . --spec **/*mochaEvents* --browser chrome", diff --git a/packages/network/test/unit/agent_spec.ts b/packages/network/test/unit/agent_spec.ts index eb5b606c62d1..2c442562c013 100644 --- a/packages/network/test/unit/agent_spec.ts +++ b/packages/network/test/unit/agent_spec.ts @@ -973,6 +973,8 @@ describe('lib/agent', function () { expect(req._header).to.equal([ 'GET / HTTP/1.1', 'host: foo.bar.baz.invalid', + // `keep-alive` was changed to be the default in Node 19: + // https://nodejs.org/en/blog/announcements/v19-release-announce#https11-keepalive-by-default 'Connection: keep-alive', '', '', ].join('\r\n')) @@ -988,6 +990,8 @@ describe('lib/agent', function () { 'GET http://quuz.quux.invalid/abc?def=123 HTTP/1.1', 'Host: foo.fleem.invalid', 'bing: bang', + // `keep-alive` was changed to be the default in Node 19: + // https://nodejs.org/en/blog/announcements/v19-release-announce#https11-keepalive-by-default 'Connection: keep-alive', '', '', ].join('\r\n')) From a235e02ced8ee7c0921419d153c4ec2e497c0d08 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 13:33:43 -0500 Subject: [PATCH 65/88] Apply suggestions from code review --- packages/network/test/unit/agent_spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/test/unit/agent_spec.ts b/packages/network/test/unit/agent_spec.ts index 2c442562c013..1d48e77a6acb 100644 --- a/packages/network/test/unit/agent_spec.ts +++ b/packages/network/test/unit/agent_spec.ts @@ -973,7 +973,7 @@ describe('lib/agent', function () { expect(req._header).to.equal([ 'GET / HTTP/1.1', 'host: foo.bar.baz.invalid', - // `keep-alive` was changed to be the default in Node 19: + // `keep-alive` was changed to be the default in Node 19: // https://nodejs.org/en/blog/announcements/v19-release-announce#https11-keepalive-by-default 'Connection: keep-alive', '', '', @@ -990,7 +990,7 @@ describe('lib/agent', function () { 'GET http://quuz.quux.invalid/abc?def=123 HTTP/1.1', 'Host: foo.fleem.invalid', 'bing: bang', - // `keep-alive` was changed to be the default in Node 19: + // `keep-alive` was changed to be the default in Node 19: // https://nodejs.org/en/blog/announcements/v19-release-announce#https11-keepalive-by-default 'Connection: keep-alive', '', '', From f45e3edee020bbc4c137beec94e8110044de9a2f Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 14:12:23 -0500 Subject: [PATCH 66/88] Update cli/CHANGELOG.md Co-authored-by: Jennifer Shehane --- cli/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index a1401d8c31fc..d1d77742eaa4 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -9,7 +9,7 @@ _Released 12/3/2024 (PENDING)_ - Prebuilt binaries for Linux are no longer compatible with Linux distributions based on glibc <2.28, for example: Ubuntu 14-18, RHEL 7, CentOS 7, Amazon Linux 2. Addresses [#29601](https://github.com/cypress-io/cypress/issues/29601). - The undocumented methods `Cypress.backend('firefox:force:gc')` and `Cypress.backend('log:memory:pressure')` were removed. Addresses [#30222](https://github.com/cypress-io/cypress/issues/30222). - Upgraded bundled Node.js version from `18.17.0` to `20.18.0`. -- It is no longer possible to do things like `cy.window().then((win) => win.fetch('')` without doing some form of initial navigation. `cy.request` will still work in this scenario. +- It is no longer possible to do things like `cy.window().then((win) => win.fetch('')` without doing some form of initial navigation via `cy.visit()`. `cy.request` will still work in this scenario. **Dependency Updates:** From 6364f8ab78687389500a11fe199ddf0ea83fefbe Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 14:20:22 -0500 Subject: [PATCH 67/88] Update cli/CHANGELOG.md Co-authored-by: Jennifer Shehane From 74bb4de2cd6d9473f5314bd9124d97d246c74601 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 15:39:59 -0500 Subject: [PATCH 68/88] Update CHANGELOG.md --- cli/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index d1d77742eaa4..46f4898933d6 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -3,6 +3,10 @@ _Released 12/3/2024 (PENDING)_ +**Bugfixes:** + +- The CSS pseudo-class `:dir()` is now supported when testing in Electron. Addresses [#29766](https://github.com/cypress-io/cypress/issues/29766). + **Breaking Changes:** - Removed support for Node.js 16 and Node.js 21. Addresses [#29930](https://github.com/cypress-io/cypress/issues/29930). From f8e5f5ed4589294d556671b0506c6b48e40d1a7a Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 16:32:59 -0500 Subject: [PATCH 69/88] Update cache-version.txt --- .circleci/cache-version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt index 08e129b1c91f..9abd271b6399 100644 --- a/.circleci/cache-version.txt +++ b/.circleci/cache-version.txt @@ -1,3 +1,3 @@ # Bump this version to force CI to re-create the cache from scratch. -10-19-2024 +10-22-2024 From ed5f6fd0cd843df01ff678359c696ccf1c549a8a Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 18:20:51 -0500 Subject: [PATCH 70/88] fix nx (maybe) --- package.json | 2 +- packages/app/src/runner/aut-iframe.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d33ac31f6fb..9009a659dcac 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "binary-smoke-test": "node ./scripts/binary.js smoke", "binary-upload": "node ./scripts/binary.js upload", "binary-zip": "node ./scripts/binary.js zip", - "build": "lerna run build --stream && lerna run build-cli --stream", + "build": "lerna run build --stream --skip-nx-cache && lerna run build-cli --stream --skip-nx-cache", "build-prod": "lerna run build-prod --stream && node ./cli/scripts/post-build.js && lerna run build-prod --stream --scope", "build-v8-snapshot-dev": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js --env=dev", "build-v8-snapshot-prod": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js", diff --git a/packages/app/src/runner/aut-iframe.ts b/packages/app/src/runner/aut-iframe.ts index 65030131559f..652ec5750c8a 100644 --- a/packages/app/src/runner/aut-iframe.ts +++ b/packages/app/src/runner/aut-iframe.ts @@ -128,6 +128,8 @@ export class AutIframe { return } + this.$iframe[0].srcdoc = '' + this.$iframe?.removeAttr('srcdoc') this.$iframe[0].src = 'about:blank' this.$iframe.one('load', () => { From 991c0c8889793fe0efe5a6aece988698db73b94f Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 19:26:33 -0500 Subject: [PATCH 71/88] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9009a659dcac..6d33ac31f6fb 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "binary-smoke-test": "node ./scripts/binary.js smoke", "binary-upload": "node ./scripts/binary.js upload", "binary-zip": "node ./scripts/binary.js zip", - "build": "lerna run build --stream --skip-nx-cache && lerna run build-cli --stream --skip-nx-cache", + "build": "lerna run build --stream && lerna run build-cli --stream", "build-prod": "lerna run build-prod --stream && node ./cli/scripts/post-build.js && lerna run build-prod --stream --scope", "build-v8-snapshot-dev": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js --env=dev", "build-v8-snapshot-prod": "node --max-old-space-size=8192 tooling/v8-snapshot/scripts/setup-v8-snapshot-in-cypress.js", From 6a61b7d55005009740520fee7ad3e360c729546c Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 19:45:17 -0500 Subject: [PATCH 72/88] try something --- packages/electron/lib/electron.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/electron/lib/electron.js b/packages/electron/lib/electron.js index bb0b74f2d87e..f5bdfbe16df7 100644 --- a/packages/electron/lib/electron.js +++ b/packages/electron/lib/electron.js @@ -94,6 +94,7 @@ module.exports = { const dest = paths.getPathToResources('app') debug('appPath %s', appPath) + debug('dest path %s', dest) // make sure this path exists! From 90056b208e1a66099d2e12383d77e4390027ec4a Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 19:49:41 -0500 Subject: [PATCH 73/88] Update packages/app/src/runner/aut-iframe.ts --- packages/app/src/runner/aut-iframe.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/app/src/runner/aut-iframe.ts b/packages/app/src/runner/aut-iframe.ts index 652ec5750c8a..65030131559f 100644 --- a/packages/app/src/runner/aut-iframe.ts +++ b/packages/app/src/runner/aut-iframe.ts @@ -128,8 +128,6 @@ export class AutIframe { return } - this.$iframe[0].srcdoc = '' - this.$iframe?.removeAttr('srcdoc') this.$iframe[0].src = 'about:blank' this.$iframe.one('load', () => { From 2ff998a6933dcce1a908d989173cbf583bd773ef Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 20:00:58 -0500 Subject: [PATCH 74/88] bump version --- .circleci/cache-version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt index 9abd271b6399..bec07b1b7ff0 100644 --- a/.circleci/cache-version.txt +++ b/.circleci/cache-version.txt @@ -1,3 +1,3 @@ # Bump this version to force CI to re-create the cache from scratch. -10-22-2024 +10-23-2024 From 31e39f7b0c45e56eca1d5f4d0f7c1698803869ef Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 20:08:04 -0500 Subject: [PATCH 75/88] try to bust cache --- packages/electron/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/electron/package.json b/packages/electron/package.json index e376d318c25e..05dfaaa6de81 100644 --- a/packages/electron/package.json +++ b/packages/electron/package.json @@ -23,6 +23,7 @@ "minimist": "1.2.8" }, "devDependencies": { + "@electron/fuses": "1.8.0", "@electron/packager": "18.3.4", "execa": "4.1.0", "mocha": "3.5.3", From 5e1f363bb05c3f414d0b0e92efab078f91b2d764 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 21:52:08 -0500 Subject: [PATCH 76/88] try to invalidate cache --- nx.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 2237f4cc40eb..ba27fca216a1 100644 --- a/nx.json +++ b/nx.json @@ -32,7 +32,8 @@ ], "default": [ "{projectRoot}/**/*", - "sharedGlobals" + "sharedGlobals", + "{workspaceRoot}/.circleci/cache-version.txt" ], "production": [ "default", From 5e2c623aee861dba1d1de8653a7f0fba3ae66fc0 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 22 Oct 2024 22:09:59 -0500 Subject: [PATCH 77/88] Update cli/CHANGELOG.md --- cli/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 46f4898933d6..c1be3eb571ce 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -12,13 +12,13 @@ _Released 12/3/2024 (PENDING)_ - Removed support for Node.js 16 and Node.js 21. Addresses [#29930](https://github.com/cypress-io/cypress/issues/29930). - Prebuilt binaries for Linux are no longer compatible with Linux distributions based on glibc <2.28, for example: Ubuntu 14-18, RHEL 7, CentOS 7, Amazon Linux 2. Addresses [#29601](https://github.com/cypress-io/cypress/issues/29601). - The undocumented methods `Cypress.backend('firefox:force:gc')` and `Cypress.backend('log:memory:pressure')` were removed. Addresses [#30222](https://github.com/cypress-io/cypress/issues/30222). -- Upgraded bundled Node.js version from `18.17.0` to `20.18.0`. -- It is no longer possible to do things like `cy.window().then((win) => win.fetch('')` without doing some form of initial navigation via `cy.visit()`. `cy.request` will still work in this scenario. +- Upgraded bundled Node.js version from `18.17.0` to `20.18.0`. Addresses [#29547](https://github.com/cypress-io/cypress/issues/29547). +- It is no longer possible to do things like `cy.window().then((win) => win.fetch('')` without doing some form of initial navigation via `cy.visit()`. `cy.request` will still work in this scenario. Addressed in [#29547](https://github.com/cypress-io/cypress/pull/30394). **Dependency Updates:** -- Upgraded `electron` from `27.3.10` to `32.2.0`. -- Upgraded bundled Chromium version from `118.0.5993.159` to `128.0.6613.178`. +- Upgraded `electron` from `27.3.10` to `32.2.0`. Addresses [#29547](https://github.com/cypress-io/cypress/issues/29547). +- Upgraded bundled Chromium version from `118.0.5993.159` to `128.0.6613.178`. Addresses [#29547](https://github.com/cypress-io/cypress/issues/29547). ## 13.15.1 From f5de4ac799a1ea11afda46cef3b7fac900ca3425 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 23 Oct 2024 11:53:46 -0500 Subject: [PATCH 78/88] suppress benign warnings --- cli/lib/exec/spawn.js | 10 +++++++++- cli/test/lib/exec/spawn_spec.js | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cli/lib/exec/spawn.js b/cli/lib/exec/spawn.js index da25f03b8224..7c2871b9de8a 100644 --- a/cli/lib/exec/spawn.js +++ b/cli/lib/exec/spawn.js @@ -74,7 +74,15 @@ const isContainerVulkanDriverWarning = /^Warning: vkCreateInstance/ const isContainerVulkanStack = /^\s*at (CheckVkSuccessImpl|CreateVkInstance|Initialize|Create|operator).+(VulkanError|BackendVk).cpp/ -const GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe, isDbusWarning, isCertVerifyProcBuiltin, isMacOSElectronWebSwapCGLLayerWarning, isHostVulkanDriverWarning, isContainerVulkanDriverWarning, isContainerVulkanStack] +/** + * In Electron 32.0.0 a new debug scenario log message started appearing when iframes navigate to about:blank. This is a benign message. + * https://github.com/electron/electron/issues/44368 + * Sample: + * [78887:1023/114920.074882:ERROR:debug_utils.cc(14)] Hit debug scenario: 4 + */ +const isDebugScenario4 = /Hit debug scenario: 4/ + +const GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe, isDbusWarning, isCertVerifyProcBuiltin, isMacOSElectronWebSwapCGLLayerWarning, isHostVulkanDriverWarning, isContainerVulkanDriverWarning, isContainerVulkanStack, isDebugScenario4] const isGarbageLineWarning = (str) => { return _.some(GARBAGE_WARNINGS, (re) => { diff --git a/cli/test/lib/exec/spawn_spec.js b/cli/test/lib/exec/spawn_spec.js index 76a0f7799c66..4302f4a95d30 100644 --- a/cli/test/lib/exec/spawn_spec.js +++ b/cli/test/lib/exec/spawn_spec.js @@ -97,6 +97,8 @@ describe('lib/exec/spawn', function () { at Initialize (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:344) at Create (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:266) at operator() (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:521) + + [78887:1023/114920.074882:ERROR:debug_utils.cc(14)] Hit debug scenario: 4 ` const lines = _ From ce6cbad11f1145369eb15ee38f6d2122f0f5b5e9 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Wed, 23 Oct 2024 16:39:50 -0500 Subject: [PATCH 79/88] Apply suggestions from code review --- system-tests/test-binary/node_versions_spec.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system-tests/test-binary/node_versions_spec.ts b/system-tests/test-binary/node_versions_spec.ts index f9deb4e6fb0b..5e32da3ed7a9 100644 --- a/system-tests/test-binary/node_versions_spec.ts +++ b/system-tests/test-binary/node_versions_spec.ts @@ -26,6 +26,8 @@ function smokeTestDockerImage (dockerImage: string) { describe('binary node versions', () => { [ + 'cypress/base:18.16.1', + 'cypress/base:20.12.2', 'cypress/base:20.18.0', 'cypress/base:22.0.0', 'cypress/base:22.7.0', @@ -34,6 +36,8 @@ describe('binary node versions', () => { describe('type: module', () => { [ + 'cypress/base:18.16.1', + 'cypress/base:20.12.2', 'cypress/base:20.18.0', 'cypress/base:22.0.0', 'cypress/base:22.7.0', From 56524b7de45f13ec82da008e1814e414250ff684 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 28 Oct 2024 09:44:31 -0500 Subject: [PATCH 80/88] PR comments --- cli/CHANGELOG.md | 8 ++++---- patches/evil-dns+0.2.0.patch | 6 ++++-- patches/ts-node+10.9.2.patch | 10 +++++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 5dd82c5faa23..2fe6a07eb197 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -3,10 +3,6 @@ _Released 12/3/2024 (PENDING)_ -**Bugfixes:** - -- The CSS pseudo-class `:dir()` is now supported when testing in Electron. Addresses [#29766](https://github.com/cypress-io/cypress/issues/29766). - **Breaking Changes:** - Removed support for Node.js 16 and Node.js 21. Addresses [#29930](https://github.com/cypress-io/cypress/issues/29930). @@ -16,6 +12,10 @@ _Released 12/3/2024 (PENDING)_ - Upgraded bundled Node.js version from `18.17.0` to `20.18.0`. Addresses [#29547](https://github.com/cypress-io/cypress/issues/29547). - It is no longer possible to do things like `cy.window().then((win) => win.fetch('')` without doing some form of initial navigation via `cy.visit()`. `cy.request` will still work in this scenario. Addressed in [#29547](https://github.com/cypress-io/cypress/pull/30394). +**Bugfixes:** + +- The CSS pseudo-class `:dir()` is now supported when testing in Electron. Addresses [#29766](https://github.com/cypress-io/cypress/issues/29766). + **Dependency Updates:** - Upgraded `electron` from `27.3.10` to `32.2.0`. Addresses [#29547](https://github.com/cypress-io/cypress/issues/29547). diff --git a/patches/evil-dns+0.2.0.patch b/patches/evil-dns+0.2.0.patch index ab71307a17b8..768a0c86ada6 100644 --- a/patches/evil-dns+0.2.0.patch +++ b/patches/evil-dns+0.2.0.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/evil-dns/evil-dns.js b/node_modules/evil-dns/evil-dns.js -index 740f40d..83986c7 100644 +index 740f40d..b78790d 100644 --- a/node_modules/evil-dns/evil-dns.js +++ b/node_modules/evil-dns/evil-dns.js -@@ -25,10 +25,12 @@ dns.lookup = function(domain, options, callback) { +@@ -25,10 +25,14 @@ dns.lookup = function(domain, options, callback) { for (i = 0; i < domains.length; i++) { var entry = domains[i]; @@ -10,6 +10,8 @@ index 740f40d..83986c7 100644 - if (!family || family === entry.family) { - return callback(null, entry.ip, entry.family); - } ++ // Note: this is patched to get around this issue: ++ // https://github.com/JamesHight/node-evil-dns/issues/7 + if (domain.match(entry.domain) && (!family || family === entry.family)) { + return process.nextTick( + options.all diff --git a/patches/ts-node+10.9.2.patch b/patches/ts-node+10.9.2.patch index 0d78f44bee90..b0c26d814ecb 100644 --- a/patches/ts-node+10.9.2.patch +++ b/patches/ts-node+10.9.2.patch @@ -1,17 +1,21 @@ diff --git a/node_modules/ts-node/dist/index.js b/node_modules/ts-node/dist/index.js -index c03afbf..56c45bb 100644 +index c03afbf..eb5bd16 100644 --- a/node_modules/ts-node/dist/index.js +++ b/node_modules/ts-node/dist/index.js -@@ -94,7 +94,7 @@ exports.DEFAULTS = { +@@ -93,8 +93,11 @@ exports.DEFAULTS = { + }; /** * TypeScript diagnostics error. ++ * ++ * Note: this is patched to extend Error instead of makeError.BaseError. This is to get around this issue: ++ * https://github.com/TypeStrong/ts-node/issues/2026 */ -class TSError extends make_error_1.BaseError { +class TSError extends Error { constructor(diagnosticText, diagnosticCodes, diagnostics = []) { super(`тип Unable to compile TypeScript:\n${diagnosticText}`); this.diagnosticCodes = diagnosticCodes; -@@ -110,12 +110,6 @@ class TSError extends make_error_1.BaseError { +@@ -110,12 +113,6 @@ class TSError extends make_error_1.BaseError { value: diagnostics, }); } From 609dee48021f22c1529e556424643bac8f538919 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 28 Oct 2024 10:21:38 -0500 Subject: [PATCH 81/88] PR comment --- cli/lib/exec/spawn.js | 8 +------- cli/test/lib/exec/spawn_spec.js | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/cli/lib/exec/spawn.js b/cli/lib/exec/spawn.js index 7c2871b9de8a..93687ef0189a 100644 --- a/cli/lib/exec/spawn.js +++ b/cli/lib/exec/spawn.js @@ -39,12 +39,6 @@ const isDbusWarning = /Failed to connect to the bus:/ // ERROR: No matching issuer found const isCertVerifyProcBuiltin = /(^\[.*ERROR:cert_verify_proc_builtin\.cc|^----- Certificate i=0 \(OU=Cypress Proxy|^ERROR: No matching issuer found$)/ -// Electron logs a benign warning about WebSwapCGLLayer on MacOS v12 and Electron v18 due to a naming collision in shared libraries. -// Once this is fixed upstream this regex can be removed: https://github.com/electron/electron/issues/33685 -// Sample: -// objc[60540]: Class WebSwapCGLLayer is implemented in both /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/Frameworks/libANGLE-shared.dylib (0x7ffa5a006318) and /{path/to/app}/node_modules/electron/dist/Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libGLESv2.dylib (0x10f8a89c8). One of the two will be used. Which one is undefined. -const isMacOSElectronWebSwapCGLLayerWarning = /^objc\[\d+\]: Class WebSwapCGLLayer is implemented in both.*Which one is undefined\./ - /** * Electron logs benign warnings about Vulkan when run on hosts that do not have a GPU. This is coming from the primary Electron process, * and not the browser being used for tests. @@ -82,7 +76,7 @@ const isContainerVulkanStack = /^\s*at (CheckVkSuccessImpl|CreateVkInstance|Init */ const isDebugScenario4 = /Hit debug scenario: 4/ -const GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe, isDbusWarning, isCertVerifyProcBuiltin, isMacOSElectronWebSwapCGLLayerWarning, isHostVulkanDriverWarning, isContainerVulkanDriverWarning, isContainerVulkanStack, isDebugScenario4] +const GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe, isDbusWarning, isCertVerifyProcBuiltin, isHostVulkanDriverWarning, isContainerVulkanDriverWarning, isContainerVulkanStack, isDebugScenario4] const isGarbageLineWarning = (str) => { return _.some(GARBAGE_WARNINGS, (re) => { diff --git a/cli/test/lib/exec/spawn_spec.js b/cli/test/lib/exec/spawn_spec.js index 4302f4a95d30..00738df40612 100644 --- a/cli/test/lib/exec/spawn_spec.js +++ b/cli/test/lib/exec/spawn_spec.js @@ -83,8 +83,6 @@ describe('lib/exec/spawn', function () { ----- Certificate i=0 (OU=Cypress Proxy Server Certificate,O=Cypress Proxy CA,L=Internet,ST=Internet,C=Internet,CN=www.googletagmanager.com) ----- ERROR: No matching issuer found - objc[60540]: Class WebSwapCGLLayer is implemented in both /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/Frameworks/libANGLE-shared.dylib (0x7ffa5a006318) and /{path/to/app}/node_modules/electron/dist/Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libGLESv2.dylib (0x10f8a89c8). One of the two will be used. Which one is undefined. - Warning: loader_scanned_icd_add: Driver /usr/lib/x86_64-linux-gnu/libvulkan_intel.so supports Vulkan 1.2, but only supports loader interface version 4. Interface version 5 or newer required to support this version of Vulkan (Policy #LDP_DRIVER_7) Warning: loader_scanned_icd_add: Driver /usr/lib/x86_64-linux-gnu/libvulkan_lvp.so supports Vulkan 1.1, but only supports loader interface version 4. Interface version 5 or newer required to support this version of Vulkan (Policy #LDP_DRIVER_7) Warning: loader_scanned_icd_add: Driver /usr/lib/x86_64-linux-gnu/libvulkan_radeon.so supports Vulkan 1.2, but only supports loader interface version 4. Interface version 5 or newer required to support this verison of Vulkan (Policy #LDP_DRIVER_7) From 5a83687d451c5b99612fae9e5c6357c81cac88c9 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 28 Oct 2024 12:30:12 -0500 Subject: [PATCH 82/88] Apply suggestions from code review --- .github/workflows/snyk_sca_scan.yaml | 4 ++-- .github/workflows/snyk_static_analysis_scan.yaml | 2 +- .github/workflows/update-browser-versions.yml | 2 +- .github/workflows/update_v8_snapshot_cache.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/snyk_sca_scan.yaml b/.github/workflows/snyk_sca_scan.yaml index b5561c0e9178..608be5ec7a83 100644 --- a/.github/workflows/snyk_sca_scan.yaml +++ b/.github/workflows/snyk_sca_scan.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20.18.x] + node-version: [20.x] steps: - name: Checkout uses: actions/checkout@v4 @@ -28,7 +28,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 20.18 + node-version: 20 cache: 'yarn' - name: Run yarn run: yarn diff --git a/.github/workflows/snyk_static_analysis_scan.yaml b/.github/workflows/snyk_static_analysis_scan.yaml index c2a158fa6a63..b0e0087f1ddb 100644 --- a/.github/workflows/snyk_static_analysis_scan.yaml +++ b/.github/workflows/snyk_static_analysis_scan.yaml @@ -21,7 +21,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 20.18 + node-version: 20 cache: 'yarn' - name: Run yarn run: yarn diff --git a/.github/workflows/update-browser-versions.yml b/.github/workflows/update-browser-versions.yml index a663177c34f8..935ffc247c4a 100644 --- a/.github/workflows/update-browser-versions.yml +++ b/.github/workflows/update-browser-versions.yml @@ -30,7 +30,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 20.18 + node-version: 20 - name: Check for new Chrome versions id: get-versions uses: actions/github-script@v7 diff --git a/.github/workflows/update_v8_snapshot_cache.yml b/.github/workflows/update_v8_snapshot_cache.yml index d34236e1e0cd..2e0dd9df6913 100644 --- a/.github/workflows/update_v8_snapshot_cache.yml +++ b/.github/workflows/update_v8_snapshot_cache.yml @@ -82,7 +82,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v4 with: - node-version: 20.18 + node-version: 20 cache: 'yarn' - name: Run yarn run: yarn From 02e27e01a64cb6705410dc1fd83ef5c2d9478143 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:40:53 +0000 Subject: [PATCH 83/88] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/linux/snapshot-meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json index 89b0481a52dd..d579bdd5eeac 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -4177,5 +4177,5 @@ "./tooling/v8-snapshot/cache/linux/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "8e90942c622942287c1462c6576572943546f0975ee7127573c914adde9fc1d2" + "deferredHash": "4b37beb9d15566a50cffd97e30705af6bdf32e9cb3ebdfc2693207a051e19207" } \ No newline at end of file From 308e5fd700e213099e3d2dc26cf60c2a673f554a Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:54:17 +0000 Subject: [PATCH 84/88] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/darwin/snapshot-meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index a8266cd433a4..ede9a60a4c1f 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -4174,5 +4174,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "8e90942c622942287c1462c6576572943546f0975ee7127573c914adde9fc1d2" + "deferredHash": "4b37beb9d15566a50cffd97e30705af6bdf32e9cb3ebdfc2693207a051e19207" } \ No newline at end of file From b6983b34330b9367f0f3ee36186ca17320e88f54 Mon Sep 17 00:00:00 2001 From: "cypress-bot[bot]" <+cypress-bot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 18:16:05 +0000 Subject: [PATCH 85/88] chore: updating v8 snapshot cache --- tooling/v8-snapshot/cache/win32/snapshot-meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/win32/snapshot-meta.json b/tooling/v8-snapshot/cache/win32/snapshot-meta.json index 69a0a5d602eb..9609b5ba1540 100644 --- a/tooling/v8-snapshot/cache/win32/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/win32/snapshot-meta.json @@ -4177,5 +4177,5 @@ "./tooling/v8-snapshot/cache/win32/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "687b7b1d4d6a51cc114ec7a068fb71b6cad1ec612f7290188ee1facab3080ca7" + "deferredHash": "9c079b1a38d5f33a74e3fd202e92ed1f2253dc66b178b764561b92ce8e16d5b4" } \ No newline at end of file From fe4cd75ed8f6b83bca10c16595e8303e1b93568c Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 28 Oct 2024 13:26:58 -0500 Subject: [PATCH 86/88] Update cli/CHANGELOG.md Co-authored-by: Matt Schile --- cli/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 8b79a53dd896..7f44c1281141 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -11,7 +11,7 @@ _Released 12/3/2024 (PENDING)_ - The `cypress open-ct` and `cypress run-ct` CLI commands were removed. Please use `cypress open --component` or `cypress run --component` respectively instead. Addressed in [#30456](https://github.com/cypress-io/cypress/pull/30456) - The undocumented methods `Cypress.backend('firefox:force:gc')` and `Cypress.backend('log:memory:pressure')` were removed. Addresses [#30222](https://github.com/cypress-io/cypress/issues/30222). - Upgraded bundled Node.js version from `18.17.0` to `20.18.0`. Addresses [#29547](https://github.com/cypress-io/cypress/issues/29547). -- It is no longer possible to do things like `cy.window().then((win) => win.fetch('')` without doing some form of initial navigation via `cy.visit()`. `cy.request` will still work in this scenario. Addressed in [#29547](https://github.com/cypress-io/cypress/pull/30394). +- It is no longer possible to make a `fetch` or `XMLHttpRequest` request from the `about:blank` page in Electron (i.e. `cy.window().then((win) => win.fetch('')`). You must use `cy.request` instead or perform some form of initial navigation via `cy.visit()`. Addressed in [#29547](https://github.com/cypress-io/cypress/pull/30394). **Bugfixes:** From b4a3f38895052f69b3366890437b885ed7cdd215 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Mon, 28 Oct 2024 13:27:49 -0500 Subject: [PATCH 87/88] update debug scenario 4 regex --- cli/lib/exec/spawn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/lib/exec/spawn.js b/cli/lib/exec/spawn.js index 93687ef0189a..469090f75137 100644 --- a/cli/lib/exec/spawn.js +++ b/cli/lib/exec/spawn.js @@ -74,7 +74,7 @@ const isContainerVulkanStack = /^\s*at (CheckVkSuccessImpl|CreateVkInstance|Init * Sample: * [78887:1023/114920.074882:ERROR:debug_utils.cc(14)] Hit debug scenario: 4 */ -const isDebugScenario4 = /Hit debug scenario: 4/ +const isDebugScenario4 = /^\[[^\]]+debug_utils\.cc[^\]]+\] Hit debug scenario: 4/ const GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe, isDbusWarning, isCertVerifyProcBuiltin, isHostVulkanDriverWarning, isContainerVulkanDriverWarning, isContainerVulkanStack, isDebugScenario4] From cb217de4c1cbd2dd8ae77a9c65a5e79f69a86755 Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Tue, 29 Oct 2024 10:32:07 -0500 Subject: [PATCH 88/88] Update scripts/binary/trigger-publish-binary-pipeline.js --- scripts/binary/trigger-publish-binary-pipeline.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index b4b2820a2fbb..1b3924fe386b 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -10,7 +10,7 @@ const { getNextVersionForBinary } = require('../get-next-version') const { nextVersion } = await getNextVersionForBinary() const body = JSON.stringify({ - branch: 'ryanm/chore/electron-upgrade', + branch: 'release/14.0.0', parameters: { temp_dir: os.tmpdir(), sha: process.env.CIRCLE_SHA1,