Handling the 'component-template-resolving' deprecation

Thanks for the details @David :smiley: