Do not use initializers

emberjs · Dec 14, 2017 · 9d1d012 · 9d1d012
1 parent 880aa7d
commit 9d1d012
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 69 deletions.
diff --git a/addon/initializers/prototype-extend.js b/addon/initializers/prototype-extend.js
diff --git a/app/initializers/prototype-extend.js b/app/initializers/prototype-extend.js
diff --git a/package.json b/package.json
@@ -18,8 +18,7 @@
     "test": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^6.6.0",
-    "ember-get-config": "^0.2.4"
+    "ember-cli-babel": "^6.6.0"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",

diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -14,7 +14,8 @@ module.exports = function(environment) {
       },
       EXTEND_PROTOTYPES: {
         // Prevent Ember Data from overriding Date.parse.
-        Date: false
+        Date: false,
+        Function: true
       }
     },
 

diff --git a/tests/unit/immediate-observer-test.js b/tests/unit/immediate-observer-test.js
@@ -46,3 +46,7 @@ test('that Ember.immediateObserver calls Ember.observer', function(assert) {
     const instance = Thing.create();
     instance.set('bar', 'start');
 });
+
+test('that function prototype correctly gets polyfilled', function(assert) {
+  assert.deepEqual(Function.prototype.observesImmediately, Ember.immediateObserver);
+});
diff --git a/tests/unit/initializers/prototype-extend-test.js b/tests/unit/initializers/prototype-extend-test.js
diff --git a/vendor/immediate-observer.js b/vendor/immediate-observer.js
@@ -10,8 +10,6 @@
     return false;
   }
 
-  var originalObserver = _Ember.immediateObserver;
-
   _Ember.immediateObserver = function() {
     _Ember.deprecate('Usage of `Ember.immediateObserver` is deprecated, use `observer` instead.', false, { id: 'ember-metal.immediate-observer', until: '3.0.0' });
 
@@ -25,4 +23,10 @@
 
     return _Ember.observer.apply(this, arguments);
   }
+
+  const EXTEND_PROTOTYPES = JSON.parse(decodeURIComponent(document.getElementsByName('dummy/config/environment')[0].content)).EmberENV.EXTEND_PROTOTYPES;
+
+  if (EXTEND_PROTOTYPES.Function === true) {
+    Function.prototype.observesImmediately = _Ember.immediateObserver;
+  }
 })();
diff --git a/yarn.lock b/yarn.lock
@@ -2054,13 +2054,6 @@ ember-export-application-global@^2.0.0:
   dependencies:
     ember-cli-babel "^6.0.0-beta.7"
 
-ember-get-config@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.2.4.tgz#118492a2a03d73e46004ed777928942021fe1ecd"
-  dependencies:
-    broccoli-file-creator "^1.1.1"
-    ember-cli-babel "^6.3.0"
-
 ember-load-initializers@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-1.0.0.tgz#4919eaf06f6dfeca7e134633d8c05a6c9921e6e7"