Merge pull request #19647 from nlfurniss/remove-ember-merge-2

emberjs · Jul 18, 2021 · 7780b26 · 7780b26
2 parents dd89193 + 4255bf0
commit 7780b26
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 88 deletions.
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
@@ -5,7 +5,6 @@
 
 export const SEND_ACTION = !!'3.4.0';
 export const EMBER_EXTEND_PROTOTYPES = !!'3.2.0-beta.5';
-export const MERGE = !!'3.6.0-beta.1';
 export const ROUTER_EVENTS = !!'4.0.0';
 export const COMPONENT_MANAGER_STRING_LOOKUP = !!'3.8.0';
 export const JQUERY_INTEGRATION = !!'3.9.0';

diff --git a/packages/@ember/polyfills/index.ts b/packages/@ember/polyfills/index.ts
@@ -1,10 +1,4 @@
-import { MERGE } from '@ember/deprecated-features';
-import { default as deprecatedMerge } from './lib/merge';
-
-let merge = MERGE ? deprecatedMerge : undefined;
-
 // Export `assignPolyfill` for testing
 export { default as assign, assign as assignPolyfill } from './lib/assign';
-export { merge };
 
 export const hasPropertyAccessors = true;
diff --git a/packages/@ember/polyfills/lib/merge.ts b/packages/@ember/polyfills/lib/merge.ts
diff --git a/packages/@ember/polyfills/tests/merge_test.js b/packages/@ember/polyfills/tests/merge_test.js
diff --git a/packages/ember/index.js b/packages/ember/index.js
@@ -98,7 +98,7 @@ import Resolver from '@ember/application/globals-resolver';
 import ApplicationInstance from '@ember/application/instance';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
-import { assign, merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 import { EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
 
 import {
@@ -211,7 +211,6 @@ Ember.EngineInstance = EngineInstance;
 
 // ****@ember/polyfills****
 Ember.assign = assign;
-Ember.merge = merge;
 
 // ****@ember/-internals/utils****
 Ember.generateGuid = utils.generateGuid;

diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
@@ -368,7 +368,6 @@ let allExports = [
   // @ember/polyfills
   ['assign', '@ember/polyfills', 'assign'],
   ['platform.hasPropertyAccessors', '@ember/polyfills', 'hasPropertyAccessors'],
-  ['merge', '@ember/polyfills', 'merge'],
 
   // @ember/routing/auto-location
   ['AutoLocation', '@ember/routing/auto-location', 'default'],

diff --git a/tests/docs/expected.js b/tests/docs/expected.js
@@ -364,7 +364,6 @@ module.exports = {
     'match',
     'matches',
     'max',
-    'merge',
     'mergedProperties',
     'meta',
     'metadata',