Merge pull request #5285 from bmac/remove-initializer-deprecation

Remove deprecation messages for old instance initializers
emberjs · Dec 19, 2017 · 3be143a · 3be143a
2 parents c542f64 + 8312496
commit 3be143a
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 151 deletions.
diff --git a/addon/initialize-store-service.js b/addon/initialize-store-service.js
@@ -1,8 +1,3 @@
-import { deprecate } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-
-let deprecateOldEmberDataInitializers;
-
 /*
   Configures a registry for use with an Ember-Data
   store.
@@ -17,50 +12,4 @@ export default function initializeStoreService(instance) {
 
   // Eagerly generate the store so defaultStore is populated.
   container.lookup('service:store');
-
-  if (DEBUG) {
-    // In Ember 2.4+ instance.base is the `Ember.Application` or `Ember.Engine` instance
-    // In Ember 1.11 - 2.3 we fallback to `instance.application`
-    let base = instance.base || instance.application;
-    deprecateOldEmberDataInitializers(base.constructor.initializers);
-  }
-}
-
-if (DEBUG) {
-  const DEPRECATED_INITIALIZER_NAMES = ['data-adapter', 'injectStore', 'transforms', 'store'];
-
-  let matchesDeprecatedInititalizer = function matchesDeprecatedInititalizer(name) {
-    return DEPRECATED_INITIALIZER_NAMES.indexOf(name) !== -1;
-  };
-
-  let warnForDeprecatedInitializers = function warnForDeprecatedInitializers(initializer) {
-    let deprecatedBeforeInitializer = matchesDeprecatedInititalizer(initializer.before);
-    let deprecatedAfterInitializer = matchesDeprecatedInititalizer(initializer.after);
-    let deprecatedProp = deprecatedBeforeInitializer ? 'before' : 'after';
-
-    deprecate(
-      `The initializer \`${initializer[deprecatedProp]}\` has been deprecated. Please update your \`${initializer.name}\` initializer to use use \`${deprecatedProp}: \'ember-data\'\` instead.`,
-      !(deprecatedBeforeInitializer || deprecatedAfterInitializer),
-      {
-        id: 'ds.deprecated-initializers',
-        until: '3.0.0'
-      });
-  };
-
-  deprecateOldEmberDataInitializers = function deprecateOldEmberDataInitializers(initializers) {
-    // collect all of the initializers
-    let keys = Object.keys(initializers);
-
-    for (let i = 0; i < keys.length; i++) {
-      let name = keys[i];
-
-      // filter out all of the Ember Data initializer. We have some
-      // deprecated initializers that depend on other deprecated
-      // initializers which may trigger the deprecation warning
-      // unintentionally.
-      if (!matchesDeprecatedInititalizer(name)) {
-        warnForDeprecatedInitializers(initializers[name]);
-      }
-    }
-  };
 }
diff --git a/app/initializers/data-adapter.js b/app/initializers/data-adapter.js
diff --git a/app/initializers/injectStore.js b/app/initializers/injectStore.js
diff --git a/app/initializers/store.js b/app/initializers/store.js
diff --git a/app/initializers/transforms.js b/app/initializers/transforms.js
diff --git a/tests/integration/application-test.js b/tests/integration/application-test.js
@@ -3,7 +3,6 @@ import Controller from '@ember/controller';
 import Application from '@ember/application';
 import { run } from '@ember/runloop';
 import Ember from 'ember';
-import testInDebug from 'dummy/tests/helpers/test-in-debug';
 
 import { module, test } from 'qunit';
 
@@ -182,54 +181,3 @@ test("ember-data initializer does not register the store service when it was alr
   assert.ok(store && store.get('isCustomStore'), 'ember-data initializer does not overwrite the previous registered service store');
 
 });
-
-testInDebug("store initializer is run (DEPRECATED)", function(assert) {
-  let ran = false;
-  App.initializer({
-    name:       "after-store",
-    after:      'store',
-    initialize() { ran = true; }
-  });
-
-  assert.expectDeprecation(() => {
-    run(() => {
-      app = App.create();
-    });
-  }, /The initializer `store` has been deprecated/)
-
-  assert.ok(ran, 'store initializer was found');
-});
-
-testInDebug("injectStore initializer is run (DEPRECATED)", function(assert) {
-  let ran = false;
-  App.initializer({
-    name:       "after-store",
-    after:      'injectStore',
-    initialize() { ran = true; }
-  });
-
-  assert.expectDeprecation(() => {
-    run(() => {
-      app = App.create();
-    });
-  }, /The initializer `injectStore` has been deprecated/)
-
-  assert.ok(ran, 'injectStore initializer was found');
-});
-
-testInDebug("transforms initializer is run (DEPRECATED)", function(assert) {
-  let ran = false;
-  App.initializer({
-    name:       "after-store",
-    after:      'transforms',
-    initialize() { ran = true; }
-  });
-
-  assert.expectDeprecation(() => {
-    run(() => {
-      app = App.create();
-    });
-  }, /The initializer `transforms` has been deprecated/)
-
-  assert.ok(ran, 'transforms initializer was found');
-});