Skip to content

Commit 936a31f

Browse files
committed
Merge branch 'main' into pr/rudransh-shrivastava/2178
2 parents b3291f4 + ab62df9 commit 936a31f

File tree

3 files changed

+522
-518
lines changed

3 files changed

+522
-518
lines changed

frontend/jest.setup.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@ if (typeof global.fetch === 'undefined') {
2727
} as Response)
2828
}
2929

30+
// Mock framer-motion due to how Jest 30 ESM resolution treats
31+
// motion-dom's internal .mjs imports as "outside test scope".
32+
jest.mock('framer-motion', () => {
33+
return {
34+
...jest.requireActual('framer-motion'),
35+
LazyMotion: ({ children }) => children,
36+
}
37+
})
38+
3039
jest.mock('next-auth/react', () => {
3140
return {
3241
...jest.requireActual('next-auth/react'),

frontend/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"@tailwindcss/postcss": "^4.1.14",
8383
"@testing-library/jest-dom": "^6.9.1",
8484
"@testing-library/react": "^16.3.0",
85-
"@types/jest": "^29.5.14",
85+
"@types/jest": "^30.0.0",
8686
"@types/leaflet": "^1.9.20",
8787
"@types/leaflet.markercluster": "^1.5.6",
8888
"@types/markdown-it": "^14.1.2",
@@ -100,11 +100,11 @@
100100
"eslint-plugin-jsx-a11y": "^6.10.2",
101101
"eslint-plugin-prettier": "^5.5.4",
102102
"eslint-plugin-react": "^7.37.5",
103-
"eslint-plugin-react-hooks": "^5.2.0",
103+
"eslint-plugin-react-hooks": "^6.1.1",
104104
"globals": "^16.4.0",
105105
"identity-obj-proxy": "^3.0.0",
106106
"import-in-the-middle": "^1.14.4",
107-
"jest": "^29.7.0",
107+
"jest": "^30.2.0",
108108
"jest-axe": "^10.0.0",
109109
"jest-environment-jsdom": "^30.2.0",
110110
"open": "^10.2.0",

0 commit comments

Comments
 (0)