Since we got no answer here. I am adding the solution we followed in our project. To not mix up the client and server components we splitted the barrel file index file for /server-only-components
and /components
this way we managed to prevent poisoning react components.