diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2d66311bf198..c28820cc7b64 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -40,8 +40,6 @@ /packages/rewriter/ @cypress-io/end-to-end /packages/root/ @cypress-io/end-to-end /packages/runner/ @cypress-io/end-to-end -/packages/runner-ct/ @cypress-io/component-testing -/packages/runner-shared/ @cypress-io/end-to-end /packages/server/ @cypress-io/end-to-end /packages/socket/ @cypress-io/end-to-end /packages/static/ @cypress-io/end-to-end diff --git a/.gitignore b/.gitignore index 04ed01aea4b3..610ab6af5aa2 100644 --- a/.gitignore +++ b/.gitignore @@ -78,8 +78,8 @@ system-tests/lib/fixtureDirs.ts # from npm/webpack-dev-server /npm/webpack-dev-server/cypress/videos -# from runner-ct -/packages/runner-ct/cypress/screenshots +# from runner +/packages/runner/cypress/screenshots # from errors /packages/errors/__snapshot-images__ diff --git a/.vscode/terminals.json b/.vscode/terminals.json index e154b4233b49..126e4974c2b7 100644 --- a/.vscode/terminals.json +++ b/.vscode/terminals.json @@ -83,13 +83,6 @@ "cwd": "[cwd]/packages/runner", "command": "yarn watch" }, - { - "name": "packages/runner-ct watch", - "focus": true, - "onlySingle": true, - "cwd": "[cwd]/packages/runner-ct", - "command": "yarn watch" - }, { "name": "packages/driver cypress open", "focus": true, diff --git a/packages/app/README.md b/packages/app/README.md index d853a4e339cf..cca5801ce754 100644 --- a/packages/app/README.md +++ b/packages/app/README.md @@ -91,13 +91,13 @@ The terminology can get a bit confusing as Vue Router's `params` are not the que ## Using existing, Vite-incompatible modules -Some of our modules, like `@packages/reporter`, `@packages/driver` and `@packages/runner-shared` cannot be easily +Some of our modules, like `@packages/reporter`, `@packages/driver` and `@packages/runner` cannot be easily used with Vite due to circular dependencies and modules that do not have compatible ESM builds. To work around this, when consuming existing code, it is bundled with webpack and made available under the `window.UnifiedRunner` namespace. It is injected via [`injectBundle`](./src/runner/injectBundle.ts). -To add more code to the bundle, add it in the bundle root, `@packages/runner-ct/src/main.tsx` and attach it to +To add more code to the bundle, add it in the bundle root, `@packages/runner/src/main.tsx` and attach it to `window.UnifiedRunner`. 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. diff --git a/packages/app/index.d.ts b/packages/app/index.d.ts index 74a41b5d1f88..f3090246d1ea 100644 --- a/packages/app/index.d.ts +++ b/packages/app/index.d.ts @@ -51,11 +51,11 @@ declare global { /** * Any React components or general code needed from - * runner-shared, reporter or driver are also bundled with + * runner, reporter or driver are also bundled with * webpack and made available via the window.UnifedRunner namespace. * * We cannot import the correct types, because this causes the linter and type - * checker to run on runner-shared and reporter, and it blows up. + * checker to run on runner and reporter, and it blows up. */ Reporter: any shortcuts: {