Merge branch 'develop' into ci/extract-contributor-workflow

Author: cacieprins

.circleci/src/workflows/@workflows.yml

@@ -5,7 +5,7 @@ version: 2.1
 # the new location and/or names:
 # - ./scripts/github-actions/update-browser-versions.js
 
-chrome-stable-version: &chrome-stable-version "140.0.7339.185"
+chrome-stable-version: &chrome-stable-version "140.0.7339.207"
 chrome-beta-version: &chrome-beta-version "141.0.7390.30"
 firefox-stable-version: &firefox-stable-version "142.0"
 base-internal-bullseye: &base-internal-bullseye cypress/base-internal:22.18.0-bullseye
@@ -116,7 +116,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" != "chore/refactor_cli_to_ts" ]]; then
+            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "fix/dbus-messages" ]]; 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
@@ -1782,7 +1782,7 @@ jobs:
                   source ./scripts/ensure-node.sh
                   yarn lerna run types
             - sanitize-verify-and-store-mocha-results:
-                expectedResultCount: 18
+                expectedResultCount: 17
 
   verify-release-readiness:
     <<: *defaults

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

@@ -4,6 +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/merge_gql_package_w_data_context', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
           value: << pipeline.git.branch >>

.circleci/workflows.yml

@@ -2,7 +2,7 @@ base-internal-bullseye: cypress/base-internal:22.18.0-bullseye
 base-internal-minimum-node: cypress/base-internal:22.15.1
 base-internal-yarn-berry: cypress/base-internal:22.18.0-yarn-berry
 chrome-beta-version: 141.0.7390.30
-chrome-stable-version: 140.0.7339.185
+chrome-stable-version: 140.0.7339.207
 commands:
   build-and-package-binary:
     steps:
@@ -398,11 +398,11 @@ commands:
         description: Google Chrome channel to install
         type: string
       google-chrome-for-testing-version:
-        default: 140.0.7339.185
+        default: 140.0.7339.207
         description: Google Chrome for Testing version to install
         type: string
       google-chrome-version:
-        default: 140.0.7339.185
+        default: 140.0.7339.207
         description: Google Chrome version to install
         type: string
       install-chrome:
@@ -868,7 +868,7 @@ commands:
       - run:
           command: |
             echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
-            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/refactor_cli_to_ts" ]]; then
+            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "fix/dbus-messages" ]]; then
                 export SHOULD_PERSIST_ARTIFACTS=true
             fi' >> "$BASH_ENV"
           name: Set environment variable to determine whether or not to persist artifacts
@@ -2011,7 +2011,6 @@ jobs:
       - run: yarn workspace @cypress/grep omit:specs
       - run: yarn workspace @cypress/grep or
       - run: yarn workspace @cypress/grep skip
-      - run: yarn workspace @cypress/grep tags
       - run: yarn workspace @cypress/grep tags:inverted
       - run: yarn workspace @cypress/grep tags:and
       - run: yarn workspace @cypress/grep tags:and:not
@@ -3485,7 +3484,7 @@ jobs:
                   yarn lerna run types
                 name: Test types
             - sanitize-verify-and-store-mocha-results:
-                expectedResultCount: 18
+                expectedResultCount: 17
     working_directory: ~/cypress
   v8-integration-tests:
     environment:
@@ -3716,6 +3715,9 @@ workflows:
         - equal:
             - update-v8-snapshot-cache-on-develop
             - << pipeline.git.branch >>
+        - equal:
+            - chore/merge_gql_package_w_data_context
+            - << pipeline.git.branch >>
         - matches:
             pattern: /^release\/\d+\.\d+\.\d+$/
             value: << pipeline.git.branch >>
@@ -3770,6 +3772,9 @@ workflows:
         - equal:
             - update-v8-snapshot-cache-on-develop
             - << pipeline.git.branch >>
+        - equal:
+            - chore/merge_gql_package_w_data_context
+            - << pipeline.git.branch >>
         - matches:
             pattern: /^release\/\d+\.\d+\.\d+$/
             value: << pipeline.git.branch >>
@@ -3835,6 +3840,9 @@ workflows:
         - equal:
             - update-v8-snapshot-cache-on-develop
             - << pipeline.git.branch >>
+        - equal:
+            - chore/merge_gql_package_w_data_context
+            - << pipeline.git.branch >>
         - matches:
             pattern: /^release\/\d+\.\d+\.\d+$/
             value: << pipeline.git.branch >>
@@ -4320,6 +4328,9 @@ workflows:
         - equal:
             - update-v8-snapshot-cache-on-develop
             - << pipeline.git.branch >>
+        - equal:
+            - chore/merge_gql_package_w_data_context
+            - << pipeline.git.branch >>
         - matches:
             pattern: /^release\/\d+\.\d+\.\d+$/
             value: << pipeline.git.branch >>
@@ -4754,6 +4765,9 @@ workflows:
         - equal:
             - update-v8-snapshot-cache-on-develop
             - << pipeline.git.branch >>
+        - equal:
+            - chore/merge_gql_package_w_data_context
+            - << pipeline.git.branch >>
         - matches:
             pattern: /^release\/\d+\.\d+\.\d+$/
             value: << pipeline.git.branch >>

.cursor/BUGBOT.md

@@ -102,9 +102,7 @@ Essential rules for reviewing code changes in the Cypress monorepo.
 
 ### Data & State Management (Medium Priority)
 - **@packages/data-context**: Data management
-  - Focus: State management patterns, data consistency, application state
-- **@packages/graphql**: GraphQL layer
-  - Focus: GraphQL schema changes, resolver logic, API schema definition
+  - Focus: State management patterns, data consistency, application state, GraphQL schema changes, resolver logic, API schema definition
 - **@packages/socket**: WebSocket communication
   - Focus: Socket security, message handling, real-time communication
 

.eslintrc.js

@@ -7,7 +7,7 @@ const graphqlOpts = {
   tagName: 'gql',
   // eslint-disable-next-line no-restricted-syntax
   schemaString: fs.readFileSync(
-    path.join(__dirname, 'packages/graphql/schemas/schema.graphql'),
+    path.join(__dirname, 'packages/data-context/schemas/schema.graphql'),
     'utf8',
   ),
 }

.github/workflows/semantic-pull-request.yml

@@ -22,6 +22,9 @@ on:
       - opened
       - edited
       - synchronize
+    branches:
+      - develop
+      - release/*
 
 jobs:
   main:
@@ -31,8 +34,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.base.ref }}
+          repository: ${{ github.event.pull_request.base.repo.full_name }}
       - run: npm install
         working-directory: scripts/github-actions/semantic-pull-request/
       - name: Lint PR Title and Cypress Changelog Entry

CONTRIBUTING.md

@@ -170,14 +170,13 @@ Here is a list of the core packages in this repository with a short description,
  | [cli](./cli)                          | `cypress`               | The command-line tool that is packaged as an `npm` module.                   |
  | [app](./packages/app)           | `@packages/app`      | The front-end for the Cypress App that renders in the launched browser instance.             |
  | [config](./packages/config)           | `@packages/config`      | The Cypress configuration types and validation used in the server, data-context and driver.             |
- | [data-context](./packages/data-context)           | `@packages/data-context`      | Centralized data access for the Cypress application.             |
+ | [data-context](./packages/data-context)           | `@packages/data-context`      | Centralized data access for the Cypress application. Contains the GraphQL layer that the `launchpad` and `app` use to interact with the `server`.   |
  | [driver](./packages/driver)           | `@packages/driver`      | The code that is used to drive the behavior of the API commands.             |
  | [electron](./packages/electron)       | `@packages/electron`    | The Cypress implementation of Electron.                                      |
  | [errors](./packages/errors)           | `@packages/errors`      | Error definitions and utilities for Cypress                                  |
  | [example](./packages/example)         | `@packages/example`     | Our example kitchen-sink application.                                        |
  | [extension](./packages/extension)     | `@packages/extension`   | The Cypress Chrome browser extension                                         |
  | [frontend-shared](./packages/frontend-shared)     | `@packages/frontend-shared`   | Shared components and styles used in the `app` and `launchpad`.                                         |
- | [graphql](./packages/graphql)     | `@packages/graphql`   | The GraphQL layer that the `launchpad` and `app` use to interact with the `server`.                                  |
  | [https-proxy](./packages/https-proxy) | `@packages/https-proxy` | This does https proxy for handling http certs and traffic.                   |
  | [icons](./packages/icons)       | `@packages/icons`    | The Cypress icons.                        |
  | [launcher](./packages/launcher)       | `@packages/launcher`    | Finds and launches browsers installed on your system.                        |

apollo.config.js

@@ -6,7 +6,7 @@ module.exports = {
   client: {
     service: {
       name: 'cypress-io',
-      localSchemaFile: path.join(__dirname, 'packages/graphql/schemas/schema.graphql'),
+      localSchemaFile: path.join(__dirname, 'packages/data-context/schemas/schema.graphql'),
     },
     tagName: 'gql',
     includes: [path.join(__dirname, 'packages/{launchpad,app,frontend-shared}/src/**/*.{vue,ts,js,tsx,jsx}')],

autobarrel.json

@@ -1,13 +1,12 @@
 {
   "prefix": "/* eslint-disable padding-line-between-statements */",
   "paths": [
-    "packages/graphql/src/**/*",
+    "packages/data-context/graphql/**/*",
     "packages/data-context/src/**/*"
   ],
   "ignore": [
     "packages/data-context/src/gen",
-    "packages/graphql/src/stitching",
-    "packages/graphql/src/testing",
-    "packages/graphql/src/gen"
+    "packages/data-context/graphql/stitching",
+    "packages/data-context/graphql/testing"
   ]
 }

cli/CHANGELOG.md

@@ -1,7 +1,19 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
-## 15.2.1
+## 15.3.1
 
-_Released 9/23/2025 (PENDING)_
+_Released 10/07/2025 (PENDING)_
+
+**Bugfixes:**
+
+- Fixed a regression introduced in [`15.0.0`](https://docs.cypress.io/guides/references/changelog#15-0-0) where `dbus` connection error messages appear in docker containers when launching Cypress. Fixes [#32290](https://github.com/cypress-io/cypress/issues/32290).
+
+## 15.3.0
+
+_Released 9/23/2025_
+
+**Features:**
+
+- Added Escape key support to [`cy.press()`](http://on.cypress.io/api/press). Addresses[#32429](https://github.com/cypress-io/cypress/issues/32429). Addressed in [#32545](https://github.com/cypress-io/cypress/pull/32545).
 
 **Bugfixes:**
 
@@ -10,8 +22,8 @@ _Released 9/23/2025 (PENDING)_
 
 **Misc:**
 
-- Update the styles for command grouping 'line' so on expansion it is displayed correctly. Addressed in [#32521](https://github.com/cypress-io/cypress/pull/32521)
-- Test hook names now correctly display with a semi-bold font weight. Addressed in [#32491](https://github.com/cypress-io/cypress/pull/32491).
+- Update the styles for command grouping 'line' so on expansion it is displayed correctly. Addressed in [#32521](https://github.com/cypress-io/cypress/pull/32521).
+- Test hook names now correctly display with a semi-bold font weight. Addresses [#32477](https://github.com/cypress-io/cypress/issues/32477). Addressed in [#32491](https://github.com/cypress-io/cypress/pull/32491).
 - Updated the Cypress Studio panel to not show bottom border. Addresses [#32478](https://github.com/cypress-io/cypress/issues/32478).
 
 **Dependency Updates:**