From 899d395cbc07a58788d73b52aea3789475b40374 Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Tue, 11 Mar 2025 14:48:06 -0400 Subject: [PATCH 01/22] dependency: update Electron to 34 --- package.json | 3 ++- packages/electron/README.md | 9 +++++++++ yarn.lock | 23 ++++++++--------------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 66c4a76abb9b..76e710bf654b 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "dedent": "^0.7.0", "del": "3.0.0", "detect-port": "^1.6.1", - "electron": "33.2.1", + "electron": "34.3.2", "electron-builder": "^25.1.8", "enzyme-adapter-react-16": "1.12.1", "eslint": "^8.56.0", @@ -279,6 +279,7 @@ "@types/react": "18.3.12", "browserify-sign": "4.2.2", "devtools-protocol": "0.0.1413303", + "node-abi": "3.74.0", "sharp": "0.29.3", "vue-template-compiler": "2.6.12" }, diff --git a/packages/electron/README.md b/packages/electron/README.md index 208a609b2810..b83ef961ad0c 100644 --- a/packages/electron/README.md +++ b/packages/electron/README.md @@ -87,3 +87,12 @@ Upgrading `electron` involves more than just bumping this package's `package.jso *Solution*: This is often due to a mismatched prebuild of `better-sqlite3`. Ensure your repository is clear of untracked files with `git clean -xfd`, and run `yarn` again. If the issue persists, ensure you are running the latest version of your operating system. Electron prebuilds key to darwin/linux/windows, and do not differentiate between versions of the same. +#### node-abi out of date + +If you run into an error like below, please try some of the strategies below. + +```shell +Could not detect abi for version X.X.X and runtime electron. Updating "node-abi" might help solve this issue if it is a new release of electron +``` + +*Solution*: See if there's a new version of `@electron/rebuild` with a newer version of `node-abi` within it. If there is not a newer version, find the [latest release](https://github.com/electron/node-abi/releases) of `node-abi` that has an updated ABI registry with an `abi` entry matching the major version of Electron that you're updating to. Set this `node-abi` version in the `resolutions` of our [package.json](./package.json) file and rerun `yarn`. \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 992be9f82c96..75c601c1f155 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15024,10 +15024,10 @@ 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@33.2.1: - version "33.2.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-33.2.1.tgz#d0d7bba7a7abf4f14881d0a6e03c498b301a2d5f" - integrity sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg== +electron@34.3.2: + version "34.3.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-34.3.2.tgz#bc6bef988e12f2b766640f45983bdb90a4ab587f" + integrity sha512-n9tzmFexVLxipZXwMTY30H10f0X9k2OP0SkpSwL5VvnDZi0l/Hc+8CEArKkQPbbSf/IS7nxgc96gtTaR+XoSBg== dependencies: "@electron/get" "^2.0.0" "@types/node" "^20.9.0" @@ -23577,17 +23577,10 @@ nock@13.2.9: lodash "^4.17.21" propagate "^2.0.0" -node-abi@^2.7.0: - version "2.30.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" - integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== - dependencies: - semver "^5.4.1" - -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== +node-abi@3.74.0, node-abi@^2.7.0, node-abi@^3.3.0, node-abi@^3.45.0: + version "3.74.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.74.0.tgz#5bfb4424264eaeb91432d2adb9da23c63a301ed0" + integrity sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w== dependencies: semver "^7.3.5" From 0890191d52fb4ae9c266e4b8ae369dbf6b8b70ec Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Tue, 11 Mar 2025 15:04:41 -0400 Subject: [PATCH 02/22] setup workflows to run against binary branch and on all tests --- .circleci/workflows.yml | 7 +++++-- scripts/binary/trigger-publish-binary-pipeline.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 0b63730a783f..c4403f9c86e4 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -40,6 +40,7 @@ mainBuildFilters: &mainBuildFilters # use the following branch as well to ensure that v8 snapshot cache updates are fully tested - 'update-v8-snapshot-cache-on-develop' - 'ryanm/chore/add_internal_studio' + - 'electron-34' # usually we don't build Mac app - it takes a long time # but sometimes we want to really confirm we are doing the right thing @@ -51,6 +52,7 @@ macWorkflowFilters: &darwin-workflow-filters # 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: [ 'feat/implement_bidi', << pipeline.git.branch >> ] + - equal: [ 'electron-34', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -85,6 +87,7 @@ windowsWorkflowFilters: &windows-workflow-filters # 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: [ 'feat/implement_bidi', << pipeline.git.branch >> ] + - equal: [ 'electron-34', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -160,7 +163,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" != "feat/implement_bidi" ]]; then + echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "electron-34" ]]; 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 @@ -625,7 +628,7 @@ commands: apt update && apt install -y docker.io 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 33.2.1 --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 34.3.2 --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 diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index a57cfa801d6b..b7d7954d5d8c 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -16,7 +16,7 @@ const { getNextVersionForBinary } = require('../get-next-version') job_name: process.env.CIRCLE_JOB, triggered_workflow_id: process.env.CIRCLE_WORKFLOW_ID, triggered_job_url: process.env.CIRCLE_BUILD_URL, - branch: process.env.CIRCLE_BRANCH, + branch: 'electron-34', should_persist_artifacts: Boolean(process.env.SHOULD_PERSIST_ARTIFACTS), binary_version: nextVersion, }, From ba034c5120c073be64b7dc3cec13e57db949af35 Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Tue, 11 Mar 2025 15:09:41 -0400 Subject: [PATCH 03/22] changelog entry --- cli/CHANGELOG.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index b0ca6cade9f9..61055b062aac 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -1,7 +1,16 @@ +## 14.2.1 + +_Released 3/25/2025 (PENDING)_ + +**Dependency Updates:** + +- Upgraded `electron` from `33.2.1` to `34.3.2`. Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). +- Upgraded bundled Chromium version from `130.0.6723.137` to `132.0.6834.210`. Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). + ## 14.2.0 -_Released 3/11/2025 (PENDING)_ +_Released 3/11/2025_ **Features:** From 2f9af487d8978b30368a7100f80858907a838bae Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Tue, 11 Mar 2025 15:12:38 -0400 Subject: [PATCH 04/22] node version did bump minorly --- .github/ISSUE_TEMPLATE/1-bug-report.yml | 2 +- .github/ISSUE_TEMPLATE/2-memory-issue.yml | 2 +- .github/ISSUE_TEMPLATE/3-install-issue.yml | 2 +- .node-version | 2 +- cli/CHANGELOG.md | 1 + package.json | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml index 19d6046515e1..a6406fe80c63 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. v20.18.1 + placeholder: ex. v20.18.3 validations: required: true - type: input diff --git a/.github/ISSUE_TEMPLATE/2-memory-issue.yml b/.github/ISSUE_TEMPLATE/2-memory-issue.yml index f492fbb8d201..22cacb13f9b9 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. v20.18.1 + placeholder: ex. v20.18.3 validations: required: true - type: input diff --git a/.github/ISSUE_TEMPLATE/3-install-issue.yml b/.github/ISSUE_TEMPLATE/3-install-issue.yml index 2a4ce852ce3d..1301c34737bd 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. v20.18.1 + placeholder: ex. v20.18.3 validations: required: true - type: dropdown diff --git a/.node-version b/.node-version index d4b7699d36ca..87bc4c77fe13 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -20.18.1 +20.18.3 diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index 61055b062aac..d289b1808cb0 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -6,6 +6,7 @@ _Released 3/25/2025 (PENDING)_ **Dependency Updates:** - Upgraded `electron` from `33.2.1` to `34.3.2`. Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). +- Upgraded bundled Node.js version from `20.18.1` to `20.18.3`. - Upgraded bundled Chromium version from `130.0.6723.137` to `132.0.6834.210`. Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). ## 14.2.0 diff --git a/package.json b/package.json index 76e710bf654b..6c15d71bb393 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "yarn-deduplicate": "3.1.0" }, "engines": { - "node": ">=20.18.1", + "node": ">=20.18.3", "yarn": ">=1.22.22" }, "productName": "Cypress", From c51227e97577ed36472d73f95d8e63d04eb60091 Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Tue, 11 Mar 2025 17:00:59 -0400 Subject: [PATCH 05/22] Update base-internal image to match new node version --- .circleci/workflows.yml | 10 +++++----- docker-compose.yml | 2 +- system-tests/test-binary/module_api_spec.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 3b282932c683..bda655384085 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -96,7 +96,7 @@ executors: # the Docker image with Cypress dependencies and Chrome browser cy-doc: docker: - - image: cypress/base-internal:20.18.1-bullseye + - image: cypress/base-internal:20.18.3-bullseye # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -105,7 +105,7 @@ executors: kitchensink-executor: docker: - - image: cypress/base-internal:20.18.1-bullseye + - image: cypress/base-internal:20.18.3-bullseye # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -115,7 +115,7 @@ executors: # Docker image with non-root "node" user non-root-docker-user: docker: - - image: cypress/base-internal:20.18.1-bullseye + - image: cypress/base-internal:3-bullseye user: node environment: PLATFORM: linux @@ -1956,7 +1956,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:20.18.1-yarn-berry + - image: cypress/base-internal:20.18.3-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 @@ -1990,7 +1990,7 @@ jobs: parallelism: 1 working_directory: ~/cypress docker: - - image: cypress/base-internal:20.18.1-bullseye + - image: cypress/base-internal:20.18.3-bullseye environment: # needed to inform the bootstrap-docker-container.sh script to link the binary in the system-test project directory REPO_DIR: /root/cypress diff --git a/docker-compose.yml b/docker-compose.yml index 64f5dcbc70c1..93f156de762c 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/base-internal:20.18.1-bullseye + image: cypress/base-internal:20.18.3-bullseye ports: - 5566:5566 - 5567:5567 diff --git a/system-tests/test-binary/module_api_spec.ts b/system-tests/test-binary/module_api_spec.ts index 03ac8eb60246..3200984fc4e8 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.1-bullseye', + dockerImage: 'cypress/base-internal:20.18.3-bullseye', withBinary: true, project: 'module-api', browser: 'electron', From aacef9ec4623acac616e83b046eaa58ed6751dd8 Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Tue, 11 Mar 2025 17:01:38 -0400 Subject: [PATCH 06/22] fix typo --- .circleci/workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index bda655384085..7e5450f1d8fc 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -115,7 +115,7 @@ executors: # Docker image with non-root "node" user non-root-docker-user: docker: - - image: cypress/base-internal:3-bullseye + - image: cypress/base-internal:20.18.3-bullseye user: node environment: PLATFORM: linux From 15957d2ea2f5e6bcd1ff999ecd3d1f78bcc76dc7 Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Tue, 11 Mar 2025 17:05:57 -0400 Subject: [PATCH 07/22] changelog updates --- cli/CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index d289b1808cb0..bc30a5f01bd3 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -5,9 +5,9 @@ _Released 3/25/2025 (PENDING)_ **Dependency Updates:** -- Upgraded `electron` from `33.2.1` to `34.3.2`. Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). -- Upgraded bundled Node.js version from `20.18.1` to `20.18.3`. -- Upgraded bundled Chromium version from `130.0.6723.137` to `132.0.6834.210`. Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). +- Upgraded `electron` from `33.2.1` to `34.3.2`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). +- Upgraded bundled Node.js version from `20.18.1` to `20.18.3`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). +- Upgraded bundled Chromium version from `130.0.6723.137` to `132.0.6834.210`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). ## 14.2.0 From d3647fbb8a1dda18aa297c989fb958b891bf395d Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Wed, 12 Mar 2025 15:28:58 -0400 Subject: [PATCH 08/22] bumping to newest version just released today - hopefully solves glibc error --- .circleci/workflows.yml | 2 +- cli/CHANGELOG.md | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 7e5450f1d8fc..c93a6ae4095e 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -628,7 +628,7 @@ commands: apt update && apt install -y docker.io 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 34.3.2 --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 34.3.3 --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 diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index ba05ad9e69b4..8d51e397ad70 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -5,7 +5,7 @@ _Released 3/25/2025 (PENDING)_ **Dependency Updates:** -- Upgraded `electron` from `33.2.1` to `34.3.2`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). +- Upgraded `electron` from `33.2.1` to `34.3.3`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). - Upgraded bundled Node.js version from `20.18.1` to `20.18.3`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). - Upgraded bundled Chromium version from `130.0.6723.137` to `132.0.6834.210`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). diff --git a/package.json b/package.json index a3fa35be59d2..a9139b2a18be 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "dedent": "^0.7.0", "del": "3.0.0", "detect-port": "^1.6.1", - "electron": "34.3.2", + "electron": "34.3.3", "electron-builder": "^25.1.8", "enzyme-adapter-react-16": "1.12.1", "eslint": "^8.56.0", diff --git a/yarn.lock b/yarn.lock index 8e61b8e54cea..489a5ea05e3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15035,10 +15035,10 @@ 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@34.3.2: - version "34.3.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-34.3.2.tgz#bc6bef988e12f2b766640f45983bdb90a4ab587f" - integrity sha512-n9tzmFexVLxipZXwMTY30H10f0X9k2OP0SkpSwL5VvnDZi0l/Hc+8CEArKkQPbbSf/IS7nxgc96gtTaR+XoSBg== +electron@34.3.3: + version "34.3.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-34.3.3.tgz#2979329d182a195756bfbf6e5687a835cd65a2ec" + integrity sha512-7m1FiO1mwc1K/UqqnnkG7Ik/kAngDzmLfHwcl+xaWgCQ+Sts9rlEqzOh6g1GHhDqebrbs4bO/aU+NDi32fCciQ== dependencies: "@electron/get" "^2.0.0" "@types/node" "^20.9.0" From 705eb8cfb0865c72f8e733c4fd3bcc1bac93fd3c Mon Sep 17 00:00:00 2001 From: Ryan Manuel Date: Thu, 13 Mar 2025 12:05:07 -0500 Subject: [PATCH 09/22] fix cy in cy --- packages/data-context/src/data/ProjectConfigIpc.ts | 3 ++- packages/server/index.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/data-context/src/data/ProjectConfigIpc.ts b/packages/data-context/src/data/ProjectConfigIpc.ts index b5c4ee725677..63a18091a142 100644 --- a/packages/data-context/src/data/ProjectConfigIpc.ts +++ b/packages/data-context/src/data/ProjectConfigIpc.ts @@ -305,7 +305,8 @@ export class ProjectConfigIpc extends EventEmitter { // If they've got TypeScript installed, we can use // ts-node for CommonJS // ts-node/esm for ESM - if (hasTypeScriptInstalled(this.projectRoot)) { + // If we're in a cy in cy project, we will handle registering typescript directly in the server entry point + if (!process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF_PARENT_PROJECT && hasTypeScriptInstalled(this.projectRoot)) { debug('found typescript in %s', this.projectRoot) if (isProjectUsingESModules) { debug(`using --experimental-specifier-resolution=node with --loader ${tsNodeEsm}`) diff --git a/packages/server/index.js b/packages/server/index.js index 2bd7a2f0d1d1..71e414479f10 100644 --- a/packages/server/index.js +++ b/packages/server/index.js @@ -27,6 +27,7 @@ const startCypress = async () => { const { entryPoint } = require('minimist')(process.argv.slice(1)) if (entryPoint) { + require('@packages/server/lib/plugins/child/register_ts_node') module.exports = runChildProcess(entryPoint) } else { module.exports = startCypress() From 1e9c1ed635b3d0a5ed3de931a5fecb1a933944be Mon Sep 17 00:00:00 2001 From: Jennifer Shehane Date: Thu, 13 Mar 2025 16:20:35 -0400 Subject: [PATCH 10/22] remove extra register_ts_node require --- packages/server/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/server/index.js b/packages/server/index.js index 71e414479f10..2bd7a2f0d1d1 100644 --- a/packages/server/index.js +++ b/packages/server/index.js @@ -27,7 +27,6 @@ const startCypress = async () => { const { entryPoint } = require('minimist')(process.argv.slice(1)) if (entryPoint) { - require('@packages/server/lib/plugins/child/register_ts_node') module.exports = runChildProcess(entryPoint) } else { module.exports = startCypress() From 2044f47d83d268d81b4f59a48646630b221f72d8 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 29 Apr 2025 15:12:56 -0400 Subject: [PATCH 11/22] updated lockfile --- yarn.lock | 71 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 63 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 37f89cac0838..7bcfb6790f68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14952,10 +14952,10 @@ electron-to-chromium@^1.5.73: resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.116.tgz#b779d73cd0cc75305d12ae4f061d7f7bcee4c761" integrity sha512-mufxTCJzLBQVvSdZzX1s5YAuXsN1M4tTyYxOOL1TcSKtIzQ9rjIrm7yFK80rN5dwGTePgdoABDSHpuVtRQh0Zw== -electron@34.3.3: - version "34.3.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-34.3.3.tgz#2979329d182a195756bfbf6e5687a835cd65a2ec" - integrity sha512-7m1FiO1mwc1K/UqqnnkG7Ik/kAngDzmLfHwcl+xaWgCQ+Sts9rlEqzOh6g1GHhDqebrbs4bO/aU+NDi32fCciQ== +electron@33.2.1: + version "33.2.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-33.2.1.tgz#d0d7bba7a7abf4f14881d0a6e03c498b301a2d5f" + integrity sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg== dependencies: "@electron/get" "^2.0.0" "@types/node" "^20.9.0" @@ -22730,7 +22730,7 @@ mobx@6.13.6: resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.13.6.tgz#3b80895c7c9df456efc86ae0b6983ccea1da6cc6" integrity sha512-r19KNV0uBN4b+ER8Z0gA4y+MzDYIQ2SvOmn3fUrqPnWXdQfakd9yfbPBDBF/p5I+bd3N5Rk1fHONIvMay+bJGA== -"mocha-7.2.0@npm:mocha@7.2.0", mocha@7.2.0, mocha@^7.1.0: +"mocha-7.2.0@npm:mocha@7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.2.0.tgz#01cc227b00d875ab1eed03a75106689cfed5a604" integrity sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ== @@ -22937,6 +22937,36 @@ mocha@7.1.2: yargs-parser "13.1.2" yargs-unparser "1.6.0" +mocha@7.2.0, mocha@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.2.0.tgz#01cc227b00d875ab1eed03a75106689cfed5a604" + integrity sha512-O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ== + 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 "3.0.0" + minimatch "3.0.4" + mkdirp "0.5.5" + 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.2" + yargs-parser "13.1.2" + yargs-unparser "1.6.0" + mocha@^8.1.1, mocha@^8.1.3: version "8.3.1" resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.3.1.tgz#b9eda6da1eb8cb8d29860a9c2205de5b8a076560" @@ -29410,7 +29440,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== @@ -29436,6 +29466,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" @@ -29546,7 +29585,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== @@ -29567,6 +29606,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" @@ -32687,7 +32733,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== @@ -32730,6 +32776,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 6792e06a0038f4f648ef2eea14b40f60cd304a36 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 30 Apr 2025 10:59:24 -0400 Subject: [PATCH 12/22] upgrade better-sqlite3 --- packages/server/package.json | 2 +- yarn.lock | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/server/package.json b/packages/server/package.json index 22136fc63685..b3a95a697b06 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -40,7 +40,7 @@ "ast-types": "0.13.3", "axios": "^1.7.9", "base64url": "^3.0.1", - "better-sqlite3": "11.5.0", + "better-sqlite3": "11.9.1", "black-hole-stream": "0.0.1", "bluebird": "3.7.2", "body-parser": "1.20.0", diff --git a/yarn.lock b/yarn.lock index 7bcfb6790f68..81ffa48c64c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11033,6 +11033,14 @@ better-sqlite3@11.5.0: bindings "^1.5.0" prebuild-install "^7.1.1" +better-sqlite3@11.9.1: + version "11.9.1" + resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-11.9.1.tgz#0540da2f2ce24cbd766bb35db412f4be2c75b8bb" + integrity sha512-Ba0KR+Fzxh2jDRhdg6TSH0SJGzb8C0aBY4hR8w8madIdIzzC6Y1+kx5qR6eS1Z+Gy20h6ZU28aeyg0z1VIrShQ== + dependencies: + bindings "^1.5.0" + prebuild-install "^7.1.1" + big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" From d93bae80d9868deac93edf1817e2f4496bb8655d Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Fri, 2 May 2025 11:49:38 -0400 Subject: [PATCH 13/22] changelog --- cli/CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index ead546901ea9..3c0e97423451 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -15,6 +15,12 @@ _Released 5/6/2025 (PENDING)_ - The URL in the Cypress App no longer displays a white background when the URL is loading. Fixes [#31556](https://github.com/cypress-io/cypress/issues/31556). +**Dependency Updates:** + +- Upgraded `electron` from `33.2.1` to `34.3.3`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). +- Upgraded bundled Node.js version from `20.18.1` to `20.18.3`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). +- Upgraded bundled Chromium version from `130.0.6723.137` to `132.0.6834.210`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). + ## 14.3.2 _Released 4/22/2025_ @@ -47,12 +53,6 @@ _Released 4/17/2025_ - The UI of the reporter and URL were updated to a darker gray background for better color contrast. Addressed in [#31475](https://github.com/cypress-io/cypress/pull/31475). - Fixed an issue where the error message output when attempting to install Cypress on an unsupported architecture included an outdated documentation link to Cypress system requirements. Fixes [#31512](https://github.com/cypress-io/cypress/issues/31512). -**Dependency Updates:** - -- Upgraded `electron` from `33.2.1` to `34.3.3`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). -- Upgraded bundled Node.js version from `20.18.1` to `20.18.3`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). -- Upgraded bundled Chromium version from `130.0.6723.137` to `132.0.6834.210`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260). - ## 14.3.0 _Released 4/8/2025_ From fc2ba416952d7a707c76fd25fe5ca28720337d46 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Mon, 5 May 2025 10:13:49 -0400 Subject: [PATCH 14/22] update electron in top level package.json --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ecbba3f1d578..387e05c9bbbf 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "dedent": "^0.7.0", "del": "3.0.0", "detect-port": "^2.1.0", - "electron": "33.2.1", + "electron": "34.3.3", "electron-builder": "^25.1.8", "enzyme-adapter-react-16": "1.12.1", "eslint": "^8.56.0", diff --git a/yarn.lock b/yarn.lock index 82e025eb669f..dcc0e2c752c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14960,10 +14960,10 @@ electron-to-chromium@^1.5.73: resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.116.tgz#b779d73cd0cc75305d12ae4f061d7f7bcee4c761" integrity sha512-mufxTCJzLBQVvSdZzX1s5YAuXsN1M4tTyYxOOL1TcSKtIzQ9rjIrm7yFK80rN5dwGTePgdoABDSHpuVtRQh0Zw== -electron@33.2.1: - version "33.2.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-33.2.1.tgz#d0d7bba7a7abf4f14881d0a6e03c498b301a2d5f" - integrity sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg== +electron@34.3.3: + version "34.3.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-34.3.3.tgz#2979329d182a195756bfbf6e5687a835cd65a2ec" + integrity sha512-7m1FiO1mwc1K/UqqnnkG7Ik/kAngDzmLfHwcl+xaWgCQ+Sts9rlEqzOh6g1GHhDqebrbs4bO/aU+NDi32fCciQ== dependencies: "@electron/get" "^2.0.0" "@types/node" "^20.9.0" From 10da1b88c94598d7f8851eae5a869404138071a1 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 14 May 2025 13:13:04 -0400 Subject: [PATCH 15/22] ts issue, update to use binary workflow for e35, update ancillary deps --- .circleci/workflows.yml | 12 +- package.json | 2 +- .../src/actions/ElectronActions.ts | 2 +- packages/electron/package.json | 2 +- packages/server/package.json | 2 +- .../binary/trigger-publish-binary-pipeline.js | 2 +- tooling/electron-mksnapshot/package.json | 2 +- yarn.lock | 281 +++++++++++++----- 8 files changed, 211 insertions(+), 94 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 7ba3c071803c..44fb55831aaf 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -38,7 +38,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' - - 'electron-34' + - 'electron-35' # usually we don't build Mac app - it takes a long time # but sometimes we want to really confirm we are doing the right thing @@ -49,7 +49,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: [ 'electron-34', << pipeline.git.branch >> ] + - equal: [ 'electron-35', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -60,11 +60,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: - [ - 'ryanm/fix/having-trouble-debugging-your-ci-failures', - << pipeline.git.branch >> - ] + - equal: [ 'electron-35', << pipeline.git.branch >> ] - matches: pattern: /^release\/\d+\.\d+\.\d+$/ value: << pipeline.git.branch >> @@ -626,7 +622,7 @@ commands: apt update && apt install -y docker.io 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 34.3.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 35.3.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 diff --git a/package.json b/package.json index 387e05c9bbbf..b7dbbeb1572c 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "dedent": "^0.7.0", "del": "3.0.0", "detect-port": "^2.1.0", - "electron": "34.3.3", + "electron": "35.3.0", "electron-builder": "^25.1.8", "enzyme-adapter-react-16": "1.12.1", "eslint": "^8.56.0", diff --git a/packages/data-context/src/actions/ElectronActions.ts b/packages/data-context/src/actions/ElectronActions.ts index 8d03ecb43bec..48d845770bc2 100644 --- a/packages/data-context/src/actions/ElectronActions.ts +++ b/packages/data-context/src/actions/ElectronActions.ts @@ -47,7 +47,7 @@ export class ElectronActions { this.electron.browserWindow?.show() if (this.isMac) { - this.ctx.config.electronApp?.dock.show().catch((e) => { + this.ctx.config.electronApp?.dock?.show().catch((e) => { this.ctx.logTraceError(e) }) } else { diff --git a/packages/electron/package.json b/packages/electron/package.json index dc8d22b68f66..19c30978cff8 100644 --- a/packages/electron/package.json +++ b/packages/electron/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@electron/fuses": "1.8.0", - "@electron/packager": "18.3.4", + "@electron/packager": "18.3.6", "execa": "4.1.0", "mocha": "3.5.3", "systeminformation": "5.22.8" diff --git a/packages/server/package.json b/packages/server/package.json index b3a95a697b06..3eee350182d5 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -145,7 +145,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.1", + "@electron/rebuild": "4.0.1", "@ffprobe-installer/ffprobe": "1.1.0", "@packages/config": "0.0.0-development", "@packages/data-context": "0.0.0-development", diff --git a/scripts/binary/trigger-publish-binary-pipeline.js b/scripts/binary/trigger-publish-binary-pipeline.js index b7d7954d5d8c..c9d3b97e7c91 100644 --- a/scripts/binary/trigger-publish-binary-pipeline.js +++ b/scripts/binary/trigger-publish-binary-pipeline.js @@ -16,7 +16,7 @@ const { getNextVersionForBinary } = require('../get-next-version') job_name: process.env.CIRCLE_JOB, triggered_workflow_id: process.env.CIRCLE_WORKFLOW_ID, triggered_job_url: process.env.CIRCLE_BUILD_URL, - branch: 'electron-34', + branch: 'electron-35', should_persist_artifacts: Boolean(process.env.SHOULD_PERSIST_ARTIFACTS), binary_version: nextVersion, }, diff --git a/tooling/electron-mksnapshot/package.json b/tooling/electron-mksnapshot/package.json index 02a9d18ab834..34faefb0df09 100644 --- a/tooling/electron-mksnapshot/package.json +++ b/tooling/electron-mksnapshot/package.json @@ -15,7 +15,7 @@ "watch": "tsc --watch" }, "dependencies": { - "@electron/get": "^3.0.0", + "@electron/get": "^4.0.0", "debug": "^4.3.4", "extract-zip": "^2.0.1", "fs-extra": "^10.0.0", diff --git a/yarn.lock b/yarn.lock index dcc0e2c752c4..767360b28891 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2934,10 +2934,10 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@electron/asar@^3.2.1", "@electron/asar@^3.2.7": - version "3.2.10" - resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.10.tgz#615cf346b734b23cafa4e0603551010bd0e50aa8" - integrity sha512-mvBSwIBUeiRscrCeJE1LwctAriBj65eUDm0Pc11iE5gRwzkmsdbS7FnZ1XUWjpSeQWL1L5g12Fc/SchPM9DUOw== +"@electron/asar@^3.2.13", "@electron/asar@^3.2.7": + version "3.4.1" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.4.1.tgz#4e9196a4b54fba18c56cd8d5cac67c5bdc588065" + integrity sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA== dependencies: commander "^5.0.0" glob "^7.1.6" @@ -2982,20 +2982,20 @@ 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" +"@electron/get@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-4.0.0.tgz#ebb11639ca921b1c1e8fffb52e5e85cde07e022b" + integrity sha512-IT42k1GIg1bhJ5RHXdKR/ExquWdQN6eU7WU6tJMnAYFLbsg0Q98GJ7kEyOONyFqE8p8Pky0hhYfmuo3Go8cxIA== 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" + debug "^4.1.1" + env-paths "^3.0.0" + got "^14.4.5" + graceful-fs "^4.2.11" + progress "^2.0.3" + semver "^7.6.3" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^3.0.0" "@electron/notarize@2.5.0", "@electron/notarize@^2.1.0", "@electron/notarize@^2.5.0": version "2.5.0" @@ -3018,12 +3018,12 @@ minimist "^1.2.6" plist "^3.0.5" -"@electron/packager@18.3.4": - version "18.3.4" - resolved "https://registry.yarnpkg.com/@electron/packager/-/packager-18.3.4.tgz#5f2769b18d5f03eaff270e8e47440758282080c6" - integrity sha512-u/IxB5nelg+areXbSEWJxg1r4z0TcS1D1Dax106PsgwgPtcFvB6jjGxZVLA0WHSrLpkj6qfigHSuVXzxMTH+Qw== +"@electron/packager@18.3.6": + version "18.3.6" + resolved "https://registry.yarnpkg.com/@electron/packager/-/packager-18.3.6.tgz#3596399334866737bc33ab663e90376d7aad89e4" + integrity sha512-1eXHB5t+SQKvUiDpWGpvr90ZSSbXj+isrh3YbjCTjKT4bE4SQrKSBfukEAaBvp67+GXHFtCHjQgN9qSTFIge+Q== dependencies: - "@electron/asar" "^3.2.1" + "@electron/asar" "^3.2.13" "@electron/get" "^3.0.0" "@electron/notarize" "^2.1.0" "@electron/osx-sign" "^1.0.5" @@ -3063,20 +3063,20 @@ tar "^6.0.5" yargs "^17.0.1" -"@electron/rebuild@3.7.1": - version "3.7.1" - resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.7.1.tgz#27ed124f7f1dbed92b222aabe68c0e4a3e6c5cea" - integrity sha512-sKGD+xav4Gh25+LcLY0rjIwcCFTw+f/HU1pB48UVbwxXXRGaXEqIH0AaYKN46dgd/7+6kuiDXzoyAEvx1zCsdw== +"@electron/rebuild@4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-4.0.1.tgz#0620d5bb71a0b8b09a86fb9fa979244e1fcc10bf" + integrity sha512-iMGXb6Ib7H/Q3v+BKZJoETgF9g6KMNZVbsO4b7Dmpgb5qTFqyFTzqW9F3TOSHdybv2vKYKzSS9OiZL+dcJb+1Q== 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" 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" + graceful-fs "^4.2.11" + node-abi "^4.2.0" + node-api-version "^0.2.1" + node-gyp "^11.2.0" ora "^5.1.0" read-binary-file-arch "^1.0.6" semver "^7.3.5" @@ -6472,6 +6472,11 @@ "@angular-devkit/schematics" "18.2.11" jsonc-parser "3.3.1" +"@sec-ant/readable-stream@^0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz#60de891bb126abfdc5410fdc6166aca065f10a0c" + integrity sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg== + "@semantic-release/changelog@6.0.3": version "6.0.3" resolved "https://registry.npmjs.org/@semantic-release/changelog/-/changelog-6.0.3.tgz#6195630ecbeccad174461de727d5f975abc23eeb" @@ -6690,6 +6695,11 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== +"@sindresorhus/is@^7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-7.0.1.tgz#693cd0bfa7fdc71a3386b72088b660fb70851927" + integrity sha512-QWLl2P+rsCJeofkDNIT3WFmb6NrRud1SUYW8dIhXK/46XFV8Q/g7Bsvib0Askb0reRLe+WYPeeE+l5cH7SlkuQ== + "@sindresorhus/merge-streams@^2.1.0": version "2.3.0" resolved "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz#719df7fb41766bc143369eaa0dd56d8dc87c9958" @@ -7409,6 +7419,13 @@ dependencies: defer-to-connect "^2.0.0" +"@szmarczak/http-timer@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-5.0.1.tgz#c7c1bf1141cdd4751b0399c8fc7b8b664cd5be3a" + integrity sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw== + dependencies: + defer-to-connect "^2.0.1" + "@tailwindcss/container-queries@^0.1.1": version "0.1.1" resolved "https://registry.yarnpkg.com/@tailwindcss/container-queries/-/container-queries-0.1.1.tgz#9a759ce2cb8736a4c6a0cb93aeb740573a731974" @@ -7964,10 +7981,10 @@ resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35" integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== -"@types/http-cache-semantics@*": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a" - integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A== +"@types/http-cache-semantics@*", "@types/http-cache-semantics@^4.0.4": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4" + integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA== "@types/http-errors@*": version "2.0.1" @@ -8151,12 +8168,12 @@ dependencies: "@types/node" "*" -"@types/node@*", "@types/node@>=10.0.0", "@types/node@^22.5.5": - version "22.10.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.1.tgz#41ffeee127b8975a05f8c4f83fb89bcb2987d766" - integrity sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ== +"@types/node@*", "@types/node@>=10.0.0", "@types/node@^22.5.5", "@types/node@^22.7.7": + version "22.15.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.18.tgz#2f8240f7e932f571c2d45f555ba0b6c3f7a75963" + integrity sha512-v1DKRfUdyW+jJhZNEI1PYy29S2YRxMV5AOO/x/SjKmW0acCIOqmbj6Haf9eHAhsPmrhlHSxEhv/1WszcLWV4cg== dependencies: - undici-types "~6.20.0" + undici-types "~6.21.0" "@types/node@16.9.1": version "16.9.1" @@ -8175,7 +8192,7 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^20.1.0", "@types/node@^20.16.0", "@types/node@^20.9.0": +"@types/node@^20.1.0", "@types/node@^20.16.0": version "20.16.12" resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.12.tgz#61cc9be049584b472fa31e465aa0ab3c090dac56" integrity sha512-LfPFB0zOeCeCNQV3i+67rcoVvoN5n0NVuR2vLG0O5ySQMgchuZlC4lgz546ZOJyDtj5KIgOxy+lacOimfqZAIA== @@ -11757,6 +11774,24 @@ cacheable-lookup@^5.0.3: resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== +cacheable-lookup@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz#3476a8215d046e5a3202a9209dd13fec1f933a27" + integrity sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w== + +cacheable-request@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-12.0.1.tgz#e6f473b5b76c02e72a0ec2cd44c7cfb7c751d7c5" + integrity sha512-Yo9wGIQUaAfIbk+qY0X4cDQgCosecfBe3V9NSyeY4qPC2SAkbCS4Xj79VP8WOzitpJUZKc/wsRCYF5ariDIwkg== + dependencies: + "@types/http-cache-semantics" "^4.0.4" + get-stream "^9.0.1" + http-cache-semantics "^4.1.1" + keyv "^4.5.4" + mimic-response "^4.0.0" + normalize-url "^8.0.1" + responselike "^3.0.0" + cacheable-request@^2.1.1: version "2.1.4" resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d" @@ -14178,7 +14213,7 @@ defer-to-connect@^1.0.1: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== -defer-to-connect@^2.0.0: +defer-to-connect@^2.0.0, defer-to-connect@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== @@ -14960,13 +14995,13 @@ electron-to-chromium@^1.5.73: resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.116.tgz#b779d73cd0cc75305d12ae4f061d7f7bcee4c761" integrity sha512-mufxTCJzLBQVvSdZzX1s5YAuXsN1M4tTyYxOOL1TcSKtIzQ9rjIrm7yFK80rN5dwGTePgdoABDSHpuVtRQh0Zw== -electron@34.3.3: - version "34.3.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-34.3.3.tgz#2979329d182a195756bfbf6e5687a835cd65a2ec" - integrity sha512-7m1FiO1mwc1K/UqqnnkG7Ik/kAngDzmLfHwcl+xaWgCQ+Sts9rlEqzOh6g1GHhDqebrbs4bO/aU+NDi32fCciQ== +electron@35.3.0: + version "35.3.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-35.3.0.tgz#358a5c017821ec3147748147325c3b4278902a83" + integrity sha512-6dLslJrQYB1qvqVPYRv1PhAA/uytC66nUeiTcq2JXiBzrmTWCHppqtGUjZhvnSRVatBCT5/SFdizdzcBiEiYUg== dependencies: "@electron/get" "^2.0.0" - "@types/node" "^20.9.0" + "@types/node" "^22.7.7" extract-zip "^2.0.1" elegant-spinner@^1.0.1: @@ -15209,6 +15244,11 @@ env-paths@^2.2.0, env-paths@^2.2.1: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== +env-paths@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-3.0.0.tgz#2f1e89c2f6dbd3408e1b1711dd82d62e317f58da" + integrity sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A== + envinfo@7.13.0, envinfo@^7.7.3: version "7.13.0" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.13.0.tgz#81fbb81e5da35d74e814941aeab7c325a606fb31" @@ -17131,6 +17171,11 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= +form-data-encoder@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-4.0.2.tgz#dd286fd5f9049e8ded1d44ce427f5e29185c7c12" + integrity sha512-KQVhvhK8ZkWzxKxOr56CPulAhH3dobtuQ4+hNQ+HekH/Wp5gSOafqRAeTphQUJAIk0GBvHZgJ2ZGRWd5kphMuw== + form-data@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -17600,6 +17645,14 @@ get-stream@^8.0.1: resolved "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2" integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA== +get-stream@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-9.0.1.tgz#95157d21df8eb90d1647102b63039b1df60ebd27" + integrity sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA== + dependencies: + "@sec-ant/readable-stream" "^0.4.1" + is-stream "^4.0.1" + get-symbol-description@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" @@ -17902,7 +17955,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.1.0: +glob@^8.0.1: version "8.1.0" resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== @@ -18126,6 +18179,23 @@ got@^11.7.0, got@^11.8.5: p-cancelable "^2.0.0" responselike "^2.0.0" +got@^14.4.5: + version "14.4.7" + resolved "https://registry.yarnpkg.com/got/-/got-14.4.7.tgz#f23644b9bc16d6f35fafdf410c18116614b922dd" + integrity sha512-DI8zV1231tqiGzOiOzQWDhsBmncFW7oQDH6Zgy6pDPrqJuVZMtoSgPLLsBZQj8Jg4JFfwoOsDA8NGtLQLnIx2g== + dependencies: + "@sindresorhus/is" "^7.0.1" + "@szmarczak/http-timer" "^5.0.1" + cacheable-lookup "^7.0.0" + cacheable-request "^12.0.1" + decompress-response "^6.0.0" + form-data-encoder "^4.0.2" + http2-wrapper "^2.2.1" + lowercase-keys "^3.0.0" + p-cancelable "^4.0.1" + responselike "^3.0.0" + type-fest "^4.26.1" + got@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937" @@ -18947,6 +19017,14 @@ http2-wrapper@^1.0.0-beta.5.2: quick-lru "^5.1.1" resolve-alpn "^1.0.0" +http2-wrapper@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-2.2.1.tgz#310968153dcdedb160d8b72114363ef5fce1f64a" + integrity sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.2.0" + https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" @@ -19989,6 +20067,11 @@ is-stream@^3.0.0: resolved "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== +is-stream@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-4.0.1.tgz#375cf891e16d2e4baec250b85926cffc14720d9b" + integrity sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A== + is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" @@ -20772,10 +20855,10 @@ keyv@3.0.0, keyv@^3.0.0: dependencies: json-buffer "3.0.0" -keyv@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.0.3.tgz#4f3aa98de254803cafcd2896734108daa35e4254" - integrity sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA== +keyv@^4.0.0, keyv@^4.5.4: + version "4.5.4" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" + integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== dependencies: json-buffer "3.0.1" @@ -21863,6 +21946,11 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== +lowercase-keys@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2" + integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ== + lru-cache@^10.0.0, lru-cache@^10.0.1, lru-cache@^10.2.0, lru-cache@^10.2.2: version "10.4.3" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" @@ -21972,7 +22060,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.2.1: +make-fetch-happen@^10.0.3: 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== @@ -22012,10 +22100,10 @@ make-fetch-happen@^13.0.0, make-fetch-happen@^13.0.1: promise-retry "^2.0.1" ssri "^10.0.0" -make-fetch-happen@^14.0.0, make-fetch-happen@^14.0.1: - version "14.0.2" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-14.0.2.tgz#c7c79fa7e6f97856cb883fe96f01e02639ed425f" - integrity sha512-ByhSXJdWoBKRHKaqfmULjm4RwlL3EN9bZogHPDIuT9GHJIqHgh8FYkxpcCMsvaNTwl2VzFFYgzrGMlGsOEtGPQ== +make-fetch-happen@^14.0.0, make-fetch-happen@^14.0.1, make-fetch-happen@^14.0.3: + version "14.0.3" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz#d74c3ecb0028f08ab604011e0bc6baed483fcdcd" + integrity sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ== dependencies: "@npmcli/agent" "^3.0.0" cacache "^19.0.1" @@ -22024,7 +22112,7 @@ make-fetch-happen@^14.0.0, make-fetch-happen@^14.0.1: minipass-fetch "^4.0.0" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" - negotiator "^0.6.3" + negotiator "^1.0.0" proc-log "^5.0.0" promise-retry "^2.0.1" ssri "^12.0.0" @@ -22414,6 +22502,11 @@ mimic-response@^3.1.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== +mimic-response@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-4.0.0.tgz#35468b19e7c75d10f5165ea25e75a5ceea7cf70f" + integrity sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg== + min-document@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" @@ -23397,6 +23490,11 @@ negotiator@^0.6.3, negotiator@~0.6.4: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7" integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w== +negotiator@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a" + integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg== + neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" @@ -23516,7 +23614,7 @@ nock@13.2.9: lodash "^4.17.21" propagate "^2.0.0" -node-abi@3.74.0, node-abi@^2.7.0, node-abi@^3.3.0, node-abi@^3.45.0: +node-abi@3.74.0, node-abi@^2.7.0, node-abi@^3.3.0, node-abi@^3.45.0, node-abi@^4.2.0: version "3.74.0" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.74.0.tgz#5bfb4424264eaeb91432d2adb9da23c63a301ed0" integrity sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w== @@ -23538,10 +23636,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.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== +node-api-version@^0.2.0, node-api-version@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.2.1.tgz#19bad54f6d65628cbee4e607a325e4488ace2de9" + integrity sha512-2xP/IGGMmmSQpI1+O/k72jF/ykvZ89JeuKX3TLJAYPDVLUalrshrLHkeVcCCZqG/eEa635cr8IBYzgnDvM2O8Q== dependencies: semver "^7.3.5" @@ -23650,6 +23748,22 @@ node-gyp@^10.0.0, node-gyp@^10.1.0: tar "^6.2.1" which "^4.0.0" +node-gyp@^11.2.0: + version "11.2.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-11.2.0.tgz#fe2ee7f0511424d6ad70f7a0c88d7346f2fc6a6e" + integrity sha512-T0S1zqskVUSxcsSTkAsLc7xCycrRYmtDHadDinzocrThjyQCn5kMlEBSj6H4qDbgsIOSLmmlRIeb0lZXj+UArA== + dependencies: + env-paths "^2.2.0" + exponential-backoff "^3.1.1" + graceful-fs "^4.2.6" + make-fetch-happen "^14.0.3" + nopt "^8.0.0" + proc-log "^5.0.0" + semver "^7.3.5" + tar "^7.4.3" + tinyglobby "^0.2.12" + which "^5.0.0" + node-gyp@^9.0.0: version "9.4.1" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185" @@ -23844,7 +23958,7 @@ normalize-url@^6.0.1: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== -normalize-url@^8.0.0: +normalize-url@^8.0.0, normalize-url@^8.0.1: version "8.0.1" resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz#9b7d96af9836577c58f5883e939365fa15623a4a" integrity sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w== @@ -24696,6 +24810,11 @@ p-cancelable@^2.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e" integrity sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg== +p-cancelable@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-4.0.1.tgz#2d1edf1ab8616b72c73db41c4bc9ecdd10af640e" + integrity sha512-wBowNApzd45EIKdO1LaU+LrMBwAcjfPaYtVzV3lmfM3gf8Z4CHZsiIqlM8TZZ8okYvh5A1cP6gTfCRQtwUpaUg== + p-defer@3.0.0, p-defer@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83" @@ -26050,11 +26169,6 @@ prismjs@1.27.0: resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057" integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA== -proc-log@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685" - integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw== - proc-log@^4.0.0, proc-log@^4.1.0, proc-log@^4.2.0: version "4.2.0" resolved "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" @@ -27388,10 +27502,10 @@ resize-img@^1.1.0: jpeg-js "^0.1.1" parse-png "^1.1.1" -resolve-alpn@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.0.0.tgz#745ad60b3d6aff4b4a48e01b8c0bdc70959e0e8c" - integrity sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA== +resolve-alpn@^1.0.0, resolve-alpn@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" + integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== resolve-cwd@^3.0.0: version "3.0.0" @@ -27509,6 +27623,13 @@ responselike@^2.0.0: dependencies: lowercase-keys "^2.0.0" +responselike@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-3.0.0.tgz#20decb6c298aff0dbee1c355ca95461d42823626" + integrity sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg== + dependencies: + lowercase-keys "^3.0.0" + restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" @@ -31016,10 +31137,10 @@ type-fest@^2.12.2, type-fest@^2.13.0, type-fest@^2.3.4: resolved "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== -type-fest@^4.6.0, type-fest@^4.7.1: - version "4.25.0" - resolved "https://registry.npmjs.org/type-fest/-/type-fest-4.25.0.tgz#b190374f969631866889bbdb01ece17ca424ee60" - integrity sha512-bRkIGlXsnGBRBQRAY56UXBm//9qH4bmJfFvq83gSz41N282df+fjy8ofcEgc1sM8geNt5cl6mC2g9Fht1cs8Aw== +type-fest@^4.26.1, type-fest@^4.6.0, type-fest@^4.7.1: + version "4.41.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.41.0.tgz#6ae1c8e5731273c2bf1f58ad39cbae2c91a46c58" + integrity sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA== type-is@^1.6.4, type-is@~1.6.18: version "1.6.18" @@ -31229,10 +31350,10 @@ undici-types@~6.19.2: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== -undici-types@~6.20.0: - version "6.20.0" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433" - integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg== +undici-types@~6.21.0: + version "6.21.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" + integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== undici@^6.20.1: version "6.21.0" From b6ea969f022d7207046a451b9a8e0ea51e80f7ed Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 14 May 2025 13:14:59 -0400 Subject: [PATCH 16/22] update gh issue templates --- .github/ISSUE_TEMPLATE/1-bug-report.yml | 2 +- .github/ISSUE_TEMPLATE/2-memory-issue.yml | 2 +- .github/ISSUE_TEMPLATE/3-install-issue.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yml b/.github/ISSUE_TEMPLATE/1-bug-report.yml index a6406fe80c63..b80e0dfd2796 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. v20.18.3 + placeholder: ex. v22.14.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 22cacb13f9b9..89983fb9eca8 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. v20.18.3 + placeholder: ex. v22.14.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 1301c34737bd..9349700f205c 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. v20.18.3 + placeholder: ex. v22.14.0 validations: required: true - type: dropdown From b20755a0774d20c22bba6287770893b6fa833c5d Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 14 May 2025 13:35:06 -0400 Subject: [PATCH 17/22] bump missed image names and engines field --- .circleci/workflows.yml | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 7e26a4f18473..697536541221 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -92,7 +92,7 @@ executors: # the Docker image with Cypress dependencies and Chrome browser cy-doc: docker: - - image: cypress/base-internal:20.18.3-bullseye + - image: cypress/base-internal:22.14.0-bullseye # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -100,7 +100,7 @@ executors: kitchensink-executor: docker: - - image: cypress/base-internal:20.18.3-bullseye + - image: cypress/base-internal:22.14.0-bullseye # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -109,7 +109,7 @@ executors: # Docker image with non-root "node" user non-root-docker-user: docker: - - image: cypress/base-internal:20.18.3-bullseye + - image: cypress/base-internal:22.14.0-bullseye user: node environment: PLATFORM: linux @@ -1875,7 +1875,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:20.18.3-yarn-berry + - image: cypress/base-internal:22.14.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 @@ -1909,7 +1909,7 @@ jobs: parallelism: 1 working_directory: ~/cypress docker: - - image: cypress/base-internal:20.18.3-bullseye + - image: cypress/base-internal:22.14.0-bullseye environment: # needed to inform the bootstrap-docker-container.sh script to link the binary in the system-test project directory REPO_DIR: /root/cypress @@ -2563,7 +2563,7 @@ jobs: <<: *defaults resource_class: small docker: - - image: cypress/base-internal:18.17.1 + - image: cypress/base-internal:22.14.0 steps: - maybe_skip_binary_jobs - restore_workspace_binaries diff --git a/package.json b/package.json index a763fd92addf..92c2511b4989 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "yarn-deduplicate": "3.1.0" }, "engines": { - "node": ">=20.18.3", + "node": ">=22.14.0", "yarn": ">=1.22.22" }, "productName": "Cypress", From c08c26d1e0d517d0385212601e707a6f8df3afd4 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 14 May 2025 13:45:18 -0400 Subject: [PATCH 18/22] node 22 --- .node-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.node-version b/.node-version index 87bc4c77fe13..7d41c735d712 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -20.18.3 +22.14.0 From f623a2c19f8c19d0e39c3dfa6f215141728c59b1 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 14 May 2025 14:23:23 -0400 Subject: [PATCH 19/22] snapgen? --- .circleci/workflows.yml | 2 +- .../cache/darwin/snapshot-meta.json | 130 +++++++++++------- 2 files changed, 84 insertions(+), 48 deletions(-) diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml index 697536541221..262d4af695b7 100644 --- a/.circleci/workflows.yml +++ b/.circleci/workflows.yml @@ -248,7 +248,7 @@ commands: command: | source ./scripts/ensure-node.sh # Minification takes some time. We only really need to do that for the binary (and we regenerate snapshots separately there) - V8_UPDATE_METAFILE=1 V8_SNAPSHOT_DISABLE_MINIFY=1 yarn build-v8-snapshot-prod + V8_UPDATE_METAFILE=1 V8_SNAPSHOT_DISABLE_MINIFY=1 DEBUG=cypress:snapgen* yarn build-v8-snapshot-prod - prepare-modules-cache # So we don't throw these in the workspace cache - persist_to_workspace: root: ~/ diff --git a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json index 284e835e5c60..fc65dfed670d 100644 --- a/tooling/v8-snapshot/cache/darwin/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/darwin/snapshot-meta.json @@ -7,6 +7,7 @@ "./node_modules/@babel/traverse/lib/path/introspection.js", "./node_modules/@babel/traverse/lib/path/lib/virtual-types-validator.js", "./node_modules/@babel/types/lib/definitions/index.js", + "./node_modules/@colors/colors/lib/system/supports-colors.js", "./node_modules/@cspotcode/source-map-support/source-map-support.js", "./node_modules/@cypress/commit-info/node_modules/debug/src/node.js", "./node_modules/@cypress/commit-info/node_modules/get-stream/buffer-stream.js", @@ -16,7 +17,6 @@ "./node_modules/chrome-remote-interface/node_modules/ws/lib/websocket.js", "./node_modules/ci-info/index.js", "./node_modules/coffeescript/lib/coffeescript/helpers.js", - "./node_modules/colors/lib/system/supports-colors.js", "./node_modules/compression/node_modules/debug/src/node.js", "./node_modules/debug/src/node.js", "./node_modules/evil-dns/evil-dns.js", @@ -31,6 +31,7 @@ "./node_modules/jose/dist/node/cjs/runtime/verify.js", "./node_modules/jsonfile/index.js", "./node_modules/lockfile/lockfile.js", + "./node_modules/make-dir/index.js", "./node_modules/minimatch/minimatch.js", "./node_modules/mocha-7.2.0/node_modules/debug/src/node.js", "./node_modules/mocha-7.2.0/node_modules/glob/node_modules/minimatch/minimatch.js", @@ -45,10 +46,12 @@ "./node_modules/prettier/third-party.js", "./node_modules/process-nextick-args/index.js", "./node_modules/react-docgen/dist/FileState.js", + "./node_modules/run-applescript/node_modules/get-stream/buffer-stream.js", "./node_modules/send/node_modules/debug/src/node.js", "./node_modules/shell-env/node_modules/get-stream/buffer-stream.js", "./node_modules/signal-exit/index.js", "./node_modules/stream-parser/node_modules/debug/src/node.js", + "./node_modules/trash/node_modules/make-dir/index.js", "./node_modules/ws/lib/websocket.js", "./packages/data-context/node_modules/get-stream/buffer-stream.js", "./packages/https-proxy/lib/ca.js", @@ -151,6 +154,8 @@ "./node_modules/@babel/types/lib/modifications/appendToMemberExpression.js", "./node_modules/@babel/types/lib/modifications/prependToMemberExpression.js", "./node_modules/@babel/types/lib/utils/react/cleanJSXElementLiteralChild.js", + "./node_modules/@colors/colors/lib/colors.js", + "./node_modules/@colors/colors/safe.js", "./node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping/dist/trace-mapping.umd.js", "./node_modules/@cypress/commit-info/node_modules/debug/src/browser.js", "./node_modules/@cypress/commit-info/node_modules/debug/src/index.js", @@ -205,9 +210,6 @@ "./node_modules/@opentelemetry/resources/build/src/platform/node/index.js", "./node_modules/@opentelemetry/resources/build/src/platform/node/machine-id/getMachineId.js", "./node_modules/@opentelemetry/sdk-trace-base/build/src/config.js", - "./node_modules/@sindresorhus/df/index.js", - "./node_modules/@stroncium/procfs/index.js", - "./node_modules/@stroncium/procfs/lib/utils.js", "./node_modules/adm-zip/adm-zip.js", "./node_modules/adm-zip/methods/zipcrypto.js", "./node_modules/adm-zip/util/fattr.js", @@ -220,25 +222,26 @@ "./node_modules/black-hole-stream/index.js", "./node_modules/buffer-from/index.js", "./node_modules/chalk/index.js", - "./node_modules/chownr/chownr.js", "./node_modules/chrome-remote-interface/index.js", "./node_modules/chrome-remote-interface/lib/chrome.js", "./node_modules/chrome-remote-interface/node_modules/ws/index.js", "./node_modules/chrome-remote-interface/node_modules/ws/lib/constants.js", "./node_modules/chrome-remote-interface/node_modules/ws/lib/receiver.js", "./node_modules/chrome-remote-interface/node_modules/ws/lib/websocket-server.js", - "./node_modules/clean-stack/index.js", "./node_modules/coffeescript/lib/coffeescript/coffeescript.js", "./node_modules/coffeescript/lib/coffeescript/index.js", "./node_modules/coffeescript/lib/coffeescript/nodes.js", "./node_modules/coffeescript/lib/coffeescript/register.js", - "./node_modules/colors/lib/colors.js", - "./node_modules/colors/safe.js", "./node_modules/combined-stream/lib/combined_stream.js", "./node_modules/compression/index.js", "./node_modules/compression/node_modules/debug/src/browser.js", "./node_modules/compression/node_modules/debug/src/index.js", "./node_modules/concat-stream/index.js", + "./node_modules/cp-file/cp-file-error.js", + "./node_modules/cp-file/fs.js", + "./node_modules/cp-file/progress-emitter.js", + "./node_modules/cross-spawn-async/lib/parse.js", + "./node_modules/cross-spawn-async/lib/resolveCommand.js", "./node_modules/debug/src/browser.js", "./node_modules/debug/src/index.js", "./node_modules/default-shell/index.js", @@ -327,6 +330,7 @@ "./node_modules/json3/lib/json3.js", "./node_modules/lodash/isBuffer.js", "./node_modules/lodash/lodash.js", + "./node_modules/make-dir/node_modules/semver/semver.js", "./node_modules/methods/index.js", "./node_modules/mime/mime.js", "./node_modules/minizlib/constants.js", @@ -382,6 +386,8 @@ "./node_modules/morgan/node_modules/debug/src/browser.js", "./node_modules/morgan/node_modules/debug/src/index.js", "./node_modules/morgan/node_modules/depd/index.js", + "./node_modules/move-file/node_modules/semver/semver.js", + "./node_modules/nested-error-stacks/index.js", "./node_modules/nexus/dist/core.js", "./node_modules/nexus/dist/definitions/list.js", "./node_modules/nexus/dist/definitions/nexusMeta.js", @@ -450,6 +456,7 @@ "./node_modules/picomatch/lib/picomatch.js", "./node_modules/pidusage/lib/stats.js", "./node_modules/pinkie/index.js", + "./node_modules/pseudomap/map.js", "./node_modules/pumpify/index.js", "./node_modules/queue/index.js", "./node_modules/randomstring/node_modules/randombytes/index.js", @@ -490,6 +497,8 @@ "./node_modules/resolve/lib/async.js", "./node_modules/resolve/lib/homedir.js", "./node_modules/resolve/lib/sync.js", + "./node_modules/run-applescript/node_modules/execa/lib/errname.js", + "./node_modules/run-applescript/node_modules/semver/semver.js", "./node_modules/safe-buffer/index.js", "./node_modules/safer-buffer/safer.js", "./node_modules/sax/lib/sax.js", @@ -537,7 +546,6 @@ "./node_modules/trash/node_modules/glob/glob.js", "./node_modules/trash/node_modules/glob/sync.js", "./node_modules/trash/node_modules/ignore/ignore.js", - "./node_modules/trash/node_modules/semver/semver.js", "./node_modules/truncate-utf8-bytes/index.js", "./node_modules/ts-node/dist-raw/node-internal-modules-cjs-helpers.js", "./node_modules/ts-node/dist-raw/node-internal-modules-cjs-loader.js", @@ -763,6 +771,7 @@ "./packages/server/node_modules/body-parser/index.js", "./packages/server/node_modules/body-parser/node_modules/debug/src/browser.js", "./packages/server/node_modules/body-parser/node_modules/debug/src/index.js", + "./packages/server/node_modules/chownr/chownr.js", "./packages/server/node_modules/cross-fetch/node_modules/node-fetch/lib/index.js", "./packages/server/node_modules/cross-spawn/node_modules/semver/semver.js", "./packages/server/node_modules/duplexify/index.js", @@ -1020,6 +1029,14 @@ "./node_modules/@babel/types/lib/validators/react/isCompatTag.js", "./node_modules/@babel/types/lib/validators/react/isReactComponent.js", "./node_modules/@babel/types/lib/validators/validate.js", + "./node_modules/@colors/colors/lib/custom/trap.js", + "./node_modules/@colors/colors/lib/custom/zalgo.js", + "./node_modules/@colors/colors/lib/maps/america.js", + "./node_modules/@colors/colors/lib/maps/rainbow.js", + "./node_modules/@colors/colors/lib/maps/random.js", + "./node_modules/@colors/colors/lib/maps/zebra.js", + "./node_modules/@colors/colors/lib/styles.js", + "./node_modules/@colors/colors/lib/system/has-flag.js", "./node_modules/@cypress/commit-info/node_modules/cross-spawn/index.js", "./node_modules/@cypress/commit-info/node_modules/cross-spawn/lib/enoent.js", "./node_modules/@cypress/commit-info/node_modules/cross-spawn/lib/parse.js", @@ -1037,6 +1054,8 @@ "./node_modules/@cypress/commit-info/src/index.js", "./node_modules/@cypress/commit-info/src/utils.js", "./node_modules/@cypress/get-windows-proxy/node_modules/debug/src/common.js", + "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/index.js", + "./node_modules/@cypress/get-windows-proxy/node_modules/registry-js/dist/lib/registry.js", "./node_modules/@cypress/get-windows-proxy/src/index.js", "./node_modules/@cypress/parse-domain/build/tries/icann.complete.json", "./node_modules/@cypress/parse-domain/build/tries/private.complete.json", @@ -1404,17 +1423,9 @@ "./node_modules/@opentelemetry/semantic-conventions/build/src/resource/index.js", "./node_modules/@opentelemetry/semantic-conventions/build/src/trace/SemanticAttributes.js", "./node_modules/@opentelemetry/semantic-conventions/build/src/trace/index.js", + "./node_modules/@sindresorhus/df/index.js", "./node_modules/@sindresorhus/df/node_modules/execa/index.js", - "./node_modules/@sindresorhus/df/node_modules/execa/lib/command.js", - "./node_modules/@sindresorhus/df/node_modules/execa/lib/error.js", - "./node_modules/@sindresorhus/df/node_modules/execa/lib/kill.js", - "./node_modules/@sindresorhus/df/node_modules/execa/lib/promise.js", - "./node_modules/@sindresorhus/df/node_modules/execa/lib/stdio.js", - "./node_modules/@sindresorhus/df/node_modules/execa/lib/stream.js", "./node_modules/@sindresorhus/df/node_modules/npm-run-path/index.js", - "./node_modules/@sindresorhus/df/node_modules/p-finally/index.js", - "./node_modules/@stroncium/procfs/lib/parsers.js", - "./node_modules/@stroncium/procfs/lib/procfs-error.js", "./node_modules/@tsconfig/node10/tsconfig.json", "./node_modules/@tsconfig/node12/tsconfig.json", "./node_modules/@tsconfig/node14/tsconfig.json", @@ -1459,7 +1470,6 @@ "./node_modules/adm-zip/util/fileSystem.js", "./node_modules/adm-zip/zipEntry.js", "./node_modules/adm-zip/zipFile.js", - "./node_modules/aggregate-error/index.js", "./node_modules/ansi-regex/index.js", "./node_modules/ansi-styles/index.js", "./node_modules/ansi_up/ansi_up.js", @@ -1521,19 +1531,6 @@ "./node_modules/base64url/index.js", "./node_modules/basic-auth/index.js", "./node_modules/bcrypt-pbkdf/index.js", - "./node_modules/better-sqlite3/lib/database.js", - "./node_modules/better-sqlite3/lib/index.js", - "./node_modules/better-sqlite3/lib/methods/aggregate.js", - "./node_modules/better-sqlite3/lib/methods/backup.js", - "./node_modules/better-sqlite3/lib/methods/function.js", - "./node_modules/better-sqlite3/lib/methods/inspect.js", - "./node_modules/better-sqlite3/lib/methods/pragma.js", - "./node_modules/better-sqlite3/lib/methods/serialize.js", - "./node_modules/better-sqlite3/lib/methods/table.js", - "./node_modules/better-sqlite3/lib/methods/transaction.js", - "./node_modules/better-sqlite3/lib/methods/wrappers.js", - "./node_modules/better-sqlite3/lib/sqlite-error.js", - "./node_modules/better-sqlite3/lib/util.js", "./node_modules/binary-extensions/binary-extensions.json", "./node_modules/binary-extensions/index.js", "./node_modules/binaryextensions/edition-es5/index.js", @@ -1594,6 +1591,7 @@ "./node_modules/ci-info/vendors.json", "./node_modules/cli-table3/index.js", "./node_modules/cli-table3/src/cell.js", + "./node_modules/cli-table3/src/debug.js", "./node_modules/cli-table3/src/layout-manager.js", "./node_modules/cli-table3/src/table.js", "./node_modules/cli-table3/src/utils.js", @@ -1609,14 +1607,6 @@ "./node_modules/color-convert/route.js", "./node_modules/color-name/index.js", "./node_modules/color-string/index.js", - "./node_modules/colors/lib/custom/trap.js", - "./node_modules/colors/lib/custom/zalgo.js", - "./node_modules/colors/lib/maps/america.js", - "./node_modules/colors/lib/maps/rainbow.js", - "./node_modules/colors/lib/maps/random.js", - "./node_modules/colors/lib/maps/zebra.js", - "./node_modules/colors/lib/styles.js", - "./node_modules/colors/lib/system/has-flag.js", "./node_modules/command-exists/index.js", "./node_modules/command-exists/lib/command-exists.js", "./node_modules/common-path-prefix/index.js", @@ -1682,13 +1672,20 @@ "./node_modules/cookie/index.js", "./node_modules/core-util-is/lib/util.js", "./node_modules/cors/lib/index.js", + "./node_modules/cp-file/index.js", + "./node_modules/cp-file/node_modules/pify/index.js", "./node_modules/create-require/create-require.js", + "./node_modules/cross-spawn-async/index.js", + "./node_modules/cross-spawn-async/lib/enoent.js", + "./node_modules/cross-spawn-async/node_modules/lru-cache/index.js", + "./node_modules/cross-spawn-async/node_modules/yallist/yallist.js", "./node_modules/cross-spawn/index.js", "./node_modules/cross-spawn/lib/enoent.js", "./node_modules/cross-spawn/lib/parse.js", "./node_modules/cross-spawn/lib/util/escape.js", "./node_modules/cross-spawn/lib/util/readShebang.js", "./node_modules/cross-spawn/lib/util/resolveCommand.js", + "./node_modules/cross-spawn/node_modules/path-key/index.js", "./node_modules/cross-spawn/node_modules/shebang-command/index.js", "./node_modules/cross-spawn/node_modules/shebang-regex/index.js", "./node_modules/cross-spawn/node_modules/which/which.js", @@ -1767,6 +1764,7 @@ "./node_modules/es-object-atoms/index.js", "./node_modules/escape-goat/index.js", "./node_modules/escape-html/index.js", + "./node_modules/escape-string-applescript/index.js", "./node_modules/escape-string-regexp/index.js", "./node_modules/esprima/dist/esprima.js", "./node_modules/esutils/lib/ast.js", @@ -2171,11 +2169,9 @@ "./node_modules/image-size/dist/types/tga.js", "./node_modules/image-size/dist/types/tiff.js", "./node_modules/image-size/dist/types/webp.js", - "./node_modules/indent-string/index.js", "./node_modules/inflight/inflight.js", "./node_modules/inherits/inherits.js", "./node_modules/inherits/inherits_browser.js", - "./node_modules/ipaddr.js/lib/ipaddr.js", "./node_modules/is-binary-path/index.js", "./node_modules/is-buffer/index.js", "./node_modules/is-core-module/core.json", @@ -2187,7 +2183,6 @@ "./node_modules/is-glob/index.js", "./node_modules/is-html/index.js", "./node_modules/is-obj/index.js", - "./node_modules/is-path-inside/index.js", "./node_modules/is-plain-obj/index.js", "./node_modules/is-regexp/index.js", "./node_modules/is-stream/index.js", @@ -2427,6 +2422,7 @@ "./node_modules/lodash/toInteger.js", "./node_modules/lodash/toNumber.js", "./node_modules/lodash/toString.js", + "./node_modules/make-dir/node_modules/pify/index.js", "./node_modules/make-error/index.js", "./node_modules/math-intrinsics/abs.js", "./node_modules/math-intrinsics/floor.js", @@ -2539,6 +2535,7 @@ "./node_modules/mount-point/index.js", "./node_modules/mount-point/node_modules/@sindresorhus/df/index.js", "./node_modules/move-file/index.js", + "./node_modules/move-file/node_modules/make-dir/index.js", "./node_modules/ms/index.js", "./node_modules/negotiator/index.js", "./node_modules/negotiator/lib/charset.js", @@ -2599,6 +2596,7 @@ "./node_modules/node-releases/data/release-schedule/release-schedule.json", "./node_modules/normalize-path/index.js", "./node_modules/npm-run-path/index.js", + "./node_modules/npm-run-path/node_modules/path-key/index.js", "./node_modules/object-assign/index.js", "./node_modules/object-keys/implementation.js", "./node_modules/object-keys/index.js", @@ -2613,8 +2611,8 @@ "./node_modules/p-defer/index.js", "./node_modules/p-finally/index.js", "./node_modules/p-limit/index.js", - "./node_modules/p-map/index.js", "./node_modules/p-timeout/index.js", + "./node_modules/p-try/index.js", "./node_modules/pako/index.js", "./node_modules/pako/lib/deflate.js", "./node_modules/pako/lib/inflate.js", @@ -2644,6 +2642,7 @@ "./node_modules/parseurl/index.js", "./node_modules/path-exists/index.js", "./node_modules/path-is-absolute/index.js", + "./node_modules/path-is-inside/lib/path-is-inside.js", "./node_modules/path-key/index.js", "./node_modules/path-parse/index.js", "./node_modules/path-root-regex/index.js", @@ -2716,7 +2715,9 @@ "./node_modules/prettier/parser-yaml.js", "./node_modules/pretty-bytes/index.js", "./node_modules/proxy-addr/index.js", + "./node_modules/proxy-addr/node_modules/ipaddr.js/lib/ipaddr.js", "./node_modules/proxy-from-env/index.js", + "./node_modules/pseudomap/pseudomap.js", "./node_modules/psl/data/rules.json", "./node_modules/psl/index.js", "./node_modules/pump/index.js", @@ -3169,6 +3170,8 @@ "./node_modules/recast/parsers/babel.js", "./node_modules/recast/parsers/esprima.js", "./node_modules/recast/parsers/typescript.js", + "./node_modules/registry-js/dist/lib/index.js", + "./node_modules/registry-js/dist/lib/registry.js", "./node_modules/request-promise-core/configure/request2.js", "./node_modules/request-promise-core/errors.js", "./node_modules/request-promise-core/lib/errors.js", @@ -3193,6 +3196,19 @@ "./node_modules/ret/lib/util.js", "./node_modules/return-deep-diff/dist/return-deep-diff.min.js", "./node_modules/reusify/reusify.js", + "./node_modules/run-applescript/index.js", + "./node_modules/run-applescript/node_modules/cross-spawn/index.js", + "./node_modules/run-applescript/node_modules/cross-spawn/lib/enoent.js", + "./node_modules/run-applescript/node_modules/cross-spawn/lib/parse.js", + "./node_modules/run-applescript/node_modules/cross-spawn/lib/util/escape.js", + "./node_modules/run-applescript/node_modules/cross-spawn/lib/util/readShebang.js", + "./node_modules/run-applescript/node_modules/cross-spawn/lib/util/resolveCommand.js", + "./node_modules/run-applescript/node_modules/execa/index.js", + "./node_modules/run-applescript/node_modules/execa/lib/stdio.js", + "./node_modules/run-applescript/node_modules/get-stream/index.js", + "./node_modules/run-applescript/node_modules/is-stream/index.js", + "./node_modules/run-applescript/node_modules/npm-run-path/index.js", + "./node_modules/run-applescript/node_modules/path-key/index.js", "./node_modules/run-parallel/index.js", "./node_modules/sanitize-filename/index.js", "./node_modules/semver/classes/comparator.js", @@ -3341,7 +3357,6 @@ "./node_modules/toidentifier/index.js", "./node_modules/token-types/lib/index.js", "./node_modules/trash/index.js", - "./node_modules/trash/lib/chunked-exec.js", "./node_modules/trash/lib/linux.js", "./node_modules/trash/lib/macos.js", "./node_modules/trash/lib/windows.js", @@ -3350,10 +3365,16 @@ "./node_modules/trash/node_modules/glob/common.js", "./node_modules/trash/node_modules/globby/gitignore.js", "./node_modules/trash/node_modules/globby/index.js", - "./node_modules/trash/node_modules/make-dir/index.js", + "./node_modules/trash/node_modules/is-path-inside/index.js", + "./node_modules/trash/node_modules/p-map/index.js", "./node_modules/trash/node_modules/path-type/index.js", "./node_modules/trash/node_modules/pify/index.js", "./node_modules/trash/node_modules/slash/index.js", + "./node_modules/trash/node_modules/uuid/index.js", + "./node_modules/trash/node_modules/uuid/lib/bytesToUuid.js", + "./node_modules/trash/node_modules/uuid/lib/rng.js", + "./node_modules/trash/node_modules/uuid/v1.js", + "./node_modules/trash/node_modules/uuid/v4.js", "./node_modules/truncate-utf8-bytes/lib/truncate.js", "./node_modules/ts-node/dist-raw/node-internal-constants.js", "./node_modules/ts-node/dist-raw/node-internal-errors.js", @@ -3462,6 +3483,7 @@ "./node_modules/universalify/index.js", "./node_modules/unpipe/index.js", "./node_modules/unused-filename/index.js", + "./node_modules/unused-filename/node_modules/path-exists/index.js", "./node_modules/url-parse/index.js", "./node_modules/utf8-stream/index.js", "./node_modules/utf8-stream/node_modules/isarray/index.js", @@ -3805,6 +3827,7 @@ "./packages/scaffold-config/node_modules/find-up/index.js", "./packages/scaffold-config/node_modules/locate-path/index.js", "./packages/scaffold-config/node_modules/p-locate/index.js", + "./packages/scaffold-config/node_modules/path-exists/index.js", "./packages/scaffold-config/src/commandFile.ts", "./packages/scaffold-config/src/component-index-template.ts", "./packages/scaffold-config/src/ct-detect-third-party.ts", @@ -3987,6 +4010,19 @@ "./packages/server/node_modules/axios/lib/platform/index.js", "./packages/server/node_modules/axios/lib/platform/node/classes/FormData.js", "./packages/server/node_modules/axios/lib/platform/node/classes/URLSearchParams.js", + "./packages/server/node_modules/better-sqlite3/lib/database.js", + "./packages/server/node_modules/better-sqlite3/lib/index.js", + "./packages/server/node_modules/better-sqlite3/lib/methods/aggregate.js", + "./packages/server/node_modules/better-sqlite3/lib/methods/backup.js", + "./packages/server/node_modules/better-sqlite3/lib/methods/function.js", + "./packages/server/node_modules/better-sqlite3/lib/methods/inspect.js", + "./packages/server/node_modules/better-sqlite3/lib/methods/pragma.js", + "./packages/server/node_modules/better-sqlite3/lib/methods/serialize.js", + "./packages/server/node_modules/better-sqlite3/lib/methods/table.js", + "./packages/server/node_modules/better-sqlite3/lib/methods/transaction.js", + "./packages/server/node_modules/better-sqlite3/lib/methods/wrappers.js", + "./packages/server/node_modules/better-sqlite3/lib/sqlite-error.js", + "./packages/server/node_modules/better-sqlite3/lib/util.js", "./packages/server/node_modules/body-parser/lib/read.js", "./packages/server/node_modules/body-parser/lib/types/json.js", "./packages/server/node_modules/body-parser/lib/types/raw.js", @@ -4169,5 +4205,5 @@ "./tooling/v8-snapshot/cache/darwin/snapshot-entry.js" ], "deferredHashFile": "yarn.lock", - "deferredHash": "f9e2de4e3ec1e82df68adb49af36c69e62529a89e528442412780a181a1b8af5" + "deferredHash": "f456dbf192d60f2a94dbb3a2442713c73d29fbb6d0abef4acae92f30587e401f" } \ No newline at end of file From 56aa00df1041f30c8b61b3b1d3cc3184ee6b1fd1 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 14 May 2025 14:41:58 -0400 Subject: [PATCH 20/22] ts issue, log errors even if err.stderr/stdout is null --- .../src/generator/snapshot-generator.ts | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tooling/v8-snapshot/src/generator/snapshot-generator.ts b/tooling/v8-snapshot/src/generator/snapshot-generator.ts index c059f6b30432..5d17a32e1347 100644 --- a/tooling/v8-snapshot/src/generator/snapshot-generator.ts +++ b/tooling/v8-snapshot/src/generator/snapshot-generator.ts @@ -327,8 +327,8 @@ export class SnapshotGenerator { } logDebug( Object.assign({}, result, { - snapshotScript: `len: ${result.snapshotScript.length}`, - bundle: `len: ${result.bundle.length}`, + snapshotScript: `len: ${Buffer.byteLength(result.snapshotScript)} bytes`, + bundle: `len: ${Buffer.byteLength(result.bundle)} bytes`, meta: '', }), ) @@ -503,12 +503,16 @@ export class SnapshotGenerator { return { v8ContextFile: this.v8ContextFile, snapshotBinDir: this.snapshotBinDir } } catch (err: any) { - if (err.stderr != null) { - logError(err.stderr.toString()) - } - - if (err.stdout != null) { - logDebug(err.stdout.toString()) + if (err.stderr || err.stdout) { + if (err.stderr != null) { + logError(err.stderr.toString()) + } + + if (err.stdout != null) { + logDebug(err.stdout.toString()) + } + } else { + logError(err.toString()) } // If things went wrong print instructions on how to execute the From 00765afbcfca389044db003eb0c1850cbe7dcd3d Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Wed, 14 May 2025 14:44:06 -0400 Subject: [PATCH 21/22] more logging --- tooling/v8-snapshot/src/generator/snapshot-generator.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tooling/v8-snapshot/src/generator/snapshot-generator.ts b/tooling/v8-snapshot/src/generator/snapshot-generator.ts index 5d17a32e1347..efb8afbc16b4 100644 --- a/tooling/v8-snapshot/src/generator/snapshot-generator.ts +++ b/tooling/v8-snapshot/src/generator/snapshot-generator.ts @@ -356,6 +356,8 @@ export class SnapshotGenerator { logInfo(`Writing snapshot script to ${this.snapshotScriptPath}`) if (this.minify) { + logInfo('Minifying snapshot script') + const minified = await minify(this.snapshotScript!.toString(), { sourceMap: false, }) @@ -369,6 +371,8 @@ export class SnapshotGenerator { } // 4. Write the snapshot script to the configured file + logInfo(`Writing snapshot script to ${this.snapshotScriptPath}`) + return fs.promises.writeFile(this.snapshotScriptPath, this.snapshotScript) } From b0b2124688d48b2b3d59dad3577823249e6ac231 Mon Sep 17 00:00:00 2001 From: Cacie Prins Date: Tue, 27 May 2025 10:09:27 -0400 Subject: [PATCH 22/22] defer http-proxy common.js due to regexp issue in v8 13.4.* - 13.8.91 --- tooling/v8-snapshot/cache/linux/snapshot-meta.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tooling/v8-snapshot/cache/linux/snapshot-meta.json b/tooling/v8-snapshot/cache/linux/snapshot-meta.json index 50bf20a152f7..d95c03dbf3be 100644 --- a/tooling/v8-snapshot/cache/linux/snapshot-meta.json +++ b/tooling/v8-snapshot/cache/linux/snapshot-meta.json @@ -842,7 +842,8 @@ "./packages/socket/node_modules/socket.io/node_modules/ws/lib/websocket-server.js", "./packages/ts/register.js", "./packages/types/index.js", - "./tooling/v8-snapshot/dist/setup/v8-snapshot-entry-cy-in-cy.js" + "./tooling/v8-snapshot/dist/setup/v8-snapshot-entry-cy-in-cy.js", + "./node_modules/http-proxy/lib/http-proxy/common.js" ], "healthy": [ "./node_modules/@babel/code-frame/lib/index.js",