From d197d87c3651f477b25a82c35deea2652771ec57 Mon Sep 17 00:00:00 2001 From: Chris Garrett Date: Mon, 1 Apr 2019 14:10:00 -0700 Subject: [PATCH 1/2] [BUGFIX] Reverts the naming of setClassicDecorator externally The rename was intended to be internal only, the external API is already in use so we should keep it as is. Name is unfortunate, but it kind of is either way. --- packages/ember/index.js | 2 +- packages/ember/tests/reexports_test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ember/index.js b/packages/ember/index.js index 8c415902eaa..14256753eae 100644 --- a/packages/ember/index.js +++ b/packages/ember/index.js @@ -275,7 +275,7 @@ Ember._tracked = metal.tracked; computed.alias = metal.alias; Ember.cacheFor = metal.getCachedValueFor; Ember.ComputedProperty = metal.ComputedProperty; -Ember._setClassicDecorator = metal.setClassicDecorator; +Ember._setComputedDecorator = metal.setClassicDecorator; Ember.meta = meta; Ember.get = metal.get; Ember.getWithDefault = metal.getWithDefault; diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js index a3ada5b56c3..a1d148fe700 100644 --- a/packages/ember/tests/reexports_test.js +++ b/packages/ember/tests/reexports_test.js @@ -113,7 +113,7 @@ let allExports = [ ['_tracked', '@ember/-internals/metal', 'tracked'], ['computed.alias', '@ember/-internals/metal', 'alias'], ['ComputedProperty', '@ember/-internals/metal'], - ['_setClassicDecorator', '@ember/-internals/metal', 'setClassicDecorator'], + ['_setComputedDecorator', '@ember/-internals/metal', 'setClassicDecorator'], ['cacheFor', '@ember/-internals/metal', 'getCachedValueFor'], ['merge', '@ember/polyfills'], ['instrument', '@ember/instrumentation'], From f12a727fa399bc27ec421f99dad90d76cd6f3a07 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Tue, 2 Apr 2019 14:59:42 -0400 Subject: [PATCH 2/2] Deprecate Ember._setComputedDecorator. --- packages/ember/index.js | 16 +++++++++++++++- packages/ember/tests/reexports_test.js | 8 +++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/packages/ember/index.js b/packages/ember/index.js index 14256753eae..3d2f063b5e6 100644 --- a/packages/ember/index.js +++ b/packages/ember/index.js @@ -275,7 +275,21 @@ Ember._tracked = metal.tracked; computed.alias = metal.alias; Ember.cacheFor = metal.getCachedValueFor; Ember.ComputedProperty = metal.ComputedProperty; -Ember._setComputedDecorator = metal.setClassicDecorator; +Object.defineProperty(Ember, '_setComputedDecorator', { + get() { + deprecate( + 'Please migrate from Ember._setComputedDecorator to Ember._setClassicDecorator', + false, + { + id: 'ember._setComputedDecorator', + until: '3.13.0', + } + ); + + return metal.setClassicDecorator; + }, +}); +Ember._setClassicDecorator = metal.setClassicDecorator; Ember.meta = meta; Ember.get = metal.get; Ember.getWithDefault = metal.getWithDefault; diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js index a1d148fe700..2c7f531a973 100644 --- a/packages/ember/tests/reexports_test.js +++ b/packages/ember/tests/reexports_test.js @@ -49,6 +49,12 @@ moduleFor( ); } } + + '@test Ember._setComputedDecorator is deprecated'() { + expectDeprecation(() => { + Ember._setComputedDecorator; + }, 'Please migrate from Ember._setComputedDecorator to Ember._setClassicDecorator'); + } } ); @@ -113,7 +119,7 @@ let allExports = [ ['_tracked', '@ember/-internals/metal', 'tracked'], ['computed.alias', '@ember/-internals/metal', 'alias'], ['ComputedProperty', '@ember/-internals/metal'], - ['_setComputedDecorator', '@ember/-internals/metal', 'setClassicDecorator'], + ['_setClassicDecorator', '@ember/-internals/metal', 'setClassicDecorator'], ['cacheFor', '@ember/-internals/metal', 'getCachedValueFor'], ['merge', '@ember/polyfills'], ['instrument', '@ember/instrumentation'],