chore(runner,runner-ct): reduce duplication with packages/runner-shar…

…ed (#16866) * move snapshot-controls to shared package * share visit-failure component * share blank-contents * share message component * move message styling to shared * stub scss in unit tests * remove whitespace * make dup files match * share selector playground * share script error * share automation-disconnected * remove old file * share no-automation * share error messages * share errors * make iframe model files similar * share iframe-model * share selector playground * share style * share highlight in selector playground * share dom file * update import * share aut-iframe * wip: shared event manager * remove CT event manager * move studio to shared runner package * fix tests * use shared event manager in CT runner * comment back in code * rename viewporth width/height to width/height * fix ts errors * share viewport info * share header * revert changed test * remove old code * fix tests and move test to shared package * move tests to shared package * make container files similar * share container in runner * share container * move test * move spec * update tsconfig] * update headeR * fix styling * style * refactor * refactor * reduce public modules * Update packages/runner-shared/src/event-manager.js Co-authored-by: Zach Bloomquist <github@chary.us> * fix percy regression * fix regression in style * improve types, try reverting style * add runner-shared tests to pipeline Co-authored-by: Zach Bloomquist <github@chary.us> Co-authored-by: Barthélémy Ledoux <bart@cypress.io>
cypress-io · Jun 16, 2021 · 929cac8 · 929cac8 · cypress-bot · Jun 16, 2021
1 parent 3029f01
commit 929cac8
Show file tree

Hide file tree

Showing 98 changed files with 1,072 additions and 3,196 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "stop-only": "npx stop-only --skip .cy,.publish,.projects,node_modules,dist,dist-test,fixtures,lib,bower_components,src,__snapshots__ --exclude e2e.ts,cypress-tests.ts,unwritten.spec.ts",
     "stop-only-all": "yarn stop-only --folder packages",
     "pretest": "yarn ensure-deps",
-    "test": "yarn lerna exec yarn test --scope cypress --scope \"'@packages/{electron,extension,https-proxy,launcher,net-stubbing,network,proxy,rewriter,runner,socket}'\"",
+    "test": "yarn lerna exec yarn test --scope cypress --scope \"'@packages/{electron,extension,https-proxy,launcher,net-stubbing,network,proxy,rewriter,runner,runner-shared,socket}'\"",
     "test-debug": "lerna exec yarn test-debug --ignore \"'@packages/{desktop-gui,driver,root,static,web-config}'\"",
     "pretest-e2e": "yarn ensure-deps",
     "test-e2e": "lerna exec yarn test-e2e --ignore \"'@packages/{desktop-gui,driver,root,static,web-config}'\"",

diff --git a/packages/driver/index.d.ts b/packages/driver/index.d.ts
@@ -2,4 +2,5 @@
 /// <reference path="../ts/index.d.ts" />
 export const $Cypress: Cypress.Cypress
 
-export default $Cypress
+export const $: typeof JQuery
+export default $Cypress
diff --git a/packages/runner-ct/cypress/component/ResizeReporter.spec.tsx b/packages/runner-ct/cypress/component/ResizeReporter.spec.tsx
@@ -3,7 +3,7 @@ import React from 'react'
 import { mount } from '@cypress/react'
 import RunnerCt from '../../src/app/RunnerCt'
 import '@packages/runner/src/main.scss'
-import eventManager from '../../src/lib/event-manager'
+import { eventManager } from '@packages/runner-shared'
 import { testSpecFile } from '../fixtures/testSpecFile'
 import { makeState, fakeConfig, getPort } from './utils'
 

diff --git a/packages/runner-ct/cypress/component/ResizeSpecList.spec.tsx b/packages/runner-ct/cypress/component/ResizeSpecList.spec.tsx
@@ -3,7 +3,7 @@ import React from 'react'
 import { mount } from '@cypress/react'
 import RunnerCt from '../../src/app/RunnerCt'
 import '@packages/runner/src/main.scss'
-import eventManager from '../../src/lib/event-manager'
+import { eventManager } from '@packages/runner-shared'
 import { testSpecFile } from '../fixtures/testSpecFile'
 import { makeState, fakeConfig, getPort } from './utils'
 

diff --git a/packages/runner-ct/cypress/component/ScriptError.spec.tsx b/packages/runner-ct/cypress/component/ScriptError.spec.tsx
@@ -2,7 +2,7 @@
 
 import React from 'react'
 import { mount } from '@cypress/react'
-import ScriptError from '../../src/errors/script-error'
+import { ScriptError } from '@packages/runner-shared'
 
 describe('ScriptError', () => {
   it('renders an error', () => {

diff --git a/packages/runner-ct/src/app/Plugins.tsx b/packages/runner-ct/src/app/Plugins.tsx
@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
 import State from '../lib/state'
 import { Hidden } from '../lib/Hidden'
-import { namedObserver } from '../lib/mobx'
+import { namedObserver } from '@packages/runner-shared'
 import { PLUGIN_BAR_HEIGHT } from './RunnerCt'
 
 import styles from './RunnerCt.module.scss'

diff --git a/packages/runner-ct/src/app/ReporterContainer.tsx b/packages/runner-ct/src/app/ReporterContainer.tsx
@@ -3,10 +3,8 @@ import cs from 'classnames'
 import { ReporterHeaderProps } from '@packages/reporter/src/header/header'
 import { Reporter } from '@packages/reporter/src/main'
 
-import errorMessages from '../errors/error-messages'
-import EventManager from '../lib/event-manager'
+import { errorMessages, namedObserver, eventManager as EventManager } from '@packages/runner-shared'
 import State from '../lib/state'
-import { namedObserver } from '../lib/mobx'
 import { ReporterHeader } from './ReporterHeader'
 import { NoSpec } from './NoSpec'
 
@@ -15,7 +13,10 @@ import styles from './RunnerCt.module.scss'
 interface ReporterContainerProps {
   state: State
   eventManager: typeof EventManager
-  config: Cypress.RuntimeConfigOptions
+  config: {
+    configFile: string
+    [key: string]: unknown
+  }
 }
 
 export const ReporterContainer = namedObserver('ReporterContainer',

diff --git a/packages/runner-ct/src/app/ReporterHeader.tsx b/packages/runner-ct/src/app/ReporterHeader.tsx
@@ -3,7 +3,7 @@ import { ReporterHeaderProps } from '@packages/reporter/src/header/header'
 import Stats from '@packages/reporter/src/header/stats'
 import Controls from '@packages/reporter/src/header/controls'
 import { StatsStore } from '@packages/reporter/src/header/stats-store'
-import { namedObserver } from '../lib/mobx'
+import { namedObserver } from '@packages/runner-shared'
 import styles from './ReporterHeader.module.scss'
 
 export const EmptyReporterHeader: React.FC = () => {

diff --git a/packages/runner-ct/src/app/RunnerCt.tsx b/packages/runner-ct/src/app/RunnerCt.tsx
@@ -14,13 +14,12 @@ library.add(fas)
 library.add(fab)
 
 import State from '../lib/state'
-import EventManager from '../lib/event-manager'
+import { eventManager as EventManager, namedObserver } from '@packages/runner-shared'
 import { useGlobalHotKey } from '../lib/useHotKey'
 import { animationFrameDebounce } from '../lib/debounce'
 import { LeftNavMenu } from './LeftNavMenu'
 import { SpecContent } from './SpecContent'
 import { hideIfScreenshotting, hideSpecsListIfNecessary } from '../lib/hideGuard'
-import { namedObserver } from '../lib/mobx'
 import { SpecList } from './SpecList/SpecList'
 import { NoSpec } from './NoSpec'
 

diff --git a/packages/runner-ct/src/app/SpecContent.tsx b/packages/runner-ct/src/app/SpecContent.tsx
@@ -1,27 +1,27 @@
 import cs from 'classnames'
 import * as React from 'react'
 import SplitPane from 'react-split-pane'
+import { Message, namedObserver, eventManager as EventManager, Header } from '@packages/runner-shared'
 
-import Header from '../header/header'
 import { Iframes } from '../iframe/iframes'
 import { animationFrameDebounce } from '../lib/debounce'
-import { Message } from '../message/message'
 import { KeyboardHelper } from './KeyboardHelper'
 import { NoSpec } from './NoSpec'
 import { Plugins } from './Plugins'
 import { ReporterContainer } from './ReporterContainer'
 import { PLUGIN_BAR_HEIGHT } from './RunnerCt'
 import State from '../lib/state'
-import EventManager from '../lib/event-manager'
 import { hideIfScreenshotting, hideReporterIfNecessary } from '../lib/hideGuard'
 
 import styles from './RunnerCt.module.scss'
-import { namedObserver } from '../lib/mobx'
 
 interface SpecContentProps {
   state: State
   eventManager: typeof EventManager
-  config: Cypress.RuntimeConfigOptions
+  config: {
+    configFile: string
+    [key: string]: unknown
+  }
 }
 
 interface SpecContentWrapperProps {
@@ -62,15 +62,27 @@ export const SpecContent = namedObserver('SpecContent', (props: SpecContentProps
           },
         )}
         >
-          <Header {...props} />
+          <Header {...props} runner='ct' />
           {props.state.spec
             ? <Iframes {...props} />
             : (
               <NoSpec>
                 <KeyboardHelper />
               </NoSpec>
             )}
-          <Message state={props.state} />
+          <Message
+            state={{
+              messageTitle: props.state.messageTitle,
+              messageControls: props.state.messageControls,
+              messageDescription: props.state.messageDescription,
+              messageType: props.state.messageType,
+              messageStyles: {
+                state: props.state.messageStyles.state,
+                styles: props.state.messageStyles.styles,
+                messageType: props.state.messageType,
+              },
+            }}
+          />
         </div>
         <Plugins
           key="plugins"

diff --git a/packages/runner-ct/src/app/useScreenshotHandler.tsx b/packages/runner-ct/src/app/useScreenshotHandler.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { runInAction } from 'mobx'
-import EventManager from '../lib/event-manager'
+import { eventManager as EventManager } from '@packages/runner-shared'
 import State from '../lib/state'
 
 /**

diff --git a/packages/runner-ct/src/errors/error-messages.js b/packages/runner-ct/src/errors/error-messages.js
diff --git a/packages/runner-ct/src/header/header.tsx b/packages/runner-ct/src/header/header.tsx