Merge branch 'develop' into ci/parameterize-binary-branch

Author: cacieprins

.circleci/cache-version.txt

@@ -1,2 +1,2 @@
 # Bump this version to force CI to re-create the cache from scratch.
-10-3-2025
+10-10-2025

.circleci/src/pipeline/@pipeline.yml

@@ -200,15 +200,15 @@ commands:
     description: Save entire folder as artifact for other jobs to run without reinstalling
     steps:
       - run:
-          name: Sync Cloud Validations
+          name: Build packages
           command: |
             source ./scripts/ensure-node.sh
-            yarn gulp syncCloudValidations
+            yarn build
       - run:
-          name: Build packages
+          name: Sync Cloud Validations
           command: |
             source ./scripts/ensure-node.sh
-            yarn build
+            yarn gulp syncCloudValidations
       - run:
           name: Generate v8 snapshot
           command: |
@@ -2806,13 +2806,6 @@ jobs:
           browser: chrome
           executor: << parameters.executor >>
 
-  test-binary-against-todomvc-firefox:
-    <<: *defaults
-    steps:
-      - test-binary-against-repo:
-          repo: cypress-example-todomvc
-          browser: firefox
-
   test-binary-against-cypress-realworld-app:
     <<: *defaults
     resource_class: medium+

.circleci/src/pipeline/workflows/@main.yml

@@ -320,7 +320,7 @@ linux-x64:
           - test-runner:build-binary
           - publish-binary
         requires:
-          - node_modules_install
+          - build
     - wait-for-binary-publish:
         type: approval
         requires:
@@ -392,10 +392,6 @@ linux-x64:
         filters: *mainBuildFilters
         requires:
           - get-published-artifacts
-    - test-binary-against-todomvc-firefox:
-        filters: *mainBuildFilters
-        requires:
-          - get-published-artifacts
     - test-binary-against-cypress-realworld-app:
         context: test-runner:cypress-record-key
         filters: *mainBuildFilters
@@ -782,10 +778,6 @@ linux-x64-contributor:
         filters: *mainBuildFilters
         requires:
           - get-published-artifacts
-    - test-binary-against-todomvc-firefox:
-        filters: *mainBuildFilters
-        requires:
-          - get-published-artifacts
     - test-binary-against-cypress-realworld-app:
         context: test-runner:cypress-record-key
         filters: *mainBuildFilters
@@ -837,7 +829,7 @@ linux-arm64:
         executor: linux-arm64
         resource_class: arm.medium
         requires:
-          - linux-arm64-node-modules-install
+          - linux-arm64-build
 
     - wait-for-binary-publish:
         name: linux-arm64-wait-for-binary-publish

.circleci/src/pipeline/workflows/pull-request.yml

@@ -261,7 +261,7 @@ jobs:
         - test-runner:build-binary
         - publish-binary
       requires:
-        - node_modules_install
+        - build
   - wait-for-binary-publish:
       type: approval
       requires:

CONTRIBUTING.md

@@ -257,7 +257,7 @@ If you prefer to disable the restrictions for one boot only, use instead:
 echo 0 | sudo tee /proc/sys/kernel/apparmor_restrict_unprivileged_userns
 ```
 
-If you do not disable these restrictions for the affected Ubuntu versions, then Cypress may exit with a fatal error when you try to run Cypress after building Cypress from source. The error includes the text `FATAL:setuid_sandbox_host.cc` and may be hidden, pending resolution of issue https://github.com/cypress-io/cypress/issues/32358.
+If you do not disable these restrictions for the affected Ubuntu versions, then Cypress may exit with a fatal error when you try to run Cypress after building Cypress from source. The error message includes the text `FATAL:setuid_sandbox_host.cc`.
 
 #### Windows
 

cli/CHANGELOG.md

@@ -3,6 +3,10 @@
 
 _Released 10/21/2025 (PENDING)_
 
+**Bugfixes:**
+
+- An error is no longer thrown during command execution when the application under test overwrites the `window.$` property with a non-function. Fixes [#1502](https://github.com/cypress-io/cypress/issues/1502). Fixed in [#32682](https://github.com/cypress-io/cypress/pull/32682).
+
 **Misc:**
 
 Browser detection in Cypress now always prefers 64-bit browser installs to 32-bit browser installs. Addressed in [#32656](https://github.com/cypress-io/cypress/pull/32656).

cli/lib/bin/cypress.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+// declared here in order to avoid consumers who are looking for the binary to be available relative to the dist directory
+import '../../bin/cypress'

cli/scripts/start-build.ts

@@ -35,3 +35,8 @@ shell.cp('dist/exec/*.js', 'build/dist/exec')
 
 shell.mkdir('-p', 'build/dist/tasks')
 shell.cp('dist/tasks/*.js', 'build/dist/tasks')
+
+shell.mkdir('-p', 'build/dist/bin')
+shell.cp('dist/bin/cypress.js', 'build/dist/bin/cypress')
+// because this is a compiled file, it is read only and we need to grant execute permissions
+shell.chmod('+x', 'build/dist/bin/cypress')

guides/esm-migration.md

@@ -52,7 +52,8 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
 - [x] packages/launcher ✅ **COMPLETED**
 - [x] packages/launchpad ✅ **COMPLETED**
 - [x] packages/net-stubbing ✅ **COMPLETED**
-- [ ] packages/network **PARTIAL** - entry point is JS
+- [x] packages/network ✅ **COMPLETED**
+- [x] packages/network-tools ✅ **COMPLETED**
 - [x] packages/packherd-require ✅ **COMPLETED**
 - [ ] packages/proxy **PARTIAL** - entry point is JS
 - [x] packages/reporter ✅ **COMPLETED**
@@ -64,7 +65,7 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
 - [ ] packages/server **PARTIAL** - many source/test files in JS. highest priority
 - [ ] packages/socket **PARTIAL** - entry point is JS. Tests are JS
 - [x] packages/stderr-filtering ✅ **COMPLETED**
-- [ ] packages/telemetry **PARTIAL** - entry point is JS
+- [x] packages/telemetry ✅ **COMPLETED**
 - [ ] packages/ts **PARTIAL** - ultimate goal is removal and likely not worth the effort to convert
 - [x] packages/types ✅ **COMPLETED**
 - [x] packages/v8-snapshot-require
@@ -101,6 +102,7 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
 - [x] packages/launcher ✅ **COMPLETED**
 - [ ] packages/net-stubbing
 - [x] packages/network ✅ **COMPLETED**
+- [x] packages/network-tools ✅ **COMPLETED**
 - [ ] packages/packherd-require
 - [ ] packages/proxy
 - [x] packages/rewriter ✅ **COMPLETED**

guides/release-process.md

@@ -193,7 +193,6 @@ _Note: It is advisable to notify the team that the `develop` branch is locked do
 24. If utilizing the `SKIP_RELEASE_CHANGELOG_VALIDATION_FOR_BRANCHES` to override and skip changelog validation for this release, change its value as needed or delete it from CircleCI so that subsequent releases and PRs will go through changelog validation.
 
 25. Check all `cypress-test-*` and `cypress-example-*` repositories, and if there is a branch named `x.y.z` for testing the features or fixes from the newly published version `x.y.z`, update that branch to refer to the newly published NPM version in `package.json`. Then, get the changes approved and merged into that project's main branch. For projects without a `x.y.z` branch, you can go to the Renovate dependency issue and check the box next to `Update dependency cypress to X.Y.Z`. It will automatically create a PR. Once it passes, you can merge it. Try updating at least the following projects:
-    - [cypress-example-todomvc](https://github.com/cypress-io/cypress-example-todomvc/issues/99)
     - [cypress-realworld-app](https://github.com/cypress-io/cypress-realworld-app/issues/41)
     - [cypress-example-recipes](https://github.com/cypress-io/cypress-example-recipes/issues/225)