Merge pull request #4003 from bmac/de-dup-initializers

Only run the Ember.onload initializers in globals mode

addon/index.js

@@ -82,8 +82,8 @@ import {
 } from "ember-data/-private/transforms";
 
 import {hasMany, belongsTo} from "ember-data/-private/system/relationships";
-import "ember-data/-private/ember-initializer";
 import setupContainer from "ember-data/-private/setup-container";
+import initializeStoreService from 'ember-data/-private/instance-initializers/initialize-store-service';
 
 import ContainerProxy from "ember-data/-private/system/container-proxy";
 import Relationship from "ember-data/-private/system/relationships/state/relationship";
@@ -148,6 +148,7 @@ DS.Relationship  = Relationship;
 DS.ContainerProxy = ContainerProxy;
 
 DS._setupContainer = setupContainer;
+DS._initializeStoreService = initializeStoreService;
 
 Object.defineProperty(DS, 'normalizeModelName', {
   enumerable: true,

app/initializers/ember-data.js

@@ -1,6 +1,38 @@
 import setupContainer from 'ember-data/-private/setup-container';
 import 'ember-data/-private/core';
 
+/*
+
+  This code initializes Ember-Data onto an Ember application.
+
+  If an Ember.js developer defines a subclass of DS.Store on their application,
+  as `App.StoreService` (or via a module system that resolves to `service:store`)
+  this code will automatically instantiate it and make it available on the
+  router.
+
+  Additionally, after an application's controllers have been injected, they will
+  each have the store made available to them.
+
+  For example, imagine an Ember.js application with the following classes:
+
+  App.StoreService = DS.Store.extend({
+    adapter: 'custom'
+  });
+
+  App.PostsController = Ember.ArrayController.extend({
+    // ...
+  });
+
+  When the application is initialized, `App.ApplicationStore` will automatically be
+  instantiated, and the instance of `App.PostsController` will have its `store`
+  property set to that instance.
+
+  Note that this code will only be run if the `ember-application` package is
+  loaded. If Ember Data is being used in an environment other than a
+  typical application (e.g., node.js where only `ember-runtime` is available),
+  this code will be ignored.
+*/
+
 export default {
   name: 'ember-data',
   initialize: setupContainer

lib/javascripts.js

@@ -107,13 +107,15 @@ function collapse(tree, outputFileName) {
 
   var emberDataShimsPath = path.join(__dirname, 'ember-data-shims.js');
   var emberDataShims = fs.readFileSync(emberDataShimsPath, { encoding: 'utf8' });
+  var emberDataInitialierPath = path.join(__dirname, '../tests/ember-data-initializers.js');
+  var emberDataInitialier = fs.readFileSync(emberDataInitialierPath, { encoding: 'utf8' });
 
   var withLoader = merge([tree, loader, license, emberShim]);
   return concat(withLoader, {
     inputFiles: ['license.js', 'loader.js', '**/*.js'],
     outputFile: '/' + outputFileName,
     header: '(function(){ \n"use strict";\n',
-    footer: '\nrequire("ember-data");\n})();\n' + emberDataShims
+    footer: '\nrequire("ember-data");\n})();\n' + emberDataShims + emberDataInitialier
   });
 }
 

tests/ember-data-initializers.js

@@ -0,0 +1,42 @@
+;(function() {
+  /* globals Ember */
+  /* globals DS */
+  var K = Ember.K;
+  Ember.onLoad('Ember.Application', function(Application) {
+
+    Application.initializer({
+      name:       "ember-data",
+      initialize: DS._setupContainer
+    });
+
+    Application.instanceInitializer({
+      name:       "ember-data",
+      initialize: DS._initializeStoreService
+    });
+
+    // Deprecated initializers to satisfy old code that depended on them
+    Application.initializer({
+      name:       "store",
+      after:      "ember-data",
+      initialize: K
+    });
+
+    Application.initializer({
+      name:       "transforms",
+      before:     "store",
+      initialize: K
+    });
+
+    Application.initializer({
+      name:       "data-adapter",
+      before:     "store",
+      initialize: K
+    });
+
+    Application.initializer({
+      name:       "injectStore",
+      before:     "store",
+      initialize: K
+    });
+  });
+})();

tests/test-helper.js

@@ -15,6 +15,7 @@ import {
 } from 'dummy/tests/helpers/warns';
 import addEmberAssertions from 'dummy/tests/helpers/ember-assertions';
 import Ember from 'ember';
+import './ember-data-initializers';
 
 
 setResolver(resolver);