Fix deprecations related to Ember.merge and ember-native-dom-helpers (#…

…330)

addon/utils/assign.js

@@ -1,13 +1,6 @@
 // @flow
 
-import { assign as EmberAssign } from '@ember/polyfills';
-import { merge } from '@ember/polyfills'
-
-const assign = EmberAssign || Object.assign || _assign;
-
-function _assign(origin, ...sources) {
-  return sources.reduce((acc, source) => merge(acc, source), merge({}, origin));
-}
+import { assign } from '@ember/polyfills';
 
 export default function pureAssign(...objects /*: Array<Object> */) /*: Object */ {
   return assign({}, ...objects);

addon/utils/computed/object-to-array.js

@@ -2,10 +2,7 @@
 
 import { computed, get } from '@ember/object';
 import { typeOf } from '@ember/utils';
-import { assign as EmberAssign } from '@ember/polyfills';
-import { merge } from '@ember/polyfills'
-
-const assign = EmberAssign || merge;
+import { assign } from '@ember/polyfills';
 
 /*::
 import type Change from 'ember-changeset/-private/change';

package.json

@@ -44,7 +44,6 @@
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-native-dom-helpers": "^0.6.2",
     "ember-resolver": "^4.0.0",
     "ember-source": "~3.2.0",
     "ember-source-channel-url": "^1.0.1",

tests/integration/components/changeset-test.js

@@ -4,14 +4,14 @@ import { resolve } from 'rsvp';
 import { typeOf, isPresent } from '@ember/utils';
 import Changeset from 'ember-changeset';
 import hbs from 'htmlbars-inline-precompile';
-import { render } from '@ember/test-helpers';
 import {
+  render,
   find,
   fillIn,
   click,
   blur,
   triggerEvent
-} from 'ember-native-dom-helpers';
+} from '@ember/test-helpers';
 
 module('Integration | Helper | changeset', function(hooks) {
   setupRenderingTest(hooks);
@@ -401,4 +401,3 @@ module('Integration | Helper | changeset', function(hooks) {
     assert.notOk(find('#error-paragraph'), 'should skip validation');
   });
 });
-

yarn.lock

@@ -3588,14 +3588,6 @@ ember-maybe-import-regenerator@^0.1.6:
     ember-cli-babel "^6.0.0-beta.4"
     regenerator-runtime "^0.9.5"
 
-ember-native-dom-helpers@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/ember-native-dom-helpers/-/ember-native-dom-helpers-0.6.2.tgz#ad1f82d64ac9abdd612022f4f390bdb6653b3d39"
-  integrity sha512-J4SfukTITFFsCYbOxG/sjGBTcZVrxgbMyFKrrTcB2cKfrglyTZSwqs9jBUpF91FEwetzmYP02Nh9N4WzcJ8cRQ==
-  dependencies:
-    broccoli-funnel "^1.1.0"
-    ember-cli-babel "^6.6.0"
-
 ember-qunit@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-3.5.0.tgz#826dd91930835f86b32ff2a97a523b865db0cf69"