From fdf24d1196de0831ad883988894b37ec1da36dc2 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Thu, 10 Apr 2025 10:44:24 +0200 Subject: [PATCH] Ember: Simplify `@service` decorator imports Importing `inject` instead is deprecated now. --- app/components/color-scheme-menu.js | 2 +- app/components/copy-button.js | 2 +- app/components/crate-header.js | 2 +- app/components/crate-sidebar.js | 2 +- app/components/dependency-list/row.js | 2 +- app/components/download-graph.js | 2 +- app/components/email-input.js | 2 +- app/components/follow-button.js | 2 +- app/components/footer.js | 2 +- app/components/header.js | 2 +- app/components/pending-owner-invite-row.js | 2 +- app/components/privileged-action.js | 2 +- app/components/progress-bar.js | 2 +- app/components/rendered-html.js | 2 +- app/components/rev-dep-row.js | 2 +- app/components/search-form.js | 2 +- app/components/settings/api-tokens.js | 2 +- app/components/support/crate-report-form.js | 2 +- app/components/version-list/row.js | 2 +- app/controllers/application.js | 2 +- app/controllers/catch-all.js | 2 +- app/controllers/crate/delete.js | 2 +- app/controllers/crate/settings.js | 2 +- app/controllers/crate/version.js | 2 +- app/controllers/crate/versions.js | 2 +- app/controllers/dashboard.js | 2 +- app/controllers/index.js | 2 +- app/controllers/search.js | 2 +- app/controllers/settings/tokens/new.js | 2 +- app/helpers/format-num.js | 2 +- app/models/user.js | 2 +- app/modifiers/render-mermaids.js | 2 +- app/routes/-authenticated-route.js | 2 +- app/routes/application.js | 2 +- app/routes/categories.js | 2 +- app/routes/category-slugs.js | 2 +- app/routes/category.js | 2 +- app/routes/category/index.js | 2 +- app/routes/confirm.js | 2 +- app/routes/crate.js | 2 +- app/routes/crate/delete.js | 2 +- app/routes/crate/dependencies.js | 2 +- app/routes/crate/docs.js | 2 +- app/routes/crate/owners.js | 2 +- app/routes/crate/range.js | 2 +- app/routes/crate/repo.js | 2 +- app/routes/crate/reverse-dependencies.js | 2 +- app/routes/crate/settings.js | 2 +- app/routes/crate/version-dependencies.js | 2 +- app/routes/crate/version.js | 2 +- app/routes/crates.js | 2 +- app/routes/dashboard.js | 2 +- app/routes/install.js | 2 +- app/routes/keyword.js | 2 +- app/routes/keywords.js | 2 +- app/routes/me/crates.js | 2 +- app/routes/me/following.js | 2 +- app/routes/me/index.js | 2 +- app/routes/me/pending-invites.js | 2 +- app/routes/search.js | 2 +- app/routes/security.js | 2 +- app/routes/settings/email-notifications.js | 2 +- app/routes/settings/index.js | 2 +- app/routes/settings/profile.js | 2 +- app/routes/settings/tokens/index.js | 2 +- app/routes/settings/tokens/new.js | 2 +- app/routes/team.js | 2 +- app/routes/user.js | 2 +- app/services/progress.js | 2 +- app/services/session.js | 2 +- 70 files changed, 70 insertions(+), 70 deletions(-) diff --git a/app/components/color-scheme-menu.js b/app/components/color-scheme-menu.js index f17c66b5fcc..3d86a373f97 100644 --- a/app/components/color-scheme-menu.js +++ b/app/components/color-scheme-menu.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; export default class Header extends Component { diff --git a/app/components/copy-button.js b/app/components/copy-button.js index 8641c9d5066..184d8521730 100644 --- a/app/components/copy-button.js +++ b/app/components/copy-button.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; import { restartableTask } from 'ember-concurrency'; diff --git a/app/components/crate-header.js b/app/components/crate-header.js index a2649804ec0..b5d76c9d1dc 100644 --- a/app/components/crate-header.js +++ b/app/components/crate-header.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; import { task } from 'ember-concurrency'; diff --git a/app/components/crate-sidebar.js b/app/components/crate-sidebar.js index 5915b375cd4..bb88e61398e 100644 --- a/app/components/crate-sidebar.js +++ b/app/components/crate-sidebar.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; import { didCancel } from 'ember-concurrency'; diff --git a/app/components/dependency-list/row.js b/app/components/dependency-list/row.js index 1cdeec41977..f9c2243c924 100644 --- a/app/components/dependency-list/row.js +++ b/app/components/dependency-list/row.js @@ -1,5 +1,5 @@ import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; diff --git a/app/components/download-graph.js b/app/components/download-graph.js index 858a949b05e..2e30d02706d 100644 --- a/app/components/download-graph.js +++ b/app/components/download-graph.js @@ -1,5 +1,5 @@ import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { waitForPromise } from '@ember/test-waiters'; import Component from '@glimmer/component'; diff --git a/app/components/email-input.js b/app/components/email-input.js index d593852cc79..993958d9bef 100644 --- a/app/components/email-input.js +++ b/app/components/email-input.js @@ -1,5 +1,5 @@ import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; diff --git a/app/components/follow-button.js b/app/components/follow-button.js index f62ed81925d..ce9b8ecd9f0 100644 --- a/app/components/follow-button.js +++ b/app/components/follow-button.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; diff --git a/app/components/footer.js b/app/components/footer.js index be7f32a6ce4..f2639df2d28 100644 --- a/app/components/footer.js +++ b/app/components/footer.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; export default class Footer extends Component { diff --git a/app/components/header.js b/app/components/header.js index 5e90c975ee0..96efa8a535a 100644 --- a/app/components/header.js +++ b/app/components/header.js @@ -1,5 +1,5 @@ import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; // Six hours. diff --git a/app/components/pending-owner-invite-row.js b/app/components/pending-owner-invite-row.js index 1f9a0c30c4d..3893ab2178f 100644 --- a/app/components/pending-owner-invite-row.js +++ b/app/components/pending-owner-invite-row.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; diff --git a/app/components/privileged-action.js b/app/components/privileged-action.js index 6af78ade122..814de90ebc4 100644 --- a/app/components/privileged-action.js +++ b/app/components/privileged-action.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; /** diff --git a/app/components/progress-bar.js b/app/components/progress-bar.js index 088d98ba208..7460a24d892 100644 --- a/app/components/progress-bar.js +++ b/app/components/progress-bar.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; export default class extends Component { diff --git a/app/components/rendered-html.js b/app/components/rendered-html.js index 38f71fb3c64..f6784d89d72 100644 --- a/app/components/rendered-html.js +++ b/app/components/rendered-html.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; export default class extends Component { diff --git a/app/components/rev-dep-row.js b/app/components/rev-dep-row.js index 767f290e899..b5c727144df 100644 --- a/app/components/rev-dep-row.js +++ b/app/components/rev-dep-row.js @@ -1,5 +1,5 @@ import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; diff --git a/app/components/search-form.js b/app/components/search-form.js index 8476298035e..4b3aa5343f9 100644 --- a/app/components/search-form.js +++ b/app/components/search-form.js @@ -1,5 +1,5 @@ import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; export default class Header extends Component { diff --git a/app/components/settings/api-tokens.js b/app/components/settings/api-tokens.js index 1c5fca08e81..dc66cdd70b9 100644 --- a/app/components/settings/api-tokens.js +++ b/app/components/settings/api-tokens.js @@ -1,5 +1,5 @@ import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; import { task } from 'ember-concurrency'; diff --git a/app/components/support/crate-report-form.js b/app/components/support/crate-report-form.js index 0d5ebfe9910..dc82041cc75 100644 --- a/app/components/support/crate-report-form.js +++ b/app/components/support/crate-report-form.js @@ -1,5 +1,5 @@ import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; diff --git a/app/components/version-list/row.js b/app/components/version-list/row.js index e52d7b4181c..82ee537993c 100644 --- a/app/components/version-list/row.js +++ b/app/components/version-list/row.js @@ -1,5 +1,5 @@ import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { htmlSafe } from '@ember/template'; import Component from '@glimmer/component'; import { tracked } from '@glimmer/tracking'; diff --git a/app/controllers/application.js b/app/controllers/application.js index 140cfcc0847..6e298e6a57b 100644 --- a/app/controllers/application.js +++ b/app/controllers/application.js @@ -1,5 +1,5 @@ import Controller from '@ember/controller'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class ApplicationController extends Controller { @service colorScheme; diff --git a/app/controllers/catch-all.js b/app/controllers/catch-all.js index 2cb2eaeb20e..b9b5fe8ac49 100644 --- a/app/controllers/catch-all.js +++ b/app/controllers/catch-all.js @@ -1,6 +1,6 @@ import Controller from '@ember/controller'; import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class CatchAllController extends Controller { @service router; diff --git a/app/controllers/crate/delete.js b/app/controllers/crate/delete.js index 37c0205450b..f7995953ecf 100644 --- a/app/controllers/crate/delete.js +++ b/app/controllers/crate/delete.js @@ -1,6 +1,6 @@ import Controller from '@ember/controller'; import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { tracked } from '@glimmer/tracking'; import { task } from 'ember-concurrency'; diff --git a/app/controllers/crate/settings.js b/app/controllers/crate/settings.js index 72d38bdce9a..f421e246d0f 100644 --- a/app/controllers/crate/settings.js +++ b/app/controllers/crate/settings.js @@ -1,5 +1,5 @@ import Controller from '@ember/controller'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { task } from 'ember-concurrency'; diff --git a/app/controllers/crate/version.js b/app/controllers/crate/version.js index d9aa81e6511..28f784949cf 100644 --- a/app/controllers/crate/version.js +++ b/app/controllers/crate/version.js @@ -1,6 +1,6 @@ import Controller from '@ember/controller'; import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { tracked } from '@glimmer/tracking'; import { task } from 'ember-concurrency'; diff --git a/app/controllers/crate/versions.js b/app/controllers/crate/versions.js index 0b88a1bd5f1..9c28f337d0a 100644 --- a/app/controllers/crate/versions.js +++ b/app/controllers/crate/versions.js @@ -1,5 +1,5 @@ import Controller from '@ember/controller'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { tracked } from '@glimmer/tracking'; import { didCancel, dropTask } from 'ember-concurrency'; diff --git a/app/controllers/dashboard.js b/app/controllers/dashboard.js index 5fd946a23fb..4dfb257b562 100644 --- a/app/controllers/dashboard.js +++ b/app/controllers/dashboard.js @@ -1,6 +1,6 @@ import { A } from '@ember/array'; import Controller from '@ember/controller'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { task } from 'ember-concurrency'; import { alias } from 'macro-decorators'; diff --git a/app/controllers/index.js b/app/controllers/index.js index 3fe3864eb46..7525f3e2de6 100644 --- a/app/controllers/index.js +++ b/app/controllers/index.js @@ -1,6 +1,6 @@ import Controller from '@ember/controller'; import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { dropTask } from 'ember-concurrency'; import { reads } from 'macro-decorators'; diff --git a/app/controllers/search.js b/app/controllers/search.js index aa3054d22ff..a2d38a3ad65 100644 --- a/app/controllers/search.js +++ b/app/controllers/search.js @@ -1,6 +1,6 @@ import Controller from '@ember/controller'; import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { tracked } from '@glimmer/tracking'; import { restartableTask } from 'ember-concurrency'; diff --git a/app/controllers/settings/tokens/new.js b/app/controllers/settings/tokens/new.js index 65f7d13fdd8..dd05cb6932e 100644 --- a/app/controllers/settings/tokens/new.js +++ b/app/controllers/settings/tokens/new.js @@ -1,6 +1,6 @@ import Controller from '@ember/controller'; import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { tracked } from '@glimmer/tracking'; import { task } from 'ember-concurrency'; diff --git a/app/helpers/format-num.js b/app/helpers/format-num.js index 60c4b2fd283..1f20932cae7 100644 --- a/app/helpers/format-num.js +++ b/app/helpers/format-num.js @@ -1,5 +1,5 @@ import Helper from '@ember/component/helper'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class FormatNumHelper extends Helper { @service intl; diff --git a/app/models/user.js b/app/models/user.js index 9e96f47adcf..1c7b51d72d7 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -1,5 +1,5 @@ import Model, { attr } from '@ember-data/model'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { waitForPromise } from '@ember/test-waiters'; import { apiAction } from '@mainmatter/ember-api-actions'; diff --git a/app/modifiers/render-mermaids.js b/app/modifiers/render-mermaids.js index 62c84dfda44..627fa518bb5 100644 --- a/app/modifiers/render-mermaids.js +++ b/app/modifiers/render-mermaids.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { waitForPromise } from '@ember/test-waiters'; import Modifier from 'ember-modifier'; diff --git a/app/routes/-authenticated-route.js b/app/routes/-authenticated-route.js index bcbf49b3324..14f1b6a6ca2 100644 --- a/app/routes/-authenticated-route.js +++ b/app/routes/-authenticated-route.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class AuthenticatedRoute extends Route { @service router; diff --git a/app/routes/application.js b/app/routes/application.js index d7467f97ec7..a3f434ad682 100644 --- a/app/routes/application.js +++ b/app/routes/application.js @@ -1,6 +1,6 @@ import { action } from '@ember/object'; import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import Ember from 'ember'; import { didCancel, dropTask, rawTimeout, task } from 'ember-concurrency'; diff --git a/app/routes/categories.js b/app/routes/categories.js index 74a69cc21b7..b9ab5cf4490 100644 --- a/app/routes/categories.js +++ b/app/routes/categories.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class CategoriesRoute extends Route { @service store; diff --git a/app/routes/category-slugs.js b/app/routes/category-slugs.js index f6a4f89187d..49c866282d0 100644 --- a/app/routes/category-slugs.js +++ b/app/routes/category-slugs.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class CategorySlugsRoute extends Route { @service store; diff --git a/app/routes/category.js b/app/routes/category.js index dc8733d8b3e..6b80bcf07d0 100644 --- a/app/routes/category.js +++ b/app/routes/category.js @@ -1,6 +1,6 @@ import { NotFoundError } from '@ember-data/adapter/error'; import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class CategoryRoute extends Route { @service router; diff --git a/app/routes/category/index.js b/app/routes/category/index.js index 90687973a7a..9ddd7428adb 100644 --- a/app/routes/category/index.js +++ b/app/routes/category/index.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class CategoryIndexRoute extends Route { @service store; diff --git a/app/routes/confirm.js b/app/routes/confirm.js index c6e4ad0f521..1ef7fc2142e 100644 --- a/app/routes/confirm.js +++ b/app/routes/confirm.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import ajax from '../utils/ajax'; diff --git a/app/routes/crate.js b/app/routes/crate.js index 310949a706e..b7efbbc449f 100644 --- a/app/routes/crate.js +++ b/app/routes/crate.js @@ -1,6 +1,6 @@ import { NotFoundError } from '@ember-data/adapter/error'; import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { waitForPromise } from '@ember/test-waiters'; export default class CrateRoute extends Route { diff --git a/app/routes/crate/delete.js b/app/routes/crate/delete.js index 0e62ac3e984..fb62f94bf83 100644 --- a/app/routes/crate/delete.js +++ b/app/routes/crate/delete.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import AuthenticatedRoute from '../-authenticated-route'; diff --git a/app/routes/crate/dependencies.js b/app/routes/crate/dependencies.js index 68334f99636..2a3cf16d1ca 100644 --- a/app/routes/crate/dependencies.js +++ b/app/routes/crate/dependencies.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class VersionRoute extends Route { @service router; diff --git a/app/routes/crate/docs.js b/app/routes/crate/docs.js index ccaffd7c739..3b924758624 100644 --- a/app/routes/crate/docs.js +++ b/app/routes/crate/docs.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class CrateDocsRoute extends Route { @service notifications; diff --git a/app/routes/crate/owners.js b/app/routes/crate/owners.js index 84a862e0ec8..c88d8b16128 100644 --- a/app/routes/crate/owners.js +++ b/app/routes/crate/owners.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class OwnersRoute extends Route { @service router; diff --git a/app/routes/crate/range.js b/app/routes/crate/range.js index e33d511b7ee..3b1b65b1231 100644 --- a/app/routes/crate/range.js +++ b/app/routes/crate/range.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import maxSatisfying from 'semver/ranges/max-satisfying'; diff --git a/app/routes/crate/repo.js b/app/routes/crate/repo.js index 6b79f2e95e7..5eea21f8c31 100644 --- a/app/routes/crate/repo.js +++ b/app/routes/crate/repo.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class RepoRoute extends Route { @service notifications; diff --git a/app/routes/crate/reverse-dependencies.js b/app/routes/crate/reverse-dependencies.js index b336a4c686c..cec813b8712 100644 --- a/app/routes/crate/reverse-dependencies.js +++ b/app/routes/crate/reverse-dependencies.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class ReverseDependenciesRoute extends Route { @service notifications; diff --git a/app/routes/crate/settings.js b/app/routes/crate/settings.js index 45c7f0f6360..e53e3480914 100644 --- a/app/routes/crate/settings.js +++ b/app/routes/crate/settings.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import AuthenticatedRoute from '../-authenticated-route'; diff --git a/app/routes/crate/version-dependencies.js b/app/routes/crate/version-dependencies.js index 9a85d43cafa..69c029065bd 100644 --- a/app/routes/crate/version-dependencies.js +++ b/app/routes/crate/version-dependencies.js @@ -1,6 +1,6 @@ import { NotFoundError } from '@ember-data/adapter/error'; import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class VersionRoute extends Route { @service store; diff --git a/app/routes/crate/version.js b/app/routes/crate/version.js index 6c932f3ee66..3a244286336 100644 --- a/app/routes/crate/version.js +++ b/app/routes/crate/version.js @@ -1,6 +1,6 @@ import { NotFoundError } from '@ember-data/adapter/error'; import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { waitForPromise } from '@ember/test-waiters'; import { didCancel } from 'ember-concurrency'; diff --git a/app/routes/crates.js b/app/routes/crates.js index 26b8f4ca185..e35e6e8e600 100644 --- a/app/routes/crates.js +++ b/app/routes/crates.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class CratesRoute extends Route { @service router; diff --git a/app/routes/dashboard.js b/app/routes/dashboard.js index c17294040e3..3ea3153e461 100644 --- a/app/routes/dashboard.js +++ b/app/routes/dashboard.js @@ -1,5 +1,5 @@ import { A } from '@ember/array'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import RSVP from 'rsvp'; import { didCancel } from 'ember-concurrency'; diff --git a/app/routes/install.js b/app/routes/install.js index 0749ba3aa21..9d845f0f1f0 100644 --- a/app/routes/install.js +++ b/app/routes/install.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class InstallRoute extends Route { @service redirector; diff --git a/app/routes/keyword.js b/app/routes/keyword.js index 8fe456be9c9..d18d4f4aedd 100644 --- a/app/routes/keyword.js +++ b/app/routes/keyword.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class KeywordIndexRoute extends Route { @service router; diff --git a/app/routes/keywords.js b/app/routes/keywords.js index 3a08f15f53d..a3bfe0e2d16 100644 --- a/app/routes/keywords.js +++ b/app/routes/keywords.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class KeywordsRoute extends Route { @service store; diff --git a/app/routes/me/crates.js b/app/routes/me/crates.js index dea6d79f23a..476803bbb76 100644 --- a/app/routes/me/crates.js +++ b/app/routes/me/crates.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import AuthenticatedRoute from '../-authenticated-route'; diff --git a/app/routes/me/following.js b/app/routes/me/following.js index eab101fc8ed..1a950d17da4 100644 --- a/app/routes/me/following.js +++ b/app/routes/me/following.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import AuthenticatedRoute from '../-authenticated-route'; diff --git a/app/routes/me/index.js b/app/routes/me/index.js index e39b5b5e8f9..283fdc8387d 100644 --- a/app/routes/me/index.js +++ b/app/routes/me/index.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class MeIndexRoute extends Route { @service router; diff --git a/app/routes/me/pending-invites.js b/app/routes/me/pending-invites.js index 9dc7e8d2604..4d8027c8160 100644 --- a/app/routes/me/pending-invites.js +++ b/app/routes/me/pending-invites.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import AuthenticatedRoute from '../-authenticated-route'; diff --git a/app/routes/search.js b/app/routes/search.js index 5e7a73d2538..ee2060ed611 100644 --- a/app/routes/search.js +++ b/app/routes/search.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class SearchRoute extends Route { @service header; diff --git a/app/routes/security.js b/app/routes/security.js index fbc623f8771..16f32559e36 100644 --- a/app/routes/security.js +++ b/app/routes/security.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class SecurityRoute extends Route { @service router; diff --git a/app/routes/settings/email-notifications.js b/app/routes/settings/email-notifications.js index 673431ebb5e..9fe3c956401 100644 --- a/app/routes/settings/email-notifications.js +++ b/app/routes/settings/email-notifications.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import AuthenticatedRoute from '../-authenticated-route'; diff --git a/app/routes/settings/index.js b/app/routes/settings/index.js index 546b7a89f8d..2c405c89258 100644 --- a/app/routes/settings/index.js +++ b/app/routes/settings/index.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class SettingsRoute extends Route { @service router; diff --git a/app/routes/settings/profile.js b/app/routes/settings/profile.js index 713584cd987..bb4faabbd53 100644 --- a/app/routes/settings/profile.js +++ b/app/routes/settings/profile.js @@ -1,4 +1,4 @@ -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import AuthenticatedRoute from '../-authenticated-route'; diff --git a/app/routes/settings/tokens/index.js b/app/routes/settings/tokens/index.js index 8597091fc1e..770f1d7a1bc 100644 --- a/app/routes/settings/tokens/index.js +++ b/app/routes/settings/tokens/index.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; import { TrackedArray } from 'tracked-built-ins'; diff --git a/app/routes/settings/tokens/new.js b/app/routes/settings/tokens/new.js index d6eb3a677a2..faa57e464ba 100644 --- a/app/routes/settings/tokens/new.js +++ b/app/routes/settings/tokens/new.js @@ -1,6 +1,6 @@ import { NotFoundError } from '@ember-data/adapter/error'; import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class TokenListRoute extends Route { @service router; diff --git a/app/routes/team.js b/app/routes/team.js index 11c8f070322..1b3cba2f241 100644 --- a/app/routes/team.js +++ b/app/routes/team.js @@ -1,6 +1,6 @@ import { NotFoundError } from '@ember-data/adapter/error'; import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class TeamRoute extends Route { @service notifications; diff --git a/app/routes/user.js b/app/routes/user.js index 6d2d5282125..e8b7175f512 100644 --- a/app/routes/user.js +++ b/app/routes/user.js @@ -1,6 +1,6 @@ import { NotFoundError } from '@ember-data/adapter/error'; import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class UserRoute extends Route { @service notifications; diff --git a/app/services/progress.js b/app/services/progress.js index 155aa1c4ab9..01c2ba9c5d2 100644 --- a/app/services/progress.js +++ b/app/services/progress.js @@ -1,4 +1,4 @@ -import Service, { inject as service } from '@ember/service'; +import Service, { service } from '@ember/service'; import { htmlSafe } from '@ember/template'; import { tracked } from '@glimmer/tracking'; import Ember from 'ember'; diff --git a/app/services/session.js b/app/services/session.js index baf5a0af7bb..6cf5b8d0d60 100644 --- a/app/services/session.js +++ b/app/services/session.js @@ -1,5 +1,5 @@ import { debug } from '@ember/debug'; -import Service, { inject as service } from '@ember/service'; +import Service, { service } from '@ember/service'; import { tracked } from '@glimmer/tracking'; import { dropTask, race, rawTimeout, restartableTask, task, waitForEvent } from 'ember-concurrency';