The Raspberry Pi Foundation has announced the new Camera Module 3, which comes with powered autofocus, which can focus from 5cm to infinity.

The module has a few variations, including standard and wide field of view, and visible light and infrared light options.

https://www.raspberrypi.com/news/new-autofocus-camera-modules/