Merge branch 'develop' into ci/parameterize-persist-artifacts

Author: cacieprins

.circleci/src/pipeline/@pipeline.yml

@@ -2140,6 +2140,7 @@ jobs:
 
   driver-integration-tests-electron:
     <<: *defaults
+    resource_class: medium+
     parallelism: 5
     steps:
       - run-driver-integration-tests:

.circleci/src/pipeline/workflows/@main.yml

@@ -4,7 +4,7 @@ linux-x64:
       - 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: [ 'chore/remove_unused_anchors', << pipeline.git.branch >> ]
+      - equal: [ 'feat/support_next_16', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
           value: << pipeline.git.branch >>

cli/CHANGELOG.md

@@ -1,12 +1,23 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
-## 15.6.1
+## 15.7.0
 
 _Released 11/18/2025 (PENDING)_
 
+**Performance:**
+
+- Limits the number of matched elements that are tested for visibility when added to a command log entry. Fixes a crash scenario related to rapid successive DOM additions in conjunction with a large number of elements returned from a query. Addressed in [#32937](https://github.com/cypress-io/cypress/pull/32937).
+
+**Features:**
+
+- `Next.js` version 16 is now supported within component testing. Currently, `webpack` is used to bundle Next.js components. Turbopack, the [new default](https://nextjs.org/docs/app/guides/upgrading/version-16#turbopack-by-default) inside Next.js 16, is not yet supported within Cypress. Addresses [#32857](https://github.com/cypress-io/cypress/issues/32857).
+
 **Bugfixes:**
 
 - Fixed an issue where [`cy.wrap()`](https://docs.cypress.io/api/commands/wrap) would cause infinite recursion and freeze the Cypress App when called with objects containing circular references. Fixes [#24715](https://github.com/cypress-io/cypress/issues/24715). Addressed in [#32917](https://github.com/cypress-io/cypress/pull/32917).
 - Fixed an issue where top changes on test retries could cause attempt numbers to show up more than one time in the reporter and cause attempts to be lost in Test Replay. Addressed in [#32888](https://github.com/cypress-io/cypress/pull/32888).
+- Fixed an issue where stack traces that are used to determine a test's invocation details are sometimes incorrect. Addressed in [#32699](https://github.com/cypress-io/cypress/pull/32699)
+- Fixed an issue where larger than expected config values were causing issues in certain cases when recording to the Cypress Cloud. Addressed in [#32957](https://github.com/cypress-io/cypress/pull/32957)
+
 
 **Misc:**
 
@@ -19,7 +30,7 @@ _Released 11/4/2025_
 
 **Features:**
 
- - Added a 'Self-healed' badge to the Command Log when [`cy.prompt()`](https://docs.cypress.io/api/commands/prompt) steps automatically recover after the element they need is not found in the cache. Addressed in [#32802](https://github.com/cypress-io/cypress/pull/32802).
+- Added a 'Self-healed' badge to the Command Log when [`cy.prompt()`](https://docs.cypress.io/api/commands/prompt) steps automatically recover after the element they need is not found in the cache. Addressed in [#32802](https://github.com/cypress-io/cypress/pull/32802).
 - [`cy.prompt()`](https://docs.cypress.io/api/commands/prompt) will now show a warning in the `Get code` modal when there are unsaved changes in `Studio` that will be lost if the user saves the generated code. Addressed in [#32741](https://github.com/cypress-io/cypress/pull/32741).
 
 **Bugfixes:**

cli/package.json

@@ -54,7 +54,6 @@
     "process": "^0.11.10",
     "proxy-from-env": "1.0.0",
     "request-progress": "^3.0.0",
-    "semver": "^7.7.1",
     "supports-color": "^8.1.1",
     "systeminformation": "5.27.7",
     "tmp": "~0.2.4",
@@ -90,6 +89,7 @@
     "mock-fs": "5.4.0",
     "nock": "13.2.9",
     "resolve-pkg": "2.0.0",
+    "semver": "^7.7.3",
     "shelljs": "0.8.5",
     "strip-ansi": "6.0.1",
     "tsx": "4.20.6",

npm/react/package.json

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@cypress/mount-utils": "0.0.0-development",
-    "@types/semver": "7.5.8",
+    "@types/semver": "7.7.1",
     "@vitejs/plugin-react": "4.6.0",
     "axios": "1.8.2",
     "cypress": "0.0.0-development",
@@ -26,7 +26,7 @@
     "react-dom": "18.3.1",
     "react-router": "6.28.0",
     "react-router-dom": "6.28.0",
-    "semver": "^7.7.1",
+    "semver": "^7.7.3",
     "typescript": "~5.4.5",
     "vite": "6.3.5",
     "vite-plugin-require-transform": "1.0.21"

npm/vite-dev-server/package.json

@@ -17,7 +17,7 @@
     "debug": "^4.3.4",
     "find-up": "6.3.0",
     "node-html-parser": "5.3.3",
-    "semver": "^7.7.1"
+    "semver": "^7.7.3"
   },
   "devDependencies": {
     "cross-env": "7.0.3",

npm/webpack-dev-server/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/webpack-dev-server-v5.2.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v5.1.5...@cypress/webpack-dev-server-v5.2.0) (2025-11-19)
+
+
+### Features
+
+* support Next.js 16 inside component testing ([#32955](https://github.com/cypress-io/cypress/issues/32955)) ([12f72f2](https://github.com/cypress-io/cypress/commit/12f72f23784f32faead8437579e29cb592fb62d1))
+
 # [@cypress/webpack-dev-server-v5.1.5](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v5.1.4...@cypress/webpack-dev-server-v5.1.5) (2025-11-07)
 
 # [@cypress/webpack-dev-server-v5.1.4](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v5.1.3...@cypress/webpack-dev-server-v5.1.4) (2025-11-04)

npm/webpack-dev-server/cypress/e2e/next.cy.ts

@@ -106,7 +106,7 @@ for (const project of NEXT_PROJECTS) {
   })
 }
 
-const NEXT_PROJECTS_TSCONFIG_TAILWIND: ProjectFixtureDir[] = ['next-14-tsconfig-tailwind', 'next-15-tsconfig-tailwind']
+const NEXT_PROJECTS_TSCONFIG_TAILWIND: ProjectFixtureDir[] = ['next-14-tsconfig-tailwind', 'next-15-tsconfig-tailwind', 'next-16-tsconfig-tailwind']
 
 for (const project of NEXT_PROJECTS_TSCONFIG_TAILWIND) {
   // Since next-tsconfig-tailwind does not use the fixture directory we need to write our own test suite
@@ -143,9 +143,11 @@ for (const project of NEXT_PROJECTS_TSCONFIG_TAILWIND) {
       })
 
       cy.waitForSpecToFinish({ failCount: 1 })
-      if (project !== 'next-15-tsconfig-tailwind') {
-        // code frames not fully working with next 15
+      if (project !== 'next-15-tsconfig-tailwind' && project !== 'next-16-tsconfig-tailwind') {
+        // code frames not fully working with next 15/16
         cy.get('.test-err-code-frame').should('be.visible')
+      } else {
+        cy.get('.runnable-err-message').should('be.visible')
       }
 
       cy.withCtx(async (ctx) => {

npm/webpack-dev-server/package.json

@@ -21,7 +21,7 @@
     "fs-extra": "9.1.0",
     "html-webpack-plugin-5": "npm:html-webpack-plugin@^5",
     "local-pkg": "0.4.1",
-    "semver": "^7.7.1",
+    "semver": "^7.7.3",
     "speed-measure-webpack-plugin": "1.4.2",
     "tslib": "^2.3.1",
     "tsx": "^4.20.6",

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

@@ -3,6 +3,7 @@ import Module from 'module'
 import type { Configuration } from 'webpack'
 import * as fs from 'fs'
 import * as path from 'path'
+import semver from 'semver'
 import type { PresetHandlerResult, WebpackDevServerConfig } from '../devServer'
 import { cypressWebpackPath, getMajorVersion, ModuleClass, SourcedDependency, SourcedWebpack, sourceFramework, sourceHtmlWebpackPlugin, sourceWebpackDevServer } from './sourceRelativeWebpackModules'
 
@@ -74,71 +75,12 @@ function getNextJsPackages (devServerConfig: WebpackDevServerConfig) {
 
 /**
  * Types for `getNextJsBaseWebpackConfig` based on version:
- * - v11.1.4
+ * - v14.0.0, v15.0.0, and v16.0.0
   [
     dir: string,
-    options: {
-      buildId: string
-      config: NextConfigComplete
-      dev?: boolean
-      isServer?: boolean
-      pagesDir: string
-      target?: string
-      reactProductionProfiling?: boolean
-      entrypoints: WebpackEntrypoints
-      rewrites: CustomRoutes['rewrites']
-      isDevFallback?: boolean
-      runWebpackSpan: Span
-    }
-  ]
-
- * - v12.0.0 = Same as v11.1.4
-
- * - v12.1.6
-  [
-    dir: string,
-    options: {
-      buildId: string
-      config: NextConfigComplete
-      compilerType: 'client' | 'server' | 'edge-server'
-      dev?: boolean
-      entrypoints: webpack5.EntryObject
-      hasReactRoot: boolean
-      isDevFallback?: boolean
-      pagesDir: string
-      reactProductionProfiling?: boolean
-      rewrites: CustomRoutes['rewrites']
-      runWebpackSpan: Span
-      target?: string
-    }
-  ]
-
- * - v13.0.0
-  [
-    dir: string,
-    options: {
-      buildId: string
-      config: NextConfigComplete
-      compilerType: CompilerNameValues
-      dev?: boolean
-      entrypoints: webpack.EntryObject
-      hasReactRoot: boolean
-      isDevFallback?: boolean
-      pagesDir?: string
-      reactProductionProfiling?: boolean
-      rewrites: CustomRoutes['rewrites']
-      runWebpackSpan: Span
-      target?: string
-      appDir?: string
-      middlewareMatchers?: MiddlewareMatcher[]
-    }
-  ]
-
- * - v13.0.1
-  [
-    dir: string,
-    options: {
+    options:  {
       buildId: string
+      encryptionKey: string
       config: NextConfigComplete
       compilerType: CompilerNameValues
       dev?: boolean
@@ -147,41 +89,27 @@ function getNextJsPackages (devServerConfig: WebpackDevServerConfig) {
       pagesDir?: string
       reactProductionProfiling?: boolean
       rewrites: CustomRoutes['rewrites']
+      originalRewrites?: CustomRoutes['rewrites']
+      originalRedirects?: CustomRoutes['redirects']
       runWebpackSpan: Span
-      target?: string
       appDir?: string
-      middlewareMatchers?: MiddlewareMatcher[]
-    }
-  ]
-
- * - v13.2.1
-  [
-    dir: string,
-    options:  {
-    buildId: string
-    config: NextConfigComplete
-    compilerType: CompilerNameValues
-    dev?: boolean
-    entrypoints: webpack.EntryObject
-    isDevFallback?: boolean
-    pagesDir?: string
-    reactProductionProfiling?: boolean
-    rewrites: CustomRoutes['rewrites']
-    runWebpackSpan: Span
-    target?: string
-    appDir?: string
-    middlewareMatchers?: MiddlewareMatcher[]
-    noMangling?: boolean
-    jsConfig: any
-    resolvedBaseUrl: string | undefined
-    supportedBrowsers: string[] | undefined
-    clientRouterFilters?: {
-        staticFilter: ReturnType<
-          import('../shared/lib/bloom-filter').BloomFilter['export']
-        >
-        dynamicFilter: ReturnType<
-          import('../shared/lib/bloom-filter').BloomFilter['export']
-        >
+      middlewareMatchers?: ProxyMatcher[]
+      noMangling?: boolean
+      jsConfig: any
+      jsConfigPath?: string
+      resolvedBaseUrl: ResolvedBaseUrl
+      supportedBrowsers: string[] | undefined
+      clientRouterFilters?: {
+          staticFilter: ReturnType<
+            import('../shared/lib/bloom-filter').BloomFilter['export']
+          >
+          dynamicFilter: ReturnType<
+            import('../shared/lib/bloom-filter').BloomFilter['export']
+          >
+        }
+      fetchCacheKeyPrefix?: string
+      isCompileMode?: boolean
+      previewProps: NonNullable<(typeof NextBuildContext)['previewProps']>;
       }
     }
   ]
@@ -210,7 +138,7 @@ async function loadWebpackConfig (devServerConfig: WebpackDevServerConfig): Prom
       // Client webpack config for Next.js > 12.1.5
       compilerType: 'client',
       // Required for Next.js > 13
-      hasReactRoot: reactVersion === 18,
+      hasReactRoot: Boolean(reactVersion && reactVersion >= 18),
       // Required for Next.js > 13.2.0 to respect TS/JS config
       jsConfig: jsConfigResult.jsConfig,
       // Required for Next.js > 13.2.0 to respect tsconfig.compilerOptions.baseUrl
@@ -338,34 +266,23 @@ function sourceNextWebpack (devServerConfig: WebpackDevServerConfig, framework:
     throw e
   }
 
-  // Next 11 allows the choice of webpack@4 or webpack@5, depending on the "webpack5" property in their next.config.js
-  // The webpackModule.init" for Next 11 returns a webpack@4 or webpack@4 compiler instance based on this boolean
-  let webpack5 = true
   const importPath = path.join(path.dirname(webpackJsonPath), 'webpack.js')
   const webpackModule = require(importPath)
 
-  try {
-    const nextConfig = require(path.resolve(devServerConfig.cypressConfig.projectRoot, 'next.config.js'))
-
-    debug('NextWebpack: next.config.js found - %o', nextConfig)
-
-    if (nextConfig.webpack5 === false) {
-      webpack5 = false
-    }
-  } catch (e) {
-    // No next.config.js, assume webpack 5
+  // If Next.js is 16 and greater, webpack.js runs the required code previously inside init() on require().
+  // init() no longer exists and has the same affect on import, so we don't/can't invoke it
+  if (semver.lt(framework.packageJson.version, '16.0.0')) {
+    // for next 15 and down, we need to initialize the webpack module
+    webpackModule.init(true)
   }
 
-  debug('NextWebpack: webpack5 - %s', webpack5)
-  webpackModule.init(webpack5)
-
   const packageJson = require(webpackJsonPath)
 
   webpack.importPath = importPath
   // The package.json of "next/dist/compiled/webpack/package.json" has no version so we supply the version for later use
-  webpack.packageJson = { ...packageJson, version: webpack5 ? '5' : '4' }
+  webpack.packageJson = { ...packageJson, version: '5' }
   webpack.module = webpackModule.webpack
-  webpack.majorVersion = getMajorVersion(webpack.packageJson, [4, 5])
+  webpack.majorVersion = getMajorVersion(webpack.packageJson, [5])
 
   debug('NextWebpack: Successfully loaded NextWebpack - %o', webpack)