Skip to content

Commit 2d119ad

Browse files
sainthkhemilyrohrboughlmiller1990
authored
chore: Intregrate runner packages. (#23028)
* chore: Intregrate runner packages. * Remove unnecessary Studio react files. * Remove unnecessary gif * runner-shared to runner-ct. * fix path. * fix package.json * Remove scss files from runner-ct * Remove runner-ct * Remove runner-shared and runner-ct comments. * Feedback * chore: reduce parallelism for reporter-componen-tests * chore: reduce paralelleism Co-authored-by: Emily Rohrbough <emilyrohrbough@users.noreply.github.com> Co-authored-by: Lachlan Miller <lachlan.miller.1990@outlook.com>
1 parent 26886c4 commit 2d119ad

File tree

107 files changed

+76
-3416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+76
-3416
lines changed

.github/CODEOWNERS

-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
/packages/rewriter/ @cypress-io/end-to-end
4141
/packages/root/ @cypress-io/end-to-end
4242
/packages/runner/ @cypress-io/end-to-end
43-
/packages/runner-ct/ @cypress-io/component-testing
44-
/packages/runner-shared/ @cypress-io/end-to-end
4543
/packages/server/ @cypress-io/end-to-end
4644
/packages/socket/ @cypress-io/end-to-end
4745
/packages/static/ @cypress-io/end-to-end

.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ system-tests/lib/fixtureDirs.ts
7878
# from npm/webpack-dev-server
7979
/npm/webpack-dev-server/cypress/videos
8080

81-
# from runner-ct
82-
/packages/runner-ct/cypress/screenshots
83-
8481
# from errors
8582
/packages/errors/__snapshot-images__
8683
/packages/errors/__snapshot-md__

.vscode/terminals.json

-7
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,6 @@
8383
"cwd": "[cwd]/packages/runner",
8484
"command": "yarn watch"
8585
},
86-
{
87-
"name": "packages/runner-ct watch",
88-
"focus": true,
89-
"onlySingle": true,
90-
"cwd": "[cwd]/packages/runner-ct",
91-
"command": "yarn watch"
92-
},
9386
{
9487
"name": "packages/driver cypress open",
9588
"focus": true,

CONTRIBUTING.md

-2
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,6 @@ Here is a list of the core packages in this repository with a short description,
271271
| [reporter](./packages/reporter) | `@packages/reporter` | The reporter shows the running results of the tests (The Command Log UI). |
272272
| [root](./packages/root) | `@packages/root` | Dummy package pointing at the root of the repository. |
273273
| [runner](./packages/runner) | `@packages/runner` | The runner is the minimal "chrome" around the user's application under test. |
274-
| [runner-ct](./packages/runner-ct) | `@packages/runner-ct` | The runner for component testing |
275-
| [runner-shared](./packages/runner-shared) | `@packages/runner-shared` | The shared components between the `runner` and the `runner-ct` packages |
276274
| [server](./packages/server) | `@packages/server` | The <3 of Cypress. This orchestrates everything. The backend node process. |
277275
| [server-ct](./packages/server-ct) | `@packages/server-ct` | Some Component Testing specific overrides. Mostly extends functionality from `@packages/server` |
278276
| [socket](./packages/socket) | `@packages/socket` | A wrapper around socket.io to provide common libraries. |

circle.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1607,7 +1607,7 @@ jobs:
16071607
percy:
16081608
type: boolean
16091609
default: false
1610-
parallelism: 7
1610+
parallelism: 2
16111611
steps:
16121612
- run-new-ui-tests:
16131613
browser: chrome

packages/app/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ The terminology can get a bit confusing as Vue Router's `params` are not the que
9191

9292
## Using existing, Vite-incompatible modules
9393

94-
Some of our modules, like `@packages/reporter`, `@packages/driver` and `@packages/runner-shared` cannot be easily
94+
Some of our modules, like `@packages/reporter`, `@packages/driver` and `@packages/runner` cannot be easily
9595
used with Vite due to circular dependencies and modules that do not have compatible ESM builds.
9696

9797
To work around this, when consuming existing code, it is bundled with webpack and made available under the
9898
`window.UnifiedRunner` namespace. It is injected via [`injectBundle`](./src/runner/injectBundle.ts).
9999

100-
To add more code to the bundle, add it in the bundle root, `@packages/runner-ct/src/main.tsx` and attach it to
100+
To add more code to the bundle, add it in the bundle root, `@packages/runner/src/main.tsx` and attach it to
101101
`window.UnifiedRunner`.
102102

103103
As a rule of thumb, avoid importing from the older, webpack based modules into this package. Instead, if you want to consume code from those older, webpack bundled modules, you should add them to the webpack root and consume them via `window.UnifiedRunner`. Ideally, update [`index.d.ts`](./index.d.ts) to add the types, as well.

packages/app/index.d.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ declare global {
5151

5252
/**
5353
* Any React components or general code needed from
54-
* runner-shared, reporter or driver are also bundled with
54+
* runner, reporter or driver are also bundled with
5555
* webpack and made available via the window.UnifedRunner namespace.
5656
*
5757
* We cannot import the correct types, because this causes the linter and type
58-
* checker to run on runner-shared and reporter, and it blows up.
58+
* checker to run on runner and reporter, and it blows up.
5959
*/
6060
Reporter: any
6161
shortcuts: {

packages/app/src/runner/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* - reporter
99
* which are built with React and bundle with webpack.
1010
*
11-
* The entry point for the webpack bundle is `runner-ct/main.tsx`.
11+
* The entry point for the webpack bundle is `runner/main.tsx`.
1212
* Any time you need to consume some existing code, add it to the `window.UnifiedRunner`
1313
* namespace there, and access it with `window.UnifiedRunner`.
1414
*

packages/driver/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"@packages/network": "0.0.0-development",
2323
"@packages/rewriter": "0.0.0-development",
2424
"@packages/runner": "0.0.0-development",
25-
"@packages/runner-shared": "0.0.0-development",
2625
"@packages/server": "0.0.0-development",
2726
"@packages/socket": "0.0.0-development",
2827
"@packages/ts": "0.0.0-development",

packages/driver/src/dom/blackout.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import $ from 'jquery'
2-
import $dimensions from '@packages/runner-shared/src/dimensions'
2+
import $dimensions from '@packages/runner/src/dom/dimensions'
33

44
const resetStyles = `
55
border: none !important;

packages/resolve-dist/lib/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import path from 'path'
22

33
let fs: typeof import('fs-extra')
44

5-
export type RunnerPkg = 'app' | 'runner' | 'runner-ct'
5+
export type RunnerPkg = 'app' | 'runner'
66

77
type FoldersWithDist = 'static' | 'driver' | RunnerPkg | 'launchpad'
88

packages/runner-ct/.eslintrc.json

-137
This file was deleted.

packages/runner-ct/.gitignore

-1
This file was deleted.

packages/runner-ct/README.md

-6
This file was deleted.

packages/runner-ct/package.json

-69
This file was deleted.

packages/runner-ct/src/SpecList/components/SearchSpec.scss

-36
This file was deleted.

0 commit comments

Comments
 (0)