Dropped ember-concurrency-decorators dependency

no issue

- since `ember-concurrency@2.0` it's possible to use the standard imports as decorators removing the need for the extra `ember-concurrency-decorators` dependency and imports
This commit is contained in:
Kevin Ansfield 2022-02-09 10:49:38 +00:00
parent 1e081aa000
commit 8cc4c6c4a1
63 changed files with 62 additions and 77 deletions

View File

@ -3,8 +3,7 @@ import {action} from '@ember/object';
import {camelize} from '@ember/string';
import {guidFor} from '@ember/object/internals';
import {htmlSafe} from '@ember/template';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class CustomThemeSettingsColorComponent extends Component {

View File

@ -9,8 +9,7 @@ import {
import {action} from '@ember/object';
import {htmlSafe} from '@ember/template';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
export default class GhBrandSettingsFormComponent extends Component {
@service ajax;

View File

@ -3,8 +3,7 @@ import config from 'ghost-admin/config/environment';
import {formatPostTime} from 'ghost-admin/helpers/gh-format-post-time';
import {get} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class GhEditorPostStatusComponent extends Component {

View File

@ -1,8 +1,7 @@
import Component from '@glimmer/component';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const RETRY_PRODUCT_SAVE_POLL_LENGTH = 1000;

View File

@ -1,6 +1,6 @@
import Component from '@glimmer/component';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class GhLaunchWizardCustomiseDesignComponent extends Component {
@service notifications;

View File

@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import {htmlSafe} from '@ember/template';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class GhLaunchWizardFinaliseComponent extends Component {
@service feature;

View File

@ -3,7 +3,7 @@ import envConfig from 'ghost-admin/config/environment';
import {action} from '@ember/object';
import {currencies, getCurrencyOptions, getSymbol} from 'ghost-admin/utils/currency';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const CURRENCIES = currencies.map((currency) => {

View File

@ -1,6 +1,5 @@
import Component from '@glimmer/component';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class GhLoadingSpinnerComponent extends Component {

View File

@ -3,7 +3,7 @@ import moment from 'moment';
import {action} from '@ember/object';
import {getNonDecimal, getSymbol} from 'ghost-admin/utils/currency';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class extends Component {

View File

@ -1,6 +1,6 @@
import Component from '@glimmer/component';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class GhMembersFilterCountComponent extends Component {

View File

@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class GhMembersNoMembersComponent extends Component {
@service session;

View File

@ -4,7 +4,7 @@ import {Promise} from 'rsvp';
import {action} from '@ember/object';
import {isBlank} from '@ember/utils';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const BASE_FILTERS = ['status:free', 'status:-free'];

View File

@ -1,6 +1,6 @@
import Component from '@glimmer/component';
import {inject as service} from '@ember/service';
import {task, taskGroup} from 'ember-concurrency-decorators';
import {task, taskGroup} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class GhMembersSegmentCountComponent extends Component {

View File

@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class GhMembersSegmentSelect extends Component {

View File

@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class VisibilitySegmentSelect extends Component {

View File

@ -3,7 +3,7 @@ import moment from 'moment';
import {action} from '@ember/object';
import {isEmpty} from '@ember/utils';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class GhPublishMenuDraftComponent extends Component {

View File

@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const DEFAULT_ROLE_NAME = 'Contributor';

View File

@ -6,8 +6,7 @@ import {isBlank, isEmpty} from '@ember/utils';
import {pluralize} from 'ember-inflector';
import {run} from '@ember/runloop';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {timeout, waitForProperty} from 'ember-concurrency';
import {task, timeout, waitForProperty} from 'ember-concurrency';
export default class GhSearchInputComponent extends Component {
@service ajax;

View File

@ -1,8 +1,7 @@
import Component from '@glimmer/component';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class GhSiteIframeComponent extends Component {

View File

@ -10,7 +10,7 @@ import {
} from 'ember-power-select/utils/group-utils';
import {htmlSafe} from '@ember/template';
import {isBlank} from '@ember/utils';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
const {Handlebars} = Ember;

View File

@ -5,7 +5,7 @@ import {IMAGE_EXTENSIONS} from 'ghost-admin/components/gh-image-uploader';
import {action} from '@ember/object';
import {htmlSafe} from '@ember/template';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class ModalEmailDesignSettings extends ModalComponent {

View File

@ -2,7 +2,7 @@ import ModalBase from 'ghost-admin/components/modal-base';
import classic from 'ember-classic-decorator';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
// TODO: update modals to work fully with Glimmer components

View File

@ -1,7 +1,7 @@
import ModalComponent from 'ghost-admin/components/modal-base';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class ModalMemberProduct extends ModalComponent {

View File

@ -3,7 +3,7 @@ import ModalBase from 'ghost-admin/components/modal-base';
import classic from 'ember-classic-decorator';
import {currencies} from 'ghost-admin/utils/currency';
import {isEmpty} from '@ember/utils';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
// TODO: update modals to work fully with Glimmer components

View File

@ -6,7 +6,7 @@ import {currencies, getCurrencyOptions, getSymbol} from 'ghost-admin/utils/curre
import {A as emberA} from '@ember/array';
import {isEmpty} from '@ember/utils';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const CURRENCIES = currencies.map((currency) => {

View File

@ -2,7 +2,7 @@ import Component from '@glimmer/component';
import {action} from '@ember/object';
import {resetQueryParams} from 'ghost-admin/helpers/reset-query-params';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class CustomViewFormModal extends Component {
@service customViews;

View File

@ -1,6 +1,6 @@
import Component from '@glimmer/component';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class DeletePostModalComponent extends Component {
@service notifications;

View File

@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class ConfirmDeleteThemeComponent extends Component {
@service ghostPaths;

View File

@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import {isThemeValidationError} from 'ghost-admin/services/ajax';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class InstallThemeModalComponent extends Component {

View File

@ -6,7 +6,7 @@ import {
import {action} from '@ember/object';
import {run} from '@ember/runloop';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class UploadThemeModalComponent extends Component {

View File

@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class ModalsEditorConfirmPublishComponent extends Component {

View File

@ -4,7 +4,7 @@ import {action} from '@ember/object';
import {isHostLimitError} from 'ghost-admin/services/ajax';
import {isInvalidError} from 'ember-ajax/errors';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class NewCustomIntegrationModalComponent extends Component {

View File

@ -1,6 +1,6 @@
import Component from '@glimmer/component';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class ArchiveOfferModalComponent extends Component {
@service notifications;

View File

@ -2,8 +2,7 @@ import Component from '@glimmer/component';
import config from 'ghost-admin/config/environment';
import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
export default class ModalsOffersLinkComponent extends Component {
@service config;

View File

@ -1,6 +1,6 @@
import Component from '@glimmer/component';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class ArchiveOfferModalComponent extends Component {
@service notifications;

View File

@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class ModalPostPreviewComponent extends Component {

View File

@ -1,7 +1,6 @@
import Component from '@glimmer/component';
import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
export default class ModalPostPreviewBrowserComponent extends Component {
@task

View File

@ -3,8 +3,7 @@ import validator from 'validator';
import {action} from '@ember/object';
import {htmlSafe} from '@ember/template';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const INJECTED_CSS = `

View File

@ -1,7 +1,6 @@
import Component from '@glimmer/component';
import copyTextToClipboard from 'ghost-admin/utils/copy-text-to-clipboard';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
export default class ModalPostPreviewBrowserComponent extends Component {
@task

View File

@ -1,6 +1,6 @@
import Component from '@glimmer/component';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class ArchiveTierModalComponent extends Component {
@service notifications;

View File

@ -1,6 +1,6 @@
import Component from '@glimmer/component';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class UnarchiveTierModalComponent extends Component {
@service notifications;

View File

@ -2,8 +2,7 @@ import Component from '@glimmer/component';
import {action} from '@ember/object';
import {htmlSafe} from '@ember/template';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
export default class AccentColorFormField extends Component {
@service settings;

View File

@ -3,7 +3,7 @@ import EmberObject, {action, defineProperty} from '@ember/object';
import boundOneWay from 'ghost-admin/utils/bound-one-way';
import moment from 'moment';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const SCRATCH_PROPS = ['name', 'email', 'note'];

View File

@ -9,8 +9,7 @@ import {capitalize} from '@ember/string';
import {ghPluralize} from 'ghost-admin/helpers/gh-pluralize';
import {resetQueryParams} from 'ghost-admin/helpers/reset-query-params';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, timeout} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const PAID_PARAMS = [{

View File

@ -6,7 +6,7 @@ import {getSymbol} from 'ghost-admin/utils/currency';
import {ghPriceAmount} from '../helpers/gh-price-amount';
import {inject as service} from '@ember/service';
import {slugify} from '@tryghost/string';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {timeout} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';

View File

@ -1,7 +1,7 @@
import Controller from '@ember/controller';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const TYPES = [{

View File

@ -1,7 +1,7 @@
import Controller from '@ember/controller';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class SettingsDesignIndexController extends Controller {

View File

@ -1,7 +1,7 @@
import Controller from '@ember/controller';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class MembersEmailController extends Controller {

View File

@ -3,7 +3,7 @@ import envConfig from 'ghost-admin/config/environment';
import {action} from '@ember/object';
import {currencies, getCurrencyOptions, getSymbol} from 'ghost-admin/utils/currency';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const CURRENCIES = currencies.map((currency) => {

View File

@ -1,7 +1,7 @@
import Controller from '@ember/controller';
import EmberObject, {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class ProductController extends Controller {

View File

@ -1,6 +1,6 @@
import Controller from '@ember/controller';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class SetupFinishingTouchesController extends Controller {
@service modals;

View File

@ -3,7 +3,7 @@ import {Resource} from 'ember-could-get-used-to-this';
import {TrackedArray} from 'tracked-built-ins';
import {action} from '@ember/object';
import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class MembersEventsFetcher extends Resource {

View File

@ -1,7 +1,7 @@
import Service, {inject as service} from '@ember/service';
import {isEmpty} from '@ember/utils';
import {run} from '@ember/runloop';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class CustomThemeSettingsServices extends Service {

View File

@ -3,7 +3,7 @@ import Service, {inject as service} from '@ember/service';
import ValidationEngine from 'ghost-admin/mixins/validation-engine';
import {isArray} from '@ember/array';
import {observes} from '@ember-decorators/object';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const VIEW_COLORS = [

View File

@ -1,7 +1,7 @@
import Service, {inject as service} from '@ember/service';
import moment from 'moment';
import {ghPluralize} from 'ghost-admin/helpers/gh-pluralize';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
export default class MembersCountCacheService extends Service {
@service session;

View File

@ -1,6 +1,6 @@
import Service, {inject as service} from '@ember/service';
import moment from 'moment';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const ONE_MINUTE = 1 * 60 * 1000;

View File

@ -3,8 +3,7 @@ import fetch from 'fetch';
import {TrackedArray} from 'tracked-built-ins';
import {action} from '@ember/object';
import {isEmpty} from '@ember/utils';
import {task, taskGroup} from 'ember-concurrency-decorators';
import {timeout} from 'ember-concurrency';
import {task, taskGroup, timeout} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
const API_URL = 'https://g1.tenor.com';

View File

@ -3,7 +3,7 @@ import config from 'ghost-admin/config/environment';
import {action} from '@ember/object';
import {isEmpty} from '@ember/utils';
import {isThemeValidationError} from 'ghost-admin/services/ajax';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export default class ThemeManagementService extends Service {

View File

@ -12,7 +12,7 @@ import {guidFor} from '@ember/object/internals';
import {isBlank} from '@ember/utils';
import {inject as service} from '@ember/service';
import {set} from '@ember/object';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export const AUDIO_EXTENSIONS = ['mp3', 'wav', 'ogg', 'm4a'];
export const AUDIO_MIME_TYPES = ['audio/mp3', 'audio/mpeg', 'audio/ogg', 'audio/wav', 'audio/vnd.wav', 'audio/wave', 'audio/x-wav', 'audio/mp4'];

View File

@ -9,7 +9,7 @@ import {htmlSafe} from '@ember/template';
import {isBlank} from '@ember/utils';
import {inject as service} from '@ember/service';
import {set} from '@ember/object';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking';
export const VIDEO_EXTENSIONS = ['mp4', 'webm', 'ogv'];

View File

@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import {action} from '@ember/object';
import {bind} from '@ember/runloop';
import {task} from 'ember-concurrency-decorators';
import {task} from 'ember-concurrency';
import {timeout} from 'ember-concurrency';
const CARD_SPACING = 20;

View File

@ -82,7 +82,6 @@
"ember-cli-test-loader": "3.0.0",
"ember-composable-helpers": "5.0.0",
"ember-concurrency": "2.2.1",
"ember-concurrency-decorators": "2.0.3",
"ember-could-get-used-to-this": "1.0.1",
"ember-css-transitions": "3.0.0",
"ember-data": "3.24.0",

View File

@ -6833,7 +6833,7 @@ ember-composable-helpers@5.0.0:
ember-cli-babel "^7.26.3"
resolve "^1.10.0"
ember-concurrency-decorators@2.0.3, ember-concurrency-decorators@^2.0.0:
ember-concurrency-decorators@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/ember-concurrency-decorators/-/ember-concurrency-decorators-2.0.3.tgz#2816c9a0283b90ba5340fc5b4e0b92ea91f7d6e3"
integrity sha512-r6O34YKI/slyYapVsuOPnmaKC4AsmBSwvgcadbdy+jHNj+mnryXPkm+3hhhRnFdlsKUKdEuXvl43lhjhYRLhhA==