chore: pull forward unification changes we can make now (#20644)

Co-authored-by: Ryan Manuel <ryanm@cypress.io>

Author: emilyrohrbough

.github/CODEOWNERS

@@ -1,14 +1,32 @@
 # Each line is a file pattern followed by one or more owners.
 
-# End-to-end team are owners of code within root packages concerning e2e, cli, and other utils
+# End-to-end team are owners of code within root packages concerning e2e testing, cli, and other utils
+# Component-testing team are owners of code within packages concerning component testing
+
 /.github/  @cypress-io/end-to-end
-/browser-versions.json  @cypress-io/end-to-end
+/browser-versions.json  @cypress-io/end-to-end @cypress-io/component-testing
+
 /cli/  @cypress-io/end-to-end
-/packages/coffee/  @cypress-io/end-to-end
-/packages/datetime-utils/  @cypress-io/end-to-end
+
+/guides/  @cypress-io/end-to-end
+
+/npm/angular @cypress-io/component-testing
+/npm/create-cypress-tests @cypress-io/component-testing
+/npm/cypress-schematic @cypress-io/component-testing
+/npm/design-system @cypress-io/component-testing
+/npm/eslint-plugin-dev @cypress-io/end-to-end @cypress-io/component-testing
+/npm/mount-utils @cypress-io/component-testing
+/npm/react @cypress-io/component-testing
+/npm/vue @cypress-io/component-testing
+/npm/webpack-batteries-included-preprocessor @cypress-io/end-to-end @cypress-io/component-testing
+/npm/webpack-dev-server @cypress-io/component-testing
+/npm/webpack-preprocessor @cypress-io/end-to-end @cypress-io/component-testing
+
+/packages/config/  @cypress-io/end-to-end
 /packages/desktop-gui/  @cypress-io/end-to-end
 /packages/driver/  @cypress-io/end-to-end
 /packages/electron/  @cypress-io/end-to-end
+/packages/errors/  @cypress-io/end-to-end @cypress-io/component-testing
 /packages/example/  @cypress-io/end-to-end
 /packages/extension/  @cypress-io/end-to-end
 /packages/https-proxy/  @cypress-io/end-to-end
@@ -17,14 +35,21 @@
 /packages/network/  @cypress-io/end-to-end
 /packages/proxy/  @cypress-io/end-to-end
 /packages/reporter/  @cypress-io/end-to-end
+/packages/resolve-dist/  @cypress-io/end-to-end
 /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
 /packages/ts/  @cypress-io/end-to-end
 /packages/ui-components/  @cypress-io/end-to-end
 /packages/web-config/  @cypress-io/end-to-end
+
+/patches/  @cypress-io/end-to-end
+
 /scripts/  @cypress-io/end-to-end
+
+/system-tests/ @cypress-io/end-to-end @cypress-io/component-testing

.vscode/cspell.json

@@ -4,14 +4,25 @@
     "dictionaryDefinitions": [],
     "dictionaries": [],
     "words": [
+        "Chainable",
+        "composables",
+        "ERRORED",
+        "forcedefault",
         "Iconify",
         "Lachlan",
         "msapplication",
+        "NOTESTS",
+        "OVERLIMIT",
         "Pinia",
+        "pnpm",
         "Screenshotting",
         "shiki",
         "testid",
+        "TIMEDOUT",
+        "unconfigured",
         "unplugin",
+        "unrunnable",
+        "urql",
         "vite",
         "vitejs",
         "vueuse"

.vscode/extensions.json

@@ -69,7 +69,7 @@
 
     // Name: Toggle Quotes
 		// Description: Toggle cycle " -> ' -> `
-    "britesnow.vscode-toggle-quotes",
+		"britesnow.vscode-toggle-quotes",
 
     // Name: Gremlins tracker for Visual Studio Code
     // Description: When you paste from Slack, Figma, or Google Docs, you'll get stylized quotes.

.vscode/settings.json

@@ -36,6 +36,7 @@
   "i18n-ally.keystyle": "nested",
 
   // Volar is the main extension that powers Vue's language features.
+  // These are commented out because they slow down node development
   // "volar.autoCompleteRefs": false,
   "volar.takeOverMode.enabled": true,
 }

README.md

@@ -42,7 +42,7 @@
 
 [![npm version](https://badge.fury.io/js/cypress.svg)](https://badge.fury.io/js/cypress)
 
-Install Cypress for Mac, Linux, or Windows, then [get started](https://docs.cypress.io/guides/getting-started/installing-cypress.html).
+Install Cypress for Mac, Linux, or Windows, then [get started](https://on.cypress.io/install).
 
 ```bash
 npm install cypress --save-dev

cli/lib/cli.js

@@ -267,6 +267,22 @@ const addCypressRunCommand = (program) => {
   .option('--dev', text('dev'), coerceFalse)
 }
 
+const addCypressOpenCommand = (program) => {
+  return program
+  .command('open')
+  .usage('[options]')
+  .description('Opens Cypress in the interactive GUI.')
+  .option('-b, --browser <browser-path>', text('browserOpenMode'))
+  .option('-c, --config <config>', text('config'))
+  .option('-C, --config-file <config-file>', text('configFile'))
+  .option('-d, --detached [bool]', text('detached'), coerceFalse)
+  .option('-e, --env <env>', text('env'))
+  .option('--global', text('global'))
+  .option('-p, --port <port>', text('port'))
+  .option('-P, --project <project-path>', text('project'))
+  .option('--dev', text('dev'), coerceFalse)
+}
+
 /**
  * Casts known command line options for "cypress run" to their intended type.
  * For example if the user passes "--port 5005" the ".port" property should be
@@ -384,23 +400,12 @@ module.exports = {
       showVersions(args)
     })
 
-    program
-    .command('open')
-    .usage('[options]')
-    .description('Opens Cypress in the interactive GUI.')
-    .option('-b, --browser <browser-path>', text('browserOpenMode'))
-    .option('-c, --config <config>', text('config'))
-    .option('-C, --config-file <config-file>', text('configFile'))
-    .option('-d, --detached [bool]', text('detached'), coerceFalse)
-    .option('-e, --env <env>', text('env'))
-    .option('--global', text('global'))
-    .option('-p, --port <port>', text('port'))
-    .option('-P, --project <project-path>', text('project'))
-    .option('--dev', text('dev'), coerceFalse)
+    addCypressOpenCommand(program)
     .action((opts) => {
       debug('opening Cypress')
       require('./exec/open')
       .start(util.parseOpts(opts))
+      .then(util.exit)
       .catch(util.logErrorExit1)
     })
 
@@ -430,6 +435,7 @@ module.exports = {
       debug('opening Cypress')
       require('./exec/open')
       .start({ ...util.parseOpts(opts), testingType: 'component' })
+      .then(util.exit)
       .catch(util.logErrorExit1)
     })
 

cli/lib/errors.js

@@ -80,7 +80,7 @@ const binaryNotExecutable = (executable) => {
 
     Please check that you have the appropriate user permissions.
 
-    You can also try clearing the cache with 'cypress cache clear' and reinstalling. 
+    You can also try clearing the cache with 'cypress cache clear' and reinstalling.
   `,
   }
 }

cli/lib/exec/open.js

@@ -4,42 +4,49 @@ const spawn = require('./spawn')
 const verify = require('../tasks/verify')
 const { processTestingType } = require('./shared')
 
-module.exports = {
-  start (options = {}) {
-    if (!util.isInstalledGlobally() && !options.global && !options.project) {
-      options.project = process.cwd()
-    }
+const processOpenOptions = (options) => {
+  if (!util.isInstalledGlobally() && !options.global && !options.project) {
+    options.project = process.cwd()
+  }
 
-    const args = []
+  const args = []
 
-    if (options.config) {
-      args.push('--config', options.config)
-    }
+  if (options.config) {
+    args.push('--config', options.config)
+  }
 
-    if (options.configFile !== undefined) {
-      args.push('--config-file', options.configFile)
-    }
+  if (options.configFile !== undefined) {
+    args.push('--config-file', options.configFile)
+  }
 
-    if (options.browser) {
-      args.push('--browser', options.browser)
-    }
+  if (options.browser) {
+    args.push('--browser', options.browser)
+  }
 
-    if (options.env) {
-      args.push('--env', options.env)
-    }
+  if (options.env) {
+    args.push('--env', options.env)
+  }
 
-    if (options.port) {
-      args.push('--port', options.port)
-    }
+  if (options.port) {
+    args.push('--port', options.port)
+  }
 
-    if (options.project) {
-      args.push('--project', options.project)
-    }
+  if (options.project) {
+    args.push('--project', options.project)
+  }
 
-    args.push(...processTestingType(options.testingType))
+  args.push(...processTestingType(options.testingType))
 
-    debug('opening from options %j', options)
-    debug('command line arguments %j', args)
+  debug('opening from options %j', options)
+  debug('command line arguments %j', args)
+
+  return args
+}
+
+module.exports = {
+  processOpenOptions,
+  start (options = {}) {
+    const args = processOpenOptions(options)
 
     function open () {
       return spawn.start(args, {

cli/lib/exec/spawn.js

@@ -102,13 +102,13 @@ module.exports = {
         const electronArgs = []
         const node11WindowsFix = isPlatform('win32')
 
+        let startScriptPath
+
         if (options.dev) {
+          executable = 'node'
           // if we're in dev then reset
           // the launch cmd to be 'npm run dev'
-          executable = 'node'
-          electronArgs.unshift(
-            path.resolve(__dirname, '..', '..', '..', 'scripts', 'start.js'),
-          )
+          startScriptPath = path.resolve(__dirname, '..', '..', '..', 'scripts', 'start.js'),
 
           debug('in dev mode the args became %o', args)
         }
@@ -118,6 +118,9 @@ module.exports = {
         }
 
         // strip dev out of child process options
+        /**
+         * @type {import('child_process').ForkOptions}
+         */
         let stdioOptions = _.pick(options, 'env', 'detached', 'stdio')
 
         // figure out if we're going to be force enabling or disabling colors.
@@ -141,9 +144,7 @@ module.exports = {
 
         if (stdioOptions.env.ELECTRON_RUN_AS_NODE) {
           // Since we are running electron as node, we need to add an entry point file.
-          const serverEntryPoint = path.join(state.getBinaryPkgPath(path.dirname(executable)), '..', 'index.js')
-
-          args = [serverEntryPoint, ...args]
+          startScriptPath = path.join(state.getBinaryPkgPath(path.dirname(executable)), '..', 'index.js')
         } else {
           // Start arguments with "--" so Electron knows these are OUR
           // arguments and does not try to sanitize them. Otherwise on Windows
@@ -152,8 +153,12 @@ module.exports = {
           args = [...electronArgs, '--', ...args]
         }
 
-        debug('spawning Cypress with executable: %s', executable)
+        if (startScriptPath) {
+          args.unshift(startScriptPath)
+        }
+
         debug('spawn args %o %o', args, _.omit(stdioOptions, 'env'))
+        debug('spawning Cypress with executable: %s', executable)
         const child = cp.spawn(executable, args, stdioOptions)
 
         function resolveOn (event) {

cli/test/spec_helper.js

@@ -6,6 +6,7 @@ const mockfs = require('mock-fs')
 const Promise = require('bluebird')
 const util = require('../lib/util')
 const { MockChildProcess } = require('spawn-mock')
+
 const _kill = MockChildProcess.prototype.kill
 
 const patchMockSpawn = () => {