Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Ember.merge #19647

Merged
merged 2 commits into from
Jul 18, 2021
Merged

Remove Ember.merge #19647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a061f8f
Remove deprecated Ember.merge for v4.0
Jul 13, 2021
4255bf0
Merge branch 'emberjs:master' into remove-ember-merge-2
nlfurniss Jul 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/@ember/deprecated-features/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 0 additions & 6 deletions packages/@ember/polyfills/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
56 changes: 0 additions & 56 deletions packages/@ember/polyfills/lib/merge.ts
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions packages/@ember/polyfills/tests/merge_test.js
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions packages/ember/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -211,7 +211,6 @@ Ember.EngineInstance = EngineInstance;

// ****@ember/polyfills****
Ember.assign = assign;
Ember.merge = merge;

// ****@ember/-internals/utils****
Ember.generateGuid = utils.generateGuid;
Expand Down
1 change: 0 additions & 1 deletion packages/ember/tests/reexports_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,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'],
Expand Down
1 change: 0 additions & 1 deletion tests/docs/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,6 @@ module.exports = {
'match',
'matches',
'max',
'merge',
'mergedProperties',
'meta',
'metadata',
Expand Down