Merge branch 'release/14.0.0' into ryanm/chore/electron-upgrade

cypress-io · Oct 28, 2024 · 814e010 · 814e010 · cypress-bot · Oct 28, 2024
2 parents b4a3f38 + e18e66a
commit 814e010
Show file tree

Hide file tree

Showing 20 changed files with 3 additions and 354 deletions.
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -7,6 +7,7 @@ _Released 12/3/2024 (PENDING)_
 
 - Removed support for Node.js 16 and Node.js 21. Addresses [#29930](https://github.com/cypress-io/cypress/issues/29930).
 - Prebuilt binaries for Linux are no longer compatible with Linux distributions based on glibc <2.28, for example: Ubuntu 14-18, RHEL 7, CentOS 7, Amazon Linux 2. Addresses [#29601](https://github.com/cypress-io/cypress/issues/29601).
+- The `experimentalFetchPolyfill` configuration option was removed. This option was deprecated in Cypress 6.0.0. We recommend using `cy.intercept()` for handling fetch requests. Addressed in [#30466](https://github.com/cypress-io/cypress/pull/30466).
 - We removed yielding the second argument of `before:browser:launch` as an array of browser arguments. This behavior has been deprecated since Cypress 4.0.0. Addressed in [#30460](https://github.com/cypress-io/cypress/pull/30460).
 - The `cypress open-ct` and `cypress run-ct` CLI commands were removed. Please use `cypress open --component` or `cypress run --component` respectively instead. Addressed in [#30456](https://github.com/cypress-io/cypress/pull/30456)
 - The undocumented methods `Cypress.backend('firefox:force:gc')` and `Cypress.backend('log:memory:pressure')` were removed. Addresses [#30222](https://github.com/cypress-io/cypress/issues/30222).

diff --git a/cli/types/cypress.d.ts b/cli/types/cypress.d.ts
@@ -3181,10 +3181,6 @@ declare namespace Cypress {
      * The user agent the browser sends in all request headers.
      */
     userAgent: null | string
-    /**
-     * Polyfills `window.fetch` to enable Network spying and stubbing
-     */
-    experimentalFetchPolyfill: boolean
 
     /**
      * Override default config options for Component Testing runner.

diff --git a/npm/react/cypress.config.js b/npm/react/cypress.config.js
@@ -5,7 +5,6 @@ module.exports = {
   'env': {
     'reactDevtools': true,
   },
-  'experimentalFetchPolyfill': true,
   'component': {
     experimentalSingleTabRunMode: true,
     'excludeSpecPattern': [

diff --git a/npm/react/cypress/component/basic/network/README.md b/npm/react/cypress/component/basic/network/README.md
@@ -1,4 +1,3 @@
 # Mocking network
 
 - [1-users-spec.js](1-users-spec.js) tests [1-users.jsx](1-users.jsx) that uses Axios to GET a list of users. Axios uses XMLHttpRequest to receive the data
-- [2-users-fetch-spec.js](2-users-fetch-spec.js) tests [2-users-fetch.jsx](2-users-fetch.jsx) that uses `fetch` directly, assuming `"experimentalFetchPolyfill": true` in `cypress.json`, read [Experimental Fetch Polyfill](https://www.cypress.io/blog/2020/06/29/experimental-fetch-polyfill/)
diff --git a/npm/vue/cypress.config.ts b/npm/vue/cypress.config.ts
@@ -5,7 +5,6 @@ export default defineConfig({
   'viewportHeight': 500,
   'responseTimeout': 2500,
   'projectId': '134ej7',
-  'experimentalFetchPolyfill': true,
   'e2e': {
     'supportFile': false,
   },

diff --git a/packages/app/cypress/e2e/settings.cy.ts b/packages/app/cypress/e2e/settings.cy.ts
@@ -183,13 +183,6 @@ describe('App: Settings', () => {
           href: 'https://on.cypress.io/experiments',
         })
 
-        cy.get('[data-cy="experiment-experimentalFetchPolyfill"]').within(() => {
-          cy.validateExternalLink({
-            name: 'cy.intercept()',
-            href: 'https://on.cypress.io/intercept',
-          })
-        })
-
         cy.get('[data-cy="experiment-experimentalInteractiveRunEvents"]').within(() => {
           cy.validateExternalLink({
             name: 'before:run',

diff --git a/packages/config/__snapshots__/index.spec.ts.js b/packages/config/__snapshots__/index.spec.ts.js
@@ -34,7 +34,6 @@ exports['config/src/index .getDefaultValues returns list of public config keys 1
   'env': {},
   'execTimeout': 60000,
   'experimentalCspAllowList': false,
-  'experimentalFetchPolyfill': false,
   'experimentalInteractiveRunEvents': false,
   'experimentalRunAllSpecs': false,
   'experimentalMemoryManagement': false,
@@ -125,7 +124,6 @@ exports['config/src/index .getDefaultValues returns list of public config keys f
   'env': {},
   'execTimeout': 60000,
   'experimentalCspAllowList': false,
-  'experimentalFetchPolyfill': false,
   'experimentalInteractiveRunEvents': false,
   'experimentalRunAllSpecs': false,
   'experimentalMemoryManagement': false,
@@ -212,7 +210,6 @@ exports['config/src/index .getPublicConfigKeys returns list of public config key
   'env',
   'execTimeout',
   'experimentalCspAllowList',
-  'experimentalFetchPolyfill',
   'experimentalInteractiveRunEvents',
   'experimentalRunAllSpecs',
   'experimentalMemoryManagement',

diff --git a/packages/config/src/options.ts b/packages/config/src/options.ts
@@ -203,11 +203,6 @@ const driverConfigOptions: Array<DriverConfigOption> = [
     validation: validate.validateAny(validate.isBoolean, validate.isArrayIncludingAny('script-src-elem', 'script-src', 'default-src', 'form-action', 'child-src', 'frame-src')),
     overrideLevel: 'never',
     requireRestartOnChange: 'server',
-  }, {
-    name: 'experimentalFetchPolyfill',
-    defaultValue: false,
-    validation: validate.isBoolean,
-    isExperimental: true,
   }, {
     name: 'experimentalInteractiveRunEvents',
     defaultValue: false,

diff --git a/packages/config/test/project/utils.spec.ts b/packages/config/test/project/utils.spec.ts
@@ -1062,7 +1062,6 @@ describe('config/src/project/utils', () => {
             experimentalSkipDomainInjection: { value: null, from: 'default' },
             experimentalJustInTimeCompile: { value: false, from: 'default' },
             experimentalCspAllowList: { value: false, from: 'default' },
-            experimentalFetchPolyfill: { value: false, from: 'default' },
             experimentalInteractiveRunEvents: { value: false, from: 'default' },
             experimentalMemoryManagement: { value: false, from: 'default' },
             experimentalOriginDependencies: { value: false, from: 'default' },
@@ -1159,7 +1158,6 @@ describe('config/src/project/utils', () => {
             experimentalSkipDomainInjection: { value: null, from: 'default' },
             experimentalJustInTimeCompile: { value: false, from: 'default' },
             experimentalCspAllowList: { value: false, from: 'default' },
-            experimentalFetchPolyfill: { value: false, from: 'default' },
             experimentalInteractiveRunEvents: { value: false, from: 'default' },
             experimentalMemoryManagement: { value: false, from: 'default' },
             experimentalOriginDependencies: { value: false, from: 'default' },

diff --git a/packages/data-context/src/sources/migration/legacyOptions.ts b/packages/data-context/src/sources/migration/legacyOptions.ts
@@ -86,11 +86,6 @@ const resolvedOptions: Array<ResolvedConfigOption> = [
     name: 'exit',
     defaultValue: true,
     canUpdateDuringTestTime: false,
-  }, {
-    name: 'experimentalFetchPolyfill',
-    defaultValue: false,
-    isExperimental: true,
-    canUpdateDuringTestTime: false,
   }, {
     name: 'experimentalInteractiveRunEvents',
     defaultValue: false,

diff --git a/packages/driver/README.md b/packages/driver/README.md
@@ -46,9 +46,6 @@ Note: you may need to enable "Verbose" or "Debug" log levels inside the browser'
 
 ## Patches
 
-- `sinon`
-- `unfetch` to polyfill `fetch`. Added constructor function to point XMLHttpRequest to the application under test window.
-
 Note: when creating a patch, make sure there is no `package-lock.json` file! Also rename the patch to have ".dev.patch" extension.
 
 ## Cross-origin Testing

diff --git a/packages/driver/package.json b/packages/driver/package.json
@@ -77,7 +77,6 @@
     "source-map": "0.8.0-beta.0",
     "text-mask-addons": "3.8.0",
     "underscore.string": "3.3.6",
-    "unfetch": "4.1.0",
     "url-parse": "1.5.10",
     "vanilla-text-mask": "5.1.1",
     "vite": "5.2.11",