Ah sorry @Arkshine - I was working on a report of the same issue over in Site broken due to ember 5 upgrade - #12 by david.
IMO it’s still worth posting your PR, and then I’ll close mine. Looks like yours does some more tidying, and also fixes a server-side deprecation 