* Update apollo to v3 * Fix imports * Add generated file to ignored * Use proper import * Tidy up code * Remove unused packages * Fix tests