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

Jump to bottom

Remove support/deprecation for global DS variable in 3.0.0 #5287

Merged
merged 1 commit into from Jan 11, 2018
Merged

Remove support/deprecation for global DS variable in 3.0.0 #5287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 0 additions & 19 deletions addon/-private/global.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions addon/-private/index.js
View file
Open in desktop
Expand Up @@ -27,8 +27,6 @@ export { getOwner, modelHasAttributeOrRelationshipNamedType } from './utils';
export { default as coerceId } from './system/coerce-id';
export { default as parseResponseHeaders } from './utils/parse-response-headers';

// should be private ?
export { default as global } from './global';
export { default as isEnabled } from './features';
// `ember-data-model-fragments` relies on `RootState` and `InternalModel`
export { default as RootState } from './system/model/states';
Expand Down
16 changes: 0 additions & 16 deletions addon/index.js
View file
Open in desktop
@@ -1,6 +1,5 @@
import EmberError from '@ember/error';
import Ember from "ember";
import { deprecate } from '@ember/debug';

/**
Ember Data
Expand All @@ -22,7 +21,6 @@ import {
BuildURLMixin,
belongsTo,
hasMany,
global,
Errors,
RootState,
Model,
Expand Down Expand Up @@ -145,18 +143,4 @@ Object.defineProperty(DS, 'normalizeModelName', {
value: normalizeModelName
});

Object.defineProperty(global, 'DS', {
configurable: true,
get() {
deprecate(
'Using the global version of DS is deprecated. Please either import ' +
'the specific modules needed or `import DS from \'ember-data\';`.',
false,
{ id: 'ember-data.global-ds', until: '3.0.0' }
);

return DS;
}
});

export default DS;