Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove instance initializer #7228

Merged
merged 2 commits into from
Jun 15, 2020
Merged

chore: remove instance initializer #7228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d22c2a3
chore: remove instance initializer
runspired Jun 15, 2020
57b92d5
fix DAG
runspired Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/-ember-data/addon/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])\./)) {
Expand Down Expand Up @@ -117,7 +116,6 @@ DS.hasMany = hasMany;
DS.Relationship = Relationship;

DS._setupContainer = setupContainer;
DS._initializeStoreService = initializeStoreService;

Object.defineProperty(DS, 'normalizeModelName', {
enumerable: true,
Expand Down
15 changes: 0 additions & 15 deletions packages/-ember-data/addon/initialize-store-service.js
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions packages/-ember-data/app/instance-initializers/ember-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import initializeStoreService from 'ember-data/initialize-store-service';

/* exists only for things that historically used "after" or "before" */
export default {
name: 'ember-data',
initialize: initializeStoreService,
initialize() {},
};
6 changes: 1 addition & 5 deletions packages/-ember-data/tests/integration/application-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
});
Expand Down