emberjs · rwjblue · Oct 19, 2018 · Oct 19, 2018
diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
@@ -26,8 +26,6 @@ export {
   endPropertyChanges,
   notifyPropertyChange,
   overrideChains,
-  propertyDidChange,
-  propertyWillChange,
   PROPERTY_DID_CHANGE,
 } from './lib/property_events';
 export { defineProperty, Descriptor } from './lib/properties';

diff --git a/packages/@ember/-internals/metal/lib/property_events.ts b/packages/@ember/-internals/metal/lib/property_events.ts
@@ -1,10 +1,5 @@
 import { descriptorFor, Meta, peekMeta } from '@ember/-internals/meta';
 import { symbol } from '@ember/-internals/utils';
-import { deprecate } from '@ember/debug';
-import {
-  PROPERTY_DID_CHANGE as ENABLE_PROPERTY_DID_CHANGE,
-  PROPERTY_WILL_CHANGE as ENABLE_PROPERTY_WILL_CHANGE,
-} from '@ember/deprecated-features';
 import { DEBUG } from '@glimmer/env';
 import changeEvent from './change_event';
 import { sendEvent } from './events';
@@ -22,54 +17,6 @@ export const PROPERTY_DID_CHANGE = symbol('PROPERTY_DID_CHANGE');
 const observerSet = new ObserverSet();
 let deferred = 0;
 
-// ..........................................................
-// PROPERTY CHANGES
-//
-
-/**
-  @method propertyWillChange
-  @for Ember
-  @private
-*/
-let propertyWillChange;
-if (ENABLE_PROPERTY_WILL_CHANGE) {
-  propertyWillChange = function propertyWillChange() {
-    deprecate(
-      `'propertyWillChange' is deprecated and has no effect. It is safe to remove this call.`,
-      false,
-      {
-        id: 'ember-metal.deprecate-propertyWillChange',
-        until: '3.5.0',
-        url:
-          'https://emberjs.com/deprecations/v3.x/#toc_use-notifypropertychange-instead-of-propertywillchange-and-propertydidchange',
-      }
-    );
-  };
-}
-
-/**
-  @method propertyDidChange
-  @for Ember
-  @private
-*/
-let propertyDidChange;
-if (ENABLE_PROPERTY_DID_CHANGE) {
-  propertyDidChange = function propertyDidChange(obj: object, keyName: string, _meta: Meta) {
-    deprecate(
-      `'propertyDidChange' is deprecated in favor of 'notifyPropertyChange'. It is safe to change this call to 'notifyPropertyChange'.`,
-      false,
-      {
-        id: 'ember-metal.deprecate-propertyDidChange',
-        until: '3.5.0',
-        url:
-          'https://emberjs.com/deprecations/v3.x/#toc_use-notifypropertychange-instead-of-propertywillchange-and-propertydidchange',
-      }
-    );
-
-    notifyPropertyChange(obj, keyName, _meta);
-  };
-}
-
 /**
   This function is called just after an object property has changed.
   It will notify any observers and clear caches among other things.
@@ -247,8 +194,6 @@ function notifyObservers(obj: object, keyName: string, meta: Meta) {
 }
 
 export {
-  propertyWillChange,
-  propertyDidChange,
   notifyPropertyChange,
   overrideChains,
   beginPropertyChanges,

diff --git a/packages/@ember/-internals/runtime/lib/mixins/observable.js b/packages/@ember/-internals/runtime/lib/mixins/observable.js
@@ -11,8 +11,6 @@ import {
   Mixin,
   hasListeners,
   beginPropertyChanges,
-  propertyWillChange,
-  propertyDidChange,
   notifyPropertyChange,
   endPropertyChanges,
   addObserver,
@@ -267,24 +265,6 @@ export default Mixin.create({
     return this;
   },
 
-  /**
-    @method propertyWillChange
-    @private
-  */
-  propertyWillChange(keyName) {
-    propertyWillChange(this, keyName);
-    return this;
-  },
-
-  /**
-    @method propertyDidChange
-    @private
-  */
-  propertyDidChange(keyName) {
-    propertyDidChange(this, keyName);
-    return this;
-  },
-
   /**
     Notify the observer system that a property has just changed.
 

diff --git a/packages/@ember/-internals/runtime/tests/mixins/observable_test.js b/packages/@ember/-internals/runtime/tests/mixins/observable_test.js
@@ -117,21 +117,5 @@ moduleFor(
       obj.incrementProperty('age');
       assert.equal(25, obj.get('age'));
     }
-
-    ['@test propertyWillChange triggers a deprecation warning']() {
-      let obj = EmberObject.create();
-
-      expectDeprecation(() => {
-        obj.propertyWillChange('foo');
-      }, /'propertyWillChange' is deprecated and has no effect. It is safe to remove this call./);
-    }
-
-    ['@test propertyDidChange triggers a deprecation warning']() {
-      let obj = EmberObject.create();
-
-      expectDeprecation(() => {
-        obj.propertyDidChange('foo');
-      }, /'propertyDidChange' is deprecated in favor of 'notifyPropertyChange'. It is safe to change this call to 'notifyPropertyChange'./);
-    }
   }
 );
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
@@ -2,8 +2,6 @@ export const SEND_ACTION = !!'3.4.0';
 export const EMBER_EXTEND_PROTOTYPES = !!'3.2.0-beta.5';
 export const LOGGER = !!'3.2.0-beta.1';
 export const POSITIONAL_PARAM_CONFLICT = !!'3.1.0-beta.1';
-export const PROPERTY_WILL_CHANGE = !!'3.1.0-beta.1';
-export const PROPERTY_DID_CHANGE = !!'3.1.0-beta.1';
 export const ROUTER_ROUTER = !!'3.2.0-beta.1';
 export const ARRAY_AT_EACH = !!'3.1.0-beta.1';
 export const TARGET_OBJECT = !!'2.18.0-beta.1';

diff --git a/packages/ember/index.js b/packages/ember/index.js
@@ -126,12 +126,7 @@ import Map from '@ember/map';
 import MapWithDefault from '@ember/map/with-default';
 import OrderedSet, { __OrderedSet__ } from '@ember/map/lib/ordered-set';
 import { assign, merge } from '@ember/polyfills';
-import {
-  PROPERTY_WILL_CHANGE,
-  PROPERTY_DID_CHANGE,
-  LOGGER,
-  EMBER_EXTEND_PROTOTYPES,
-} from '@ember/deprecated-features';
+import { LOGGER, EMBER_EXTEND_PROTOTYPES } from '@ember/deprecated-features';
 
 // ****@ember/-internals/environment****
 
@@ -290,12 +285,6 @@ Ember.isNone = metal.isNone;
 Ember.isEmpty = metal.isEmpty;
 Ember.isBlank = metal.isBlank;
 Ember.isPresent = metal.isPresent;
-if (PROPERTY_WILL_CHANGE) {
-  Ember.propertyWillChange = metal.propertyWillChange;
-}
-if (PROPERTY_DID_CHANGE) {
-  Ember.propertyDidChange = metal.propertyDidChange;
-}
 Ember.notifyPropertyChange = metal.notifyPropertyChange;
 Ember.overrideChains = metal.overrideChains;
 Ember.beginPropertyChanges = metal.beginPropertyChanges;

diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
@@ -131,8 +131,6 @@ let allExports = [
   ['run.throttle', '@ember/runloop', 'throttle'],
   ['run.currentRunLoop', '@ember/runloop', { get: 'getCurrentRunLoop' }],
   ['run.cancelTimers', '@ember/runloop', 'cancelTimers'],
-  ['propertyWillChange', '@ember/-internals/metal'],
-  ['propertyDidChange', '@ember/-internals/metal'],
   ['notifyPropertyChange', '@ember/-internals/metal'],
   ['overrideChains', '@ember/-internals/metal'],
   ['beginPropertyChanges', '@ember/-internals/metal'],

diff --git a/tests/docs/expected.js b/tests/docs/expected.js
@@ -401,8 +401,6 @@ module.exports = {
     'positionalParams',
     'promise',
     'property',
-    'propertyDidChange',
-    'propertyWillChange',
     'pushObject',
     'pushObjects',
     'pushState',