Merge branch '10.0-release' into tgriesser/chore/e2e-data-clean

* 10.0-release:
  feat: improve vite DX (#18937)
  feat: Use plugins on config files (#18798)
  BREAKING CHANGE: trigger major bump
  BREAKING CHANGE: trigger major bump
  fix: fix cypress/package.json crasher
  fix(breaking): change circle.yml to release binary
  fix: build-prod-ui deps before build-prod packages
  feat: implement spec list tree (#18901)
  chore: adding 10.0-release to the circle.yml build script (#18926)
  feat(app): remove __vite__ route and default to unified runner (#18909)
  fix: app layout + specs list review (#18862)
  feat(app): show previous versions (#18838)
  feat: scaffold integration files in app (#18763)
  feat: add footer to the settings (#18867)
  fix: Exit when both --e2e and --component flags are passed in (#18855)

Author: tgriesser

circle.yml

@@ -8,6 +8,7 @@ macBuildFilters: &macBuildFilters
     branches:
       only:
         - develop
+        - 10.0-release
         - tgriesser/chore/fix-release
 
 defaults: &defaults
@@ -42,6 +43,7 @@ onlyMainBranches: &onlyMainBranches
     branches:
       only:
         - develop
+        - 10.0-release
         - tgriesser/chore/fix-release
   requires:
     - create-build-artifacts
@@ -1030,6 +1032,8 @@ jobs:
             runner-integration-tests-chrome,
             runner-ct-integration-tests-chrome,
             reporter-integration-tests,
+            run-app-integration-tests-chrome,
+            run-launchpad-integration-tests-chrome
       - run: yarn percy build:finalize
 
   cli-visual-tests:
@@ -1618,7 +1622,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "tgriesser/chore/fix-release" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "10.0-release" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -1912,7 +1916,21 @@ jobs:
             CYPRESS_INTERNAL_FORCE_SCAFFOLD: "1"
           command: |
             rm -rf cypress.json
-            echo 'export default {}' > cypress.config.ts
+            echo "export default {
+                    e2e: {
+                      setupNodeEvents (on, config) {
+                        on('task', {
+                          log (x) {
+                            console.log(x)
+
+                            return null
+                          },
+                        })
+
+                        return config
+                      },
+                    },
+                  }" > cypress.config.ts
       - run:
           name: Run project tests 🗳
           working_directory: <<parameters.wd>>
@@ -2310,6 +2328,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
+              - 10.0-release
               - tgriesser/chore/fix-release
         requires:
           - build
@@ -2322,6 +2341,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
+              - 10.0-release
               - tgriesser/chore/fix-release
         requires:
           - build
@@ -2372,6 +2392,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
+              - 10.0-release
               - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
@@ -2380,6 +2401,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
+              - 10.0-release
               - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
@@ -2389,6 +2411,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
+              - 10.0-release
               - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
@@ -2414,6 +2437,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
+              - 10.0-release
               - tgriesser/chore/fix-release
         requires:
           - create-build-artifacts
@@ -2486,6 +2510,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
+              - 10.0-release
               - tgriesser/chore/fix-release
         requires:
           - darwin-create-build-artifacts
@@ -2498,6 +2523,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
+              - 10.0-release
               - tgriesser/chore/fix-release
         requires:
           - darwin-create-build-artifacts

cli/__snapshots__/errors_spec.js

@@ -26,29 +26,6 @@ Platform: test platform (Foo-OsVersion)
 Cypress Version: 1.2.3
 `
 
-exports['errors individual has the following errors 1'] = [
-  "CYPRESS_RUN_BINARY",
-  "binaryNotExecutable",
-  "childProcessKilled",
-  "failedDownload",
-  "failedUnzip",
-  "incompatibleHeadlessFlags",
-  "invalidCacheDirectory",
-  "invalidCypressEnv",
-  "invalidRunProjectPath",
-  "invalidSmokeTestDisplayError",
-  "invalidTestingType",
-  "missingApp",
-  "missingDependency",
-  "missingXvfb",
-  "nonZeroExitCodeXvfb",
-  "notInstalledCI",
-  "smokeTestFailure",
-  "unexpected",
-  "unknownError",
-  "versionMismatch"
-]
-
 exports['invalid display error'] = `
 Cypress verification failed.
 
@@ -95,3 +72,28 @@ Consider opening a new issue.
 Platform: test platform (Foo-OsVersion)
 Cypress Version: 1.2.3
 `
+
+exports['errors individual has the following errors 1'] = [
+  "CYPRESS_RUN_BINARY",
+  "binaryNotExecutable",
+  "childProcessKilled",
+  "failedDownload",
+  "failedUnzip",
+  "incompatibleHeadlessFlags",
+  "incompatibleTestTypeFlags",
+  "incompatibleTestingTypeAndFlag",
+  "invalidCacheDirectory",
+  "invalidCypressEnv",
+  "invalidRunProjectPath",
+  "invalidSmokeTestDisplayError",
+  "invalidTestingType",
+  "missingApp",
+  "missingDependency",
+  "missingXvfb",
+  "nonZeroExitCodeXvfb",
+  "notInstalledCI",
+  "smokeTestFailure",
+  "unexpected",
+  "unknownError",
+  "versionMismatch"
+]

cli/lib/errors.js

@@ -73,7 +73,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.
   `,
   }
 }
@@ -213,6 +213,16 @@ const invalidTestingType = {
   solution: `Please provide a valid testingType. Valid test types are ${chalk.cyan('\'e2e\'')} and ${chalk.cyan('\'component\'')}.`,
 }
 
+const incompatibleTestTypeFlags = {
+  description: '`--e2e` and `--component` cannot both be passed.',
+  solution: 'Either pass `--e2e` or `--component`, but not both.',
+}
+
+const incompatibleTestingTypeAndFlag = {
+  description: 'Set a `testingType` and also passed `--e2e` or `--component` flags.',
+  solution: 'Either set `testingType` or pass a testing type flag, but not both.',
+}
+
 /**
  * This error happens when CLI detects that the child Test Runner process
  * was killed with a signal, like SIGBUS
@@ -404,5 +414,7 @@ module.exports = {
     incompatibleHeadlessFlags,
     invalidRunProjectPath,
     invalidTestingType,
+    incompatibleTestTypeFlags,
+    incompatibleTestingTypeAndFlag,
   },
 }

cli/lib/exec/shared.js

@@ -24,6 +24,14 @@ const throwInvalidOptionError = (details) => {
  * @returns {string[]} The array of new exec arguments
  */
 const processTestingType = (options) => {
+  if (options.e2e && options.component) {
+    return throwInvalidOptionError(errors.incompatibleTestTypeFlags)
+  }
+
+  if (options.testingType && (options.component || options.e2e)) {
+    return throwInvalidOptionError(errors.incompatibleTestTypeFlags)
+  }
+
   if (options.testingType === 'component' || options.component || options.ct) {
     return ['--testing-type', 'component']
   }

cli/lib/util.js

@@ -259,7 +259,7 @@ const getApplicationDataFolder = (...paths) => {
 
   const ELECTRON_APP_DATA_PATH = path.join(OS_DATA_PATH, PRODUCT_NAME)
 
-  if (process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF === 'true') {
+  if (process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF) {
     folder = `${folder}-e2e-test`
   }
 

cli/test/lib/exec/run_spec.js

@@ -104,6 +104,14 @@ describe('exec run', function () {
     it('throws if testingType is invalid', () => {
       expect(() => run.processRunOptions({ testingType: 'randomTestingType' })).to.throw()
     })
+
+    it('throws if both e2e and component are set', () => {
+      expect(() => run.processRunOptions({ e2e: true, component: true })).to.throw()
+    })
+
+    it('throws if both testingType and component are set', () => {
+      expect(() => run.processRunOptions({ testingType: 'component', component: true })).to.throw()
+    })
   })
 
   context('.start', function () {

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 = () => {

cli/types/cypress.d.ts

@@ -2813,6 +2813,11 @@ declare namespace Cypress {
      * An array of objects defining the certificates
      */
     clientCertificates: ClientCertificate[]
+
+     /**
+     * Handle Cypress plugins
+     */
+    setupNodeEvents: (on: PluginEvents, config: PluginConfigOptions) => Promise<PluginConfigOptions> | PluginConfigOptions
   }
 
   /**

npm/angular/cypress.config.ts

@@ -9,5 +9,6 @@ export default defineConfig({
   'component': {
     'componentFolder': 'src/app',
     'testFiles': '**/*cy-spec.ts',
+    'setupNodeEvents': require('./cypress/plugins'),
   },
 })

npm/design-system/cypress.config.js

@@ -13,4 +13,13 @@ module.exports = {
   ],
   componentFolder: 'src',
   fixturesFolder: false,
+  component: {
+    setupNodeEvents (on, config) {
+      const { startDevServer } = require('@cypress/vite-dev-server')
+
+      on('dev-server:start', (options) => startDevServer({ options }))
+
+      return config
+    },
+  },
 }