Merge branch 'develop' into renovate/cypress-design-vue-button-0.x

.circleci/workflows.yml

@@ -2134,13 +2134,6 @@ jobs:
           path: npm/grep/test_results
       - store-npm-logs
 
-  npm-create-cypress-tests:
-    <<: *defaults
-    resource_class: small
-    steps:
-      - restore_cached_workspace
-      - run: yarn lerna run build --scope create-cypress-tests
-
   npm-eslint-plugin-dev:
     <<: *defaults
     steps:
@@ -2798,9 +2791,6 @@ linux-x64-workflow: &linux-x64-workflow
     - npm-mount-utils:
         requires:
           - build
-    - npm-create-cypress-tests:
-        requires:
-          - build
     - npm-eslint-plugin-dev:
         requires:
           - build
@@ -2820,7 +2810,6 @@ linux-x64-workflow: &linux-x64-workflow
           - check-ts
           - npm-angular
           - npm-eslint-plugin-dev
-          - npm-create-cypress-tests
           - npm-react
           - npm-mount-utils
           - npm-vue
@@ -2876,7 +2865,6 @@ linux-x64-workflow: &linux-x64-workflow
           - check-ts
           - npm-angular
           - npm-eslint-plugin-dev
-          - npm-create-cypress-tests
           - npm-react
           - npm-mount-utils
           - npm-vue
@@ -3194,9 +3182,6 @@ linux-x64-contributor-workflow: &linux-x64-contributor-workflow
     - npm-mount-utils:
         requires:
           - build
-    - npm-create-cypress-tests:
-        requires:
-          - build
     - npm-eslint-plugin-dev:
         requires:
           - build
@@ -3216,7 +3201,6 @@ linux-x64-contributor-workflow: &linux-x64-contributor-workflow
           - check-ts
           - npm-angular
           - npm-eslint-plugin-dev
-          - npm-create-cypress-tests
           - npm-puppeteer-unit-tests
           - npm-puppeteer-cypress-tests
           - npm-react
@@ -3272,7 +3256,6 @@ linux-x64-contributor-workflow: &linux-x64-contributor-workflow
           - check-ts
           - npm-angular
           - npm-eslint-plugin-dev
-          - npm-create-cypress-tests
           - npm-react
           - npm-mount-utils
           - npm-vue

.eslintrc.js

@@ -53,8 +53,6 @@ module.exports = {
         'tooling/**',
         'packages/{app,driver,frontend-shared,launchpad}/cypress/**',
         '*.test.ts',
-        // ignore in packages that don't run in the Cypress process
-        'npm/create-cypress-tests/**',
       ],
       rules: {
         'no-restricted-properties': 'off',

.gitignore

@@ -92,7 +92,7 @@ system-tests/lib/fixtureDirs.ts
 /packages/frontend-shared/src/generated
 /packages/frontend-shared/cypress/e2e/support/e2eProjectDirs.ts
 
-# from npm/create-cypress-tests
+# from old npm/create-cypress-tests
 /npm/create-cypress-tests/initial-template
 /npm/create-cypress-tests/src/test-output
 

CHANGELOG.md

@@ -2,7 +2,6 @@
 
 - [Cypress App](https://on.cypress.io/changelog)
 - [`@cypress/angular`](https://github.com/cypress-io/cypress/blob/develop/npm/angular/CHANGELOG.md)
-- [`@cypress/create-cypress-tests`](https://github.com/cypress-io/cypress/blob/develop/npm/create-cypress-tests/CHANGELOG.md)
 - [`@cypress/eslint-plugin-dev`](https://github.com/cypress-io/cypress/blob/develop/npm/eslint-plugin-dev/CHANGELOG.md)
 - [`@cypress/mount-utils`](https://github.com/cypress-io/cypress/blob/develop/npm/mount-utils/CHANGELOG.md)
 - [`@cypress/react`](https://github.com/cypress-io/cypress/blob/develop/npm/react/CHANGELOG.md)

CONTRIBUTING.md

@@ -183,7 +183,6 @@ Here is a list of the npm packages in this repository:
  | Folder Name                                            | Package Name                       | Purpose                                                                      |
  | :----------------------------------------------------- | :--------------------------------- | :--------------------------------------------------------------------------- |
  | [angular](./npm/angular)                               | `@cypress/angular`                   | Cypress component testing for Angular.     |
- | [create-cypress-tests](./npm/create-cypress-tests)     | `@cypress/create-cypress-tests`    | Tooling to scaffold Cypress configuration and demo test files. |
  | [eslint-plugin-dev](./npm/eslint-plugin-dev)           | `@cypress/eslint-plugin-dev`       | Eslint plugin for internal development.          |
  | [grep](./npm/grep)                                       | `@cypress/grep`                     | Filter tests using substring                        |
  | [mount-utils](./npm/mount-utils)                       | `@cypress/mount-utils`             | Common functionality for Vue/React/Angular adapters. |

cli/CHANGELOG.md

@@ -1,18 +1,19 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
 ## 13.6.1
 
-_Released 12/5/2023 (PENDING)_
+_Released 12/5/2023_
 
 **Bugfixes:**
 
 - Fixed an issue where pages or downloads opened in a new tab were missing basic auth headers. Fixes [#28350](https://github.com/cypress-io/cypress/issues/28350).
 - Fixed an issue where request logging would default the `message` to the `args` of the currently running command even though those `args` would not apply to the request log and are not displayed. If the `args` are sufficiently large (e.g. when running the `cy.task` from the [code-coverage](https://github.com/cypress-io/code-coverage/) plugin) there could be performance/memory implications. Addressed in [#28411](https://github.com/cypress-io/cypress/pull/28411).
-- Fixed an issue where commands would fail with the error `must only be invoked from the spec file or support file` if the project's `baseUrl` included basic auth credentials. Fixes [#28336](https://github.com/cypress-io/cypress/issues/28336).
+- Fixed an issue where commands would fail with the error `must only be invoked from the spec file or support file` if the project's `baseUrl` included basic auth credentials. Fixes [#27457](https://github.com/cypress-io/cypress/issues/27457) and [#28336](https://github.com/cypress-io/cypress/issues/28336).
 - Fixed an issue where some URLs would timeout in pre-request correlation. Addressed in [#28427](https://github.com/cypress-io/cypress/pull/28427).
+- Cypress will now correctly log errors and debug logs on Linux machines. Fixes [#5051](https://github.com/cypress-io/cypress/issues/5051) and [#24713](https://github.com/cypress-io/cypress/issues/24713).
 
 **Misc:**
 
-- Artifact upload duration is now reported to Cypress Cloud. Addressed in [#28418](https://github.com/cypress-io/cypress/pull/28418)
+- Artifact upload duration is now reported to Cypress Cloud. Fixes [#28238](https://github.com/cypress-io/cypress/issues/28238). Addressed in [#28418](https://github.com/cypress-io/cypress/pull/28418).
 
 ## 13.6.0
 

cli/lib/exec/spawn.js

@@ -4,7 +4,6 @@ const cp = require('child_process')
 const path = require('path')
 const Promise = require('bluebird')
 const debug = require('debug')('cypress:cli')
-const debugElectron = require('debug')('cypress:electron')
 
 const util = require('../util')
 const state = require('../tasks/state')
@@ -122,10 +121,9 @@ module.exports = {
       return new Promise((resolve, reject) => {
         _.defaults(overrides, {
           onStderrData: false,
-          electronLogging: false,
         })
 
-        const { onStderrData, electronLogging } = overrides
+        const { onStderrData } = overrides
         const envOverrides = util.getEnvOverrides(options)
         const electronArgs = []
         const node11WindowsFix = isPlatform('win32')
@@ -160,10 +158,6 @@ module.exports = {
           stdioOptions = _.extend({}, stdioOptions, { windowsHide: false })
         }
 
-        if (electronLogging) {
-          stdioOptions.env.ELECTRON_ENABLE_LOGGING = true
-        }
-
         if (util.isPossibleLinuxWithIncorrectDisplay()) {
           // make sure we use the latest DISPLAY variable if any
           debug('passing DISPLAY', process.env.DISPLAY)
@@ -241,7 +235,7 @@ module.exports = {
 
             // if we have a callback and this explicitly returns
             // false then bail
-            if (onStderrData && onStderrData(str) === false) {
+            if (onStderrData && onStderrData(str)) {
               return
             }
 
@@ -294,13 +288,6 @@ module.exports = {
             if (util.isBrokenGtkDisplay(str)) {
               brokenGtkDisplay = true
             }
-
-            // we should attempt to always slurp up
-            // the stderr logs unless we've explicitly
-            // enabled the electron debug logging
-            if (!debugElectron.enabled) {
-              return false
-            }
           },
         })
       }

cli/lib/tasks/verify.js

@@ -101,12 +101,8 @@ const runSmokeTest = (binaryDir, options) => {
     debug('smoke test command:', smokeTestCommand)
     debug('smoke test timeout %d ms', options.smokeTestTimeout)
 
-    const env = _.extend({}, process.env, {
-      ELECTRON_ENABLE_LOGGING: true,
-    })
-
     const stdioOptions = _.extend({}, {
-      env,
+      env: process.env,
       timeout: options.smokeTestTimeout,
     })
 

cli/test/lib/tasks/verify_spec.js

@@ -278,35 +278,6 @@ context('lib/tasks/verify', () => {
     })
   })
 
-  it('sets ELECTRON_ENABLE_LOGGING without mutating process.env', () => {
-    createfs({
-      alreadyVerified: false,
-      executable: mockfs.file({ mode: 0o777 }),
-      packageVersion,
-    })
-
-    expect(process.env.ELECTRON_ENABLE_LOGGING).to.be.undefined
-
-    util.exec.resolves()
-    sinon.stub(util, 'stdoutLineMatches').returns(true)
-
-    return verify
-    .start()
-    .then(() => {
-      expect(process.env.ELECTRON_ENABLE_LOGGING).to.be.undefined
-
-      const stdioOptions = util.exec.firstCall.args[2]
-
-      expect(stdioOptions).to.include({
-        timeout: verify.VERIFY_TEST_RUNNER_TIMEOUT_MS,
-      })
-
-      expect(stdioOptions.env).to.include({
-        ELECTRON_ENABLE_LOGGING: true,
-      })
-    })
-  })
-
   describe('with force: true', () => {
     beforeEach(() => {
       createfs({