Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/src/pipeline/@pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ version: 2.1
chrome-stable-version: &chrome-stable-version "141.0.7390.107"
chrome-beta-version: &chrome-beta-version "142.0.7444.34"
firefox-stable-version: &firefox-stable-version "142.0"
base-internal-trixie: &base-internal-trixie cypress/base-internal:22.19.0-trixie
base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry
base-internal-trixie: &base-internal-trixie cypress/base-internal:22.20.0-trixie
base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.20.0-yarn-berry
# Lowest Node.js version we support of the minimum major version supported
# See https://docs.cypress.io/app/get-started/install-cypress#Nodejs
base-internal-minimum-node: &base-internal-minimum-node cypress/base-internal:20.15.0
Expand Down Expand Up @@ -600,9 +600,9 @@ commands:
if [[ ! -f better_sqlite3.node ]]; then
set -x
apt update && apt install -y docker.io
docker run -d --name better-sqlite3-builder cypress/base-internal:22.19.0-glibc-2.31 /bin/bash -c "sleep 1000000000"
docker run -d --name better-sqlite3-builder cypress/base-internal:22.20.0-glibc-2.31 /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 37.6.0 --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 38.5.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
Expand Down
2 changes: 1 addition & 1 deletion .circleci/src/pipeline/workflows/@main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ linux-x64:
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal: [ 'chore/remove_unused_anchors', << pipeline.git.branch >> ]
- equal: [ 'electron-bump-version', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.19.0
22.20.0
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.19.0
22.20.0
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
- .:/opt/cypress
ci:
# This should mirror the image used in workflows.yml
image: cypress/base-internal:22.19.0-trixie
image: cypress/base-internal:22.20.0-trixie
ports:
- 5566:5566
- 5567:5567
Expand Down
2 changes: 1 addition & 1 deletion npm/cypress-schematic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@schematics/angular": "^20.1.6",
"@types/chai-enzyme": "0.6.13",
"@types/mocha": "8.0.3",
"@types/node": "^22.18.7",
"@types/node": "^22.19.0",
"eslint": "^9.31.0",
"typescript": "~5.4.5",
"vitest": "^3.2.4"
Expand Down
2 changes: 1 addition & 1 deletion npm/puppeteer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"devDependencies": {
"@packages/eslint-config": "0.0.0-development",
"@types/node": "^22.18.7",
"@types/node": "^22.19.0",
"chokidar": "^3.5.3",
"eslint": "^9.31.0",
"express": "4.21.0",
Expand Down
2 changes: 1 addition & 1 deletion npm/webpack-dev-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"webpack-merge": "^5.4.0"
},
"devDependencies": {
"@types/node": "22.18.7",
"@types/node": "22.19.0",
"@types/speed-measure-webpack-plugin": "^1.3.4",
"@types/webpack-bundle-analyzer": "4.7.0",
"chai": "^4.3.6",
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"@types/lodash": "^4.14.168",
"@types/markdown-it": "12.2.3",
"@types/mocha": "8.0.3",
"@types/node": "22.18.7",
"@types/node": "22.19.0",
"@types/prismjs": "1.16.0",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
Expand Down Expand Up @@ -144,7 +144,7 @@
"dedent": "^0.7.0",
"del": "3.0.0",
"detect-port": "^2.1.0",
"electron": "37.6.0",
"electron": "38.5.0",
"electron-builder": "^25.1.8",
"enzyme-adapter-react-16": "1.12.1",
"eslint": "^8.56.0",
Expand Down Expand Up @@ -218,7 +218,7 @@
"yarn-deduplicate": "3.1.0"
},
"engines": {
"node": ">=22.19.0",
"node": ">=22.20.0",
"yarn": ">=1.22.22"
},
"productName": "Cypress",
Expand Down Expand Up @@ -281,7 +281,7 @@
"@types/react": "18.3.12",
"browserify-sign": "4.2.2",
"devtools-protocol": "0.0.1528500",
"node-abi": "4.9.0",
"node-abi": "4.17.0",
"vue-template-compiler": "2.6.12"
},
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
Expand Down
14 changes: 7 additions & 7 deletions packages/electron/.cursor/rules/electron-upgrade.mdc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Before starting, gather the following information:

### Finding Version Information

**IMPORTANT**: The target Electron version, Chromium version, and Node.js verions must be specified in the chat prompt.
**IMPORTANT**: The target Electron version, Chromium version, and Node.js versions must be specified in the chat prompt.

## Step 1: Update Core Electron Version

Expand Down Expand Up @@ -147,18 +147,18 @@ An Electron upgrade is **NOT a breaking change** if:
```markdown
## Breaking Changes

- Upgraded `electron` from `OLD_VERSION` to `NEW_VERSION`
- Upgraded bundled Node.js version from `OLD_NODE_VERSION` to `NEW_NODE_VERSION`
- Upgraded bundled Chromium version from `OLD_CHROMIUM_VERSION` to `NEW_CHROMIUM_VERSION`
- Upgraded `electron`
- Upgraded bundled Node.js version
- Upgraded bundled Chromium version
```

**For Non-Breaking Changes**:
```markdown
## Dependency Updates

- Upgraded `electron` from `OLD_VERSION` to `NEW_VERSION`
- Upgraded bundled Node.js version from `OLD_NODE_VERSION` to `NEW_NODE_VERSION`
- Upgraded bundled Chromium version from `OLD_CHROMIUM_VERSION` to `NEW_CHROMIUM_VERSION`
- Upgraded `electron`
- Upgraded bundled Node.js version
- Upgraded bundled Chromium version
```

## Step 10: Testing and Validation
Expand Down
2 changes: 1 addition & 1 deletion packages/errors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@packages/server": "0.0.0-development",
"@packages/ts": "0.0.0-development",
"@packages/types": "0.0.0-development",
"@types/node": "22.18.7",
"@types/node": "22.19.0",
"@types/pngjs": "^6.0.1",
"ansi-styles": "^5",
"ci-info": "^4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"@types/chrome": "0.0.101",
"@types/chrome-remote-interface": "0.31.14",
"@types/http-proxy": "1.17.4",
"@types/node": "22.18.7",
"@types/node": "22.19.0",
"@types/request-promise": "^4.1.48",
"@types/tar": "^6.1.0",
"babel-loader": "10.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/stderr-filtering/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"@packages/eslint-config": "0.0.0-development",
"@types/node": "^22.18.7",
"@types/node": "^22.19.0",
"@vitest/coverage-v8": "^3.2.4",
"eslint": "^9.22.0",
"rimraf": "^6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"devDependencies": {
"@packages/root": "0.0.0-development",
"@types/node": "22.18.7",
"@types/node": "22.19.0",
"axios": "^1.8.3",
"better-sqlite3": "12.4.1",
"devtools-protocol": "0.0.1528500",
Expand Down
2 changes: 1 addition & 1 deletion system-tests/test-binary/module_api_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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:22.19.0-trixie',
dockerImage: 'cypress/base-internal:22.20.0-trixie',
withBinary: true,
project: 'module-api',
browser: 'electron',
Expand Down
4 changes: 2 additions & 2 deletions system-tests/test-binary/node_versions_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('binary node versions', () => {
'cypress/base:22.0.0',
'cypress/base:22.7.0',
'cypress/base:22.12.0',
'cypress/base:22.19.0',
'cypress/base:22.20.0',
'cypress/base:24.0.0',
'cypress/base:25.0.0',
].forEach(smokeTestDockerImage)
Expand All @@ -44,7 +44,7 @@ describe('type: module', () => {
'cypress/base:22.0.0',
'cypress/base:22.7.0',
'cypress/base:22.12.0',
'cypress/base:22.19.0',
'cypress/base:22.20.0',
'cypress/base:24.0.0',
'cypress/base:25.0.0',
].forEach((dockerImage) => {
Expand Down
24 changes: 12 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8610,10 +8610,10 @@
dependencies:
"@types/node" "*"

"@types/node@*", "@types/node@22.18.7", "@types/node@>=10.0.0", "@types/node@^22.18.7", "@types/node@^22.7.7":
version "22.18.7"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.18.7.tgz#e1d013d5759fa50ff4d334aee3fd6254f1dbae74"
integrity sha512-3E97nlWEVp2V6J7aMkR8eOnw/w0pArPwf/5/W0865f+xzBoGL/ZuHkTAKAGN7cOWNwd+sG+hZOqj+fjzeHS75g==
"@types/node@*", "@types/node@22.19.0", "@types/node@>=10.0.0", "@types/node@^22.19.0", "@types/node@^22.7.7":
version "22.19.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-22.19.0.tgz#849606ef3920850583a4e7ee0930987c35ad80be"
integrity sha512-xpr/lmLPQEj+TUnHmR+Ab91/glhJvsqcjB+yY0Ix9GO70H6Lb4FHH5GeqdOE5btAx7eIMwuHkp4H2MSkLcqWbA==
dependencies:
undici-types "~6.21.0"

Expand Down Expand Up @@ -15476,10 +15476,10 @@ electron-to-chromium@^1.5.173:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.185.tgz#b4f9189c4ef652ddf9f1bb37529e2b79f865e912"
integrity sha512-dYOZfUk57hSMPePoIQ1fZWl1Fkj+OshhEVuPacNKWzC1efe56OsHY3l/jCfiAgIICOU3VgOIdoq7ahg7r7n6MQ==

electron@37.6.0:
version "37.6.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-37.6.0.tgz#4f13cd6fe57c9577d11385ffecea5edb4fbf24bd"
integrity sha512-8AANcn6irYQ7cTAJRY7r0CovWckcGCHUniQecyGhw/jJ25vWwitVhF97skF+EyDztiEI6YBoF0G6tx1s37bO3g==
electron@38.5.0:
version "38.5.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-38.5.0.tgz#9c9353e85d964c99bca9a1f4eafc6cf7a47bd257"
integrity sha512-dbC7V+eZweerYMJfxQldzHOg37a1VdNMCKxrJxlkp3cA30gOXtXSg4ZYs07L5+QwI19WOy1uyvtEUgbw1RRsCQ==
dependencies:
"@electron/get" "^2.0.0"
"@types/node" "^22.7.7"
Expand Down Expand Up @@ -24547,10 +24547,10 @@ [email protected]:
lodash "^4.17.21"
propagate "^2.0.0"

node-abi@4.9.0, node-abi@^2.7.0, node-abi@^3.3.0, node-abi@^3.45.0, node-abi@^4.2.0:
version "4.9.0"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-4.9.0.tgz#ca6dabf7991e54bf3ba6d8d32641e1b84f305263"
integrity sha512-0isb3h+AXUblx5Iv0mnYy2WsErH+dk2e9iXJXdKAtS076Q5hP+scQhp6P4tvDeVlOBlG3ROKvkpQHtbORllq2A==
node-abi@4.17.0, node-abi@^2.7.0, node-abi@^3.3.0, node-abi@^3.45.0, node-abi@^4.2.0:
version "4.17.0"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-4.17.0.tgz#154ce9589d83c0a3c93d1ff96fbce5a96fabe897"
integrity sha512-ljZ7PiChMA2O3sGPX5/bpBhW0O9rXn+orb2xo3Z0vleSlil7G65WZjSFjmIeAtHZHa2GXiTOMdFCsiyImMEIMg==
dependencies:
semver "^7.6.3"

Expand Down
Loading