Merge branch 'main' into bun-v1.2

# Conflicts: # bun.lockb # package.json
ExpediaGroup · Jan 23, 2025 · bcdb16d · bcdb16d
2 parents d7f725d + c78940b
commit bcdb16d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/frontend/cypress/support/component.ts b/app/frontend/cypress/support/component.ts
@@ -1,6 +1,6 @@
 import './commands';
 
-import { mount } from 'cypress/react18';
+import { mount } from 'cypress/react';
 import { MOCK_ERROR_MESSAGE } from '../mocks/base-image-update-rejection';
 
 declare global {

diff --git a/comparadise-utils/package.json b/comparadise-utils/package.json
@@ -22,7 +22,7 @@
   "devDependencies": {
     "@types/pixelmatch": "5.2.6",
     "@types/pngjs": "6.0.5",
-    "cypress": "13.17.0",
+    "cypress": "14.0.0",
     "tsup": "8.3.5"
   },
   "peerDependencies": {

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "@total-typescript/ts-reset": "0.6.1",
     "@types/jest": "29.5.14",
     "bun-types": "1.2.0",
-    "cypress": "13.17.0",
+    "cypress": "14.0.0",
     "eslint": "9.17.0",
     "eslint-plugin-react": "7.37.3",
     "jest": "29.7.0",