Gigafactory will be ramping up with the new tabless design, no rare earths, and it's going to dwarve the current battery production of the planet. Check out Battery day from last year on youtube.

This is basically the push behind the majority of battery research right now. For example, sulfur batteries have significantly higher densities (multiples higher) than lipo but can't charge or discharge as fast.

Solid state research is also pushing in this direction.

And lithium extraction from sea water is also on the table.

Rares like cobalt is really the issue. And next gen batteries are likely to take them off the table or significantly reduce per battery quantities.

Likewise, the US has two mines with multiple alternate sites but they are forced closed by Obama's EPA. Forcing supply to China and other hostiles. Surprise!

They're is much bullshit surrounding battery tech and even shills here push hard to confuse and conflate things.