Skip to content

Commit

Permalink
[CLEANUP beta] Remove support for global DS variable (#5287)
Browse files Browse the repository at this point in the history
(cherry picked from commit 4c2eca6)
  • Loading branch information
bmac committed Feb 12, 2018
1 parent 721ffc9 commit 595783f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 37 deletions.
19 changes: 0 additions & 19 deletions addon/-private/global.js

This file was deleted.

2 changes: 0 additions & 2 deletions addon/-private/index.js
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 595783f

Please sign in to comment.