main
build: update to the latest version of dev-infra with ESM (#25052)
build: follow-up fixes to fix CI errors