Merge pull request #16514 from rwjblue/fix-extend-prototypes

[BUGFIX beta] Bring back (with deprecation) Ember.EXTEND_PROTOTYPES.
emberjs · Apr 13, 2018 · c58044b · c58044b
2 parents 5473f70 + 15f4ebb
commit c58044b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/packages/ember/index.js b/packages/ember/index.js
@@ -110,6 +110,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 { deprecate } from 'ember-debug';
 
 // ****ember-environment****
 
@@ -131,6 +132,17 @@ Object.defineProperty(Ember, 'lookup', {
   enumerable: false,
 });
 
+Object.defineProperty(Ember, 'EXTEND_PROTOTYPES', {
+  enumerable: false,
+  get() {
+    deprecate(
+      'Accessing Ember.EXTEND_PROTOTYPES is deprecated, please migrate to Ember.ENV.EXTEND_PROTOTYPES'
+    );
+
+    return ENV.EXTEND_PROTOTYPES;
+  },
+});
+
 // ****@ember/application****
 Ember.getOwner = getOwner;
 Ember.setOwner = setOwner;

diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
@@ -21,6 +21,16 @@ moduleFor(
     ['@test Ember.String.isHTMLSafe exports correctly'](assert) {
       confirmExport(Ember, assert, 'String.isHTMLSafe', 'ember-glimmer', 'isHTMLSafe');
     }
+
+    ['@test Ember.EXTEND_PROTOTYPES is present (but deprecated)'](assert) {
+      expectDeprecation(() => {
+        assert.strictEqual(
+          Ember.ENV.EXTEND_PROTOTYPES,
+          Ember.EXTEND_PROTOTYPES,
+          'Ember.EXTEND_PROTOTYPES exists'
+        );
+      }, /EXTEND_PROTOTYPES is deprecated/);
+    }
   }
 );