Merge branch 'develop' into docs/ts-upgrade-guide

Author: cacieprins

.circleci/workflows.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
-chrome-stable-version: &chrome-stable-version "134.0.6998.88"
-chrome-beta-version: &chrome-beta-version "135.0.7049.17"
+chrome-stable-version: &chrome-stable-version "134.0.6998.165"
+chrome-beta-version: &chrome-beta-version "135.0.7049.28"
 firefox-stable-version: &firefox-stable-version "135.0"
 
 orbs:

cli/CHANGELOG.md

@@ -3,9 +3,23 @@
 
 _Released 3/25/2025 (PENDING)_
 
+**Bugfixes:**
+
+- Applies a fix from [#30730](https://github.com/cypress-io/cypress/pull/30730) and [#30099](https://github.com/cypress-io/cypress/pull/30099) related to Node.js turning on ESM flags by default in Node.js version `20.19.0`. Fixed in [#31308](https://github.com/cypress-io/cypress/pull/31308).
+- Fixed an issue where Firefox BiDi was not correctly removing prerequests on expected network request failures. Fixes [#31325](https://github.com/cypress-io/cypress/issues/31325).
+- Fixed an issue in `@cypress/webpack-batteries-included-preprocessor` and `@cypress/webpack-preprocessor` where sourceMaps were not being set correctly in TypeScript 5. This should now make error code frames accurate for TypeScript 5 users. Fixes [#29614](https://github.com/cypress-io/cypress/issues/29614).
+
+**Misc:**
+
+- The UI above the application under test now displays in dark mode. Addresses [#31106](https://github.com/cypress-io/cypress/issues/31106). Addressed in [#31360](https://github.com/cypress-io/cypress/pull/31360).
+
 **Dependency Updates:**
 
 - Upgraded `@cypress/request` from `3.0.7` to `3.0.8`. Addressed in [#31311](https://github.com/cypress-io/cypress/pull/31311).
+- Upgraded `cross-fetch` from `3.1.8` to `4.1.0`. Addressed in [#31327](https://github.com/cypress-io/cypress/pull/31327).
+- Upgraded `micromatch` from `4.0.6` to `4.0.8`. Addressed in [#31330](https://github.com/cypress-io/cypress/pull/31330).
+- Upgraded `resolve` from `1.17.0` to `1.22.10`. Addressed in [#31333](https://github.com/cypress-io/cypress/pull/31333).
+- Upgraded `semver` from `7.5.3` to `7.7.1`. Addressed in [#31341](https://github.com/cypress-io/cypress/pull/31341).
 - Upgraded `systeminformation` from `5.21.7` to `5.22.8`. Addressed in [#31281](https://github.com/cypress-io/cypress/pull/31281).
 
 ## 14.2.0

cli/package.json

@@ -57,7 +57,7 @@
     "process": "^0.11.10",
     "proxy-from-env": "1.0.0",
     "request-progress": "^3.0.0",
-    "semver": "^7.5.3",
+    "semver": "^7.7.1",
     "supports-color": "^8.1.1",
     "tmp": "~0.2.3",
     "tree-kill": "1.2.2",

npm/react/package.json

@@ -26,7 +26,7 @@
     "react-dom": "18.3.1",
     "react-router": "6.28.0",
     "react-router-dom": "6.28.0",
-    "semver": "^7.5.3",
+    "semver": "^7.7.1",
     "typescript": "~5.4.5",
     "vite": "5.4.10",
     "vite-plugin-require-transform": "1.0.12"

npm/vite-dev-server/package.json

@@ -18,7 +18,7 @@
     "debug": "^4.3.4",
     "find-up": "6.3.0",
     "node-html-parser": "5.3.3",
-    "semver": "^7.5.3"
+    "semver": "^7.7.1"
   },
   "devDependencies": {
     "chai": "^4.3.6",

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

@@ -1,6 +1,4 @@
 const path = require('path')
-const fs = require('fs-extra')
-const JSON5 = require('json5')
 const webpack = require('webpack')
 const Debug = require('debug')
 const webpackPreprocessor = require('@cypress/webpack-preprocessor')
@@ -17,38 +15,6 @@ const hasTsLoader = (rules) => {
   })
 }
 
-const getTSCompilerOptionsForUser = (configFilePath) => {
-  const compilerOptions = {
-    sourceMap: false,
-    inlineSourceMap: true,
-    inlineSources: true,
-    downlevelIteration: true,
-  }
-
-  if (!configFilePath) {
-    return compilerOptions
-  }
-
-  try {
-    // If possible, try to read the user's tsconfig.json and see if sourceMap is configured
-    // eslint-disable-next-line no-restricted-syntax
-    const tsconfigJSON = fs.readFileSync(configFilePath, 'utf8')
-    // file might have trailing commas, new lines, etc. JSON5 can parse those correctly
-    const parsedJSON = JSON5.parse(tsconfigJSON)
-
-    // if the user has sourceMap's configured, set the option to true and turn off inlineSourceMaps
-    if (parsedJSON?.compilerOptions?.sourceMap) {
-      compilerOptions.sourceMap = true
-      compilerOptions.inlineSourceMap = false
-      compilerOptions.inlineSources = false
-    }
-  } catch (e) {
-    debug(`error in getTSCompilerOptionsForUser. Returning default...`, e)
-  } finally {
-    return compilerOptions
-  }
-}
-
 const addTypeScriptConfig = (file, options) => {
   // shortcut if we know we've already added typescript support
   if (options.__typescriptSupportAdded) return options
@@ -60,14 +26,21 @@ const addTypeScriptConfig = (file, options) => {
   if (!rules || !Array.isArray(rules)) return options
 
   // if we find ts-loader configured, don't add it again
-  if (hasTsLoader(rules)) return options
+  if (hasTsLoader(rules)) {
+    debug('ts-loader already configured, not adding again')
+
+    return options
+  }
 
   const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin')
   // node will try to load a projects tsconfig.json instead of the node
-  // package using require('tsconfig'), so we alias it as 'tsconfig-aliased-for-wbip'
-  const configFile = require('tsconfig-aliased-for-wbip').findSync(path.dirname(file.filePath))
 
-  const compilerOptions = getTSCompilerOptionsForUser(configFile)
+  const getTsConfig = require('get-tsconfig')
+
+  // returns null if tsconfig cannot be found in the path/parent hierarchy
+  const configFile = getTsConfig.getTsconfig(file.filePath)
+
+  configFile ? debug(`found user tsconfig.json at ${configFile?.path} with compilerOptions: ${JSON.stringify(configFile?.config?.compilerOptions)}`) : debug('no user tsconfig.json found')
 
   webpackOptions.module.rules.push({
     test: /\.tsx?$/,
@@ -77,7 +50,6 @@ const addTypeScriptConfig = (file, options) => {
         loader: require.resolve('ts-loader'),
         options: {
           compiler: options.typescript,
-          compilerOptions,
           logLevel: 'error',
           silent: true,
           transpileOnly: true,
@@ -88,7 +60,7 @@ const addTypeScriptConfig = (file, options) => {
 
   webpackOptions.resolve.extensions = webpackOptions.resolve.extensions.concat(['.ts', '.tsx'])
   webpackOptions.resolve.plugins = [new TsconfigPathsPlugin({
-    configFile,
+    configFile: configFile?.path,
     silent: true,
   })]
 

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

@@ -27,9 +27,8 @@
     "debug": "^4.3.4",
     "domain-browser": "^4.22.0",
     "events": "^3.3.0",
-    "fs-extra": "^9.1.0",
+    "get-tsconfig": "^4.10.0",
     "https-browserify": "^1.0.0",
-    "json5": "2.2.3",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
@@ -39,8 +38,7 @@
     "stream-http": "^3.2.0",
     "string_decoder": "1.3.0",
     "timers-browserify": "^2.0.12",
-    "ts-loader": "9.4.4",
-    "tsconfig-aliased-for-wbip": "npm:tsconfig@^7.0.0",
+    "ts-loader": "9.5.2",
     "tsconfig-paths-webpack-plugin": "^3.5.2",
     "tty-browserify": "^0.0.1",
     "url": "^0.11.1",

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

@@ -32,36 +32,24 @@ describe('webpack-batteries-included-preprocessor', () => {
   })
 
   context('#getTSCompilerOptionsForUser', () => {
-    const mockTsconfigPath = '/path/to/tsconfig.json'
-    let readFileTsConfigMock
+    let getTsConfigMock
     let preprocessor
-    let readFileTsConfigStub
     let webpackOptions
 
     beforeEach(() => {
       const tsConfigPathSpy = sinon.spy()
 
-      readFileTsConfigMock = () => {
-        throw new Error('Could not read file!')
-      }
-
       mock('tsconfig-paths-webpack-plugin', tsConfigPathSpy)
       mock('@cypress/webpack-preprocessor', (options) => {
         return (file) => undefined
       })
 
-      const tsconfig = require('tsconfig-aliased-for-wbip')
+      const getTsConfig = require('get-tsconfig')
 
-      sinon.stub(tsconfig, 'findSync').callsFake(() => mockTsconfigPath)
+      getTsConfigMock = sinon.stub(getTsConfig, 'getTsconfig')
 
       preprocessor = require('../../index')
 
-      const fs = require('fs-extra')
-
-      readFileTsConfigStub = sinon.stub(fs, 'readFileSync').withArgs(mockTsconfigPath, 'utf8').callsFake(() => {
-        return readFileTsConfigMock()
-      })
-
       webpackOptions = {
         module: {
           rules: [],
@@ -74,12 +62,14 @@ describe('webpack-batteries-included-preprocessor', () => {
     })
 
     afterEach(() => {
-    // Remove the mock
+      // Remove the mock
       mock.stop('tsconfig-paths-webpack-plugin')
       mock.stop('@cypress/webpack-preprocessor')
     })
 
-    it('always returns compilerOptions even if there is an error discovering the user\'s tsconfig.json', () => {
+    it('always returns loader options even if there is an error discovering the user\'s tsconfig.json', () => {
+      getTsConfigMock.returns(null)
+
       const preprocessorCB = preprocessor({
         typescript: true,
         webpackOptions,
@@ -90,7 +80,6 @@ describe('webpack-batteries-included-preprocessor', () => {
         outputPath: '.js',
       })
 
-      sinon.assert.calledOnce(readFileTsConfigStub)
       const tsLoader = webpackOptions.module.rules[0].use[0]
 
       expect(tsLoader.loader).to.contain('ts-loader')
@@ -100,80 +89,8 @@ describe('webpack-batteries-included-preprocessor', () => {
       expect(tsLoader.options.silent).to.be.true
       expect(tsLoader.options.transpileOnly).to.be.true
 
-      const compilerOptions = tsLoader.options.compilerOptions
-
-      expect(compilerOptions.downlevelIteration).to.be.true
-      expect(compilerOptions.inlineSources).to.be.true
-      expect(compilerOptions.inlineSources).to.be.true
-      expect(compilerOptions.sourceMap).to.be.false
-    })
-
-    it('turns inlineSourceMaps on by default even if none are configured', () => {
-      // make json5 compat schema
-      const mockTsConfig = `{
-          "compilerOptions": {
-            "sourceMap": false,
-            "someConfigWithTrailingComma": true,
-          }
-        }`
-
-      readFileTsConfigMock = () => mockTsConfig
-
-      const preprocessorCB = preprocessor({
-        typescript: true,
-        webpackOptions,
-      })
-
-      preprocessorCB({
-        filePath: 'foo.ts',
-        outputPath: '.js',
-      })
-
-      sinon.assert.calledOnce(readFileTsConfigStub)
-      const tsLoader = webpackOptions.module.rules[0].use[0]
-
-      expect(tsLoader.loader).to.contain('ts-loader')
-
-      const compilerOptions = tsLoader.options.compilerOptions
-
-      expect(compilerOptions.downlevelIteration).to.be.true
-      expect(compilerOptions.inlineSources).to.be.true
-      expect(compilerOptions.inlineSources).to.be.true
-      expect(compilerOptions.sourceMap).to.be.false
-    })
-
-    it('turns on sourceMaps and disables inlineSourceMap and inlineSources if the sourceMap configuration option is set by the user', () => {
-      // make json5 compat schema
-      const mockTsConfig = `{
-          "compilerOptions": {
-            "sourceMap": true,
-            "someConfigWithTrailingComma": true,
-          }
-        }`
-
-      readFileTsConfigMock = () => mockTsConfig
-
-      const preprocessorCB = preprocessor({
-        typescript: true,
-        webpackOptions,
-      })
-
-      preprocessorCB({
-        filePath: 'foo.ts',
-        outputPath: '.js',
-      })
-
-      sinon.assert.calledOnce(readFileTsConfigStub)
-      const tsLoader = webpackOptions.module.rules[0].use[0]
-
-      expect(tsLoader.loader).to.contain('ts-loader')
-
-      const compilerOptions = tsLoader.options.compilerOptions
-
-      expect(compilerOptions.downlevelIteration).to.be.true
-      expect(compilerOptions.inlineSources).to.be.false
-      expect(compilerOptions.inlineSources).to.be.false
-      expect(compilerOptions.sourceMap).to.be.true
+      // compilerOptions are set by `@cypress/webpack-preprocessor` if ts-loader is present
+      expect(tsLoader.options.compilerOptions).to.be.undefined
     })
   })
 })

npm/webpack-dev-server/package.json

@@ -22,7 +22,7 @@
     "html-webpack-plugin-4": "npm:html-webpack-plugin@^4",
     "html-webpack-plugin-5": "npm:html-webpack-plugin@^5",
     "local-pkg": "0.4.1",
-    "semver": "^7.5.3",
+    "semver": "^7.7.1",
     "speed-measure-webpack-plugin": "1.4.2",
     "tslib": "^2.3.1",
     "webpack-dev-server": "^5.1.0",