Dell, a TX company, made my laptop in Vietnam, however I haven't noticed any punji sticks in the keyboard.
I work there, anything that the US government buys or military has including laptops is built in the US, per law, but yes we're moving our consumer stuff out of China to Vietnam and other places.
Servers have always been built stateside. They never outsourced that for security reasons.