diff --git a/package.json b/package.json index a5b0d418ac..f4283135fe 100644 --- 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 index b814a4d928..8bb8dc0232 100644 --- a/packages/driver/index.d.ts +++ b/packages/driver/index.d.ts @@ -2,4 +2,5 @@ /// export const $Cypress: Cypress.Cypress -export default $Cypress +export const $: typeof JQuery +export default $Cypress \ No newline at end of file diff --git a/packages/runner-ct/cypress/component/ResizeReporter.spec.tsx b/packages/runner-ct/cypress/component/ResizeReporter.spec.tsx index c7c993ea15..cd8227c2b4 100644 --- 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 index a1881ab530..8a37873500 100644 --- 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 index 4b9e1826de..d7b5623608 100644 --- 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 index 7644b97db4..983be61883 100644 --- 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 index 5a657101f0..4fbe03a8aa 100644 --- 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 index 7ec83090a4..ba4cd687ee 100644 --- 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 index b41039b224..ee501e1a0c 100644 --- 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 index 21f69cc8a6..da9628220f 100644 --- 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,7 +62,7 @@ export const SpecContent = namedObserver('SpecContent', (props: SpecContentProps }, )} > -
+
{props.state.spec ? : ( @@ -70,7 +70,19 @@ export const SpecContent = namedObserver('SpecContent', (props: SpecContentProps )} - + { - headerRef = React.createRef() - - @observable showingViewportMenu = false - - render () { - const { state, config } = this.props - - return ( -
-
- -