assign -> Object.assign

packages/-ember-data/tests/integration/application-test.js

@@ -1,7 +1,6 @@
 import Application from '@ember/application';
 import Namespace from '@ember/application/namespace';
 import Controller from '@ember/controller';
-import { assign } from '@ember/polyfills';
 import Service, { inject as service } from '@ember/service';
 
 import { module, test } from 'qunit';
@@ -26,7 +25,7 @@ module('integration/application - Injecting a Custom Store', function (hooks) {
       'controller:baz',
       class Controller {
         constructor(args) {
-          assign(this, args);
+          Object.assign(this, args);
         }
         @service('store') store;
         static create(args) {
@@ -69,7 +68,7 @@ module('integration/application - Injecting the Default Store', function (hooks)
       'controller:baz',
       class Controller {
         constructor(args) {
-          assign(this, args);
+          Object.assign(this, args);
         }
         @service('store') store;
         static create(args) {
@@ -112,7 +111,7 @@ module('integration/application - Using the store as a service', function (hooks
       'controller:baz',
       class Controller {
         constructor(args) {
-          assign(this, args);
+          Object.assign(this, args);
         }
         @service('store') store;
         static create(args) {

packages/-ember-data/tests/integration/record-data/unloading-record-data-test.js

@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import { run } from '@ember/runloop';
 
 import { module, test } from 'qunit';
@@ -52,7 +51,7 @@ module('RecordData Compatibility', function (hooks) {
       this.attributes = jsonApiResource.attributes || null;
 
       if (shouldCalculateChanges) {
-        changedKeys = Object.keys(assign({}, oldAttrs, this.attributes));
+        changedKeys = Object.keys(Object.assign({}, oldAttrs, this.attributes));
       }
 
       return changedKeys || [];

packages/-ember-data/tests/integration/store/adapter-for-test.js

@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import { run } from '@ember/runloop';
 
 import { module, test } from 'qunit';
@@ -9,7 +8,7 @@ import Store from '@ember-data/store';
 
 class TestAdapter {
   constructor(args) {
-    assign(this, args);
+    Object.assign(this, args);
     this.didInit();
   }
 

packages/-ember-data/tests/integration/store/serializer-for-test.js

@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import { run } from '@ember/runloop';
 
 import { module, test } from 'qunit';
@@ -10,7 +9,7 @@ import { deprecatedTest } from '@ember-data/unpublished-test-infra/test-support/
 
 class TestAdapter {
   constructor(args) {
-    assign(this, args);
+    Object.assign(this, args);
     this.didInit();
   }
 
@@ -23,7 +22,7 @@ class TestAdapter {
 
 class TestSerializer {
   constructor(args) {
-    assign(this, args);
+    Object.assign(this, args);
     this.didInit();
   }
 

packages/-ember-data/tests/unit/store/peek-record-test.js

@@ -1,5 +1,4 @@
 import EmberObject from '@ember/object';
-import { assign } from '@ember/polyfills';
 
 import { module, test } from 'qunit';
 
@@ -113,7 +112,7 @@ module('unit/store/peekRecord - Store peekRecord', function (hooks) {
         peekRecordArgs.lid = recordIdentifierFor(person).lid;
       }
       if (extra) {
-        assign(peekRecordArgs, extra);
+        Object.assign(peekRecordArgs, extra);
       }
 
       assert.strictEqual(

packages/adapter/addon/rest.ts

@@ -4,7 +4,6 @@
 import { getOwner } from '@ember/application';
 import { assert, deprecate, warn } from '@ember/debug';
 import { computed } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 
@@ -1181,7 +1180,7 @@ class RESTAdapter extends Adapter.extend(BuildURLMixin) {
     method: string,
     options: JQueryAjaxSettings | RequestInit
   ): JQueryRequestInit | FetchRequestInit {
-    let reqOptions: JQueryRequestInit | FetchRequestInit = assign(
+    let reqOptions: JQueryRequestInit | FetchRequestInit = Object.assign(
       {
         url,
         method,

packages/canary-features/addon/index.ts

@@ -1,7 +1,5 @@
 /* globals EmberDataENV */
 
-import { assign } from '@ember/polyfills';
-
 import DEFAULT_FEATURES from './default-features';
 
 type FeatureList = {
@@ -26,7 +24,7 @@ function featureValue(value: boolean | null): boolean | null {
   return value;
 }
 
-export const FEATURES: FeatureList = assign({}, DEFAULT_FEATURES, ENV.FEATURES);
+export const FEATURES: FeatureList = Object.assign({}, DEFAULT_FEATURES, ENV.FEATURES);
 export const SAMPLE_FEATURE_FLAG = featureValue(FEATURES.SAMPLE_FEATURE_FLAG);
 export const RECORD_DATA_ERRORS = featureValue(FEATURES.RECORD_DATA_ERRORS);
 export const RECORD_DATA_STATE = featureValue(FEATURES.RECORD_DATA_STATE);

packages/record-data/addon/-private/record-data.ts

@@ -2,7 +2,6 @@
  * @module @ember-data/record-data
  */
 import { assert } from '@ember/debug';
-import { assign } from '@ember/polyfills';
 import { _backburner as emberBackburner } from '@ember/runloop';
 import { isEqual } from '@ember/utils';
 
@@ -98,7 +97,7 @@ export default class RecordDataDefault implements RelationshipRecordData {
       changedKeys = this._changedKeys(data.attributes);
     }
 
-    assign(this._data, data.attributes);
+    Object.assign(this._data, data.attributes);
     if (this.__attributes) {
       // only do if we have attribute changes
       this._updateChangedAttributes();
@@ -305,7 +304,7 @@ export default class RecordDataDefault implements RelationshipRecordData {
     }
     let changedKeys = this._changedKeys(newCanonicalAttributes);
 
-    assign(this._data, this.__inFlightAttributes, newCanonicalAttributes);
+    Object.assign(this._data, this.__inFlightAttributes, newCanonicalAttributes);
 
     this._inFlightAttributes = null;
 
@@ -752,7 +751,7 @@ export default class RecordDataDefault implements RelationshipRecordData {
         attrs = this._attributes;
       }
 
-      original = assign(Object.create(null), this._data, this.__inFlightAttributes);
+      original = Object.assign(Object.create(null), this._data, this.__inFlightAttributes);
 
       for (i = 0; i < length; i++) {
         key = keys[i];

packages/record-data/tests/integration/graph/edge-removal/abstract-edge-removal-test.ts

@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import settled from '@ember/test-helpers/settled';
 
 import { module, test as runTest } from 'qunit';
@@ -129,19 +128,19 @@ module('Integration | Graph | Edge Removal', function (hooks) {
 
     TestScenarios.forEach(unpersistedDeletionTest);
     TestScenarios.forEach((testConfig) => {
-      const config = assign({}, testConfig, { name: `[Newly Created] ${testConfig.name}`, useCreate: true });
+      const config = Object.assign({}, testConfig, { name: `[Newly Created] ${testConfig.name}`, useCreate: true });
       unpersistedDeletionTest(config);
     });
     TestScenarios.forEach((testConfig) => {
-      const config = assign({}, testConfig, { name: `[LOCAL STATE] ${testConfig.name}`, dirtyLocal: true });
+      const config = Object.assign({}, testConfig, { name: `[LOCAL STATE] ${testConfig.name}`, dirtyLocal: true });
       unpersistedDeletionTest(config);
     });
   });
 
   module('Unload of a Record does not remove it from the graph', function () {
     function unloadTest(_config: TestConfig) {
       test(_config.name, async function (this: Context, assert) {
-        const config = assign({}, _config, { isUnloadAsDelete: true });
+        const config = Object.assign({}, _config, { isUnloadAsDelete: true });
         const testState = await setInitialState(this, config, assert);
         const { john } = testState;
 
@@ -185,11 +184,11 @@ module('Integration | Graph | Edge Removal', function (hooks) {
 
     TestScenarios.forEach(unloadTest);
     TestScenarios.forEach((testConfig) => {
-      const config = assign({}, testConfig, { name: `[Newly Created] ${testConfig.name}`, useCreate: true });
+      const config = Object.assign({}, testConfig, { name: `[Newly Created] ${testConfig.name}`, useCreate: true });
       unloadTest(config);
     });
     TestScenarios.forEach((testConfig) => {
-      const config = assign({}, testConfig, { name: `[LOCAL STATE] ${testConfig.name}`, dirtyLocal: true });
+      const config = Object.assign({}, testConfig, { name: `[LOCAL STATE] ${testConfig.name}`, dirtyLocal: true });
       unloadTest(config);
     });
   });
@@ -231,11 +230,11 @@ module('Integration | Graph | Edge Removal', function (hooks) {
 
     TestScenarios.forEach(persistedDeletionTest);
     TestScenarios.forEach((testConfig) => {
-      const config = assign({}, testConfig, { name: `[Newly Created] ${testConfig.name}`, useCreate: true });
+      const config = Object.assign({}, testConfig, { name: `[Newly Created] ${testConfig.name}`, useCreate: true });
       persistedDeletionTest(config);
     });
     TestScenarios.forEach((testConfig) => {
-      const config = assign({}, testConfig, { name: `[LOCAL STATE] ${testConfig.name}`, dirtyLocal: true });
+      const config = Object.assign({}, testConfig, { name: `[LOCAL STATE] ${testConfig.name}`, dirtyLocal: true });
       persistedDeletionTest(config);
     });
   });
@@ -259,11 +258,11 @@ module('Integration | Graph | Edge Removal', function (hooks) {
 
     TestScenarios.forEach(persistedDeletionUnloadedTest);
     TestScenarios.forEach((testConfig) => {
-      const config = assign({}, testConfig, { name: `[Newly Created] ${testConfig.name}`, useCreate: true });
+      const config = Object.assign({}, testConfig, { name: `[Newly Created] ${testConfig.name}`, useCreate: true });
       persistedDeletionUnloadedTest(config);
     });
     TestScenarios.forEach((testConfig) => {
-      const config = assign({}, testConfig, { name: `[LOCAL STATE] ${testConfig.name}`, dirtyLocal: true });
+      const config = Object.assign({}, testConfig, { name: `[LOCAL STATE] ${testConfig.name}`, dirtyLocal: true });
       persistedDeletionUnloadedTest(config);
     });
   });

packages/serializer/addon/json.js

@@ -4,7 +4,6 @@
 import { getOwner } from '@ember/application';
 import { assert, warn } from '@ember/debug';
 import { get } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { isNone, typeOf } from '@ember/utils';
 
 import Serializer from '@ember-data/serializer';
@@ -1155,7 +1154,7 @@ const JSONSerializer = Serializer.extend({
     @param {Object} options
   */
   serializeIntoHash(hash, typeClass, snapshot, options) {
-    assign(hash, this.serialize(snapshot, options));
+    Object.assign(hash, this.serialize(snapshot, options));
   },
 
   /**

packages/unpublished-test-infra/addon-test-support/public-props.js

@@ -1,12 +1,10 @@
-import { assign } from '@ember/polyfills';
-
 // publicProps(['prop1', 'prop2'], { prop1: val, prop2: val2, privatePro: val3 }) -> { prop1: val, prop2: val2 }
 export default function publicProps(publicArgs, obj) {
-  return assign.apply(
+  return Object.assign.apply(
     this,
     [{}].concat(
       Object.keys(obj).map((key) => ({
-        [key]: assign.apply(this, [{}].concat(publicArgs.map((prop) => ({ [prop]: obj[key][prop] })))),
+        [key]: Object.assign.apply(this, [{}].concat(publicArgs.map((prop) => ({ [prop]: obj[key][prop] })))),
       }))
     )
   );