Skip to content

Commit 030f4e1

Browse files
authored
chore: pin to react 18 (#363)
1 parent 2cba87c commit 030f4e1

File tree

7 files changed

+5098
-7096
lines changed

7 files changed

+5098
-7096
lines changed

package.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
},
1515
"devDependencies": {
1616
"@biomejs/biome": "^1.9.4",
17+
"@types/react": "18.3.1",
18+
"@types/react-dom": "18.3.1",
19+
"react": "18.3.1",
20+
"react-dom": "18.3.1",
1721
"turbo": "^2.4.4",
1822
"typescript": "5.8.2"
1923
},
@@ -33,6 +37,12 @@
3337
"sqlite3",
3438
"ssh2",
3539
"svelte-preprocess"
36-
]
40+
],
41+
"overrides": {
42+
"react": "18.3.1",
43+
"react-dom": "18.3.1",
44+
"@types/react": "18.3.1",
45+
"@types/react-dom": "18.3.1"
46+
}
3747
}
38-
}
48+
}

platforms/eVoting/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"tailwind-merge": "^3.3.1",
5757
"tailwindcss-animate": "^1.0.7",
5858
"vaul": "^1.1.2",
59-
"zod": "^4.0.14"
59+
"zod": "^3.24.2"
6060
},
6161
"devDependencies": {
6262
"@eslint/eslintrc": "^3",
@@ -69,4 +69,4 @@
6969
"tailwindcss": "^4",
7070
"typescript": "^5"
7171
}
72-
}
72+
}

platforms/eVoting/src/components/ui/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
5050
/>
5151
)
5252
}
53-
)
53+
) as React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLButtonElement>>
5454
Button.displayName = "Button"
5555

5656
export { Button, buttonVariants }

platforms/eVoting/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
"@/*": [
2828
"src/*"
2929
]
30-
}
30+
},
31+
"types": ["react", "react-dom"]
3132
},
3233
"include": [
3334
"**/*.ts",

platforms/group-charter-manager/src/components/ui/button.tsx

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,14 @@ export interface ButtonProps
3939
asChild?: boolean
4040
}
4141

42-
const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
43-
({ className, variant, size, asChild = false, ...props }, ref) => {
44-
const Comp = asChild ? Slot : "button"
45-
return (
46-
<Comp
47-
className={cn(buttonVariants({ variant, size, className }))}
48-
ref={ref}
49-
{...props}
50-
/>
51-
)
52-
}
53-
)
54-
Button.displayName = "Button"
42+
function Button({ className, variant, size, asChild = false, ...props }: ButtonProps) {
43+
const Comp = asChild ? Slot : "button"
44+
return (
45+
<Comp
46+
className={cn(buttonVariants({ variant, size, className }))}
47+
{...props}
48+
/>
49+
)
50+
}
5551

5652
export { Button, buttonVariants }

platforms/group-charter-manager/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
],
2121
"paths": {
2222
"@/*": ["./src/*"]
23-
}
23+
},
24+
"types": ["react", "react-dom"]
2425
},
2526
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
2627
"exclude": ["node_modules"]

0 commit comments

Comments
 (0)