From 0360af1dfa45a558c476e021d2a1c7d0c5e33626 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 22 Dec 2019 00:27:38 +0100 Subject: [PATCH] Migrate `ember-data` imports to new module import paths --- app/adapters/api-token.js | 4 +-- app/adapters/application.js | 4 +-- app/adapters/crate-owner-invite.js | 4 +-- app/models/api-token.js | 12 +++---- app/models/category-slug.js | 8 ++--- app/models/category.js | 20 +++++------ app/models/crate-owner-invite.js | 14 ++++---- app/models/crate.js | 56 +++++++++++++++--------------- app/models/dependency.js | 20 +++++------ app/models/keyword.js | 12 +++---- app/models/owned-crate.js | 8 ++--- app/models/team.js | 18 +++++----- app/models/user.js | 20 +++++------ app/models/version-download.js | 10 +++--- app/models/version.js | 30 ++++++++-------- app/serializers/application.js | 4 +-- 16 files changed, 122 insertions(+), 122 deletions(-) diff --git a/app/adapters/api-token.js b/app/adapters/api-token.js index 1c7e6f33e4e..452710f713e 100644 --- a/app/adapters/api-token.js +++ b/app/adapters/api-token.js @@ -1,6 +1,6 @@ -import DS from 'ember-data'; +import RESTAdapter from '@ember-data/adapter/rest'; -export default DS.RESTAdapter.extend({ +export default RESTAdapter.extend({ namespace: 'api/v1/me', pathForType() { return 'tokens'; diff --git a/app/adapters/application.js b/app/adapters/application.js index 4249a827a2a..f6e373f8934 100644 --- a/app/adapters/application.js +++ b/app/adapters/application.js @@ -1,5 +1,5 @@ -import DS from 'ember-data'; +import RESTAdapter from '@ember-data/adapter/rest'; -export default DS.RESTAdapter.extend({ +export default RESTAdapter.extend({ namespace: 'api/v1', }); diff --git a/app/adapters/crate-owner-invite.js b/app/adapters/crate-owner-invite.js index ad99112db29..b158db8eb9d 100644 --- a/app/adapters/crate-owner-invite.js +++ b/app/adapters/crate-owner-invite.js @@ -1,6 +1,6 @@ -import DS from 'ember-data'; +import RESTAdapter from '@ember-data/adapter/rest'; -export default DS.RESTAdapter.extend({ +export default RESTAdapter.extend({ namespace: 'api/v1/me', pathForType() { return 'crate_owner_invitations'; diff --git a/app/models/api-token.js b/app/models/api-token.js index b4f95ea61ec..e64072849aa 100644 --- a/app/models/api-token.js +++ b/app/models/api-token.js @@ -1,8 +1,8 @@ -import DS from 'ember-data'; +import Model, { attr } from '@ember-data/model'; -export default DS.Model.extend({ - name: DS.attr('string'), - token: DS.attr('string'), - created_at: DS.attr('date'), - last_used_at: DS.attr('date'), +export default Model.extend({ + name: attr('string'), + token: attr('string'), + created_at: attr('date'), + last_used_at: attr('date'), }); diff --git a/app/models/category-slug.js b/app/models/category-slug.js index 100f88069c0..c600f0faf7f 100644 --- a/app/models/category-slug.js +++ b/app/models/category-slug.js @@ -1,6 +1,6 @@ -import DS from 'ember-data'; +import Model, { attr } from '@ember-data/model'; -export default DS.Model.extend({ - slug: DS.attr('string'), - description: DS.attr('string'), +export default Model.extend({ + slug: attr('string'), + description: attr('string'), }); diff --git a/app/models/category.js b/app/models/category.js index cfc787f806c..09d182fce14 100644 --- a/app/models/category.js +++ b/app/models/category.js @@ -1,14 +1,14 @@ -import DS from 'ember-data'; +import Model, { attr, hasMany } from '@ember-data/model'; -export default DS.Model.extend({ - category: DS.attr('string'), - slug: DS.attr('string'), - description: DS.attr('string'), - created_at: DS.attr('date'), - crates_cnt: DS.attr('number'), +export default Model.extend({ + category: attr('string'), + slug: attr('string'), + description: attr('string'), + created_at: attr('date'), + crates_cnt: attr('number'), - subcategories: DS.attr(), - parent_categories: DS.attr(), + subcategories: attr(), + parent_categories: attr(), - crates: DS.hasMany('crate', { async: true }), + crates: hasMany('crate', { async: true }), }); diff --git a/app/models/crate-owner-invite.js b/app/models/crate-owner-invite.js index d1fb018f7dd..f7025612081 100644 --- a/app/models/crate-owner-invite.js +++ b/app/models/crate-owner-invite.js @@ -1,9 +1,9 @@ -import DS from 'ember-data'; +import Model, { attr } from '@ember-data/model'; -export default DS.Model.extend({ - invited_by_username: DS.attr('string'), - crate_name: DS.attr('string'), - crate_id: DS.attr('number'), - created_at: DS.attr('date'), - accepted: DS.attr('boolean', { defaultValue: false }), +export default Model.extend({ + invited_by_username: attr('string'), + crate_name: attr('string'), + crate_id: attr('number'), + created_at: attr('date'), + accepted: attr('boolean', { defaultValue: false }), }); diff --git a/app/models/crate.js b/app/models/crate.js index 19c057c4c46..59cbf21bf24 100644 --- a/app/models/crate.js +++ b/app/models/crate.js @@ -1,25 +1,25 @@ +import Model, { attr, hasMany } from '@ember-data/model'; import { map, sort } from '@ember/object/computed'; -import DS from 'ember-data'; - -export default DS.Model.extend({ - name: DS.attr('string'), - downloads: DS.attr('number'), - recent_downloads: DS.attr('number'), - created_at: DS.attr('date'), - updated_at: DS.attr('date'), - max_version: DS.attr('string'), - - description: DS.attr('string'), - homepage: DS.attr('string'), - wiki: DS.attr('string'), - mailing_list: DS.attr('string'), - issues: DS.attr('string'), - documentation: DS.attr('string'), - repository: DS.attr('string'), - exact_match: DS.attr('boolean'), - - versions: DS.hasMany('versions', { async: true }), - badges: DS.attr(), + +export default Model.extend({ + name: attr('string'), + downloads: attr('number'), + recent_downloads: attr('number'), + created_at: attr('date'), + updated_at: attr('date'), + max_version: attr('string'), + + description: attr('string'), + homepage: attr('string'), + wiki: attr('string'), + mailing_list: attr('string'), + issues: attr('string'), + documentation: attr('string'), + repository: attr('string'), + exact_match: attr('boolean'), + + versions: hasMany('versions', { async: true }), + badges: attr(), enhanced_badges: map('badges', badge => ({ ...badge, component_name: `badge-${badge.badge_type}`, @@ -29,13 +29,13 @@ export default DS.Model.extend({ badge_sort: ['badge_type'], annotated_badges: sort('enhanced_badges', 'badge_sort'), - owners: DS.hasMany('users', { async: true }), - owner_team: DS.hasMany('teams', { async: true }), - owner_user: DS.hasMany('users', { async: true }), - version_downloads: DS.hasMany('version-download', { async: true }), - keywords: DS.hasMany('keywords', { async: true }), - categories: DS.hasMany('categories', { async: true }), - reverse_dependencies: DS.hasMany('dependency', { async: true }), + owners: hasMany('users', { async: true }), + owner_team: hasMany('teams', { async: true }), + owner_user: hasMany('users', { async: true }), + version_downloads: hasMany('version-download', { async: true }), + keywords: hasMany('keywords', { async: true }), + categories: hasMany('categories', { async: true }), + reverse_dependencies: hasMany('dependency', { async: true }), follow() { return this.store.adapterFor('crate').follow(this.id); diff --git a/app/models/dependency.js b/app/models/dependency.js index 9cccd5d7d54..ee406800e77 100644 --- a/app/models/dependency.js +++ b/app/models/dependency.js @@ -1,17 +1,17 @@ -import DS from 'ember-data'; +import Model, { belongsTo, attr } from '@ember-data/model'; import Inflector from 'ember-inflector'; Inflector.inflector.irregular('dependency', 'dependencies'); -export default DS.Model.extend({ - version: DS.belongsTo('version', { +export default Model.extend({ + version: belongsTo('version', { async: false, }), - crate_id: DS.attr('string'), - req: DS.attr('string'), - optional: DS.attr('boolean'), - default_features: DS.attr('boolean'), - features: DS.attr({ defaultValue: () => [] }), - kind: DS.attr('string'), - downloads: DS.attr('number'), + crate_id: attr('string'), + req: attr('string'), + optional: attr('boolean'), + default_features: attr('boolean'), + features: attr({ defaultValue: () => [] }), + kind: attr('string'), + downloads: attr('number'), }); diff --git a/app/models/keyword.js b/app/models/keyword.js index a55b15bca86..0f3fe5c7e63 100644 --- a/app/models/keyword.js +++ b/app/models/keyword.js @@ -1,9 +1,9 @@ -import DS from 'ember-data'; +import Model, { attr, hasMany } from '@ember-data/model'; -export default DS.Model.extend({ - keyword: DS.attr('string'), - created_at: DS.attr('date'), - crates_cnt: DS.attr('number'), +export default Model.extend({ + keyword: attr('string'), + created_at: attr('date'), + crates_cnt: attr('number'), - crates: DS.hasMany('crate', { async: true }), + crates: hasMany('crate', { async: true }), }); diff --git a/app/models/owned-crate.js b/app/models/owned-crate.js index 6a708563854..7fd2e18a068 100644 --- a/app/models/owned-crate.js +++ b/app/models/owned-crate.js @@ -1,6 +1,6 @@ -import DS from 'ember-data'; +import Model, { attr } from '@ember-data/model'; -export default DS.Model.extend({ - name: DS.attr('string'), - email_notifications: DS.attr('boolean'), +export default Model.extend({ + name: attr('string'), + email_notifications: attr('boolean'), }); diff --git a/app/models/team.js b/app/models/team.js index 80b4a6bb782..d98748e54e4 100644 --- a/app/models/team.js +++ b/app/models/team.js @@ -1,14 +1,14 @@ +import Model, { attr } from '@ember-data/model'; import { computed } from '@ember/object'; -import DS from 'ember-data'; -export default DS.Model.extend({ - email: DS.attr('string'), - name: DS.attr('string'), - login: DS.attr('string'), - api_token: DS.attr('string'), - avatar: DS.attr('string'), - url: DS.attr('string'), - kind: DS.attr('string'), +export default Model.extend({ + email: attr('string'), + name: attr('string'), + login: attr('string'), + api_token: attr('string'), + avatar: attr('string'), + url: attr('string'), + kind: attr('string'), org_name: computed('login', function() { let login = this.login; let login_split = login.split(':'); diff --git a/app/models/user.js b/app/models/user.js index 0bcbdcbce71..7fa7fd1f8f8 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -1,14 +1,14 @@ -import DS from 'ember-data'; +import Model, { attr } from '@ember-data/model'; -export default DS.Model.extend({ - email: DS.attr('string'), - email_verified: DS.attr('boolean'), - email_verification_sent: DS.attr('boolean'), - name: DS.attr('string'), - login: DS.attr('string'), - avatar: DS.attr('string'), - url: DS.attr('string'), - kind: DS.attr('string'), +export default Model.extend({ + email: attr('string'), + email_verified: attr('boolean'), + email_verification_sent: attr('boolean'), + name: attr('string'), + login: attr('string'), + avatar: attr('string'), + url: attr('string'), + kind: attr('string'), stats() { return this.store.adapterFor('user').stats(this.id); diff --git a/app/models/version-download.js b/app/models/version-download.js index fc15938974c..fac359ec282 100644 --- a/app/models/version-download.js +++ b/app/models/version-download.js @@ -1,9 +1,9 @@ -import DS from 'ember-data'; +import Model, { belongsTo, attr } from '@ember-data/model'; -export default DS.Model.extend({ - version: DS.belongsTo('version', { +export default Model.extend({ + version: belongsTo('version', { async: false, }), - downloads: DS.attr('number'), - date: DS.attr('date'), + downloads: attr('number'), + date: attr('date'), }); diff --git a/app/models/version.js b/app/models/version.js index 504ba240d93..5529c2498f5 100644 --- a/app/models/version.js +++ b/app/models/version.js @@ -1,25 +1,25 @@ +import Model, { attr, belongsTo, hasMany } from '@ember-data/model'; import { computed } from '@ember/object'; -import DS from 'ember-data'; -export default DS.Model.extend({ - num: DS.attr('string'), - dl_path: DS.attr('string'), - readme_path: DS.attr('string'), - created_at: DS.attr('date'), - updated_at: DS.attr('date'), - downloads: DS.attr('number'), - yanked: DS.attr('boolean'), - license: DS.attr('string'), +export default Model.extend({ + num: attr('string'), + dl_path: attr('string'), + readme_path: attr('string'), + created_at: attr('date'), + updated_at: attr('date'), + downloads: attr('number'), + yanked: attr('boolean'), + license: attr('string'), - crate: DS.belongsTo('crate', { + crate: belongsTo('crate', { async: false, }), - authors: DS.hasMany('users', { async: true }), - dependencies: DS.hasMany('dependency', { async: true }), - version_downloads: DS.hasMany('version-download', { async: true }), + authors: hasMany('users', { async: true }), + dependencies: hasMany('dependency', { async: true }), + version_downloads: hasMany('version-download', { async: true }), crateName: computed('crate', function() { return this.belongsTo('crate').id(); }), - crate_size: DS.attr('number'), + crate_size: attr('number'), }); diff --git a/app/serializers/application.js b/app/serializers/application.js index 114c96ff7b7..5fefe7820a2 100644 --- a/app/serializers/application.js +++ b/app/serializers/application.js @@ -1,3 +1,3 @@ -import DS from 'ember-data'; +import RESTSerializer from '@ember-data/serializer/rest'; -export default DS.RESTSerializer; +export default RESTSerializer;