Skip to content

Commit 0360af1

Browse files
Turbo87Turbo87
committed
Migrate ember-data imports to new module import paths
1 parent a987769 commit 0360af1

16 files changed

+122
-122
lines changed

‎app/adapters/api-token.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import DS from 'ember-data';
1+
import RESTAdapter from '@ember-data/adapter/rest';
22

3-
export default DS.RESTAdapter.extend({
3+
export default RESTAdapter.extend({
44
namespace: 'api/v1/me',
55
pathForType() {
66
return 'tokens';

‎app/adapters/application.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import DS from 'ember-data';
1+
import RESTAdapter from '@ember-data/adapter/rest';
22

3-
export default DS.RESTAdapter.extend({
3+
export default RESTAdapter.extend({
44
namespace: 'api/v1',
55
});

‎app/adapters/crate-owner-invite.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import DS from 'ember-data';
1+
import RESTAdapter from '@ember-data/adapter/rest';
22

3-
export default DS.RESTAdapter.extend({
3+
export default RESTAdapter.extend({
44
namespace: 'api/v1/me',
55
pathForType() {
66
return 'crate_owner_invitations';

‎app/models/api-token.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import DS from 'ember-data';
1+
import Model, { attr } from '@ember-data/model';
22

3-
export default DS.Model.extend({
4-
name: DS.attr('string'),
5-
token: DS.attr('string'),
6-
created_at: DS.attr('date'),
7-
last_used_at: DS.attr('date'),
3+
export default Model.extend({
4+
name: attr('string'),
5+
token: attr('string'),
6+
created_at: attr('date'),
7+
last_used_at: attr('date'),
88
});

‎app/models/category-slug.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import DS from 'ember-data';
1+
import Model, { attr } from '@ember-data/model';
22

3-
export default DS.Model.extend({
4-
slug: DS.attr('string'),
5-
description: DS.attr('string'),
3+
export default Model.extend({
4+
slug: attr('string'),
5+
description: attr('string'),
66
});

‎app/models/category.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import DS from 'ember-data';
1+
import Model, { attr, hasMany } from '@ember-data/model';
22

3-
export default DS.Model.extend({
4-
category: DS.attr('string'),
5-
slug: DS.attr('string'),
6-
description: DS.attr('string'),
7-
created_at: DS.attr('date'),
8-
crates_cnt: DS.attr('number'),
3+
export default Model.extend({
4+
category: attr('string'),
5+
slug: attr('string'),
6+
description: attr('string'),
7+
created_at: attr('date'),
8+
crates_cnt: attr('number'),
99

10-
subcategories: DS.attr(),
11-
parent_categories: DS.attr(),
10+
subcategories: attr(),
11+
parent_categories: attr(),
1212

13-
crates: DS.hasMany('crate', { async: true }),
13+
crates: hasMany('crate', { async: true }),
1414
});

‎app/models/crate-owner-invite.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import DS from 'ember-data';
1+
import Model, { attr } from '@ember-data/model';
22

3-
export default DS.Model.extend({
4-
invited_by_username: DS.attr('string'),
5-
crate_name: DS.attr('string'),
6-
crate_id: DS.attr('number'),
7-
created_at: DS.attr('date'),
8-
accepted: DS.attr('boolean', { defaultValue: false }),
3+
export default Model.extend({
4+
invited_by_username: attr('string'),
5+
crate_name: attr('string'),
6+
crate_id: attr('number'),
7+
created_at: attr('date'),
8+
accepted: attr('boolean', { defaultValue: false }),
99
});

‎app/models/crate.js

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1+
import Model, { attr, hasMany } from '@ember-data/model';
12
import { map, sort } from '@ember/object/computed';
2-
import DS from 'ember-data';
3-
4-
export default DS.Model.extend({
5-
name: DS.attr('string'),
6-
downloads: DS.attr('number'),
7-
recent_downloads: DS.attr('number'),
8-
created_at: DS.attr('date'),
9-
updated_at: DS.attr('date'),
10-
max_version: DS.attr('string'),
11-
12-
description: DS.attr('string'),
13-
homepage: DS.attr('string'),
14-
wiki: DS.attr('string'),
15-
mailing_list: DS.attr('string'),
16-
issues: DS.attr('string'),
17-
documentation: DS.attr('string'),
18-
repository: DS.attr('string'),
19-
exact_match: DS.attr('boolean'),
20-
21-
versions: DS.hasMany('versions', { async: true }),
22-
badges: DS.attr(),
3+
4+
export default Model.extend({
5+
name: attr('string'),
6+
downloads: attr('number'),
7+
recent_downloads: attr('number'),
8+
created_at: attr('date'),
9+
updated_at: attr('date'),
10+
max_version: attr('string'),
11+
12+
description: attr('string'),
13+
homepage: attr('string'),
14+
wiki: attr('string'),
15+
mailing_list: attr('string'),
16+
issues: attr('string'),
17+
documentation: attr('string'),
18+
repository: attr('string'),
19+
exact_match: attr('boolean'),
20+
21+
versions: hasMany('versions', { async: true }),
22+
badges: attr(),
2323
enhanced_badges: map('badges', badge => ({
2424
...badge,
2525
component_name: `badge-${badge.badge_type}`,
@@ -29,13 +29,13 @@ export default DS.Model.extend({
2929
badge_sort: ['badge_type'],
3030
annotated_badges: sort('enhanced_badges', 'badge_sort'),
3131

32-
owners: DS.hasMany('users', { async: true }),
33-
owner_team: DS.hasMany('teams', { async: true }),
34-
owner_user: DS.hasMany('users', { async: true }),
35-
version_downloads: DS.hasMany('version-download', { async: true }),
36-
keywords: DS.hasMany('keywords', { async: true }),
37-
categories: DS.hasMany('categories', { async: true }),
38-
reverse_dependencies: DS.hasMany('dependency', { async: true }),
32+
owners: hasMany('users', { async: true }),
33+
owner_team: hasMany('teams', { async: true }),
34+
owner_user: hasMany('users', { async: true }),
35+
version_downloads: hasMany('version-download', { async: true }),
36+
keywords: hasMany('keywords', { async: true }),
37+
categories: hasMany('categories', { async: true }),
38+
reverse_dependencies: hasMany('dependency', { async: true }),
3939

4040
follow() {
4141
return this.store.adapterFor('crate').follow(this.id);

‎app/models/dependency.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import DS from 'ember-data';
1+
import Model, { belongsTo, attr } from '@ember-data/model';
22
import Inflector from 'ember-inflector';
33

44
Inflector.inflector.irregular('dependency', 'dependencies');
55

6-
export default DS.Model.extend({
7-
version: DS.belongsTo('version', {
6+
export default Model.extend({
7+
version: belongsTo('version', {
88
async: false,
99
}),
10-
crate_id: DS.attr('string'),
11-
req: DS.attr('string'),
12-
optional: DS.attr('boolean'),
13-
default_features: DS.attr('boolean'),
14-
features: DS.attr({ defaultValue: () => [] }),
15-
kind: DS.attr('string'),
16-
downloads: DS.attr('number'),
10+
crate_id: attr('string'),
11+
req: attr('string'),
12+
optional: attr('boolean'),
13+
default_features: attr('boolean'),
14+
features: attr({ defaultValue: () => [] }),
15+
kind: attr('string'),
16+
downloads: attr('number'),
1717
});

‎app/models/keyword.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import DS from 'ember-data';
1+
import Model, { attr, hasMany } from '@ember-data/model';
22

3-
export default DS.Model.extend({
4-
keyword: DS.attr('string'),
5-
created_at: DS.attr('date'),
6-
crates_cnt: DS.attr('number'),
3+
export default Model.extend({
4+
keyword: attr('string'),
5+
created_at: attr('date'),
6+
crates_cnt: attr('number'),
77

8-
crates: DS.hasMany('crate', { async: true }),
8+
crates: hasMany('crate', { async: true }),
99
});

‎app/models/owned-crate.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import DS from 'ember-data';
1+
import Model, { attr } from '@ember-data/model';
22

3-
export default DS.Model.extend({
4-
name: DS.attr('string'),
5-
email_notifications: DS.attr('boolean'),
3+
export default Model.extend({
4+
name: attr('string'),
5+
email_notifications: attr('boolean'),
66
});

‎app/models/team.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
import Model, { attr } from '@ember-data/model';
12
import { computed } from '@ember/object';
2-
import DS from 'ember-data';
33

4-
export default DS.Model.extend({
5-
email: DS.attr('string'),
6-
name: DS.attr('string'),
7-
login: DS.attr('string'),
8-
api_token: DS.attr('string'),
9-
avatar: DS.attr('string'),
10-
url: DS.attr('string'),
11-
kind: DS.attr('string'),
4+
export default Model.extend({
5+
email: attr('string'),
6+
name: attr('string'),
7+
login: attr('string'),
8+
api_token: attr('string'),
9+
avatar: attr('string'),
10+
url: attr('string'),
11+
kind: attr('string'),
1212
org_name: computed('login', function() {
1313
let login = this.login;
1414
let login_split = login.split(':');

‎app/models/user.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import DS from 'ember-data';
1+
import Model, { attr } from '@ember-data/model';
22

3-
export default DS.Model.extend({
4-
email: DS.attr('string'),
5-
email_verified: DS.attr('boolean'),
6-
email_verification_sent: DS.attr('boolean'),
7-
name: DS.attr('string'),
8-
login: DS.attr('string'),
9-
avatar: DS.attr('string'),
10-
url: DS.attr('string'),
11-
kind: DS.attr('string'),
3+
export default Model.extend({
4+
email: attr('string'),
5+
email_verified: attr('boolean'),
6+
email_verification_sent: attr('boolean'),
7+
name: attr('string'),
8+
login: attr('string'),
9+
avatar: attr('string'),
10+
url: attr('string'),
11+
kind: attr('string'),
1212

1313
stats() {
1414
return this.store.adapterFor('user').stats(this.id);

‎app/models/version-download.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import DS from 'ember-data';
1+
import Model, { belongsTo, attr } from '@ember-data/model';
22

3-
export default DS.Model.extend({
4-
version: DS.belongsTo('version', {
3+
export default Model.extend({
4+
version: belongsTo('version', {
55
async: false,
66
}),
7-
downloads: DS.attr('number'),
8-
date: DS.attr('date'),
7+
downloads: attr('number'),
8+
date: attr('date'),
99
});

‎app/models/version.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1+
import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
12
import { computed } from '@ember/object';
2-
import DS from 'ember-data';
33

4-
export default DS.Model.extend({
5-
num: DS.attr('string'),
6-
dl_path: DS.attr('string'),
7-
readme_path: DS.attr('string'),
8-
created_at: DS.attr('date'),
9-
updated_at: DS.attr('date'),
10-
downloads: DS.attr('number'),
11-
yanked: DS.attr('boolean'),
12-
license: DS.attr('string'),
4+
export default Model.extend({
5+
num: attr('string'),
6+
dl_path: attr('string'),
7+
readme_path: attr('string'),
8+
created_at: attr('date'),
9+
updated_at: attr('date'),
10+
downloads: attr('number'),
11+
yanked: attr('boolean'),
12+
license: attr('string'),
1313

14-
crate: DS.belongsTo('crate', {
14+
crate: belongsTo('crate', {
1515
async: false,
1616
}),
17-
authors: DS.hasMany('users', { async: true }),
18-
dependencies: DS.hasMany('dependency', { async: true }),
19-
version_downloads: DS.hasMany('version-download', { async: true }),
17+
authors: hasMany('users', { async: true }),
18+
dependencies: hasMany('dependency', { async: true }),
19+
version_downloads: hasMany('version-download', { async: true }),
2020

2121
crateName: computed('crate', function() {
2222
return this.belongsTo('crate').id();
2323
}),
24-
crate_size: DS.attr('number'),
24+
crate_size: attr('number'),
2525
});

‎app/serializers/application.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import DS from 'ember-data';
1+
import RESTSerializer from '@ember-data/serializer/rest';
22

3-
export default DS.RESTSerializer;
3+
export default RESTSerializer;

0 commit comments

Comments
 (0)