Merge pull request #3436 from github/mbg/rebuild-js-es2022

Merge pull request #3436 from github/mbg/rebuild-js-es2022 #8855