Skip to content

Commit 1a54203

Browse files
committed
[cleanup 4.6] Remove deprecated Ember.Error usage
1 parent 8c1bba7 commit 1a54203

File tree

5 files changed

+4
-11
lines changed

5 files changed

+4
-11
lines changed

packages/-ember-data/tests/unit/adapter-errors-test.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import EmberError from '@ember/error';
2-
31
import { module, test } from 'qunit';
42

53
import DS from 'ember-data';
@@ -11,7 +9,6 @@ module('unit/adapter-errors - DS.AdapterError', function () {
119
let error = new DS.AdapterError();
1210

1311
assert.ok(error instanceof Error);
14-
assert.ok(error instanceof EmberError);
1512
assert.ok(error.isAdapterError);
1613
assert.strictEqual(error.message, 'Adapter operation failed');
1714
});

packages/adapter/addon/error.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
@module @ember-data/adapter/error
33
*/
44
import { assert } from '@ember/debug';
5-
import EmberError from '@ember/error';
65

76
/**
87
A `AdapterError` is used by an adapter to signal that an error occurred
@@ -74,7 +73,7 @@ import EmberError from '@ember/error';
7473
*/
7574
function AdapterError(errors, message = 'Adapter operation failed') {
7675
this.isAdapterError = true;
77-
let error = EmberError.call(this, message);
76+
let error = Error.call(this, message);
7877

7978
// in ember 3.8+ Error is a Native Error and we don't
8079
// gain these automatically from the EmberError.call
@@ -115,7 +114,7 @@ function extend(ParentErrorClass, defaultMessage) {
115114
return ErrorClass;
116115
}
117116

118-
AdapterError.prototype = Object.create(EmberError.prototype);
117+
AdapterError.prototype = Object.create(Error.prototype);
119118
AdapterError.prototype.code = 'AdapterError';
120119
AdapterError.extend = extendFn(AdapterError);
121120

packages/model/addon/-private/model.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
*/
44

55
import { assert, warn } from '@ember/debug';
6-
import EmberError from '@ember/error';
76
import EmberObject, { get } from '@ember/object';
87
import { dependentKeyCompat } from '@ember/object/compat';
98
import { run } from '@ember/runloop';
@@ -125,7 +124,7 @@ class Model extends EmberObject {
125124

126125
init(options = {}) {
127126
if (DEBUG && !options._secretInit && !options._internalModel && !options._createProps) {
128-
throw new EmberError(
127+
throw new Error(
129128
'You should not call `create` on a model. Instead, call `store.createRecord` with the attributes you would like to set.'
130129
);
131130
}
@@ -2105,7 +2104,7 @@ if (DEBUG) {
21052104
let idDesc = lookupDescriptor(this, 'id');
21062105

21072106
if (idDesc.get !== ID_DESCRIPTOR.get) {
2108-
throw new EmberError(
2107+
throw new Error(
21092108
`You may not set 'id' as an attribute on your model. Please remove any lines that look like: \`id: attr('<type>')\` from ${this.constructor.toString()}`
21102109
);
21112110
}

packages/model/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ module.exports = Object.assign({}, addonBaseConfig, {
2424
'@ember/array/mutable',
2525
'@ember/array/proxy',
2626
'@ember/debug',
27-
'@ember/error',
2827
'@ember/object',
2928
'@ember/object/compat',
3029
'@ember/object/computed',

packages/store/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ module.exports = Object.assign({}, addonBaseConfig, {
1919
'@ember/array/proxy',
2020
'@ember/array',
2121
'@ember/debug',
22-
'@ember/error',
2322
'@ember/object',
2423
'@ember/object/computed',
2524
'@ember/object/evented',

0 commit comments

Comments
 (0)