Merge branch 'release/15.0.0' into electron-36

Author: cacieprins

.circleci/cache-version.txt

@@ -1,3 +1,3 @@
 # Bump this version to force CI to re-create the cache from scratch.
 
-5-21-2025
+6-9-2025

.circleci/workflows.yml

@@ -38,7 +38,7 @@ mainBuildFilters: &mainBuildFilters
         - /^release\/\d+\.\d+\.\d+$/
         # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
         - 'update-v8-snapshot-cache-on-develop'
-        - 'electron-35'
+        - 'electron-36'
 
 # 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
@@ -49,7 +49,7 @@ macWorkflowFilters: &darwin-workflow-filters
       - equal: [ develop, << pipeline.git.branch >> ]
       # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
       - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-      - equal: [ 'electron-35', << pipeline.git.branch >> ]
+      - equal: [ 'electron-36', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
           value: << pipeline.git.branch >>
@@ -60,7 +60,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
       - equal: [ develop, << pipeline.git.branch >> ]
       # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
       - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-      - equal: [ 'electron-35', << pipeline.git.branch >> ]
+      - equal: [ 'electron-36', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
           value: << pipeline.git.branch >>
@@ -83,7 +83,7 @@ windowsWorkflowFilters: &windows-workflow-filters
       - equal: [ develop, << pipeline.git.branch >> ]
       # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
       - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-      - equal: [ 'electron-34', << pipeline.git.branch >> ]
+      - equal: [ 'electron-36', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
           value: << pipeline.git.branch >>
@@ -157,7 +157,7 @@ commands:
           name: Set environment variable to determine whether or not to persist artifacts
           command: |
             echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
-            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "electron-35" ]]; then
+            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "electron-36" ]]; then
                 export SHOULD_PERSIST_ARTIFACTS=true
             fi' >> "$BASH_ENV"
   # You must run `setup_should_persist_artifacts` command and be using bash before running this command

cli/CHANGELOG.md

@@ -13,12 +13,13 @@ _Released 07/01/2025 (PENDING)_
 - The Cypress configuration wizard for Component Testing supports TypeScript 5.0 or greater. Addresses [#31187](https://github.com/cypress-io/cypress/issues/31187).
 - `@cypress/webpack-dev-server` and `@cypress/webpack-preprocessor` no longer support `webpack` version 4. Addresses [#31344](https://github.com/cypress-io/cypress/issues/31344). If you still need to use `webpack` version 4, please see our [migration guide](https://docs.cypress.io/app/references/migration-guide#Migrating-to-Cypress-150).
 - `@cypress/webpack-dev-server` no longer supports `webpack-dev-server` version 4. Addresses [#31605](https://github.com/cypress-io/cypress/issues/31605). If you still need to use `webpack-dev-server` version 4, please see our [migration guide](https://docs.cypress.io/app/references/migration-guide#Migrating-to-Cypress-150).
-- The `@cypress/webpack-batteries-included-preprocessor` no longer includes browser built-ins that were automatically provided by Webpack 4. To add built-ins manually, refer to the Webpack [resolve.fallback](https://webpack.js.org/configuration/resolve/#resolvefallback) documentation and the [`@cypress/webpack-batteries-included-preprocessor` README](../npm/webpack-batteries-included-preprocessor/README.md). Addresses [#31039](https://github.com/cypress-io/cypress/issues/31039).
+- In order to better align with best practices, `@cypress/webpack-batteries-included-preprocessor` no longer includes certain browser built-ins that were automatically provided by Webpack 4. The removed built-ins are `assert`, `constants`, `crypto`, `domain`, `events`, `http`, `https`, `punycode`, `querystring`, `string_decoder`, `sys`, `timers`, `tty`, `url`, `util`, `vm`, and `zlib`. However, we know that certain built-ins are popular, given that many users have files that are shared between their Cypress tests and node context. Because of this, `@cypress/webpack-batteries-included-preprocessor` will ship with built-in support for `buffer`, `path`, `process`, `os`, and `stream`. If there is a built-in that isn't supported be default and you need to add support, please refer to the Webpack [resolve.fallback](https://webpack.js.org/configuration/resolve/#resolvefallback) documentation and the [`@cypress/webpack-batteries-included-preprocessor` README](../npm/webpack-batteries-included-preprocessor/README.md). Addresses [#31039](https://github.com/cypress-io/cypress/issues/31039).
 - The application under test's `pagehide` event in Chromium browsers will no longer trigger Cypress's `window:unload` event. Addressed in [#31853](https://github.com/cypress-io/cypress/pull/31853).
 
 **Features:**
 
 - [`tsx`](https://tsx.is/) is now used in all cases to run the Cypress config, replacing [ts-node](https://github.com/TypeStrong/ts-node) for TypeScript and Node for commonjs/ESM. This should allow for more interoperability for users who are using any variant of ES Modules. Addresses [#8090](https://github.com/cypress-io/cypress/issues/8090), [#15724](https://github.com/cypress-io/cypress/issues/15724), [#21805](https://github.com/cypress-io/cypress/issues/21805), [#22273](https://github.com/cypress-io/cypress/issues/22273), [#22747](https://github.com/cypress-io/cypress/issues/22747), [#23141](https://github.com/cypress-io/cypress/issues/23141), [#25958](https://github.com/cypress-io/cypress/issues/25958), [#25959](https://github.com/cypress-io/cypress/issues/25959), [#26606](https://github.com/cypress-io/cypress/issues/26606), [#27359](https://github.com/cypress-io/cypress/issues/27359), [#27450](https://github.com/cypress-io/cypress/issues/27450), [#28442](https://github.com/cypress-io/cypress/issues/28442), [#30318](https://github.com/cypress-io/cypress/issues/30318), [#30718](https://github.com/cypress-io/cypress/issues/30718), [#30907](https://github.com/cypress-io/cypress/issues/30907), [#30915](https://github.com/cypress-io/cypress/issues/30915), [#30925](https://github.com/cypress-io/cypress/issues/30925), [#30954](https://github.com/cypress-io/cypress/issues/30954) and [#31185](https://github.com/cypress-io/cypress/issues/31185).
+- [`cy.url()`](https://docs.cypress.io/api/commands/url), [`cy.hash()`](https://docs.cypress.io/api/commands/hash), [`cy.go()`](https://docs.cypress.io/api/commands/go), [`cy.reload()`](https://docs.cypress.io/api/commands/reload), [`cy.title()`](https://docs.cypress.io/api/commands/title), and [`cy.location()`](https://docs.cypress.io/api/commands/location) now use the automation client (CDP for Chromium browsers and WebDriver BiDi for Firefox) to return the appropriate values from the commands to the user instead of the window object. This is to avoid cross origin issues with [`cy.origin()`](https://docs.cypress.io/api/commands/origin) so these commands can be invoked anywhere inside a Cypress test without having to worry about origin access issues. Experimental Webkit still will use the window object to retrieve these values. Also, [`cy.window()`](https://docs.cypress.io/api/commands/window) will always return the current window object, regardless of origin restrictions. Not every property from the window object will be accessible depending on the origin context. Addresses [#31196](https://github.com/cypress-io/cypress/issues/31196).
 
 **Misc:**
 

npm/webpack-batteries-included-preprocessor/README.md

@@ -44,7 +44,7 @@ module.exports = (on) => {
 }
 ```
 
-As of version `4.x.x`, `@cypress/webpack-batteries-included-preprocessor` no longer includes Webpack built-ins by default. If your project requires them, you can retrieve the preprocessor's default Webpack options and decorate them as needed.
+As of version `4.x.x`, `@cypress/webpack-batteries-included-preprocessor` only includes the `buffer`, `path`, `process`, `os`, and `stream` built-ins. If your project requires built-ins not provided, you can retrieve the preprocessor's default Webpack options and decorate them as needed.
 
 ```javascript
 const webpackPreprocessor = require('@cypress/webpack-batteries-included-preprocessor')
@@ -53,7 +53,7 @@ function getWebpackOptions () {
   const options = webpackPreprocessor.getFullWebpackOptions()
 
   // add built-ins as needed
-  options.resolve.fallback.path = require.resolve('path-browserify')
+  options.resolve.fallback.zlib = require.resolve('browserify-zlib')
 
   return options
 }

npm/webpack-batteries-included-preprocessor/index.js

@@ -1,6 +1,7 @@
 const path = require('path')
 const Debug = require('debug')
 const getTsConfig = require('get-tsconfig')
+const webpack = require('webpack')
 const webpackPreprocessor = require('@cypress/webpack-preprocessor')
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 
@@ -135,6 +136,24 @@ const getDefaultWebpackOptions = () => {
       }],
     },
     plugins: [
+      new webpack.ProvidePlugin({
+        Buffer: ['buffer', 'Buffer'],
+        // As of Webpack 5, a new option called resolve.fullySpecified, was added.
+        // This option means that a full path, in particular to .mjs / .js files
+        // in ESM packages must have the full path of an import specified.
+        // Otherwise, compilation fails as this option defaults to true.
+        // This means we need to adjust our global injections to always
+        // resolve to include the full file extension if a file resolution is provided.
+        // @see https://github.com/cypress-io/cypress/issues/27599
+        // @see https://webpack.js.org/configuration/module/#resolvefullyspecified
+
+        // Due to Pnp compatibility issues, we want to make sure that we resolve to the 'process' library installed with the binary,
+        // which should resolve on leaf app/packages/server/node_modules/@cypress/webpack-batteries-included-preprocessor and up the tree.
+        // In other words, we want to resolve 'process' that is installed with cypress (or the package itself, i.e. @cypress/webpack-batteries-included-preprocessor)
+        // and not in the user's node_modules directory as it may not exist.
+        // @see https://github.com/cypress-io/cypress/issues/27947.
+        process: require.resolve('process/browser.js'),
+      }),
       // If the user is trying to debug their bundle, we'll add the BundleAnalyzerPlugin
       // to see the size of the support file (first bundle when running `cypress open`)
       // and spec files (subsequent bundles when running `cypress open`)
@@ -144,7 +163,7 @@ const getDefaultWebpackOptions = () => {
       extensions: ['.js', '.json', '.jsx', '.mjs', '.coffee'],
       fallback: {
         assert: false,
-        buffer: false,
+        buffer: require.resolve('buffer/'),
         child_process: false,
         cluster: false,
         console: false,
@@ -161,15 +180,15 @@ const getDefaultWebpackOptions = () => {
         inspector: false,
         module: false,
         net: false,
-        os: false,
-        path: false,
+        os: require.resolve('os-browserify/browser'),
+        path: require.resolve('path-browserify'),
         perf_hooks: false,
         punycode: false,
-        process: false,
+        process: require.resolve('process/browser.js'),
         querystring: false,
         readline: false,
         repl: false,
-        stream: false,
+        stream: require.resolve('stream-browserify'),
         string_decoder: false,
         sys: false,
         timers: false,

npm/webpack-batteries-included-preprocessor/package.json

@@ -17,10 +17,15 @@
     "@babel/runtime": "^7.25.0",
     "babel-loader": "^10.0.0",
     "babel-plugin-add-module-exports": "^1.0.2",
+    "buffer": "^6.0.3",
     "coffee-loader": "^4.0.0",
     "coffeescript": "2.6.0",
     "debug": "^4.3.4",
     "get-tsconfig": "^4.10.0",
+    "os-browserify": "^0.3.0",
+    "path-browserify": "^1.0.1",
+    "process": "^0.11.10",
+    "stream-browserify": "^3.0.0",
     "ts-loader": "9.5.2",
     "tsconfig-paths-webpack-plugin": "^3.5.2",
     "webpack": "^5.88.2",

npm/webpack-batteries-included-preprocessor/test/unit/index.spec.js

@@ -40,8 +40,8 @@ describe('webpack-batteries-included-preprocessor', () => {
       preprocessor = require('../../index')
       const result = preprocessor.getFullWebpackOptions('file/path', 'typescript/path')
 
-      expect(result.plugins).to.have.length(1)
-      expect(result.plugins[0].constructor.name).to.equal('BundleAnalyzerPlugin')
+      expect(result.plugins).to.have.length(2)
+      expect(result.plugins[1].constructor.name).to.equal('BundleAnalyzerPlugin')
       Debug.disable()
     })
   })

packages/driver/cypress/e2e/commands/location.cy.js

@@ -23,12 +23,15 @@ describe('src/cy/commands/location', () => {
       cy.url().should('match', /baz/).and('eq', 'http://localhost:3500/foo/bar/baz.html')
     })
 
-    it('catches thrown errors', () => {
-      cy.stub(Cypress.utils, 'locToString')
-      .onFirstCall().throws(new Error)
-      .onSecondCall().returns('http://localhost:3500/baz.html')
+    it('propagates thrown errors from CDP', (done) => {
+      cy.on('fail', (err) => {
+        expect(err.message).to.include('CDP was unable to find the AUT iframe')
+        done()
+      })
+
+      cy.stub(Cypress, 'automation').withArgs('get:aut:url').rejects(new Error('CDP was unable to find the AUT iframe'))
 
-      cy.url().should('include', '/baz.html')
+      cy.url()
     })
 
     // https://github.com/cypress-io/cypress/issues/17399
@@ -380,7 +383,16 @@ describe('src/cy/commands/location', () => {
   context('#location', () => {
     it('returns the location object', () => {
       cy.location().then((loc) => {
-        expect(loc).to.have.keys(['auth', 'authObj', 'hash', 'href', 'host', 'hostname', 'pathname', 'port', 'protocol', 'search', 'origin', 'superDomainOrigin', 'superDomain', 'toString'])
+        expect(loc).to.have.property('hash')
+        expect(loc).to.have.property('host')
+        expect(loc).to.have.property('hostname')
+        expect(loc).to.have.property('href')
+        expect(loc).to.have.property('origin')
+        expect(loc).to.have.property('pathname')
+        expect(loc).to.have.property('port')
+        expect(loc).to.have.property('protocol')
+        expect(loc).to.have.property('search')
+        expect(loc).to.have.property('searchParams')
       })
     })
 
@@ -402,15 +414,13 @@ describe('src/cy/commands/location', () => {
 
     // https://github.com/cypress-io/cypress/issues/16463
     it('eventually returns a given key', function () {
-      cy.stub(cy, 'getRemoteLocation')
-      .onFirstCall().returns('')
-      .onSecondCall().returns({
-        pathname: '/my/path',
-      })
+      cy.stub(Cypress, 'automation').withArgs('get:aut:url')
+      .onFirstCall().resolves('http://localhost:3500')
+      .onSecondCall().resolves('http://localhost:3500/my/path')
 
       cy.location('pathname').should('equal', '/my/path')
       .then(() => {
-        expect(cy.getRemoteLocation).to.have.been.calledTwice
+        expect(Cypress.automation).to.have.been.calledTwice
       })
     })
 
@@ -614,7 +624,8 @@ describe('src/cy/commands/location', () => {
           expect(_.keys(consoleProps)).to.deep.eq(['name', 'type', 'props'])
           expect(consoleProps.name).to.eq('location')
           expect(consoleProps.type).to.eq('command')
-          expect(_.keys(consoleProps.props.Yielded)).to.deep.eq(['auth', 'authObj', 'hash', 'href', 'host', 'hostname', 'origin', 'pathname', 'port', 'protocol', 'search', 'superDomainOrigin', 'superDomain', 'toString'])
+
+          expect(_.keys(consoleProps.props.Yielded)).to.deep.eq(['hash', 'host', 'hostname', 'href', 'origin', 'pathname', 'port', 'protocol', 'search', 'searchParams'])
         })
       })
     })

packages/driver/cypress/e2e/commands/navigation.cy.js

@@ -11,35 +11,23 @@ describe('src/cy/commands/navigation', () => {
     })
 
     it('calls into window.location.reload', () => {
-      const locReload = cy.spy(Cypress.utils, 'locReload')
-
-      cy.reload().then(() => {
-        expect(locReload).to.be.calledWith(false)
+      cy.on('fail', () => {
+        expect(Cypress.automation).to.be.calledWith('reload:aut:frame', { forceReload: false })
       })
-    })
 
-    it('can pass forceReload', () => {
-      const locReload = cy.spy(Cypress.utils, 'locReload')
+      cy.stub(Cypress, 'automation').withArgs('reload:aut:frame', { forceReload: false }).resolves()
 
-      cy.reload(true).then(() => {
-        expect(locReload).to.be.calledWith(true)
-      })
+      cy.reload({ timeout: 1000 })
     })
 
     it('can pass forceReload + options', () => {
-      const locReload = cy.spy(Cypress.utils, 'locReload')
-
-      cy.reload(true, {}).then(() => {
-        expect(locReload).to.be.calledWith(true)
+      cy.on('fail', () => {
+        expect(Cypress.automation).to.be.calledWith('reload:aut:frame', { forceReload: true })
       })
-    })
 
-    it('can pass just options', () => {
-      const locReload = cy.spy(Cypress.utils, 'locReload')
+      cy.stub(Cypress, 'automation').withArgs('reload:aut:frame', { forceReload: true }).resolves()
 
-      cy.reload({}).then(() => {
-        expect(locReload).to.be.calledWith(false)
-      })
+      cy.reload(true, { timeout: 1000 })
     })
 
     it('returns the window object', () => {
@@ -596,14 +584,15 @@ describe('src/cy/commands/navigation', () => {
             const { lastLog } = this
 
             beforeunload = true
-            expect(lastLog.get('snapshots').length).to.eq(1)
+            expect(lastLog.get('snapshots').length).to.eq(2)
             expect(lastLog.get('snapshots')[0].name).to.eq('before')
             expect(lastLog.get('snapshots')[0].body).to.be.an('object')
 
             return undefined
           })
 
-          cy.go('back').then(function () {
+          // wait for the beforeunload event to be fired after the history navigation
+          cy.go('back').wait(100).then(function () {
             const { lastLog } = this
 
             expect(beforeunload).to.be.true