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

fix @ember/error and @ember/string deprecations #8422

Merged
merged 2 commits into from
Feb 25, 2023
Merged

fix @ember/error and @ember/string deprecations #8422

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
154f6dc
cleanup: Switch all uses of @ember/error to native Error
runspired Feb 25, 2023
a04c387
cleanup: move @ember/string to ember-data peer-dependencies
runspired Feb 25, 2023
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
6 changes: 4 additions & 2 deletions packages/-ember-data/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
},
"author": "",
"license": "MIT",
"peerDependencies": {
"@ember/string": "^3.0.1"
},
"dependencies": {
"@ember-data/adapter": "workspace:4.9.1",
"@ember-data/debug": "workspace:4.9.1",
Expand All @@ -26,7 +29,6 @@
"@ember-data/store": "workspace:4.9.1",
"@ember-data/tracking": "workspace:4.9.1",
"@ember/edition-utils": "^1.2.0",
"@ember/string": "^3.0.0",
"@embroider/macros": "^1.10.0",
"@glimmer/env": "^0.1.7",
"broccoli-merge-trees": "^4.2.0",
Expand Down Expand Up @@ -81,4 +83,4 @@
"extends": "../../package.json"
},
"packageManager": "[email protected]"
}
}
7 changes: 2 additions & 5 deletions packages/adapter/addon/error.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@module @ember-data/adapter/error
*/
import { assert, deprecate } from '@ember/debug';
import EmberError from '@ember/error';

import { DEPRECATE_HELPERS } from '@ember-data/private-build-infra/deprecations';

Expand Down Expand Up @@ -76,10 +75,8 @@ import { DEPRECATE_HELPERS } from '@ember-data/private-build-infra/deprecations'
*/
function AdapterError(errors, message = 'Adapter operation failed') {
this.isAdapterError = true;
let error = EmberError.call(this, message);
let error = Error.call(this, message);

// in ember 3.8+ Error is a Native Error and we don't
// gain these automatically from the EmberError.call
if (error) {
this.stack = error.stack;
this.description = error.description;
Expand Down Expand Up @@ -117,7 +114,7 @@ function extend(ParentErrorClass, defaultMessage) {
return ErrorClass;
}

AdapterError.prototype = Object.create(EmberError.prototype);
AdapterError.prototype = Object.create(Error.prototype);
AdapterError.prototype.code = 'AdapterError';
AdapterError.extend = extendFn(AdapterError);

Expand Down
4 changes: 2 additions & 2 deletions packages/adapter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"scripts": {},
"peerDependencies": {
"@ember-data/store": "workspace:4.9.1",
"@ember/string": "^3.0.0",
"@ember/string": "^3.0.1",
"ember-inflector": "^4.0.2"
},
"dependenciesMeta": {
Expand All @@ -43,4 +43,4 @@
"extends": "../../package.json"
},
"packageManager": "[email protected]"
}
}
4 changes: 2 additions & 2 deletions packages/debug/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"directories": {},
"scripts": {},
"peerDependencies": {
"@ember/string": "^3.0.0"
"@ember/string": "^3.0.1"
},
"dependenciesMeta": {
"@ember-data/private-build-infra": {
Expand All @@ -40,4 +40,4 @@
"extends": "../../package.json"
},
"packageManager": "[email protected]"
}
}
1 change: 0 additions & 1 deletion packages/model/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ module.exports = Object.assign({}, addonBaseConfig, {
'@ember/array/mutable',
'@ember/array/proxy',
'@ember/debug',
'@ember/error',
'@ember/object',
'@ember/object/compat',
'@ember/object/computed',
Expand Down
4 changes: 2 additions & 2 deletions packages/model/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@ember-data/record-data": "workspace:4.9.1",
"@ember-data/store": "workspace:4.9.1",
"@ember-data/tracking": "workspace:4.9.1",
"@ember/string": "^3.0.0",
"@ember/string": "^3.0.1",
"ember-inflector": "^4.0.2"
},
"peerDependenciesMeta": {
Expand Down Expand Up @@ -61,4 +61,4 @@
"extends": "../../package.json"
},
"packageManager": "[email protected]"
}
}
4 changes: 2 additions & 2 deletions packages/serializer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"scripts": {},
"peerDependencies": {
"@ember-data/store": "workspace:4.9.1",
"@ember/string": "^3.0.0",
"@ember/string": "^3.0.1",
"ember-inflector": "^4.0.2"
},
"dependenciesMeta": {
Expand All @@ -42,4 +42,4 @@
"extends": "../../package.json"
},
"packageManager": "[email protected]"
}
}
1 change: 0 additions & 1 deletion packages/store/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ module.exports = Object.assign({}, addonBaseConfig, {
'@ember/array/proxy',
'@ember/array',
'@ember/debug',
'@ember/error',
'@ember/object',
'@ember/object/computed',
'@ember/object/evented',
Expand Down
4 changes: 2 additions & 2 deletions packages/store/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@ember-data/model": "workspace:4.9.1",
"@ember-data/record-data": "workspace:4.9.1",
"@ember-data/tracking": "workspace:4.9.1",
"@ember/string": "^3.0.0",
"@ember/string": "^3.0.1",
"@glimmer/tracking": "^1.1.2"
},
"peerDependenciesMeta": {
Expand Down Expand Up @@ -58,4 +58,4 @@
"extends": "../../package.json"
},
"packageManager": "[email protected]"
}
}
Loading