Merge branch 'develop' into electron-34

Author: jennifer-shehane

.circleci/workflows.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 chrome-stable-version: &chrome-stable-version "135.0.7049.84"
-chrome-beta-version: &chrome-beta-version "136.0.7103.17"
+chrome-beta-version: &chrome-beta-version "136.0.7103.25"
 firefox-stable-version: &firefox-stable-version "137.0"
 
 orbs:

.gitignore

@@ -398,4 +398,7 @@ tooling/v8-snapshot/cache/prod-win32
 system-tests/lib/validations
 
 .nx/cache
-.nx/workspace-data
+.nx/workspace-data
+
+# IDE files
+.cursor

cli/CHANGELOG.md

@@ -3,6 +3,16 @@
 
 _Released 4/22/2025 (PENDING)_
 
+**Bugfixes:**
+
+- The [`cy.press()`](http://on.cypress.io/api/press) command no longer errors when used in specs subsequent to the first spec in run mode. Fixes [#31466](https://github.com/cypress-io/cypress/issues/31466).
+
+**Misc:**
+
+- Suppress benign warnings that reference OOM score of renderer. Addresses [#29563](https://github.com/cypress-io/cypress/issues/29563). Addressed in [#31521](https://github.com/cypress-io/cypress/pull/31521).
+- The UI of the reporter and URL were updated to a darker gray background for better color contrast. Addressed in [#31475](https://github.com/cypress-io/cypress/pull/31475).
+- Fixed an issue where the error message output when attempting to install Cypress on an unsupported architecture included an outdated documentation link to Cypress system requirements. Fixes [#31512](https://github.com/cypress-io/cypress/issues/31512).
+
 **Dependency Updates:**
 
 - Upgraded `electron` from `33.2.1` to `34.3.3`. Addresses [#31245](https://github.com/cypress-io/cypress/issues/31245). Addressed in [#31260](https://github.com/cypress-io/cypress/pull/31260).

cli/__snapshots__/install_spec.js

@@ -274,7 +274,7 @@ Installing Cypress (version: 1.2.3)
 exports['error when installing on unsupported os'] = `
 Error: The Cypress App could not be installed. Your machine does not meet the operating system requirements.
 
-https://on.cypress.io/guides/getting-started/installing-cypress#system-requirements
+https://on.cypress.io/app/get-started/install-cypress#System-requirements
 
 ----------
 

cli/lib/errors.js

@@ -42,7 +42,7 @@ const invalidOS = {
   description: 'The Cypress App could not be installed. Your machine does not meet the operating system requirements.',
   solution: stripIndent`
 
-  ${chalk.blue('https://on.cypress.io/guides/getting-started/installing-cypress#system-requirements')}`,
+  ${chalk.blue('https://on.cypress.io/app/get-started/install-cypress#System-requirements')}`,
 }
 
 const failedDownload = {

cli/lib/exec/spawn.js

@@ -16,6 +16,11 @@ const readline = require('readline')
 const isXlibOrLibudevRe = /^(?:Xlib|libudev)/
 const isHighSierraWarningRe = /\*\*\* WARNING/
 const isRenderWorkerRe = /\.RenderWorker-/
+// This is a warning that occurs when running in a container on Linux.
+// https://github.com/cypress-io/cypress/issues/29563
+// Example:
+// [437:1212/125803.148706:ERROR:zygote_host_impl_linux.cc(273)] Failed to adjust OOM score of renderer with pid 610: Permission denied (13)
+const isOOMScoreWarningRe = /Failed to adjust OOM score of renderer with pid/
 
 // Chromium (which Electron uses) always makes several attempts to connect to the system dbus.
 // This works fine in most desktop environments, but in a docker container, there is no dbus service
@@ -100,6 +105,7 @@ const GARBAGE_WARNINGS = [
   isXlibOrLibudevRe,
   isHighSierraWarningRe,
   isRenderWorkerRe,
+  isOOMScoreWarningRe,
   isDbusWarning,
   isCertVerifyProcBuiltin,
   isHostVulkanDriverWarning,

cli/test/lib/exec/spawn_spec.js

@@ -99,6 +99,8 @@ describe('lib/exec/spawn', function () {
         [78887:1023/114920.074882:ERROR:debug_utils.cc(14)] Hit debug scenario: 4
 
         [18489:0822/130231.159571:ERROR:gl_display.cc(497)] EGL Driver message (Error) eglQueryDeviceAttribEXT: Bad attribute.
+
+        [437:1212/125803.148706:ERROR:zygote_host_impl_linux.cc(273)] Failed to adjust OOM score of renderer with pid 610: Permission denied (13)
       `
 
       const lines = _
@@ -124,6 +126,10 @@ describe('lib/exec/spawn', function () {
     it('returns true for GLX driver errors', () => {
       expect(spawn.isGarbageLineWarning('glx: failed to create drisw screen')).to.be.true
     })
+
+    it('returns true for OOM score adjustment warnings', () => {
+      expect(spawn.isGarbageLineWarning('[437:1212/125803.148706:ERROR:zygote_host_impl_linux.cc(273)] Failed to adjust OOM score of renderer with pid 610: Permission denied (13)')).to.be.true
+    })
   })
 
   context('.start', function () {

npm/mount-utils/tsconfig.json

@@ -43,7 +43,6 @@
     // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
 
     /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
     "esModuleInterop": true
   },

npm/vite-dev-server/tsconfig.json

@@ -42,7 +42,6 @@
     // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
 
     /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
     "esModuleInterop": true,
     /** Allows us to strip internal types sourced from webpack */

npm/vite-plugin-cypress-esm/tsconfig.json

@@ -42,7 +42,6 @@
     // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
 
     /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
     "esModuleInterop": true,
     /** Allows us to strip internal types sourced from webpack */

npm/vue/tsconfig.json

@@ -45,7 +45,6 @@
     // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
 
     /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
     "esModuleInterop": true
   },

npm/webpack-dev-server/tsconfig.json

@@ -42,7 +42,6 @@
     // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
 
     /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
     "esModuleInterop": true,
     "skipLibCheck": true,

npm/webpack-preprocessor/tsconfig.json

@@ -56,7 +56,6 @@
     // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
 
     /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
 
     /* Advanced Options */

packages/app/src/runner/SpecRunnerHeaderOpenMode.vue

@@ -2,15 +2,15 @@
   <div
     id="spec-runner-header"
     ref="autHeaderEl"
-    class="h-full bg-gray-1000 border-l-[1px] border-gray-900 min-h-[64px] text-[14px]"
+    class="h-full bg-gray-1100 border-l-[1px] border-gray-900 min-h-[64px] text-[14px]"
   >
     <div class="flex flex-wrap grow p-[16px] gap-[12px] justify-end h-[64px]">
       <button
         data-cy="playground-activator"
         :disabled="isDisabled"
-        class="bg-gray-900 border rounded-md flex h-full border-gray-800 outline-solid outline-indigo-500 transition w-[40px] duration-150 items-center justify-center hover:bg-gray-800"
+        class="bg-gray-1100 border rounded-md flex h-full border-gray-800 outline-solid outline-indigo-500 transition w-[40px] duration-150 items-center justify-center hover:bg-gray-800"
         :aria-label="t('runner.selectorPlayground.toggle')"
-        :class="[selectorPlaygroundStore.show ? 'bg-gray-800 border-gray-700' : 'bg-gray-900']"
+        :class="[selectorPlaygroundStore.show ? 'bg-gray-800 border-gray-700' : 'bg-gray-1100']"
         @click="togglePlayground"
       >
         <i-cy-crosshairs_x16 class="icon-dark-gray-300" />

packages/app/src/runner/SpecRunnerHeaderRunMode.vue

@@ -2,7 +2,7 @@
   <div
     id="spec-runner-header"
     ref="autHeaderEl"
-    class="bg-gray-1000 border-l-[1px] border-gray-900 min-h-[64px] px-[16px] text-[14px]"
+    class="bg-gray-1100 border-l-[1px] border-gray-900 min-h-[64px] px-[16px] text-[14px]"
   >
     <!-- this is similar to the Open Mode header but it's not interactive, so can be a lot smaller-->
     <div class="flex grow flex-wrap py-[16px] gap-[12px] justify-end">

packages/app/src/studio/studio-app-types.ts

@@ -1,5 +1,7 @@
 export interface StudioPanelProps {
   canAccessStudioAI: boolean
+  useStudioEventManager?: StudioEventManagerShape
+  useStudioAIStream?: StudioAIStreamShape
 }
 
 export type StudioPanelShape = (props: StudioPanelProps) => JSX.Element
@@ -9,3 +11,27 @@ export interface StudioAppDefaultShape {
   // transferred to the Cypress app
   StudioPanel: StudioPanelShape
 }
+
+export type CypressInternal = Cypress.Cypress &
+CyEventEmitter & {
+  state: (key: string) => any
+}
+
+export interface StudioEventManagerProps {
+  Cypress: CypressInternal
+}
+
+export type RunnerStatus = 'running' | 'finished'
+
+export type StudioEventManagerShape = (props: StudioEventManagerProps) => {
+  runnerStatus: RunnerStatus
+  testBlock: string | null
+}
+
+export interface StudioAIStreamProps {
+  canAccessStudioAI: boolean
+  AIOutputRef: { current: HTMLTextAreaElement | null }
+  runnerStatus: RunnerStatus
+}
+
+export type StudioAIStreamShape = (props: StudioAIStreamProps) => void

packages/data-context/src/DataActions.ts

@@ -19,98 +19,117 @@ import { ErrorActions } from './actions/ErrorActions'
 import { EventCollectorActions } from './actions/EventCollectorActions'
 import { NotificationActions } from './actions/NotificationActions'
 import { VersionsActions } from './actions/VersionsActions'
-import { cached } from './util'
 
 export class DataActions {
-  constructor (private ctx: DataContext) {}
+  private _error: ErrorActions
+  private _file: FileActions
+  private _dev: DevActions
+  private _app: AppActions
+  private _auth: AuthActions
+  private _localSettings: LocalSettingsActions
+  private _wizard: WizardActions
+  private _project: ProjectActions
+  private _electron: ElectronActions
+  private _migration: MigrationActions
+  private _browser: BrowserActions
+  private _servers: ServersActions
+  private _versions: VersionsActions
+  private _eventCollector: EventCollectorActions
+  private _cohorts: CohortsActions
+  private _codegen: CodegenActions
+  private _notification: NotificationActions
+  private _cloudProject: CloudProjectActions
+
+  constructor (private ctx: DataContext) {
+    this._error = new ErrorActions(this.ctx)
+    this._file = new FileActions(this.ctx)
+    this._dev = new DevActions(this.ctx)
+    this._app = new AppActions(this.ctx)
+    this._auth = new AuthActions(this.ctx)
+    this._localSettings = new LocalSettingsActions(this.ctx)
+    this._wizard = new WizardActions(this.ctx)
+    this._project = new ProjectActions(this.ctx)
+    this._electron = new ElectronActions(this.ctx)
+    this._migration = new MigrationActions(this.ctx)
+    this._browser = new BrowserActions(this.ctx)
+    this._servers = new ServersActions(this.ctx)
+    this._versions = new VersionsActions(this.ctx)
+    this._eventCollector = new EventCollectorActions(this.ctx)
+    this._cohorts = new CohortsActions(this.ctx)
+    this._codegen = new CodegenActions(this.ctx)
+    this._notification = new NotificationActions(this.ctx)
+    this._cloudProject = new CloudProjectActions(this.ctx)
+  }
 
-  @cached
   get error () {
-    return new ErrorActions(this.ctx)
+    return this._error
   }
 
-  @cached
   get file () {
-    return new FileActions(this.ctx)
+    return this._file
   }
 
-  @cached
   get dev () {
-    return new DevActions(this.ctx)
+    return this._dev
   }
 
-  @cached
   get app () {
-    return new AppActions(this.ctx)
+    return this._app
   }
 
-  @cached
   get auth () {
-    return new AuthActions(this.ctx)
+    return this._auth
   }
 
-  @cached
   get localSettings () {
-    return new LocalSettingsActions(this.ctx)
+    return this._localSettings
   }
 
-  @cached
   get wizard () {
-    return new WizardActions(this.ctx)
+    return this._wizard
   }
 
-  @cached
   get project () {
-    return new ProjectActions(this.ctx)
+    return this._project
   }
 
-  @cached
   get electron () {
-    return new ElectronActions(this.ctx)
+    return this._electron
   }
 
-  @cached
   get migration () {
-    return new MigrationActions(this.ctx)
+    return this._migration
   }
 
-  @cached
   get browser () {
-    return new BrowserActions(this.ctx)
+    return this._browser
   }
 
-  @cached
   get servers () {
-    return new ServersActions(this.ctx)
+    return this._servers
   }
 
-  @cached
   get versions () {
-    return new VersionsActions(this.ctx)
+    return this._versions
   }
 
-  @cached
   get eventCollector () {
-    return new EventCollectorActions(this.ctx)
+    return this._eventCollector
   }
 
-  @cached
   get cohorts () {
-    return new CohortsActions(this.ctx)
+    return this._cohorts
   }
 
-  @cached
   get codegen () {
-    return new CodegenActions(this.ctx)
+    return this._codegen
   }
 
-  @cached
   get notification () {
-    return new NotificationActions(this.ctx)
+    return this._notification
   }
 
-  @cached
   get cloudProject () {
-    return new CloudProjectActions(this.ctx)
+    return this._cloudProject
   }
 }