misc: update playwright-webkit from 1.24.2 to 1.56.1 and base-internal image from Debian Bullseye to Debian Trixie (#32852)

* chore: update playwright-webkit from 1.24.2 to 1.56.1

* chore: fix cookies.cy.js tests in webkit by checking for strict domain
match first when calling getCookie and falling back to apex domain

* misc: add changelog item

Author: AtofStryker

.circleci/src/pipeline/@pipeline.yml

@@ -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-bullseye: &base-internal-bullseye cypress/base-internal:22.19.0-bullseye
-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.19.0-trixie
+base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry-trixie
 # 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
@@ -46,15 +46,15 @@ executors:
   # the Docker image with Cypress dependencies and Chrome browser
   cy-doc:
     docker:
-      - image: *base-internal-bullseye
+      - image: *base-internal-trixie
     # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed.
     resource_class: medium
     environment:
       PLATFORM: linux
 
   kitchensink-executor:
     docker:
-      - image: *base-internal-bullseye
+      - image: *base-internal-trixie
     # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed.
     resource_class: medium
     environment:
@@ -63,7 +63,7 @@ executors:
   # Docker image with non-root "node" user
   non-root-docker-user:
     docker:
-      - image: *base-internal-bullseye
+      - image: *base-internal-trixie
         user: node
     environment:
       PLATFORM: linux
@@ -587,7 +587,7 @@ commands:
                       version: << parameters.google-chrome-for-testing-version >>
                       install_chromedriver: false
 
-  # This code builds better-sqlite3 on Debian 11 (Bullseye). This is necessary because Debian 10 has the oldest glibc version (2.31) that we support.
+  # This code builds better-sqlite3 on Debian 11 (Bullseye). This is necessary because Debian 11 has the oldest glibc version (2.31) that we support.
   #
   # Since this is running Docker remote (because the job running the command may not be using an executor with the appropriate glibc version), we need to 
   # copy the project into the container, and copy the built plugin out of the container because the host running docker does not have access to the 
@@ -1937,7 +1937,7 @@ jobs:
     parallelism: 1
     working_directory: ~/cypress
     docker:
-      - image: *base-internal-bullseye
+      - image: *base-internal-trixie
     environment:
       # needed to inform the bootstrap-docker-container.sh script to link the binary in the system-test project directory
       REPO_DIR: /root/cypress

cli/CHANGELOG.md

@@ -21,6 +21,7 @@ _Released 11/4/2025 (PENDING)_
 - Add top padding for command log labels. Addressed in [#32774](https://github.com/cypress-io/cypress/pull/32774).
 - The hitbox for expanding a grouped command has been widened. Addresses [#32778](https://github.com/cypress-io/cypress/issues/32778). Addressed in [#32783](https://github.com/cypress-io/cypress/pull/32783).
 - Have cursor on hover of the AUT URL to show as pointer. Addresses [#32777](https://github.com/cypress-io/cypress/issues/32777). Addressed in [#32782](https://github.com/cypress-io/cypress/pull/32782).
+- WebKit now prefers a cookie's fully qualified `domain` when requesting a cookie value via [`cy.getCookie()`](https://docs.cypress.io/api/commands/getcookie). If none are found, the cookie's apex domain will be used as a fallback. Addresses [#29954](https://github.com/cypress-io/cypress/issues/29954), [#29973](https://github.com/cypress-io/cypress/issues/29973) and [#30392](https://github.com/cypress-io/cypress/issues/30392). Addressed in [#32852](https://github.com/cypress-io/cypress/pull/32852).
 
 **Dependency Updates:**
 

docker-compose.yml

@@ -31,7 +31,7 @@ services:
       - .:/opt/cypress
   ci:
     # This should mirror the image used in workflows.yml
-    image: cypress/base-internal:22.19.0-bullseye
+    image: cypress/base-internal:22.19.0-trixie
     ports:
       - 5566:5566
       - 5567:5567

package.json

@@ -189,7 +189,7 @@
     "npm-packlist": "9.0.0",
     "p-defer": "^3.0.0",
     "patch-package": "8.0.0",
-    "playwright-webkit": "1.24.2",
+    "playwright-webkit": "1.56.1",
     "pluralize": "8.0.0",
     "print-arch": "1.0.0",
     "proxyquire": "2.1.3",

packages/driver/cypress/e2e/commands/cookies.cy.js

@@ -123,10 +123,13 @@ describe('src/cy/commands/cookies - no stub', () => {
 
       cy.getCookies({ domain: 'www.foobar.com' }).then((cookies) => {
         expect(cookies).to.have.length(2)
-        expect(cookies[0].name).to.equal('key1')
-        expect(cookies[0].domain).to.match(/\.?www\.foobar\.com/)
-        expect(cookies[1].name).to.equal('key2')
-        expect(cookies[1].domain).to.match(/\.?foobar\.com/)
+
+        const sortedCookies = Cypress._.sortBy(cookies, 'name')
+
+        expect(sortedCookies[0].name).to.equal('key1')
+        expect(sortedCookies[0].domain).to.match(/\.?www\.foobar\.com/)
+        expect(sortedCookies[1].name).to.equal('key2')
+        expect(sortedCookies[1].domain).to.match(/\.?foobar\.com/)
       })
 
       cy.getCookies({ domain: 'barbaz.com' }).then((cookies) => {
@@ -1380,8 +1383,12 @@ describe('src/cy/commands/cookies', () => {
       // other browsers do not return sameSite at all
       const sameSite = (
         Cypress.isBrowser('webkit')
-      ) ? 'no_restriction' :
-        Cypress.isBrowser('firefox') ? 'unspecified' : null
+        // There is an odd inconsistency when setting an undefined cookie context in WebKit in WebKit 26.
+        // On linux based machines, the sameSite will be set to `lax`, but on MacOS the sameSite is set to `None` (no_restriction).
+        // There is no difference in the webkit-automation logic within cypress so the inconsistency must lie in the OS
+        // implement of WebKit
+      ) ? Cypress.platform === 'darwin' ? 'no_restriction' : 'lax'
+        : Cypress.isBrowser('firefox') ? 'unspecified' : null
 
       if (sameSite) {
         cy.getCookie('five').should('include', { sameSite })

packages/electron/.cursor/rules/electron-upgrade.mdc

@@ -67,14 +67,14 @@ When Electron is upgraded, the bundled Node.js version often changes. Sync this
 ```bash
 # File: /docker-compose.yml
 # Update the base-internal image reference:
-# "cypress/base-internal:22.18.0-bullseye" -> "cypress/base-internal:NEW_NODE_VERSION-bullseye"
+# "cypress/base-internal:22.18.0-trixie" -> "cypress/base-internal:NEW_NODE_VERSION-trixie"
 ```
 
 ### CircleCI Workflows
 ```bash
 # File: /.circleci/src/@workflows.yml
 # Update base-internal image references:
-# "base-internal-bullseye: &base-internal-bullseye cypress/base-internal:22.18.0-bullseye" -> "base-internal-bullseye: &base-internal-bullseye cypress/base-internal:NEW_NODE_VERSION-bullseye"
+# "base-internal-trixie: &base-internal-trixie cypress/base-internal:22.18.0-trixie" -> "base-internal-trixie: &base-internal-trixie cypress/base-internal:NEW_NODE_VERSION-trixie"
 # "base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.18.0-yarn-berry" -> "base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:NEW_NODE_VERSION-yarn-berry"
 # "base-internal-minimum-node: &base-internal-minimum-node cypress/base-internal:22.18.0" -> "base-internal-minimum-node: &base-internal-minimum-node cypress/base-internal:NEW_NODE_VERSION"
 ```

packages/server/lib/automation/util.ts

@@ -12,8 +12,9 @@ export type CyCookie = Pick<chrome.cookies.Cookie, 'name' | 'value' | 'expiratio
 // @ts-ignore
 export type CyCookieFilter = chrome.cookies.GetAllDetails
 
-export const cookieMatches = (cookie: CyCookie | playwright.Cookie, filter?: CyCookieFilter) => {
-  if (filter?.domain && !domainMatch(filter?.domain, cookie.domain)) {
+export const cookieMatches = (cookie: CyCookie | playwright.Cookie, filter?: CyCookieFilter, options?: { strictDomain: boolean }) => {
+  if (filter?.domain) {
+    if (options?.strictDomain ? filter?.domain !== cookie.domain : !domainMatch(filter?.domain, cookie.domain))
     return false
   }
 

packages/server/lib/browsers/webkit-automation.ts

@@ -270,11 +270,19 @@ export class WebKitAutomation {
 
     if (!cookies.length) return null
 
-    const cookie = cookies.find((cookie) => {
-      return cookieMatches(cookie, filter)
+    // first attempt to match cookie on strict domain
+    let cookie = cookies.find((cookie) => {
+      return cookieMatches(cookie, filter, { strictDomain: true })
     })
 
-    if (!cookie) return null
+    if (!cookie) {
+      cookie = cookies.find((cookie) => {
+          // if unable to match closest via strict domain, then return a cookie that matches the apex domain
+        return cookieMatches(cookie, filter)
+      })
+
+      if (!cookie) return null
+    }
 
     return normalizeGetCookieProps(cookie)
   }

packages/server/package.json

@@ -198,7 +198,7 @@
     "mocked-env": "1.2.4",
     "mockery": "2.1.0",
     "nock": "13.2.9",
-    "playwright-webkit": "1.24.2",
+    "playwright-webkit": "1.56.1",
     "proxyquire": "2.1.3",
     "repl.history": "0.1.4",
     "request-promise": "4.2.6",

packages/server/test/unit/automation/util_spec.ts

@@ -45,5 +45,19 @@ context('lib/automation/util', () => {
 
       expect(cookieMatches(cookie, filter)).to.be.false
     })
+
+    it('strict matches exact domain with strictDomain=true', () => {
+      const cookie = { domain: 'www.example.com' } as CyCookie
+      const filter = { domain: 'www.example.com' }
+
+      expect(cookieMatches(cookie, filter, { strictDomain: true })).to.be.true
+    })
+
+    it('fails apex domain match with strictDomain=true', () => {
+      const cookie = { domain: 'example.com' } as CyCookie
+      const filter = { domain: 'www.example.com' }
+
+      expect(cookieMatches(cookie, filter, { strictDomain: true })).to.be.false
+    })
   })
 })