Add Ember.immediateObserver support

config/environment.js

@@ -17,7 +17,8 @@ module.exports = function(/* environment, appConfig */) {
       _ENABLE_REVERSED_OBSERVER_SUPPORT: true,
       _ENABLE_INITIALIZER_ARGUMENTS_SUPPORT: true,
       _ENABLE_ROUTER_RESOURCE: true,
-      _ENABLE_CURRENT_WHEN_SUPPORT: true
+      _ENABLE_CURRENT_WHEN_SUPPORT: true,
+      _ENABLE_IMMEDIATE_OBSERVER_SUPPORT: true
     }
   };
 };

index.js

@@ -15,5 +15,6 @@ module.exports = {
     this.import('vendor/initializer-arity.js');
     this.import('vendor/router-resource.js');
     this.import('vendor/current-when.js');
+    this.import('vendor/immediate-observer.js');
   }
 };

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",
@@ -34,7 +33,6 @@
     "ember-cli-shims": "^1.2.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
-    "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-qunit-assert-helpers": "^0.2.1",

tests/dummy/config/environment.js

@@ -14,7 +14,9 @@ module.exports = function(environment) {
       },
       EXTEND_PROTOTYPES: {
         // Prevent Ember Data from overriding Date.parse.
-        Date: false
+        Date: false,
+        String: false,
+        Array: false
       }
     },
 

tests/unit/immediate-observer-test.js

@@ -0,0 +1,52 @@
+import Ember from 'ember';
+import { module, test } from 'qunit';
+
+let originalObserver;
+
+module('Ember.immediateObserver', {
+  beforeEach() {
+    originalObserver = Ember.observer;
+  },
+
+  afterEach() {
+    Ember.observer = originalObserver;
+  }
+});
+
+test('that Ember.immediateObserver is deprecated', function(assert) {
+  assert.expectDeprecation(() => {
+    const Thing = Ember.Object.extend({
+      bar: null,
+      baz: null,
+
+      foo: Ember.immediateObserver('bar', function() {
+        this.set('baz', 'helloworld');
+      })
+    });
+
+    const instance = Thing.create();
+    instance.set('bar', 'start');
+
+    assert.equal(instance.get('baz'), 'helloworld');
+  }, 'Usage of `Ember.immediateObserver` is deprecated, use `observer` instead');
+});
+
+test('that Ember.immediateObserver calls Ember.observer', function(assert) {
+    assert.expect(1);
+
+    Ember.observer = () => {
+      assert.ok(true, 'immediateObserver calls observer');
+    };
+
+    const Thing = Ember.Object.extend({
+      bar: null,
+      foo: Ember.immediateObserver('bar', function() {})
+    });
+
+    const instance = Thing.create();
+    instance.set('bar', 'start');
+});
+
+test('that function prototype correctly gets polyfilled', function(assert) {
+  assert.deepEqual(Function.prototype.observesImmediately, Ember.immediateObserver);
+});

vendor/immediate-observer.js

@@ -0,0 +1,30 @@
+(function() {
+  var _Ember;
+  if (typeof Ember !== 'undefined') {
+    _Ember = Ember;
+  } else {
+    _Ember = require('ember').default;
+  }
+
+  if (EmberENV && EmberENV._ENABLE_IMMEDIATE_OBSERVER_SUPPORT !== true) {
+    return false;
+  }
+
+  _Ember.immediateObserver = function() {
+    _Ember.deprecate('Usage of `Ember.immediateObserver` is deprecated, use `observer` instead.', false, { id: 'ember-metal.immediate-observer', until: '3.0.0' });
+
+    for (let i = 0; i < arguments.length; i++) {
+      let arg = arguments[i];
+      _Ember.assert(
+        'Immediate observers must observe internal properties only, not properties on other objects.',
+        typeof arg !== 'string' || arg.indexOf('.') === -1
+      );
+    }
+
+    return _Ember.observer.apply(this, arguments);
+  }
+
+  if (EmberENV.EXTEND_PROTOTYPES.Function === true) {
+    Function.prototype.observesImmediately = _Ember.immediateObserver;
+  }
+})();

yarn.lock

@@ -2044,23 +2044,12 @@ ember-cli@~2.17.0:
     walk-sync "^0.3.0"
     yam "0.0.22"
 
-ember-disable-prototype-extensions@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e"
-
 ember-export-application-global@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.0.tgz#8d6d7619ac8a1a3f8c43003549eb21ebed685bd2"
   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"