From d22c2a358f74650a826f66da3b4609d9eab2d5a7 Mon Sep 17 00:00:00 2001
From: Chris Thoburn <runspired@gmail.com>
Date: Mon, 15 Jun 2020 14:39:34 -0700
Subject: [PATCH 1/2] chore: remove instance initializer

---
 packages/-ember-data/addon/index.js               |  2 --
 .../-ember-data/addon/initialize-store-service.js | 15 ---------------
 .../app/instance-initializers/ember-data.js       |  6 ------
 .../tests/integration/application-test.js         |  6 +-----
 4 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 packages/-ember-data/addon/initialize-store-service.js
 delete mode 100644 packages/-ember-data/app/instance-initializers/ember-data.js

diff --git a/packages/-ember-data/addon/index.js b/packages/-ember-data/addon/index.js
index 4a913b4d2e9..6049c414fb4 100644
--- a/packages/-ember-data/addon/index.js
+++ b/packages/-ember-data/addon/index.js
@@ -43,7 +43,6 @@ import {
   RootState,
   Snapshot,
 } from './-private';
-import initializeStoreService from './initialize-store-service';
 import setupContainer from './setup-container';
 
 if (VERSION.match(/^1\.([0-9]|1[0-2])\./)) {
@@ -117,7 +116,6 @@ DS.hasMany = hasMany;
 DS.Relationship = Relationship;
 
 DS._setupContainer = setupContainer;
-DS._initializeStoreService = initializeStoreService;
 
 Object.defineProperty(DS, 'normalizeModelName', {
   enumerable: true,
diff --git a/packages/-ember-data/addon/initialize-store-service.js b/packages/-ember-data/addon/initialize-store-service.js
deleted file mode 100644
index 57031dc3530..00000000000
--- a/packages/-ember-data/addon/initialize-store-service.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-  Configures a registry for use with an Ember-Data
-  store.
-
-  @method initializeStoreService
-  @param {Ember.ApplicationInstance | Ember.EngineInstance} instance
-*/
-export default function initializeStoreService(instance) {
-  // instance.lookup supports Ember 2.1 and higher
-  // instance.container supports Ember 1.11 - 2.0
-  const container = instance.lookup ? instance : instance.container;
-
-  // Eagerly generate the store so defaultStore is populated.
-  container.lookup('service:store');
-}
diff --git a/packages/-ember-data/app/instance-initializers/ember-data.js b/packages/-ember-data/app/instance-initializers/ember-data.js
deleted file mode 100644
index 6b0dee68e7b..00000000000
--- a/packages/-ember-data/app/instance-initializers/ember-data.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import initializeStoreService from 'ember-data/initialize-store-service';
-
-export default {
-  name: 'ember-data',
-  initialize: initializeStoreService,
-};
diff --git a/packages/-ember-data/tests/integration/application-test.js b/packages/-ember-data/tests/integration/application-test.js
index 72473cb6175..6d9369bb10b 100644
--- a/packages/-ember-data/tests/integration/application-test.js
+++ b/packages/-ember-data/tests/integration/application-test.js
@@ -5,7 +5,6 @@ import Service, { inject as service } from '@ember/service';
 
 import { module, test } from 'qunit';
 
-import initializeStoreService from 'ember-data/initialize-store-service';
 import initializeEmberData from 'ember-data/setup-container';
 import Store from 'ember-data/store';
 import { setupTest } from 'ember-qunit';
@@ -105,10 +104,7 @@ module('integration/application - Attaching initializer', function(hooks) {
       name: 'ember-data',
       initialize: initializeEmberData,
     });
-    this.TestApplication.instanceInitializer({
-      name: 'ember-data',
-      initialize: initializeStoreService,
-    });
+
     this.application = null;
     this.owner = null;
   });

From 57b92d57b9eec3d26a8b2c3fee908c135d995ba1 Mon Sep 17 00:00:00 2001
From: Chris Thoburn <runspired@gmail.com>
Date: Mon, 15 Jun 2020 15:20:06 -0700
Subject: [PATCH 2/2] fix DAG

---
 packages/-ember-data/app/instance-initializers/ember-data.js | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/-ember-data/app/instance-initializers/ember-data.js

diff --git a/packages/-ember-data/app/instance-initializers/ember-data.js b/packages/-ember-data/app/instance-initializers/ember-data.js
new file mode 100644
index 00000000000..b48556a316c
--- /dev/null
+++ b/packages/-ember-data/app/instance-initializers/ember-data.js
@@ -0,0 +1,5 @@
+/* exists only for things that historically used "after" or "before" */
+export default {
+  name: 'ember-data',
+  initialize() {},
+};