chore: develop (including cy.origin) merge into 10.0

cli/types/cypress.d.ts

@@ -56,6 +56,16 @@ declare namespace Cypress {
     password: string
   }
 
+  interface RemoteState {
+    auth?: Auth
+    domainName: string
+    strategy: 'file' | 'http'
+    origin: string
+    fileServer: string | null
+    props: Record<string, any>
+    visiting: string
+  }
+
   interface Backend {
     /**
      * Firefox only: Force Cypress to run garbage collection routines.
@@ -2939,6 +2949,9 @@ declare namespace Cypress {
      * The platform Cypress is running on.
      */
     platform: 'linux' | 'darwin' | 'win32'
+
+    remote: RemoteState
+
     /**
      * The Cypress version being used.
      */
@@ -2971,6 +2984,7 @@ declare namespace Cypress {
     parentTestsFolderDisplay: string
     projectName: string
     proxyUrl: string
+    remote: RemoteState
     report: boolean
     reporterRoute: string
     reporterUrl: string

packages/app/index.d.ts

@@ -1,3 +1,5 @@
+/// <reference path="../driver/types/internal-types.d.ts" />
+
 import type { Socket } from '@packages/socket/lib/browser'
 import type MobX from 'mobx'
 import type { EventManager } from './src/runner/event-manager'

packages/driver/types/internal-types.d.ts

@@ -3,7 +3,6 @@
 /// <reference path="./cy/commands/session.d.ts" />
 /// <reference path="./cy/logGroup.d.ts" />
 /// <reference path="./cypress/log.d.ts" />
-/// <reference path="./remote-state.d.ts" />
 
 interface InternalWindowLoadDetails {
   type: 'same:origin' | 'cross:origin' | 'cross:origin:failure'

packages/resolve-dist/lib/index.ts

@@ -10,7 +10,7 @@ export const resolveFromPackages = (...args: string[]) => {
   return path.join(...[__dirname, '..', '..', ...args])
 }
 
-const getRunnerContents = (filename) => {
+const getRunnerContents = (filename: string) => {
   fs ??= require('fs-extra') as typeof import('fs-extra')
 
   return fs.readFile(getPathToDist('runner', filename))

packages/server/index.d.ts

@@ -13,8 +13,6 @@
 /// <reference path="../../cli/types/cypress-global-vars.d.ts" />
 /// <reference path="../../cli/types/cypress-type-helpers.d.ts" />
 
-/// <reference path="../driver/types/remote-state.d.ts" />
-
 // types for the `server` package
 export namespace CyServer {
   // TODO: pull this from main types

packages/server/lib/browsers/chrome.ts

@@ -324,7 +324,7 @@ const onReconnect = (client: CRIWrapper.Client) => {
   // if the client disconnects (e.g. due to a computer sleeping), update
   // the frame tree on reconnect in cases there were changes while
   // the client was disconnected
-  _updateFrameTree(client)()
+  return _updateFrameTree(client)()
 }
 
 // eslint-disable-next-line @cypress/dev/arrow-body-multiline-braces