DEV: Replace `$.extend` with `Object.assign` (#14921)

app/assets/javascripts/discourse/app/controllers/flag.js

@@ -258,8 +258,9 @@ export default Controller.extend(ModalFunctionality, {
       let params = this.get("selected.is_custom_flag")
         ? { message: this.message }
         : {};
+
       if (opts) {
-        params = $.extend(params, opts);
+        params = Object.assign(params, opts);
       }
 
       this.appEvents.trigger(

app/assets/javascripts/discourse/app/mixins/upload.js

@@ -94,11 +94,14 @@ export default Mixin.create({
       const isValid = validateUploadedFiles(data.files, opts);
       const type = this.type;
       let form = type ? { type } : {};
+
       if (this.data) {
-        form = $.extend(form, this.data);
+        form = Object.assign(form, this.data);
       }
+
       data.formData = form;
       this.setProperties({ uploadProgress: 0, uploading: isValid });
+
       return isValid;
     });
 

app/assets/javascripts/discourse/app/routes/tag-show.js

@@ -220,7 +220,7 @@ export default DiscourseRoute.extend(FilterModeMixin, {
       const categoryId = controller.get("category.id");
 
       if (categoryId) {
-        options = $.extend({}, options, {
+        options = Object.assign({}, options, {
           categoryId,
           includeSubcategories: !controller.noSubcategories,
         });

app/assets/javascripts/discourse/app/services/search.js

@@ -15,7 +15,7 @@ export default EmberObject.extend({
     },
     set(value, searchContext) {
       // a bit hacky, consider cleaning this up, need to work through all observers though
-      const context = $.extend({}, searchContext);
+      const context = Object.assign({}, searchContext);
       context.type = value;
       this.set("searchContext", context);
       return this.get("searchContext.type");

app/assets/javascripts/discourse/app/widgets/header.js

@@ -402,7 +402,7 @@ export default createWidget("header", {
     let contentsAttrs = { contents, minimized: !!attrs.topic };
     return h(
       "div.wrap",
-      this.attach("header-contents", $.extend({}, attrs, contentsAttrs))
+      this.attach("header-contents", Object.assign({}, attrs, contentsAttrs))
     );
   },
 

app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js

@@ -97,7 +97,11 @@ export function withFrozenTime(timeString, timezone, callback) {
 let _pretenderCallbacks = {};
 
 export function resetSite(siteSettings, extras) {
-  let siteAttrs = $.extend({}, siteFixtures["site.json"].site, extras || {});
+  let siteAttrs = Object.assign(
+    {},
+    siteFixtures["site.json"].site,
+    extras || {}
+  );
   siteAttrs.store = createStore();
   siteAttrs.siteSettings = siteSettings;
   return Site.resetCurrent(Site.create(siteAttrs));

app/assets/javascripts/discourse/tests/setup-tests.js

@@ -42,7 +42,7 @@ function AcceptanceModal(option, _relatedTarget) {
   return this.each(function () {
     let $this = $(this);
     let data = $this.data("bs.modal");
-    let options = $.extend(
+    let options = Object.assign(
       {},
       Modal.DEFAULTS,
       $this.data(),

plugins/lazy-yt/assets/javascripts/lib/lazyYT.js

@@ -162,10 +162,10 @@ export default function initLazyYt($) {
   $.fn.lazyYT = function (newSettings) {
     let defaultSettings = {
       default_ratio: "16:9",
-      callback: null, // ToDO execute callback if given
+      callback: null, // TODO: execute callback if given
       container_class: "lazyYT-container",
     };
-    let settings = $.extend(defaultSettings, newSettings);
+    let settings = Object.assign(defaultSettings, newSettings);
 
     return this.each(function () {
       let $el = $(this).addClass(settings.container_class);

plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js

@@ -89,7 +89,7 @@ export function createData(store) {
     topicId++;
     return store.createRecord(
       "topic",
-      $.extend(
+      Object.assign(
         {
           id: topicId,
           title: `Example Topic Title ${topicId}`,