Merge branch 'develop' of github.com:cypress-io/cypress into chore/remove_unused_anchors

Author: AtofStryker

cli/CHANGELOG.md

@@ -15,6 +15,7 @@ _Released 11/4/2025 (PENDING)_
 - Fixed an issue where grouped command text jumps up and down when expanding and collapsing in the command log. Addressed in [#32757](https://github.com/cypress-io/cypress/pull/32757).
 - Fixed an issue with grouped console prop items having a hard to read blue color in the console log and duplicate `:` characters being displayed. Addressed in [#32776](https://github.com/cypress-io/cypress/pull/32776).
 - Added more context to the error message shown when `cy.prompt()` fails to download. Addressed in [#32822](https://github.com/cypress-io/cypress/pull/32822).
+- Fixed an issue where absolute file paths were not correctly determined from the source map when the source map root was updated. Fixes [#32809](https://github.com/cypress-io/cypress/issues/32809).
 
 **Misc:**
 

npm/vite-dev-server/cypress/e2e/vite-dev-server.cy.ts

@@ -126,27 +126,27 @@ describe('sourcemaps', () => {
 
     cy.withCtx(async (ctx, o) => {
       await ctx.actions.file.writeFileInProject(
-        'JsErrorSpec.cy.js',
+        'src/JsErrorSpec.cy.js',
         o.testContent,
       )
 
       await ctx.actions.file.writeFileInProject(
-        'JsWithImportErrorSpec.cy.js',
+        'src/JsWithImportErrorSpec.cy.js',
         `import React from 'react';\n\n${o.testContent}`,
       )
 
       await ctx.actions.file.writeFileInProject(
-        'JsxErrorSpec.cy.jsx',
+        'src/JsxErrorSpec.cy.jsx',
         o.testContent,
       )
 
       await ctx.actions.file.writeFileInProject(
-        'TsErrorSpec.cy.ts',
+        'src/TsErrorSpec.cy.ts',
         `type MyType = { value: string }\n\n${o.testContent}`,
       )
 
       await ctx.actions.file.writeFileInProject(
-        'TsxErrorSpec.cy.tsx',
+        'src/TsxErrorSpec.cy.tsx',
         `type MyType = { value: string }\n\n${o.testContent}`,
       )
     }, { testContent })
@@ -157,7 +157,23 @@ describe('sourcemaps', () => {
       cy.contains(specName).click()
       cy.waitForSpecToFinish()
       cy.get('.failed > .num').should('contain', 2)
-      cy.get('.runnable-err-file-path', { timeout: 250 }).should('contain', `${specName}:${line}:${column}`)
+      cy.get('.runnable-err-file-path').eq(1).should('contain', `${specName}:${line}:${column}`)
+      cy.window().then((win) => {
+        // @ts-expect-error
+        cy.stub(win.getEventManager(), 'emit').as('emit')
+      })
+
+      cy.get('.runnable-err-file-path', { timeout: 250 }).eq(1).as('filePath')
+      cy.get('@filePath').should('contain', `${specName}:${line}:${column}`)
+      cy.get('@filePath').then(($el) => {
+        $el.find('span').trigger('click')
+      })
+
+      cy.get('@emit').should('have.been.calledWithMatch', 'open:file', {
+        absoluteFile: Cypress.sinon.match(new RegExp(`cy-projects/vite7.0.0-react/src/${specName}$`)),
+        line,
+        column,
+      })
     }
 
     verifySourcemap('JsErrorSpec.cy.js', 7, 8)

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

@@ -1,5 +1,7 @@
 /// <reference path="../support/e2e.ts" />
 
+import dedent from 'dedent'
+
 describe('Config options', () => {
   it('supports supportFile = false', () => {
     cy.scaffoldProject('webpack5_wds5-react')
@@ -86,3 +88,70 @@ describe('Config options', () => {
     cy.get('.passed > .num').should('contain', 1)
   })
 })
+
+describe('sourcemaps', () => {
+  it('should be provided for JS and transpiled files', () => {
+    const testContent = dedent`
+      describe('spec file with import', () => {
+        it('should generate uncaught error', () => {
+          throw new Error('uncaught')
+        })
+      
+        it('should generate failed command', () => {
+          cy.get('#does-not-exist', { timeout: 100 })
+        })
+      })
+    `
+
+    cy.scaffoldProject('webpack5_wds5-react')
+    cy.openProject('webpack5_wds5-react', ['--config-file', 'cypress-webpack-no-support.config.ts', '--component'])
+    cy.startAppServer('component')
+
+    cy.withCtx(async (ctx, o) => {
+      await ctx.actions.file.writeFileInProject(
+        'src/JsErrorSpec.cy.js',
+        o.testContent,
+      )
+
+      await ctx.actions.file.writeFileInProject(
+        'src/JsWithImportErrorSpec.cy.js',
+        `import React from 'react';\n\n${o.testContent}`,
+      )
+
+      await ctx.actions.file.writeFileInProject(
+        'src/JsxErrorSpec.cy.jsx',
+        o.testContent,
+      )
+    }, { testContent })
+
+    const verifySourcemap = (specName: string, line: number, column: number) => {
+      cy.visitApp()
+      cy.specsPageIsVisible()
+      cy.contains(specName).click()
+      cy.waitForSpecToFinish()
+      cy.get('.failed > .num').should('contain', 2)
+      cy.window().then((win) => {
+        // @ts-expect-error
+        cy.stub(win.getEventManager(), 'emit').as('emit')
+      })
+
+      cy.get('.runnable-err-file-path', { timeout: 250 }).eq(1).as('filePath')
+      cy.get('@filePath').should('contain', `${specName}:${line}:${column}`)
+      cy.get('@filePath').then(($el) => {
+        $el.find('span').trigger('click')
+      })
+
+      cy.get('@emit').should('have.been.calledWithMatch', 'open:file', {
+        absoluteFile: Cypress.sinon.match(new RegExp(`cy-projects/webpack5_wds5-react/src/${specName}$`)),
+        line,
+        column,
+      })
+    }
+
+    verifySourcemap('JsErrorSpec.cy.js', 7, 8)
+
+    verifySourcemap('JsWithImportErrorSpec.cy.js', 9, 8)
+
+    verifySourcemap('JsxErrorSpec.cy.jsx', 7, 8)
+  })
+})

packages/app/cypress/e2e/runner/ct-framework-errors.cy.ts

@@ -48,7 +48,7 @@ function loadErrorSpec (options: Options): VerifyFunc {
   })
 
   // Return scoped verify function with spec options baked in
-  return createVerify({ fileName: Cypress._.last(filePath.split('/')), hasPreferredIde: false, mode: 'component' })
+  return createVerify({ fileName: Cypress._.last(filePath.split('/')), filePath, hasPreferredIde: false, mode: 'component' })
 }
 
 const reactVersions = [18, 19] as const

packages/app/cypress/e2e/runner/reporter-ct-generator.ts

@@ -28,7 +28,7 @@ function loadErrorSpec (options: specLoader.LoadSpecOptions, configFile: string)
   specLoader.loadSpec(effectiveOptions)
 
   // Return scoped verify function with spec options baked in
-  return createVerify({ fileName: Cypress._.last(filePath.split('/')), hasPreferredIde, mode })
+  return createVerify({ fileName: Cypress._.last(filePath.split('/')), filePath, hasPreferredIde, mode })
 }
 
 /**

packages/app/cypress/e2e/runner/reporter.command_errors.cy.ts

@@ -17,7 +17,7 @@ function loadErrorSpec (options: specLoader.LoadSpecOptions): VerifyFunc {
   specLoader.loadSpec(options)
 
   // Return scoped verify function with spec options baked in
-  return createVerify({ fileName: Cypress._.last(filePath.split('/')), hasPreferredIde, mode })
+  return createVerify({ filePath, fileName: Cypress._.last(filePath.split('/')), hasPreferredIde, mode })
 }
 
 describe('errors ui', {
@@ -56,6 +56,37 @@ describe('errors ui', {
     })
   })
 
+  it('assertion failures with new sourcemap root', () => {
+    const verifyWithNewSourcemapRoot = loadErrorSpec({
+      filePath: 'errors/assertions.cy.js',
+      hasPreferredIde: true,
+      failCount: 3,
+      projectName: 'runner-e2e-specs-new-sourcemap-root',
+      configFile: 'cypress.config.mjs',
+    })
+
+    verifyWithNewSourcemapRoot('with expect().<foo>', {
+      line: 3,
+      column: 25,
+      message: `expected 'actual' to equal 'expected'`,
+      verifyOpenInIde: true,
+    })
+
+    verifyWithNewSourcemapRoot('with assert()', {
+      line: 7,
+      column: [5, 12], // [chrome, firefox]
+      message: `should be true`,
+      verifyOpenInIde: true,
+    })
+
+    verifyWithNewSourcemapRoot('with assert.<foo>()', {
+      line: 11,
+      column: 12,
+      message: `expected 'actual' to equal 'expected'`,
+      verifyOpenInIde: true,
+    })
+  })
+
   it('assertion failures - no preferred IDE', () => {
     const verify = loadErrorSpec({
       filePath: 'errors/assertions.cy.js',

packages/app/cypress/e2e/runner/reporter.errors.cy.ts

@@ -17,7 +17,7 @@ function loadErrorSpec (options: specLoader.LoadSpecOptions): VerifyFunc {
   specLoader.loadSpec(options)
 
   // Return scoped verify function with spec options baked in
-  return createVerify({ fileName: Cypress._.last(filePath.split('/')), hasPreferredIde, mode })
+  return createVerify({ fileName: Cypress._.last(filePath.split('/')), filePath, hasPreferredIde, mode })
 }
 
 describe('errors ui', {

packages/app/cypress/e2e/runner/support/spec-loader.ts

@@ -26,7 +26,7 @@ export type LoadSpecOptions = {
   failCount?: number | string
   pendingCount?: number | string
   hasPreferredIde?: boolean
-  projectName?: 'runner-e2e-specs' | 'runner-ct-specs' | 'session-and-origin-e2e-specs' | ExperimentalRetriesProjects
+  projectName?: 'runner-e2e-specs' | 'runner-e2e-specs-new-sourcemap-root' | 'runner-ct-specs' | 'session-and-origin-e2e-specs' | ExperimentalRetriesProjects
   mode?: 'e2e' | 'component'
   configFile?: string
   scaffold?: boolean

packages/app/cypress/e2e/runner/support/verify-failures.ts

@@ -3,7 +3,7 @@ import defaultMessages from '@packages/frontend-shared/src/locales/en-US.json'
 
 // Assert that either the the dialog is presented or the mutation is emitted, depending on
 // whether the test has a preferred IDE defined.
-const verifyIdeOpen = ({ fileName, action, hasPreferredIde, line, column }) => {
+const verifyIdeOpen = ({ fileName, filePath, action, hasPreferredIde, line, column }) => {
   if (hasPreferredIde) {
     cy.withCtx((ctx, o) => {
       // @ts-expect-error - check if we've stubbed it already, only need to stub it once
@@ -15,8 +15,8 @@ const verifyIdeOpen = ({ fileName, action, hasPreferredIde, line, column }) => {
     action()
 
     cy.withCtx((ctx, o) => {
-      expect(ctx.actions.file.openFile).to.have.been.calledWith(o.sinon.match(new RegExp(`${o.fileName}$`)), o.line, o.column)
-    }, { fileName, line, column })
+      expect(ctx.actions.file.openFile).to.have.been.calledWith(o.sinon.match(new RegExp(`cypress/e2e/${o.filePath}$`)), o.line, o.column)
+    }, { fileName, filePath, line, column })
   } else {
     action()
 
@@ -38,6 +38,7 @@ const verifyFailure = (options) => {
     command,
     stack,
     fileName,
+    filePath,
     uncaught = false,
     uncaughtMessage,
     line,
@@ -138,6 +139,7 @@ const verifyFailure = (options) => {
   if (verifyOpenInIde) {
     verifyIdeOpen({
       fileName,
+      filePath,
       hasPreferredIde,
       action: () => {
         cy.get('@Root').contains('.runnable-err-stack-trace .runnable-err-file-path a', fileName)
@@ -185,6 +187,7 @@ const verifyFailure = (options) => {
   if (verifyOpenInIde) {
     verifyIdeOpen({
       fileName,
+      filePath,
       hasPreferredIde,
       action: () => {
         cy.get('@Root').contains('.test-err-code-frame .runnable-err-file-path a', fileName)
@@ -198,12 +201,13 @@ const verifyFailure = (options) => {
 
 type ChainableVerify = (specTitle: string, props: any) => Cypress.Chainable
 
-export const createVerify = ({ fileName, hasPreferredIde, mode }): ChainableVerify => {
+export const createVerify = ({ fileName, filePath, hasPreferredIde, mode }): ChainableVerify => {
   return (specTitle: string, props: any) => {
     props.specTitle ||= specTitle
     props.fileName ||= fileName
     props.hasPreferredIde = hasPreferredIde
     props.mode = mode
+    props.filePath ||= filePath
 
     return cy.wrap(
       (props.verifyFn || verifyFailure).call(null, props),