chore(web): Merge remote-tracking branch 'origin/refactor/web/common-esbundling' into refactor/web/common-esbundling