Skip to content

chore: pin to react 18 #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2025
Merged

chore: pin to react 18 #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
"@types/react": "18.3.1",
"@types/react-dom": "18.3.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"turbo": "^2.4.4",
"typescript": "5.8.2"
},
Expand All @@ -33,6 +37,12 @@
"sqlite3",
"ssh2",
"svelte-preprocess"
]
],
"overrides": {
"react": "18.3.1",
"react-dom": "18.3.1",
"@types/react": "18.3.1",
"@types/react-dom": "18.3.1"
}
}
}
}
4 changes: 2 additions & 2 deletions platforms/eVoting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"tailwind-merge": "^3.3.1",
"tailwindcss-animate": "^1.0.7",
"vaul": "^1.1.2",
"zod": "^4.0.14"
"zod": "^3.24.2"
},
"devDependencies": {
"@eslint/eslintrc": "^3",
Expand All @@ -69,4 +69,4 @@
"tailwindcss": "^4",
"typescript": "^5"
}
}
}
2 changes: 1 addition & 1 deletion platforms/eVoting/src/components/ui/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
/>
)
}
)
) as React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLButtonElement>>
Button.displayName = "Button"

export { Button, buttonVariants }
3 changes: 2 additions & 1 deletion platforms/eVoting/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"@/*": [
"src/*"
]
}
},
"types": ["react", "react-dom"]
},
"include": [
"**/*.ts",
Expand Down
22 changes: 9 additions & 13 deletions platforms/group-charter-manager/src/components/ui/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,14 @@ export interface ButtonProps
asChild?: boolean
}

const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
({ className, variant, size, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : "button"
return (
<Comp
className={cn(buttonVariants({ variant, size, className }))}
ref={ref}
{...props}
/>
)
}
)
Button.displayName = "Button"
function Button({ className, variant, size, asChild = false, ...props }: ButtonProps) {
const Comp = asChild ? Slot : "button"
return (
<Comp
className={cn(buttonVariants({ variant, size, className }))}
{...props}
/>
)
}

export { Button, buttonVariants }
3 changes: 2 additions & 1 deletion platforms/group-charter-manager/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
],
"paths": {
"@/*": ["./src/*"]
}
},
"types": ["react", "react-dom"]
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
"exclude": ["node_modules"]
Expand Down
Loading
Loading