Merge branch 'develop' into angular-signals-ct-harness

cypress-io · Jun 28, 2024 · 8a85432 · 8a85432 · cypress-bot · Jun 28, 2024
2 parents fff8222 + ed85a2c
commit 8a85432
Show file tree

Hide file tree

Showing 17 changed files with 294 additions and 255 deletions.
diff --git a/browser-versions.json b/browser-versions.json
@@ -1,5 +1,5 @@
 {
-  "chrome:beta": "127.0.6533.17",
+  "chrome:beta": "127.0.6533.26",
   "chrome:stable": "126.0.6478.126",
   "chrome:minimum": "64.0.3282.0"
 }
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -18,6 +18,7 @@ _Released 7/02/2024 (PENDING)_
 
 **Dependency Updates:**
 
+- Updated `memfs` from `3.4.12` to `3.5.3`. Addressed in [#29746](https://github.com/cypress-io/cypress/pull/29746).
 - Updated `tmp` from `0.2.1` to `0.2.3`. Addresses [#29693](https://github.com/cypress-io/cypress/issues/29693).
 - Updated `ws` from `5.2.3` to `5.2.4`. Addressed in [#29698](https://github.com/cypress-io/cypress/pull/29698).
 

diff --git a/packages/frontend-shared/src/public/shiki/languages/css.tmLanguage.json b/packages/frontend-shared/src/public/shiki/languages/css.tmLanguage.json
diff --git a/packages/frontend-shared/src/styles/normalize.scss b/packages/frontend-shared/src/styles/normalize.scss
@@ -677,7 +677,7 @@ select {
  background-size: 1.5em 1.5em;
  padding-right: 2.5rem;
  -webkit-print-color-adjust: exact;
- color-adjust: exact;
+ print-color-adjust: exact;
 }
 
 [multiple] {
@@ -687,7 +687,7 @@ select {
  background-size: initial;
  padding-right: .75rem;
  -webkit-print-color-adjust: unset;
- color-adjust: unset;
+ print-color-adjust: unset;
 }
 
 [type=checkbox],
@@ -697,7 +697,7 @@ select {
  appearance: none;
  padding: 0;
  -webkit-print-color-adjust: exact;
- color-adjust: exact;
+ print-color-adjust: exact;
  display: inline-block;
  vertical-align: middle;
  background-origin: border-box;

diff --git a/packages/frontend-shared/src/styles/shared.scss b/packages/frontend-shared/src/styles/shared.scss
@@ -169,7 +169,7 @@ select {
 	background-size: 1.5em 1.5em;
 	padding-right: 2.5rem;
 	-webkit-print-color-adjust: exact;
-	color-adjust: exact;
+	print-color-adjust: exact;
 }
 
 [multiple] {
@@ -179,7 +179,7 @@ select {
 	background-size: initial;
 	padding-right: .75rem;
 	-webkit-print-color-adjust: unset;
-	color-adjust: unset;
+	print-color-adjust: unset;
 }
 
 [type=checkbox],
@@ -189,7 +189,7 @@ select {
 	appearance: none;
 	padding: 0;
 	-webkit-print-color-adjust: exact;
-	color-adjust: exact;
+	print-color-adjust: exact;
 	display: inline-block;
 	vertical-align: middle;
 	background-origin: border-box;

diff --git a/packages/server/lib/browsers/browser-cri-client.ts b/packages/server/lib/browsers/browser-cri-client.ts
@@ -5,7 +5,7 @@ import Debug from 'debug'
 import type { Protocol } from 'devtools-protocol'
 import { _connectAsync, _getDelayMsForRetry } from './protocol'
 import * as errors from '../errors'
-import { create, CriClient, DEFAULT_NETWORK_ENABLE_OPTIONS } from './cri-client'
+import { CriClient, DEFAULT_NETWORK_ENABLE_OPTIONS } from './cri-client'
 import { serviceWorkerClientEventHandler, serviceWorkerClientEventHandlerName } from '@packages/proxy/lib/http/util/service-worker-manager'
 import type { ProtocolManagerShape } from '@packages/types'
 import type { ServiceWorkerEventHandler } from '@packages/proxy/lib/http/util/service-worker-manager'
@@ -241,7 +241,7 @@ export class BrowserCriClient {
     return retryWithIncreasingDelay(async () => {
       const versionInfo = await CRI.Version({ host, port, useHostName: true })
 
-      const browserClient = await create({
+      const browserClient = await CriClient.create({
         target: versionInfo.webSocketDebuggerUrl,
         onAsynchronousError,
         onReconnect,
@@ -543,7 +543,7 @@ export class BrowserCriClient {
         throw new Error(`Could not find url target in browser ${url}. Targets were ${JSON.stringify(targets)}`)
       }
 
-      this.currentlyAttachedTarget = await create({
+      this.currentlyAttachedTarget = await CriClient.create({
         target: target.targetId,
         onAsynchronousError: this.onAsynchronousError,
         host: this.host,
@@ -603,7 +603,7 @@ export class BrowserCriClient {
     })
 
     if (target) {
-      this.currentlyAttachedTarget = await create({
+      this.currentlyAttachedTarget = await CriClient.create({
         target: target.targetId,
         onAsynchronousError: this.onAsynchronousError,
         host: this.host,

diff --git a/packages/server/lib/browsers/cdp_automation.ts b/packages/server/lib/browsers/cdp_automation.ts
@@ -144,7 +144,7 @@ export type SendDebuggerCommand = <T extends CdpCommand>(message: T, data?: Prot
 
 export type OnFn = <T extends CdpEvent>(eventName: T, cb: (data: ProtocolMapping.Events[T][0], sessionId?: string) => void) => void
 
-export type OffFn = (eventName: string, cb: (data: any) => void) => void
+export type OffFn = <T extends CdpEvent>(eventName: T, cb: (data: any) => void) => void
 
 type SendCloseCommand = (shouldKeepTabOpen: boolean) => Promise<any> | void
 interface HasFrame {