Skip to content

Commit a4f1e3c

Browse files
Merge branch 'development' into shravan-animal-management-landing-page
2 parents e4bc931 + 99e7a79 commit a4f1e3c

340 files changed

Lines changed: 55982 additions & 12705 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.husky/pre-commit

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
#!/bin/sh
22
# Load nvm if available
3-
# Try to load nvm (non-blocking)
43
export NVM_DIR="$HOME/.nvm"
5-
6-
if [ -s "$NVM_DIR/nvm.sh" ]; then
7-
. "$NVM_DIR/nvm.sh"
8-
nvm use >/dev/null 2>&1
9-
echo "Using Node via nvm"
10-
else
11-
echo "nvm not available, using system Node"
4+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
5+
# Use Node 20 if available (or install if needed)
6+
if [ -f .nvmrc ]; then
7+
nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
128
fi
139

1410
echo ""

jest.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ module.exports = {
2020
'react-leaflet': '<rootDir>/src/_tests_/__mocks__/react-leaflet.js',
2121
'marker-cluster-group': '<rootDir>/src/_tests_/__mocks__/react-leaflet-cluster.js',
2222
'\\.(css|less|scss|sass)$': 'identity-obj-proxy', // <-- Added to mock CSS/SCSS files
23+
// Fix for Node.js built-in modules in Node 20
24+
'^node:(.*)$': '$1',
2325
},
2426

2527
// The paths to modules that run some code to configure or set up the testing environment before each test

0 commit comments

Comments
 (0)