Merge pull request #20920 from wagenet/less-extend

Remove many uses of .extend

Author: wagenet

package.json

@@ -400,4 +400,4 @@
     }
   },
   "packageManager": "[email protected]"
-}
+}