Skip to content

Commit d596325

Browse files
committed
Merge branch 'renovate/pin-dependencies' of https://github.com/ai16z/eliza into shaw/package-updates
2 parents 0a7b8af + 5b6c673 commit d596325

File tree

3 files changed

+11
-32197
lines changed

3 files changed

+11
-32197
lines changed

client/package.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"lucide-react": "0.460.0",
1818
"react": "18.3.1",
1919
"react-dom": "18.3.1",
20-
"tailwind-merge": "2.5.4",
20+
"tailwind-merge": "2.5.5",
2121
"tailwindcss-animate": "1.0.7",
2222
"vite-plugin-top-level-await": "1.4.4",
2323
"vite-plugin-wasm": "3.3.0"
@@ -29,9 +29,15 @@
2929
"@types/react-dom": "18.3.1",
3030
"@vitejs/plugin-react": "4.3.3",
3131
"autoprefixer": "10.4.20",
32+
<<<<<<< HEAD
3233
"eslint": "9.13.0",
3334
"eslint-plugin-react-hooks": "5.0.0",
3435
"eslint-plugin-react-refresh": "0.4.14",
36+
=======
37+
"eslint": "^9.13.0",
38+
"eslint-plugin-react-hooks": "^5.0.0",
39+
"eslint-plugin-react-refresh": "^0.4.14",
40+
>>>>>>> 5b6c673ed81a1bd29680e6809c7579493b37b1b7
3541
"globals": "15.12.0",
3642
"postcss": "8.4.49",
3743
"tailwindcss": "3.4.15",

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
"test": "bash ./scripts/test.sh"
2424
},
2525
"devDependencies": {
26+
"@commitlint/cli": "18.6.1",
27+
"@commitlint/config-conventional": "18.6.3",
2628
"lerna": "8.1.5",
2729
"only-allow": "1.2.1",
2830
"concurrently": "9.1.0",
@@ -31,9 +33,8 @@
3133
"typedoc": "0.26.11",
3234
"typescript": "5.6.3",
3335
"vite": "5.4.11",
34-
"vitest": "2.1.5",
35-
"@commitlint/cli": "18.6.1",
36-
"@commitlint/config-conventional": "18.6.3"
36+
"vitest": "2.1.5"
37+
3738
},
3839
"pnpm": {
3940
"overrides": {

0 commit comments

Comments
 (0)