The Colorado Avalanche have re-signed restricted free agent defenceman Cale Makar to a six-year, $54 million contract.