Shanghai transit free visa policy

Hi!

Can you please help answer:

1. November 22 I fly from Los Angeles to Shanghai
2. November 23 stay in Shanghai (one day)
3. November 24 get on cruise to Japan (no China stops just all Japan) for 7 days
4. Dec 1 get off cruise in Shanghai
5. Same day Dec 1 fly from Shanghai to Singapore stay in Singapore for 3 days
6. Dec 5 fly from Singapore to Shanghai connecting only 5 hours later fly back to Los Angeles (we don’t leave Shanghai airport)

Will I need a visa for this itinerary? Thanks so much for your answer/help!