chore: merge develop burnin

.circleci/cache-version.txt

@@ -1,3 +1,3 @@
 # Bump this version to force CI to re-create the cache from scratch.
 
-08-31-23
+09-3-23

.circleci/workflows.yml

@@ -32,7 +32,7 @@ mainBuildFilters: &mainBuildFilters
         - 'update-v8-snapshot-cache-on-develop'
         - 'feature/test-burn-in'
         - 'publish-binary'
-        - 'cacie/chore/capture-metadata'
+        - 'chore/update_electron25_and_node18'
 
 # usually we don't build Mac app - it takes a long time
 # but sometimes we want to really confirm we are doing the right thing
@@ -52,7 +52,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
     - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
     - equal: [ 'feature/test-burn-in', << pipeline.git.branch >> ]
     - equal: [ 'publish-binary', << pipeline.git.branch >> ]
-    - equal: [ cacie/chore/capture-metadata', << pipeline.git.branch >> ]
+    - equal: [ 'chore/update_electron25_and_node18', << pipeline.git.branch >> ]
     - matches:
         pattern: /^release\/\d+\.\d+\.\d+$/
         value: << pipeline.git.branch >>
@@ -81,7 +81,7 @@ executors:
   # the Docker image with Cypress dependencies and Chrome browser
   cy-doc:
     docker:
-      - image: cypress/browsers:node16.16.0-chrome106-ff99-edge
+      - image: cypress/browsers-internal:node18.15.0-chrome114-ff115
     # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed.
     resource_class: medium
     environment:
@@ -91,7 +91,7 @@ executors:
   # Docker image with non-root "node" user
   non-root-docker-user:
     docker:
-      - image: cypress/browsers:node16.16.0-chrome106-ff99-edge
+      - image: cypress/browsers-internal:node18.15.0-chrome114-ff115
         user: node
     environment:
       PLATFORM: linux
@@ -823,13 +823,10 @@ commands:
           working_directory: /tmp/<<parameters.repo>>
           command: yarn types
       - run:
+          # NOTE: we do not need to wait for the vite dev server to start
           working_directory: /tmp/<<parameters.repo>>
           command: <<parameters.server-start-command>>
           background: true
-      - run:
-          condition: <<parameters.wait-on>>
-          name: "Waiting on server to boot: <<parameters.wait-on>>"
-          command: "npx wait-on <<parameters.wait-on>>"
       - when:
           condition: <<parameters.folder>>
           steps:
@@ -2244,7 +2241,7 @@ jobs:
     <<: *defaults
     resource_class: small
     docker:
-      - image: cypress/base:16.16.0
+      - image: cypress/base-internal:18.15.0
     steps:
       - restore_workspace_binaries
       - run: mkdir test-binary
@@ -2259,15 +2256,15 @@ jobs:
       - run:
           name: Verify Cypress binary
           working_directory: test-binary
-          command: $(npm bin)/cypress verify
+          command: npx cypress verify
       - run:
           name: Print Cypress version
           working_directory: test-binary
-          command: $(npm bin)/cypress version
+          command: npx cypress version
       - run:
           name: Cypress info
           working_directory: test-binary
-          command: $(npm bin)/cypress info
+          command: npx cypress info
 
   test-types-cypress-and-jest:
     parameters:
@@ -2371,20 +2368,23 @@ jobs:
       - test-binary-against-repo:
           repo: cypress-example-recipes
           command: npm run test:ci:firefox
+          browser: firefox
 
   test-binary-against-recipes-chrome:
     <<: *defaults
     steps:
       - test-binary-against-repo:
           repo: cypress-example-recipes
           command: npm run test:ci:chrome
+          browser: chrome
 
   test-binary-against-recipes:
     <<: *defaults
     steps:
       - test-binary-against-repo:
           repo: cypress-example-recipes
           command: npm run test:ci
+          browser: electron
 
   # This is a special job. It allows you to test the current
   # built test runner against a pull request in the repo
@@ -2412,7 +2412,7 @@ jobs:
     steps:
       - test-binary-against-repo:
           repo: cypress-example-kitchensink
-          browser: "electron"
+          browser: electron
 
   test-binary-against-kitchensink-firefox:
     <<: *defaults

.github/ISSUE_TEMPLATE/1-bug-report.yml

@@ -43,7 +43,7 @@ body:
     attributes:
       label: Node version
       description: What version of node.js are you using to run Cypress?
-      placeholder: ex. v16.16.0
+      placeholder: ex. v18.15.0
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/2-memory-issue.yml

@@ -51,7 +51,7 @@ body:
     attributes:
       label: Node version
       description: What version of node.js are you using to run Cypress?
-      placeholder: ex. v16.16.0
+      placeholder: ex. v18.15.0
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/3-install-issue.yml

@@ -38,7 +38,7 @@ body:
     attributes:
       label: Node version
       description: What version of node.js are you using to run Cypress?
-      placeholder: ex. v16.16.0
+      placeholder: ex. v18.15.0
     validations:
       required: true
   - type: dropdown

.github/workflows/snyk_sca_scan.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -26,7 +26,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Run yarn
         run: yarn

.github/workflows/snyk_static_analysis_scan.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Run yarn
         run: yarn

.github/workflows/update-browser-versions.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 14
+          node-version: 18
       - name: Check for new Chrome versions
         id: get-versions
         uses: actions/github-script@v6

.github/workflows/update_v8_snapshot_cache.yml

@@ -63,7 +63,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
       - name: Run yarn
         run: yarn

.node-version

@@ -1 +1 @@
-16.16.0
+18.15.0

CONTRIBUTING.md

@@ -163,7 +163,7 @@ Here is a list of the core packages in this repository with a short description,
  | [socket](./packages/socket)           | `@packages/socket`      | A wrapper around socket.io to provide common libraries.                      |
  | [ts](./packages/ts)                   | `@packages/ts`          | A centralized version of typescript.                                         |
  | [types](./packages/types)             | `@packages/types`          | The shared internal Cypress types.                                         |
- | [v8-snapshot-require](./packages/v8-snapshot-require) | `@packages/v8-snapshot-requie` | Tool to load a snapshot for Electron applications that was created by `@tooling/v8-snapshot`. |
+ | [v8-snapshot-require](./packages/v8-snapshot-require) | `@packages/v8-snapshot-require` | Tool to load a snapshot for Electron applications that was created by `@tooling/v8-snapshot`. |
  | [web-config](./packages/web-config)             | `@packages/web-config`          | The web-related configuration.                                         |
 
 Private packages involved in development of the app live within the [`tooling`](./tooling) directory and are in the `@tooling/` namespace. They are discrete modules with different responsibilities, but each is necessary for development of the Cypress app and is not necessarily useful outside of the Cypress app.

cli/CHANGELOG.md

@@ -1,4 +1,20 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
+## 13.2.0
+
+_Released 09/12/2023 (PENDING)_
+
+**Features:**
+
+ - Adds support for Nx users who want to run Angular Component Testing in parallel. Addresses [#27723](https://github.com/cypress-io/cypress/pull/27723).
+
+**Bugfixes:**
+
+- Fixed an issue where `enter`, `keyup`, and `space` events where not triggering `click` events properly in some versions of Firefox. Addressed in [#27715](https://github.com/cypress-io/cypress/pull/27715). 
+
+**Dependency Updates:**
+
+- Upgraded Electron from `21.0.0` to `25.8.0`, which updates bundled Chromium from `106.0.5249.51` to `114.0.5735.289`. Addresses [#27595](https://github.com/cypress-io/cypress/issues/27595). Additionally, the Node version the binary has been upgraded from from `16.16.0` to `18.15.0`. This does **NOT** have an impact on the node version you are using with Cypress and is merely an internal update to the repository & shipped binary. Addressed in [#27715](https://github.com/cypress-io/cypress/pull/27715). Addresses [#27595](https://github.com/cypress-io/cypress/issues/27595).
+
 ## 13.1.0
 
 _Released 08/31/2023_

cli/package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@cypress/request": "^3.0.0",
     "@cypress/xvfb": "^1.2.4",
-    "@types/node": "^16.18.39",
+    "@types/node": "^18.17.5",
     "@types/sinonjs__fake-timers": "8.1.1",
     "@types/sizzle": "^2.3.2",
     "arch": "^2.2.0",
@@ -95,7 +95,7 @@
     "execa-wrap": "1.4.0",
     "hasha": "5.2.2",
     "mocha": "6.2.2",
-    "mock-fs": "5.1.1",
+    "mock-fs": "5.2.0",
     "mocked-env": "1.3.2",
     "nock": "13.2.9",
     "proxyquire": "2.1.3",

npm/create-cypress-tests/CHANGELOG.md

@@ -1,3 +1,5 @@
+# [create-cypress-tests-v2.0.3](https://github.com/cypress-io/cypress/compare/create-cypress-tests-v2.0.2...create-cypress-tests-v2.0.3) (2023-09-07)
+
 # [create-cypress-tests-v2.0.2](https://github.com/cypress-io/cypress/compare/create-cypress-tests-v2.0.1...create-cypress-tests-v2.0.2) (2023-04-07)
 
 # [create-cypress-tests-v2.0.1](https://github.com/cypress-io/cypress/compare/create-cypress-tests-v2.0.0...create-cypress-tests-v2.0.1) (2023-01-03)

npm/create-cypress-tests/package.json

@@ -32,12 +32,12 @@
     "@types/babel__core": "^7.1.2",
     "@types/inquirer": "7.3.1",
     "@types/mock-fs": "4.10.0",
-    "@types/node": "16.18.39",
+    "@types/node": "18.17.5",
     "@types/ora": "^3.2.0",
     "@types/semver": "7.5.0",
     "copy": "0.3.2",
     "mocha": "7.1.1",
-    "mock-fs": "5.1.1",
+    "mock-fs": "5.2.0",
     "snap-shot-it": "7.9.3",
     "typescript": "^4.7.4"
   },

npm/cypress-schematic/CHANGELOG.md

@@ -1,3 +1,5 @@
+# [@cypress/schematic-v2.5.1](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v2.5.0...@cypress/schematic-v2.5.1) (2023-09-07)
+
 # [@cypress/schematic-v2.5.0](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v2.4.0...@cypress/schematic-v2.5.0) (2023-01-25)
 
 

npm/cypress-schematic/package.json

@@ -22,7 +22,7 @@
     "@schematics/angular": "^14.2.1",
     "@types/chai-enzyme": "0.6.7",
     "@types/mocha": "8.0.3",
-    "@types/node": "^18.0.6",
+    "@types/node": "^18.17.5",
     "chai": "4.2.0",
     "mocha": "3.5.3",
     "typescript": "^4.7.4"

npm/webpack-dev-server/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [@cypress/webpack-dev-server-v3.6.1](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v3.6.0...@cypress/webpack-dev-server-v3.6.1) (2023-09-07)
+
+# [@cypress/webpack-dev-server-v3.6.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v3.5.3...@cypress/webpack-dev-server-v3.6.0) (2023-09-07)
+
+
+### Features
+
+* **webpack-dev-server:** update the generated tsconfig path for angular CT ([#27723](https://github.com/cypress-io/cypress/issues/27723)) ([264a118](https://github.com/cypress-io/cypress/commit/264a118e4858ea6bc401d71895b09f656a4dc938))
+
 # [@cypress/webpack-dev-server-v3.5.3](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v3.5.2...@cypress/webpack-dev-server-v3.5.3) (2023-08-29)
 
 

npm/webpack-dev-server/package.json

@@ -30,7 +30,7 @@
     "webpack-merge": "^5.4.0"
   },
   "devDependencies": {
-    "@types/node": "16.18.39",
+    "@types/node": "18.17.5",
     "@types/proxyquire": "^1.3.28",
     "@types/speed-measure-webpack-plugin": "^1.3.4",
     "@types/webpack-dev-server-3": "npm:@types/webpack-dev-server@^3",

npm/webpack-dev-server/src/helpers/angularHandler.ts

@@ -154,15 +154,15 @@ export async function generateTsConfig (devServerConfig: AngularWebpackDevServer
     include: includePaths,
   }, null, 2)
 
-  const tsConfigPath = path.join(await getTempDir(), 'tsconfig.json')
+  const tsConfigPath = path.join(await getTempDir(path.basename(projectRoot)), 'tsconfig.json')
 
   await fs.writeFile(tsConfigPath, tsConfigContent)
 
   return tsConfigPath
 }
 
-export async function getTempDir (): Promise<string> {
-  const cypressTempDir = path.join(tmpdir(), 'cypress-angular-ct')
+export async function getTempDir (projectName: string): Promise<string> {
+  const cypressTempDir = path.join(tmpdir(), 'cypress-angular-ct', projectName)
 
   await fs.ensureDir(cypressTempDir)
 

npm/webpack-dev-server/test/handlers/angularHandler.spec.ts

@@ -194,7 +194,7 @@ const expectLoadsAngularBuildOptions = (buildOptions: BuildOptions) => {
 const expectGeneratesTsConfig = async (devServerConfig: AngularWebpackDevServerConfig, buildOptions: any) => {
   const { projectRoot } = devServerConfig.cypressConfig
   let tsConfigPath = await generateTsConfig(devServerConfig, buildOptions)
-  const tempDir = await getTempDir()
+  const tempDir = await getTempDir(path.basename(projectRoot))
 
   expect(tsConfigPath).to.eq(path.join(tempDir, 'tsconfig.json'))
 

package.json

@@ -111,7 +111,7 @@
     "@types/markdown-it": "12.2.3",
     "@types/mini-css-extract-plugin": "1.2.3",
     "@types/mocha": "8.0.3",
-    "@types/node": "16.18.39",
+    "@types/node": "18.17.5",
     "@types/prismjs": "1.16.0",
     "@types/react": "16.9.50",
     "@types/react-dom": "16.9.8",
@@ -145,7 +145,7 @@
     "dedent": "^0.7.0",
     "del": "3.0.0",
     "detect-port": "^1.3.0",
-    "electron": "21.0.0",
+    "electron": "25.8.0",
     "electron-builder": "^23.6.0",
     "enzyme-adapter-react-16": "1.12.1",
     "eslint": "7.22.0",
@@ -185,7 +185,7 @@
     "mocha-banner": "1.1.2",
     "mocha-junit-reporter": "2.2.0",
     "mocha-multi-reporters": "1.1.7",
-    "mock-fs": "5.1.1",
+    "mock-fs": "5.2.0",
     "p-defer": "^3.0.0",
     "patch-package": "6.4.7",
     "playwright-webkit": "1.24.2",
@@ -212,7 +212,7 @@
     "yarn-deduplicate": "3.1.0"
   },
   "engines": {
-    "node": ">=16.16.0",
+    "node": ">=18.15.0",
     "yarn": ">=1.17.3"
   },
   "productName": "Cypress",

packages/data-context/src/actions/ElectronActions.ts

@@ -120,7 +120,7 @@ export class ElectronActions {
 
     debug('notification created %o', notification)
 
-    function clickFn (event: Event) {
+    function clickFn (event: Electron.Event) {
       debug('notification clicked %o', event)
       onClick()
       notifications.delete(notification)

packages/driver/cypress/e2e/e2e/origin/config_env.cy.ts

@@ -233,21 +233,10 @@
     })
 
     context('structuredClone()', () => {
-      it('(firefox) uses native structuredClone in firefox and does NOT serialize Error objects in config', {
-        browser: 'firefox',
-      }, function () {
-        Cypress[fnName](USED_KEYS.error, new Error('error'))
-
-        cy.origin('http://www.foobar.com:3500', { args: { fnName, USED_KEYS } }, ({ fnName, USED_KEYS }) => {
-          const isUndefined = Cypress[fnName](USED_KEYS.error)
-
-          expect(isUndefined).to.be.undefined
-        })
-      })
-
       // NOTE: chrome 98 and above uses a native structuredClone() method, but that method CAN clone Error objects
-      it('(chromium) uses ponyfilled or native structuredClone that can serialize Error objects in config', {
-        browser: { family: 'chromium' },
+      // NOTE: firefox 114 can now serialize/clone error objects
+      it('uses ponyfilled or native structuredClone that can serialize Error objects in config', {
+        browser: '!webkit',
       }, () => {
         Cypress[fnName](USED_KEYS.error, new Error('error'))