From 038e5deb2a19fb6e2ca0317100525713692f7696 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 25 Jul 2024 15:09:06 +0200 Subject: [PATCH] DEV: Clean up imports (#28060) * `@ember/owner` instead of `@ember/application` * `discourse-i18n` instead of `I18n` * `{ service } from "@ember/service"` instead of `inject as service` --- .../admin/addon/components/admin-config-areas/flags.gjs | 2 +- .../javascripts/admin/addon/components/admin-flag-item.gjs | 2 +- .../admin/addon/components/admin-plugin-config-area.gjs | 2 +- .../admin/addon/components/admin-plugin-config-top-nav.gjs | 2 +- .../components/admin-plugin-filtered-site-settings.gjs | 2 +- .../admin/addon/routes/admin-plugins-show-index.js | 2 +- .../admin/addon/routes/admin-plugins-show-settings.js | 2 +- .../javascripts/admin/addon/routes/admin-plugins-show.js | 2 +- .../javascripts/discourse-common/addon/lib/get-owner.js | 6 +++--- .../javascripts/discourse/app/components/bookmark-menu.gjs | 2 +- .../javascripts/discourse/app/components/composer-editor.js | 2 +- .../discourse/app/components/composer-message.js | 2 +- .../javascripts/discourse/app/components/custom-html.js | 2 +- .../javascripts/discourse/app/components/discourse-topic.js | 2 +- .../discourse/app/components/edit-topic-timer-form.js | 2 +- .../discourse/app/components/group-smtp-email-settings.gjs | 4 ++-- app/assets/javascripts/discourse/app/components/header.gjs | 2 +- .../javascripts/discourse/app/components/links-redirect.js | 2 +- .../discourse/app/components/modal/bulk-topic-actions.gjs | 2 +- .../discourse/app/components/modal/share-topic.js | 2 +- .../javascripts/discourse/app/components/reviewable-item.js | 2 +- .../discourse/app/components/small-user-list.gjs | 2 +- .../discourse/app/components/topic-admin-menu.gjs | 2 +- .../discourse/app/components/topic-footer-buttons.js | 2 +- .../javascripts/discourse/app/components/topic-list-item.js | 2 +- .../javascripts/discourse/app/components/user-menu/menu.js | 2 +- .../javascripts/discourse/app/components/user-stream.js | 2 +- .../javascripts/discourse/app/components/user-tip.gjs | 2 +- .../discourse/app/form-kit/components/fk/form.gjs | 2 +- app/assets/javascripts/discourse/app/helpers/raw.js | 2 +- .../javascripts/discourse/app/helpers/route-action.js | 2 +- .../app/instance-initializers/auto-load-modules.js | 2 +- .../javascripts/discourse/app/lib/bulk-select-helper.js | 2 +- app/assets/javascripts/discourse/app/lib/fabricators.js | 2 +- .../javascripts/discourse/app/lib/hashtag-types/base.js | 2 +- .../javascripts/discourse/app/lib/implicit-injections.js | 2 +- .../javascripts/discourse/app/lib/keyboard-shortcuts.js | 2 +- .../javascripts/discourse/app/lib/optional-service.js | 2 +- .../javascripts/discourse/app/lib/post-bookmark-manager.js | 4 ++-- .../javascripts/discourse/app/lib/raw-render-glimmer.js | 2 +- .../app/lib/sidebar/common/community-section/section.js | 2 +- app/assets/javascripts/discourse/app/lib/sidebar/section.js | 2 +- .../javascripts/discourse/app/lib/topic-bookmark-manager.js | 4 ++-- app/assets/javascripts/discourse/app/lib/url.js | 2 +- .../javascripts/discourse/app/lib/user-status-message.js | 2 +- .../javascripts/discourse/app/lib/wait-for-keyboard.js | 2 +- .../discourse/app/mixins/composer-upload-uppy.js | 2 +- .../discourse/app/mixins/composer-video-thumbnail-uppy.js | 2 +- app/assets/javascripts/discourse/app/models/rest.js | 2 +- app/assets/javascripts/discourse/app/models/user.js | 2 +- app/assets/javascripts/discourse/app/routes/user-index.js | 2 +- .../javascripts/discourse/app/services/bookmark-api.js | 2 +- .../discourse/app/services/client-error-handler.js | 2 +- .../discourse/app/services/restricted-routing.js | 2 +- .../discourse/app/widgets/component-connector.js | 2 +- app/assets/javascripts/discourse/app/widgets/connector.js | 2 +- app/assets/javascripts/discourse/app/widgets/post.js | 2 +- app/assets/javascripts/discourse/app/widgets/widget.js | 2 +- .../discourse/tests/acceptance/client-error-handler-test.js | 2 +- .../tests/acceptance/composer-uploads-uppy-test.js | 2 +- .../javascripts/discourse/tests/acceptance/globals-test.js | 2 +- .../javascripts/discourse/tests/acceptance/homepage-test.js | 2 +- .../discourse/tests/acceptance/implicit-injections-test.js | 2 +- .../discourse/tests/acceptance/loading-indicator-test.js | 2 +- .../discourse/tests/acceptance/modal-service-test.gjs | 2 +- .../discourse/tests/acceptance/notifications-test.js | 2 +- .../discourse/tests/acceptance/page-tracking-test.js | 2 +- .../discourse/tests/acceptance/personal-message-test.js | 2 +- .../integration/components/admin-plugin-config-area-test.js | 2 +- .../integration/components/admin-plugins-list-item-test.js | 2 +- .../components/bulk-select-topics-dropdown-test.js | 2 +- .../tests/integration/components/float-kit/d-menu-test.js | 2 +- .../tests/integration/components/float-kit/d-toast-test.gjs | 2 +- .../integration/components/form-kit/layout/submit-test.gjs | 2 +- .../tests/integration/components/home-logo-test.gjs | 2 +- .../tests/integration/components/invite-panel-test.js | 2 +- .../tests/integration/components/light-dark-img-test.gjs | 2 +- .../tests/integration/components/pending-post-test.js | 2 +- .../integration/components/reorder-categories-test.gjs | 2 +- .../components/request-group-membership-form-test.gjs | 2 +- .../components/select-kit/category-chooser-test.js | 2 +- .../components/select-kit/pinned-options-test.js | 2 +- .../select-kit/topic-notifications-button-test.js | 2 +- .../select-kit/topic-notifications-options-test.js | 2 +- .../tests/integration/components/topic-list-item-test.js | 2 +- .../tests/integration/components/topic-list-test.js | 2 +- .../tests/integration/components/widgets/home-logo-test.gjs | 2 +- .../integration/components/widgets/post-stream-test.js | 2 +- .../tests/integration/components/widgets/post-test.js | 2 +- .../integration/components/widgets/topic-status-test.js | 2 +- .../discourse/tests/integration/helpers/raw-test.gjs | 2 +- app/assets/javascripts/discourse/tests/setup-tests.js | 2 +- .../discourse/tests/unit/components/create-account-test.js | 2 +- .../discourse/tests/unit/controllers/topic-test.js | 2 +- .../discourse/tests/unit/lib/build-quote-test.js | 2 +- .../discourse/tests/unit/lib/category-badge-test.js | 2 +- .../javascripts/discourse/tests/unit/lib/computed-test.js | 2 +- .../javascripts/discourse/tests/unit/lib/emoji-test.js | 2 +- .../discourse/tests/unit/lib/form-kit/validator-test.js | 2 +- .../javascripts/discourse/tests/unit/lib/formatter-test.js | 2 +- .../discourse/tests/unit/lib/grant-badge-utils-test.js | 2 +- .../discourse/tests/unit/lib/link-lookup-test.js | 2 +- .../javascripts/discourse/tests/unit/lib/plugin-api-test.js | 2 +- .../javascripts/discourse/tests/unit/lib/uploads-test.js | 2 +- .../javascripts/discourse/tests/unit/lib/utilities-test.js | 2 +- .../javascripts/discourse/tests/unit/models/badge-test.js | 2 +- .../discourse/tests/unit/models/bookmark-test.js | 2 +- .../discourse/tests/unit/models/category-test.js | 2 +- .../discourse/tests/unit/models/composer-test.js | 2 +- .../discourse/tests/unit/models/email-log-test.js | 2 +- .../javascripts/discourse/tests/unit/models/group-test.js | 2 +- .../javascripts/discourse/tests/unit/models/invite-test.js | 2 +- .../discourse/tests/unit/models/nav-item-test.js | 2 +- .../discourse/tests/unit/models/pending-post-test.js | 2 +- .../discourse/tests/unit/models/post-stream-test.js | 2 +- .../javascripts/discourse/tests/unit/models/post-test.js | 2 +- .../models/private-message-topic-tracking-state-test.js | 2 +- .../javascripts/discourse/tests/unit/models/report-test.js | 2 +- .../discourse/tests/unit/models/rest-model-test.js | 2 +- .../discourse/tests/unit/models/result-set-test.js | 2 +- .../javascripts/discourse/tests/unit/models/site-test.js | 2 +- .../discourse/tests/unit/models/staff-action-log-test.js | 2 +- .../javascripts/discourse/tests/unit/models/tag-test.js | 2 +- .../javascripts/discourse/tests/unit/models/theme-test.js | 2 +- .../discourse/tests/unit/models/topic-details-test.js | 2 +- .../javascripts/discourse/tests/unit/models/topic-test.js | 2 +- .../discourse/tests/unit/models/user-action-test.js | 2 +- .../discourse/tests/unit/models/user-badge-test.js | 2 +- .../discourse/tests/unit/models/user-drafts-test.js | 2 +- .../discourse/tests/unit/models/user-stream-test.js | 2 +- .../javascripts/discourse/tests/unit/models/user-test.js | 2 +- .../discourse/tests/unit/services/document-title-test.js | 2 +- .../discourse/tests/unit/services/emoji-store-test.js | 2 +- .../discourse/tests/unit/services/header-test.js | 2 +- .../discourse/tests/unit/services/lightbox-test.js | 2 +- .../discourse/tests/unit/services/presence-test.js | 2 +- .../discourse/tests/unit/services/site-settings-test.js | 2 +- .../javascripts/discourse/tests/unit/services/store-test.js | 2 +- .../discourse/tests/unit/services/toasts-test.js | 2 +- .../discourse/tests/unit/services/user-tips-test.js | 2 +- .../float-kit/addon/components/d-inline-float.gjs | 2 +- .../javascripts/float-kit/addon/components/d-menu.gjs | 2 +- .../javascripts/float-kit/addon/components/d-menus.gjs | 2 +- .../javascripts/float-kit/addon/components/d-tooltip.gjs | 2 +- .../javascripts/float-kit/addon/components/d-tooltips.gjs | 2 +- .../javascripts/float-kit/addon/lib/d-menu-instance.js | 2 +- .../javascripts/float-kit/addon/lib/d-toast-instance.js | 2 +- .../javascripts/float-kit/addon/lib/d-tooltip-instance.js | 2 +- app/assets/javascripts/float-kit/addon/services/menu.js | 2 +- app/assets/javascripts/float-kit/addon/services/toasts.js | 2 +- app/assets/javascripts/float-kit/addon/services/tooltip.js | 2 +- .../addon/components/category-drop-more-collection.gjs | 2 +- .../javascripts/admin/components/automation-field.gjs | 2 +- .../admin/components/fields/da-choices-field.gjs | 2 +- .../javascripts/admin/components/fields/da-custom-field.gjs | 2 +- .../admin/components/fields/da-custom-fields.gjs | 2 +- .../admin/components/fields/da-key-value-field.gjs | 2 +- .../javascripts/admin/components/fields/da-period-field.gjs | 2 +- .../javascripts/admin/components/fields/da-pms-field.gjs | 4 ++-- .../admin/components/fields/da-trust-levels-field.gjs | 2 +- .../javascripts/admin/components/fields/da-user-field.gjs | 2 +- .../controllers/admin-plugins-discourse-automation-edit.js | 4 ++-- .../controllers/admin-plugins-discourse-automation-index.js | 4 ++-- .../controllers/admin-plugins-discourse-automation-new.js | 2 +- .../admin/controllers/admin-plugins-discourse-automation.js | 2 +- .../admin/assets/javascripts/admin/lib/fabricators.js | 2 +- .../integration/components/da-boolean-field-test.js | 2 +- .../integration/components/da-categories-field-test.js | 2 +- .../integration/components/da-category-field-test.js | 2 +- .../components/da-category-notification-level-field-test.js | 2 +- .../integration/components/da-choices-field-test.js | 2 +- .../integration/components/da-custom-field-test.js | 2 +- .../integration/components/da-date-time-field-test.js | 2 +- .../integration/components/da-group-field-test.js | 2 +- .../integration/components/da-message-field-test.js | 2 +- .../javascripts/integration/components/da-pms-field-test.js | 2 +- .../integration/components/da-post-field-test.js | 2 +- .../integration/components/da-tags-field-test.js | 2 +- .../integration/components/da-text-field-test.js | 2 +- .../integration/components/da-text-list-field-test.js | 2 +- .../integration/components/da-trust-levels-field-test.js | 2 +- .../integration/components/da-user-field-test.js | 2 +- .../integration/components/da-users-field-test.js | 2 +- .../discourse/components/chat-channel-metadata.gjs | 2 +- .../javascripts/discourse/components/chat-channel.gjs | 4 ++-- .../javascripts/discourse/components/chat-composer.js | 2 +- .../discourse/components/chat-message-actions-desktop.gjs | 2 +- .../discourse/components/chat-message-actions-mobile.gjs | 2 +- .../discourse/components/chat-message-separator.gjs | 2 +- .../javascripts/discourse/components/chat-message.gjs | 2 +- .../discourse/components/chat-thread-title-prompt.js | 2 +- .../assets/javascripts/discourse/components/chat-thread.gjs | 4 ++-- .../components/chat/message-creator/lib/chatables-loader.js | 2 +- .../discourse/components/chat/navbar/back-button.gjs | 2 +- .../components/chat/navbar/browse-channels-button.gjs | 2 +- .../components/chat/navbar/close-threads-button.gjs | 2 +- .../components/chat/navbar/new-direct-message-button.gjs | 2 +- .../components/chat/navbar/threads-list-button.gjs | 2 +- .../discourse/components/chat/selection-manager.gjs | 2 +- .../components/chat/thread/header-unread-indicator.gjs | 2 +- .../components/styleguide/chat-composer-message-details.js | 2 +- .../discourse/components/styleguide/chat-composer.js | 2 +- .../discourse/components/styleguide/chat-message.js | 2 +- .../components/styleguide/chat-modal-archive-channel.js | 2 +- .../components/styleguide/chat-modal-delete-channel.js | 2 +- .../styleguide/chat-modal-edit-channel-description.js | 2 +- .../components/styleguide/chat-modal-edit-channel-name.js | 2 +- .../styleguide/chat-modal-move-message-to-channel.js | 2 +- .../components/styleguide/chat-modal-thread-settings.js | 2 +- .../styleguide/chat-modal-toggle-channel-status.js | 2 +- .../components/styleguide/chat-thread-list-item.js | 2 +- .../discourse/lib/chat-channel-subscription-manager.js | 2 +- .../lib/chat-channel-thread-subscription-manager.js | 2 +- .../assets/javascripts/discourse/lib/chat-message-flag.js | 2 +- .../javascripts/discourse/lib/chat-message-interactor.js | 2 +- .../javascripts/discourse/lib/chat-messages-loader.js | 2 +- .../javascripts/discourse/lib/chat-messages-manager.js | 2 +- .../javascripts/discourse/lib/chat-threads-manager.js | 2 +- .../javascripts/discourse/lib/extract-current-topic-info.js | 2 +- .../chat/assets/javascripts/discourse/lib/fabricators.js | 2 +- .../assets/javascripts/discourse/lib/textarea-interactor.js | 2 +- .../javascripts/discourse/models/chat-tracking-state.js | 2 +- .../discourse/services/chat-tracking-state-manager.js | 2 +- .../chat/test/javascripts/components/channel-icon-test.gjs | 2 +- .../chat/test/javascripts/components/channel-name-test.gjs | 2 +- .../chat/test/javascripts/components/channel-title-test.gjs | 2 +- .../test/javascripts/components/chat-channel-card-test.js | 2 +- .../javascripts/components/chat-channel-leave-btn-test.js | 2 +- .../javascripts/components/chat-channel-metadata-test.js | 2 +- .../components/chat-channel-preview-card-test.js | 2 +- .../test/javascripts/components/chat-channel-row-test.js | 2 +- .../test/javascripts/components/chat-channel-status-test.js | 2 +- .../chat/test/javascripts/components/chat-channel-test.js | 2 +- .../components/chat-composer-message-details-test.js | 2 +- .../test/javascripts/components/chat-message-avatar-test.js | 2 +- .../test/javascripts/components/chat-message-info-test.js | 2 +- .../javascripts/components/chat-message-left-gutter-test.js | 2 +- .../chat/test/javascripts/components/chat-message-test.js | 2 +- .../components/chat-modal-archive-channel-test.js | 2 +- .../components/chat-modal-delete-channel-test.js | 2 +- .../components/chat-modal-move-message-to-channel-test.js | 2 +- .../chat/test/javascripts/components/chat-notices-test.js | 2 +- .../javascripts/components/chat-replying-indicator-test.js | 2 +- .../components/chat-retention-reminder-text-test.js | 2 +- .../test/javascripts/components/chat-thread-header-test.js | 2 +- .../javascripts/components/chat-thread-list-item-test.js | 2 +- .../javascripts/components/chat-thread-participants-test.js | 2 +- .../test/javascripts/components/chat-user-avatar-test.js | 2 +- .../javascripts/components/chat-user-card-button-test.js | 2 +- .../test/javascripts/components/thread-settings-test.gjs | 2 +- .../test/javascripts/unit/helpers/format-chat-date-test.js | 2 +- .../javascripts/unit/lib/chat-emoji-reaction-store-test.js | 2 +- .../test/javascripts/unit/lib/get-reaction-text-test.js | 2 +- .../chat/test/javascripts/unit/models/chat-message-test.js | 2 +- .../services/chat-channel-info-route-origin-manager-test.js | 2 +- .../javascripts/unit/services/chat-drafts-manager-test.js | 2 +- .../test/javascripts/unit/services/chat-drawer-size-test.js | 2 +- .../unit/services/chat-emoji-picker-manager-test.js | 2 +- .../test/javascripts/unit/services/chat-guardian-test.js | 2 +- .../javascripts/unit/services/chat-state-manager-test.js | 2 +- .../chat/test/javascripts/unit/utility/plugin-api-test.js | 2 +- .../discourse/components/poll-buttons-dropdown.gjs | 2 +- .../assets/javascripts/discourse/components/poll-info.gjs | 4 ++-- .../discourse/components/poll-option-ranked-choice.gjs | 2 +- .../javascripts/discourse/components/poll-options.gjs | 2 +- .../poll/assets/javascripts/discourse/components/poll.gjs | 2 +- .../javascripts/component/poll-buttons-dropdown-test.js | 2 +- plugins/poll/test/javascripts/component/poll-info-test.js | 2 +- .../component/poll-results-ranked-choice-test.js | 2 +- 269 files changed, 280 insertions(+), 280 deletions(-) diff --git a/app/assets/javascripts/admin/addon/components/admin-config-areas/flags.gjs b/app/assets/javascripts/admin/addon/components/admin-config-areas/flags.gjs index 3be32a52704..c6cdbc220ec 100644 --- a/app/assets/javascripts/admin/addon/components/admin-config-areas/flags.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-config-areas/flags.gjs @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import i18n from "discourse-common/helpers/i18n"; diff --git a/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs b/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs index 5ba07387cdf..cf138e06437 100644 --- a/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-flag-item.gjs @@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking"; import { fn } from "@ember/helper"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; import { not } from "truth-helpers"; import DButton from "discourse/components/d-button"; diff --git a/app/assets/javascripts/admin/addon/components/admin-plugin-config-area.gjs b/app/assets/javascripts/admin/addon/components/admin-plugin-config-area.gjs index affe336be3c..13d74e2bcfb 100644 --- a/app/assets/javascripts/admin/addon/components/admin-plugin-config-area.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-plugin-config-area.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { LinkTo } from "@ember/routing"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import concatClass from "discourse/helpers/concat-class"; import I18n from "discourse-i18n"; diff --git a/app/assets/javascripts/admin/addon/components/admin-plugin-config-top-nav.gjs b/app/assets/javascripts/admin/addon/components/admin-plugin-config-top-nav.gjs index 1149a2f7080..beabd3cd52d 100644 --- a/app/assets/javascripts/admin/addon/components/admin-plugin-config-top-nav.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-plugin-config-top-nav.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav"; import NavItem from "discourse/components/nav-item"; import i18n from "discourse-common/helpers/i18n"; diff --git a/app/assets/javascripts/admin/addon/components/admin-plugin-filtered-site-settings.gjs b/app/assets/javascripts/admin/addon/components/admin-plugin-filtered-site-settings.gjs index 07cbeb17ef4..5b4d69160c6 100644 --- a/app/assets/javascripts/admin/addon/components/admin-plugin-filtered-site-settings.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-plugin-filtered-site-settings.gjs @@ -2,7 +2,7 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; import { cancel } from "@ember/runloop"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { isEmpty } from "@ember/utils"; import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner"; import SiteSettingFilter from "discourse/lib/site-setting-filter"; diff --git a/app/assets/javascripts/admin/addon/routes/admin-plugins-show-index.js b/app/assets/javascripts/admin/addon/routes/admin-plugins-show-index.js index e3cba45f04f..52db3507814 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-plugins-show-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-plugins-show-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 AdminPluginsShowIndexRoute extends Route { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-plugins-show-settings.js b/app/assets/javascripts/admin/addon/routes/admin-plugins-show-settings.js index 8c76769729c..b6bcaa643e6 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-plugins-show-settings.js +++ b/app/assets/javascripts/admin/addon/routes/admin-plugins-show-settings.js @@ -1,5 +1,5 @@ import Route from "@ember/routing/route"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import SiteSetting from "admin/models/site-setting"; export default class AdminPluginsShowSettingsRoute extends Route { diff --git a/app/assets/javascripts/admin/addon/routes/admin-plugins-show.js b/app/assets/javascripts/admin/addon/routes/admin-plugins-show.js index d9f57f1c0eb..7312d28c8c3 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-plugins-show.js +++ b/app/assets/javascripts/admin/addon/routes/admin-plugins-show.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 "discourse/lib/ajax"; import { sanitize } from "discourse/lib/text"; import AdminPlugin from "admin/models/admin-plugin"; diff --git a/app/assets/javascripts/discourse-common/addon/lib/get-owner.js b/app/assets/javascripts/discourse-common/addon/lib/get-owner.js index 9003c39b5ea..9f1768dc720 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/get-owner.js +++ b/app/assets/javascripts/discourse-common/addon/lib/get-owner.js @@ -1,14 +1,14 @@ -import { getOwner as emberGetOwner, setOwner } from "@ember/application"; +import { getOwner as emberGetOwner, setOwner } from "@ember/owner"; import deprecated from "discourse-common/lib/deprecated"; let _default = {}; /** - * Works similarly to { getOwner } from `@ember/application`, but has a fallback + * Works similarly to { getOwner } from `@ember/owner`, but has a fallback * when the passed object doesn't have an owner. * * This exists for historical reasons. Ideally, any uses of it should be updated to use - * the official `@ember/application` implementation. + * the official `@ember/owner` implementation. */ export function getOwnerWithFallback(obj) { if (emberGetOwner) { diff --git a/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs b/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs index 1cff63b1cb6..98d785e17e4 100644 --- a/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs +++ b/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs @@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking"; import { array, fn } from "@ember/helper"; import { action } from "@ember/object"; import didInsert from "@ember/render-modifiers/modifiers/did-insert"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import DButton from "discourse/components/d-button"; import DropdownMenu from "discourse/components/dropdown-menu"; import BookmarkModal from "discourse/components/modal/bookmark"; diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js index 5e290a20611..65a3819f24d 100644 --- a/app/assets/javascripts/discourse/app/components/composer-editor.js +++ b/app/assets/javascripts/discourse/app/components/composer-editor.js @@ -1,7 +1,7 @@ -import { getOwner } from "@ember/application"; import Component from "@ember/component"; import EmberObject, { computed } from "@ember/object"; import { alias } from "@ember/object/computed"; +import { getOwner } from "@ember/owner"; import { next, schedule, throttle } from "@ember/runloop"; import { BasePlugin } from "@uppy/core"; import $ from "jquery"; diff --git a/app/assets/javascripts/discourse/app/components/composer-message.js b/app/assets/javascripts/discourse/app/components/composer-message.js index 303fbcb3f42..cf72b63ad0c 100644 --- a/app/assets/javascripts/discourse/app/components/composer-message.js +++ b/app/assets/javascripts/discourse/app/components/composer-message.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import Component from "@ember/component"; +import { getOwner } from "@ember/owner"; import deprecated from "discourse-common/lib/deprecated"; import discourseComputed from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/discourse/app/components/custom-html.js b/app/assets/javascripts/discourse/app/components/custom-html.js index d030d560a1f..63c0b9873a4 100644 --- a/app/assets/javascripts/discourse/app/components/custom-html.js +++ b/app/assets/javascripts/discourse/app/components/custom-html.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import Component from "@ember/component"; +import { getOwner } from "@ember/owner"; import { hbs } from "ember-cli-htmlbars"; import { getCustomHTML } from "discourse/helpers/custom-html"; import deprecated from "discourse-common/lib/deprecated"; diff --git a/app/assets/javascripts/discourse/app/components/discourse-topic.js b/app/assets/javascripts/discourse/app/components/discourse-topic.js index 126ad57a20f..ead258f0173 100644 --- a/app/assets/javascripts/discourse/app/components/discourse-topic.js +++ b/app/assets/javascripts/discourse/app/components/discourse-topic.js @@ -1,6 +1,6 @@ -import { getOwner } from "@ember/application"; import Component from "@ember/component"; import { alias } from "@ember/object/computed"; +import { getOwner } from "@ember/owner"; import { schedule, scheduleOnce } from "@ember/runloop"; import { isBlank } from "@ember/utils"; import $ from "jquery"; diff --git a/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js index 7626b00b194..68f9dec40d0 100644 --- a/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js +++ b/app/assets/javascripts/discourse/app/components/edit-topic-timer-form.js @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { isEmpty } from "@ember/utils"; import ItsATrap from "@discourse/itsatrap"; import { diff --git a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.gjs b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.gjs index fe72445d310..f9ba58acb69 100644 --- a/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.gjs +++ b/app/assets/javascripts/discourse/app/components/group-smtp-email-settings.gjs @@ -4,7 +4,7 @@ import { fn } from "@ember/helper"; import { on } from "@ember/modifier"; import { action, getProperties } from "@ember/object"; import { LinkTo } from "@ember/routing"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { or } from "truth-helpers"; import Form from "discourse/components/form"; import formatDate from "discourse/helpers/format-date"; @@ -13,7 +13,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error"; import { GROUP_SMTP_SSL_MODES } from "discourse/lib/constants"; import emailProviderDefaultSettings from "discourse/lib/email-provider-default-settings"; import i18n from "discourse-common/helpers/i18n"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; export default class GroupSmtpEmailSettings extends Component { @service currentUser; diff --git a/app/assets/javascripts/discourse/app/components/header.gjs b/app/assets/javascripts/discourse/app/components/header.gjs index 3b05cb2d03b..4b0284ffdc3 100644 --- a/app/assets/javascripts/discourse/app/components/header.gjs +++ b/app/assets/javascripts/discourse/app/components/header.gjs @@ -1,8 +1,8 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { hash } from "@ember/helper"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import { modifier as modifierFn } from "ember-modifier"; import { and, eq, not, or } from "truth-helpers"; diff --git a/app/assets/javascripts/discourse/app/components/links-redirect.js b/app/assets/javascripts/discourse/app/components/links-redirect.js index de85c8fa94d..0972b937990 100644 --- a/app/assets/javascripts/discourse/app/components/links-redirect.js +++ b/app/assets/javascripts/discourse/app/components/links-redirect.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import Component from "@ember/component"; +import { getOwner } from "@ember/owner"; import ClickTrack from "discourse/lib/click-track"; export default Component.extend({ diff --git a/app/assets/javascripts/discourse/app/components/modal/bulk-topic-actions.gjs b/app/assets/javascripts/discourse/app/components/modal/bulk-topic-actions.gjs index 2b120f2494c..c224003616e 100644 --- a/app/assets/javascripts/discourse/app/components/modal/bulk-topic-actions.gjs +++ b/app/assets/javascripts/discourse/app/components/modal/bulk-topic-actions.gjs @@ -1,9 +1,9 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { Input } from "@ember/component"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; import { Promise } from "rsvp"; diff --git a/app/assets/javascripts/discourse/app/components/modal/share-topic.js b/app/assets/javascripts/discourse/app/components/modal/share-topic.js index e21c33b0e04..2dbf4ae8d0a 100644 --- a/app/assets/javascripts/discourse/app/components/modal/share-topic.js +++ b/app/assets/javascripts/discourse/app/components/modal/share-topic.js @@ -1,7 +1,7 @@ -import { getOwner } from "@ember/application"; import Component from "@ember/component"; import { action } from "@ember/object"; import { readOnly } from "@ember/object/computed"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import CreateInvite from "discourse/components/modal/create-invite"; import { longDateNoYear } from "discourse/lib/formatter"; diff --git a/app/assets/javascripts/discourse/app/components/reviewable-item.js b/app/assets/javascripts/discourse/app/components/reviewable-item.js index 6deebf6f92c..11ff78a6595 100644 --- a/app/assets/javascripts/discourse/app/components/reviewable-item.js +++ b/app/assets/javascripts/discourse/app/components/reviewable-item.js @@ -1,6 +1,6 @@ -import { getOwner } from "@ember/application"; import Component from "@ember/component"; import { action, set } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import { classify, dasherize } from "@ember/string"; import ExplainReviewableModal from "discourse/components/modal/explain-reviewable"; diff --git a/app/assets/javascripts/discourse/app/components/small-user-list.gjs b/app/assets/javascripts/discourse/app/components/small-user-list.gjs index ca5bb6e7bd4..70e61c825e2 100644 --- a/app/assets/javascripts/discourse/app/components/small-user-list.gjs +++ b/app/assets/javascripts/discourse/app/components/small-user-list.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import avatar from "discourse/helpers/bound-avatar-template"; import { userPath } from "discourse/lib/url"; import i18n from "discourse-common/helpers/i18n"; diff --git a/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs b/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs index 16738b37b72..fa1284f2818 100644 --- a/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs +++ b/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { fn } from "@ember/helper"; import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { and, not, or } from "truth-helpers"; import DButton from "discourse/components/d-button"; import DropdownMenu from "discourse/components/dropdown-menu"; diff --git a/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js index 43339bcda97..d15b3e3be50 100644 --- a/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js +++ b/app/assets/javascripts/discourse/app/components/topic-footer-buttons.js @@ -1,7 +1,7 @@ -import { getOwner } from "@ember/application"; import Component from "@ember/component"; import { computed } from "@ember/object"; import { alias, or } from "@ember/object/computed"; +import { getOwner } from "@ember/owner"; import { NotificationLevels } from "discourse/lib/notification-levels"; import { getTopicFooterButtons } from "discourse/lib/register-topic-footer-button"; import { getTopicFooterDropdowns } from "discourse/lib/register-topic-footer-dropdown"; diff --git a/app/assets/javascripts/discourse/app/components/topic-list-item.js b/app/assets/javascripts/discourse/app/components/topic-list-item.js index 12467d747f3..0fbf3d6e2e8 100644 --- a/app/assets/javascripts/discourse/app/components/topic-list-item.js +++ b/app/assets/javascripts/discourse/app/components/topic-list-item.js @@ -1,7 +1,7 @@ -import { getOwner } from "@ember/application"; import Component from "@ember/component"; import { alias } from "@ember/object/computed"; import { on } from "@ember/object/evented"; +import { getOwner } from "@ember/owner"; import { schedule } from "@ember/runloop"; import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; diff --git a/app/assets/javascripts/discourse/app/components/user-menu/menu.js b/app/assets/javascripts/discourse/app/components/user-menu/menu.js index aaa2a5452f6..dfb29e96578 100644 --- a/app/assets/javascripts/discourse/app/components/user-menu/menu.js +++ b/app/assets/javascripts/discourse/app/components/user-menu/menu.js @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { cached, tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import { wantsNewWindow } from "discourse/lib/intercept-click"; import UserMenuTab, { CUSTOM_TABS_CLASSES } from "discourse/lib/user-menu/tab"; diff --git a/app/assets/javascripts/discourse/app/components/user-stream.js b/app/assets/javascripts/discourse/app/components/user-stream.js index dac1d20ab42..b441f77ca14 100644 --- a/app/assets/javascripts/discourse/app/components/user-stream.js +++ b/app/assets/javascripts/discourse/app/components/user-stream.js @@ -1,6 +1,6 @@ -import { getOwner } from "@ember/application"; import Component from "@ember/component"; import { on } from "@ember/object/evented"; +import { getOwner } from "@ember/owner"; import { later } from "@ember/runloop"; import { service } from "@ember/service"; import $ from "jquery"; diff --git a/app/assets/javascripts/discourse/app/components/user-tip.gjs b/app/assets/javascripts/discourse/app/components/user-tip.gjs index c144a1ff1de..be079382a50 100644 --- a/app/assets/javascripts/discourse/app/components/user-tip.gjs +++ b/app/assets/javascripts/discourse/app/components/user-tip.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { schedule } from "@ember/runloop"; import { service } from "@ember/service"; import { modifier } from "ember-modifier"; diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/form.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/form.gjs index f8ea5e86cac..6fa571f5380 100644 --- a/app/assets/javascripts/discourse/app/form-kit/components/fk/form.gjs +++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/form.gjs @@ -17,7 +17,7 @@ import FKSection from "discourse/form-kit/components/fk/section"; import { VALIDATION_TYPES } from "discourse/form-kit/lib/constants"; import FKFieldData from "discourse/form-kit/lib/fk-field-data"; import FKFormData from "discourse/form-kit/lib/fk-form-data"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; class FKForm extends Component { @service dialog; diff --git a/app/assets/javascripts/discourse/app/helpers/raw.js b/app/assets/javascripts/discourse/app/helpers/raw.js index 903f41c75d5..e2d2929faa6 100644 --- a/app/assets/javascripts/discourse/app/helpers/raw.js +++ b/app/assets/javascripts/discourse/app/helpers/raw.js @@ -1,6 +1,6 @@ -import { getOwner, setOwner } from "@ember/application"; import Helper from "@ember/component/helper"; import { registerDestructor } from "@ember/destroyable"; +import { getOwner, setOwner } from "@ember/owner"; import { schedule } from "@ember/runloop"; import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; diff --git a/app/assets/javascripts/discourse/app/helpers/route-action.js b/app/assets/javascripts/discourse/app/helpers/route-action.js index b47cf7028af..fb08af80a73 100644 --- a/app/assets/javascripts/discourse/app/helpers/route-action.js +++ b/app/assets/javascripts/discourse/app/helpers/route-action.js @@ -1,9 +1,9 @@ /* eslint-disable ember/no-private-routing-service */ -import { getOwner } from "@ember/application"; import { A } from "@ember/array"; import Helper from "@ember/component/helper"; import { assert, runInDebug } from "@ember/debug"; import { computed, get } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { join } from "@ember/runloop"; function getCurrentRouteInfos(router) { diff --git a/app/assets/javascripts/discourse/app/instance-initializers/auto-load-modules.js b/app/assets/javascripts/discourse/app/instance-initializers/auto-load-modules.js index c9a42ca0724..108c16a52ff 100644 --- a/app/assets/javascripts/discourse/app/instance-initializers/auto-load-modules.js +++ b/app/assets/javascripts/discourse/app/instance-initializers/auto-load-modules.js @@ -1,4 +1,4 @@ -import { setOwner } from "@ember/application"; +import { setOwner } from "@ember/owner"; import Handlebars from "handlebars"; import { createHelperContext, diff --git a/app/assets/javascripts/discourse/app/lib/bulk-select-helper.js b/app/assets/javascripts/discourse/app/lib/bulk-select-helper.js index d2edd724a6d..1630ed7e666 100644 --- a/app/assets/javascripts/discourse/app/lib/bulk-select-helper.js +++ b/app/assets/javascripts/discourse/app/lib/bulk-select-helper.js @@ -1,5 +1,5 @@ import { tracked } from "@glimmer/tracking"; -import { getOwner, setOwner } from "@ember/application"; +import { getOwner, setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { TrackedArray } from "@ember-compat/tracked-built-ins"; import { NotificationLevels } from "discourse/lib/notification-levels"; diff --git a/app/assets/javascripts/discourse/app/lib/fabricators.js b/app/assets/javascripts/discourse/app/lib/fabricators.js index 9c10234d366..9616a022718 100644 --- a/app/assets/javascripts/discourse/app/lib/fabricators.js +++ b/app/assets/javascripts/discourse/app/lib/fabricators.js @@ -5,8 +5,8 @@ styleguide to use them, and eventually to generate dummy data in a placeholder component. It should not be used for any other case. */ -import { setOwner } from "@ember/application"; import ApplicationInstance from "@ember/application/instance"; +import { setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { getLoadedFaker } from "discourse/lib/load-faker"; diff --git a/app/assets/javascripts/discourse/app/lib/hashtag-types/base.js b/app/assets/javascripts/discourse/app/lib/hashtag-types/base.js index f8fe5fc1ebd..5a6fef0bbb7 100644 --- a/app/assets/javascripts/discourse/app/lib/hashtag-types/base.js +++ b/app/assets/javascripts/discourse/app/lib/hashtag-types/base.js @@ -1,4 +1,4 @@ -import { setOwner } from "@ember/application"; +import { setOwner } from "@ember/owner"; import { debounce } from "@ember/runloop"; import { ajax } from "discourse/lib/ajax"; import { getHashtagTypeClasses } from "discourse/lib/hashtag-type-registry"; diff --git a/app/assets/javascripts/discourse/app/lib/implicit-injections.js b/app/assets/javascripts/discourse/app/lib/implicit-injections.js index eebefc7d922..b1eff159665 100644 --- a/app/assets/javascripts/discourse/app/lib/implicit-injections.js +++ b/app/assets/javascripts/discourse/app/lib/implicit-injections.js @@ -1,7 +1,7 @@ -import { getOwner } from "@ember/application"; import Component from "@ember/component"; import Controller from "@ember/controller"; import EmberObject, { computed } from "@ember/object"; +import { getOwner } from "@ember/owner"; import Route from "@ember/routing/route"; import Service from "@ember/service"; import RestAdapter from "discourse/adapters/rest"; diff --git a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js index 7cfcf226eb8..bd3f14c8461 100644 --- a/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js +++ b/app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js @@ -1,4 +1,4 @@ -import { getOwner, setOwner } from "@ember/application"; +import { getOwner, setOwner } from "@ember/owner"; import { run, throttle } from "@ember/runloop"; import { ajax } from "discourse/lib/ajax"; import { headerOffset } from "discourse/lib/offset-calculator"; diff --git a/app/assets/javascripts/discourse/app/lib/optional-service.js b/app/assets/javascripts/discourse/app/lib/optional-service.js index 611db40d296..07412b59c1b 100644 --- a/app/assets/javascripts/discourse/app/lib/optional-service.js +++ b/app/assets/javascripts/discourse/app/lib/optional-service.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import { computed } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { dasherize } from "@ember/string"; export default function (name) { diff --git a/app/assets/javascripts/discourse/app/lib/post-bookmark-manager.js b/app/assets/javascripts/discourse/app/lib/post-bookmark-manager.js index 3491a964f66..a3bf6889c8b 100644 --- a/app/assets/javascripts/discourse/app/lib/post-bookmark-manager.js +++ b/app/assets/javascripts/discourse/app/lib/post-bookmark-manager.js @@ -1,7 +1,7 @@ import { tracked } from "@glimmer/tracking"; -import { setOwner } from "@ember/application"; import { inject as controller } from "@ember/controller"; -import { inject as service } from "@ember/service"; +import { setOwner } from "@ember/owner"; +import { service } from "@ember/service"; import { CLOSE_INITIATED_BY_BUTTON, CLOSE_INITIATED_BY_ESC, diff --git a/app/assets/javascripts/discourse/app/lib/raw-render-glimmer.js b/app/assets/javascripts/discourse/app/lib/raw-render-glimmer.js index 9c602a3d25b..8a1e7c488e8 100644 --- a/app/assets/javascripts/discourse/app/lib/raw-render-glimmer.js +++ b/app/assets/javascripts/discourse/app/lib/raw-render-glimmer.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { schedule } from "@ember/runloop"; let counter = 0; diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/section.js b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/section.js index 6ffc86d6fe0..2468de3cdb9 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/section.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/common/community-section/section.js @@ -1,5 +1,5 @@ import { tracked } from "@glimmer/tracking"; -import { setOwner } from "@ember/application"; +import { setOwner } from "@ember/owner"; import { service } from "@ember/service"; import AboutSectionLink from "discourse/lib/sidebar/common/community-section/about-section-link"; import BadgesSectionLink from "discourse/lib/sidebar/common/community-section/badges-section-link"; diff --git a/app/assets/javascripts/discourse/app/lib/sidebar/section.js b/app/assets/javascripts/discourse/app/lib/sidebar/section.js index 68b42f2b512..4c076ae676f 100644 --- a/app/assets/javascripts/discourse/app/lib/sidebar/section.js +++ b/app/assets/javascripts/discourse/app/lib/sidebar/section.js @@ -1,5 +1,5 @@ import { tracked } from "@glimmer/tracking"; -import { setOwner } from "@ember/application"; +import { setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { isPresent } from "@ember/utils"; import SidebarSectionForm from "discourse/components/modal/sidebar-section-form"; diff --git a/app/assets/javascripts/discourse/app/lib/topic-bookmark-manager.js b/app/assets/javascripts/discourse/app/lib/topic-bookmark-manager.js index a97e314c0f7..aa9852eb9cf 100644 --- a/app/assets/javascripts/discourse/app/lib/topic-bookmark-manager.js +++ b/app/assets/javascripts/discourse/app/lib/topic-bookmark-manager.js @@ -1,7 +1,7 @@ import { tracked } from "@glimmer/tracking"; -import { setOwner } from "@ember/application"; import { inject as controller } from "@ember/controller"; -import { inject as service } from "@ember/service"; +import { setOwner } from "@ember/owner"; +import { service } from "@ember/service"; import { BookmarkFormData } from "discourse/lib/bookmark-form-data"; import Bookmark from "discourse/models/bookmark"; diff --git a/app/assets/javascripts/discourse/app/lib/url.js b/app/assets/javascripts/discourse/app/lib/url.js index 663220ee87c..e9e63596ebd 100644 --- a/app/assets/javascripts/discourse/app/lib/url.js +++ b/app/assets/javascripts/discourse/app/lib/url.js @@ -1,6 +1,6 @@ /* eslint-disable ember/no-private-routing-service */ -import { setOwner } from "@ember/application"; import EmberObject from "@ember/object"; +import { setOwner } from "@ember/owner"; import { next, schedule } from "@ember/runloop"; import { isEmpty } from "@ember/utils"; import $ from "jquery"; diff --git a/app/assets/javascripts/discourse/app/lib/user-status-message.js b/app/assets/javascripts/discourse/app/lib/user-status-message.js index e4197ff0f0c..af544160a7e 100644 --- a/app/assets/javascripts/discourse/app/lib/user-status-message.js +++ b/app/assets/javascripts/discourse/app/lib/user-status-message.js @@ -1,4 +1,4 @@ -import { setOwner } from "@ember/application"; +import { setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { until } from "discourse/lib/formatter"; import { emojiUnescape } from "discourse/lib/text"; diff --git a/app/assets/javascripts/discourse/app/lib/wait-for-keyboard.js b/app/assets/javascripts/discourse/app/lib/wait-for-keyboard.js index bd1ef043145..8eaf7c30b59 100644 --- a/app/assets/javascripts/discourse/app/lib/wait-for-keyboard.js +++ b/app/assets/javascripts/discourse/app/lib/wait-for-keyboard.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; export async function waitForClosedKeyboard(context) { if (!window.visualViewport) { diff --git a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js index 3420c6e7934..9d11cdede07 100644 --- a/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js +++ b/app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js @@ -1,7 +1,7 @@ -import { getOwner } from "@ember/application"; import { warn } from "@ember/debug"; import EmberObject from "@ember/object"; import Mixin from "@ember/object/mixin"; +import { getOwner } from "@ember/owner"; import { run } from "@ember/runloop"; import { service } from "@ember/service"; import Uppy from "@uppy/core"; diff --git a/app/assets/javascripts/discourse/app/mixins/composer-video-thumbnail-uppy.js b/app/assets/javascripts/discourse/app/mixins/composer-video-thumbnail-uppy.js index c27f336c4aa..959fdfd38c6 100644 --- a/app/assets/javascripts/discourse/app/mixins/composer-video-thumbnail-uppy.js +++ b/app/assets/javascripts/discourse/app/mixins/composer-video-thumbnail-uppy.js @@ -1,7 +1,7 @@ import { tracked } from "@glimmer/tracking"; -import { setOwner } from "@ember/application"; import { warn } from "@ember/debug"; import EmberObject from "@ember/object"; +import { setOwner } from "@ember/owner"; import { service } from "@ember/service"; import Uppy from "@uppy/core"; import { isVideo } from "discourse/lib/uploads"; diff --git a/app/assets/javascripts/discourse/app/models/rest.js b/app/assets/javascripts/discourse/app/models/rest.js index 2501a19cccb..68f7a7132e1 100644 --- a/app/assets/javascripts/discourse/app/models/rest.js +++ b/app/assets/javascripts/discourse/app/models/rest.js @@ -1,8 +1,8 @@ import { tracked } from "@glimmer/tracking"; -import { getOwner, setOwner } from "@ember/application"; import { warn } from "@ember/debug"; import EmberObject from "@ember/object"; import { equal } from "@ember/object/computed"; +import { getOwner, setOwner } from "@ember/owner"; import { Promise } from "rsvp"; import { getOwnerWithFallback } from "discourse-common/lib/get-owner"; diff --git a/app/assets/javascripts/discourse/app/models/user.js b/app/assets/javascripts/discourse/app/models/user.js index 3c80f8474f7..d8a57f2bc86 100644 --- a/app/assets/javascripts/discourse/app/models/user.js +++ b/app/assets/javascripts/discourse/app/models/user.js @@ -1,10 +1,10 @@ import { tracked } from "@glimmer/tracking"; -import { getOwner, setOwner } from "@ember/application"; import { A } from "@ember/array"; import EmberObject, { computed, get, getProperties } from "@ember/object"; import { dependentKeyCompat } from "@ember/object/compat"; import { alias, equal, filterBy, gt, mapBy, or } from "@ember/object/computed"; import Evented from "@ember/object/evented"; +import { getOwner, setOwner } from "@ember/owner"; import { cancel } from "@ember/runloop"; import { service } from "@ember/service"; import { camelize } from "@ember/string"; diff --git a/app/assets/javascripts/discourse/app/routes/user-index.js b/app/assets/javascripts/discourse/app/routes/user-index.js index b98f5d1ba96..4cb22f5f930 100644 --- a/app/assets/javascripts/discourse/app/routes/user-index.js +++ b/app/assets/javascripts/discourse/app/routes/user-index.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import DiscourseRoute from "discourse/routes/discourse"; diff --git a/app/assets/javascripts/discourse/app/services/bookmark-api.js b/app/assets/javascripts/discourse/app/services/bookmark-api.js index afbfb2f4f61..21ea8dfb11d 100644 --- a/app/assets/javascripts/discourse/app/services/bookmark-api.js +++ b/app/assets/javascripts/discourse/app/services/bookmark-api.js @@ -1,4 +1,4 @@ -import Service, { inject as service } from "@ember/service"; +import Service, { service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import Bookmark from "discourse/models/bookmark"; diff --git a/app/assets/javascripts/discourse/app/services/client-error-handler.js b/app/assets/javascripts/discourse/app/services/client-error-handler.js index b32128e5db4..801a08149d2 100644 --- a/app/assets/javascripts/discourse/app/services/client-error-handler.js +++ b/app/assets/javascripts/discourse/app/services/client-error-handler.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import Service, { service } from "@ember/service"; import $ from "jquery"; import { getAndClearUnhandledThemeErrors } from "discourse/app"; diff --git a/app/assets/javascripts/discourse/app/services/restricted-routing.js b/app/assets/javascripts/discourse/app/services/restricted-routing.js index 525a65be729..b8e1e05c037 100644 --- a/app/assets/javascripts/discourse/app/services/restricted-routing.js +++ b/app/assets/javascripts/discourse/app/services/restricted-routing.js @@ -1,4 +1,4 @@ -import Service, { inject as service } from "@ember/service"; +import Service, { service } from "@ember/service"; export default class RestrictedRouting extends Service { @service currentUser; diff --git a/app/assets/javascripts/discourse/app/widgets/component-connector.js b/app/assets/javascripts/discourse/app/widgets/component-connector.js index 2b2cfde090d..676def89f75 100644 --- a/app/assets/javascripts/discourse/app/widgets/component-connector.js +++ b/app/assets/javascripts/discourse/app/widgets/component-connector.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { scheduleOnce } from "@ember/runloop"; export default class ComponentConnector { diff --git a/app/assets/javascripts/discourse/app/widgets/connector.js b/app/assets/javascripts/discourse/app/widgets/connector.js index 7e08a18e230..715712620c1 100644 --- a/app/assets/javascripts/discourse/app/widgets/connector.js +++ b/app/assets/javascripts/discourse/app/widgets/connector.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { next } from "@ember/runloop"; export default class Connector { diff --git a/app/assets/javascripts/discourse/app/widgets/post.js b/app/assets/javascripts/discourse/app/widgets/post.js index 14ada174f3d..443133b72ee 100644 --- a/app/assets/javascripts/discourse/app/widgets/post.js +++ b/app/assets/javascripts/discourse/app/widgets/post.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { hbs } from "ember-cli-htmlbars"; import { Promise } from "rsvp"; import { h } from "virtual-dom"; diff --git a/app/assets/javascripts/discourse/app/widgets/widget.js b/app/assets/javascripts/discourse/app/widgets/widget.js index ab6bf391dbf..84ae9858a13 100644 --- a/app/assets/javascripts/discourse/app/widgets/widget.js +++ b/app/assets/javascripts/discourse/app/widgets/widget.js @@ -1,5 +1,5 @@ -import { getOwner, setOwner } from "@ember/application"; import { get } from "@ember/object"; +import { getOwner, setOwner } from "@ember/owner"; import { camelize } from "@ember/string"; import { Promise } from "rsvp"; import { h } from "virtual-dom"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/client-error-handler-test.js b/app/assets/javascripts/discourse/tests/acceptance/client-error-handler-test.js index 4e53b4d7a10..256e77bf196 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/client-error-handler-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/client-error-handler-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { visit } from "@ember/test-helpers"; import { test } from "qunit"; import Sinon from "sinon"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js index 6ca1000aa7b..db63ab8c549 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/composer-uploads-uppy-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, fillIn, settled, visit } from "@ember/test-helpers"; import { skip, test } from "qunit"; import { Promise } from "rsvp"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/globals-test.js b/app/assets/javascripts/discourse/tests/acceptance/globals-test.js index 4fbd2d0ee2f..c6449853766 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/globals-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/globals-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { visit } from "@ember/test-helpers"; import { test } from "qunit"; import Site from "discourse/models/site"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/homepage-test.js b/app/assets/javascripts/discourse/tests/acceptance/homepage-test.js index 8c9f5a7ac4e..4e6c4a39565 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/homepage-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/homepage-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, settled, visit } from "@ember/test-helpers"; import { test } from "qunit"; import { setDefaultHomepage } from "discourse/lib/utilities"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/implicit-injections-test.js b/app/assets/javascripts/discourse/tests/acceptance/implicit-injections-test.js index 1c605ca70e8..75ab0f29a05 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/implicit-injections-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/implicit-injections-test.js @@ -1,4 +1,4 @@ -import { getOwner, setOwner } from "@ember/application"; +import { getOwner, setOwner } from "@ember/owner"; import Service, { service } from "@ember/service"; import { test } from "qunit"; import RestModel from "discourse/models/rest"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/loading-indicator-test.js b/app/assets/javascripts/discourse/tests/acceptance/loading-indicator-test.js index 9efa91019a8..45702a857d1 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/loading-indicator-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/loading-indicator-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { currentRouteName, getSettledState, diff --git a/app/assets/javascripts/discourse/tests/acceptance/modal-service-test.gjs b/app/assets/javascripts/discourse/tests/acceptance/modal-service-test.gjs index 4cc38a6401b..aaefd680d35 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/modal-service-test.gjs +++ b/app/assets/javascripts/discourse/tests/acceptance/modal-service-test.gjs @@ -1,8 +1,8 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { click, settled, triggerKeyEvent, visit } from "@ember/test-helpers"; import { test } from "qunit"; import DModal, { diff --git a/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js b/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js index 0961d8bb932..eb9052ef2a6 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/notifications-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, currentURL, visit } from "@ember/test-helpers"; import { test } from "qunit"; import NotificationFixtures from "discourse/tests/fixtures/notification-fixtures"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/page-tracking-test.js b/app/assets/javascripts/discourse/tests/acceptance/page-tracking-test.js index 92f3849d645..322b5e26db4 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/page-tracking-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/page-tracking-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, visit } from "@ember/test-helpers"; import { test } from "qunit"; import { ajax } from "discourse/lib/ajax"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js b/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js index 59ef758ce73..3264778aa50 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/personal-message-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, currentURL, visit } from "@ember/test-helpers"; import { test } from "qunit"; import sinon from "sinon"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/admin-plugin-config-area-test.js b/app/assets/javascripts/discourse/tests/integration/components/admin-plugin-config-area-test.js index a07b4091bc1..c1a0c292828 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/admin-plugin-config-area-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/admin-plugin-config-area-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/admin-plugins-list-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/admin-plugins-list-item-test.js index d075ff1ba3c..1e4619eabb7 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/admin-plugins-list-item-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/admin-plugins-list-item-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/bulk-select-topics-dropdown-test.js b/app/assets/javascripts/discourse/tests/integration/components/bulk-select-topics-dropdown-test.js index 13e2963f8ab..934ebf5e6e7 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/bulk-select-topics-dropdown-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/bulk-select-topics-dropdown-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js index f94fadce570..76a78fa30f1 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, find, diff --git a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-toast-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-toast-test.gjs index 0614d67e811..ea03a60c185 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-toast-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-toast-test.gjs @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { render, triggerEvent } from "@ember/test-helpers"; import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/form-kit/layout/submit-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/form-kit/layout/submit-test.gjs index 6c8c2b312aa..e1b8e38dc00 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/form-kit/layout/submit-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/components/form-kit/layout/submit-test.gjs @@ -2,7 +2,7 @@ import { click, render } from "@ember/test-helpers"; import { module, test } from "qunit"; import Form from "discourse/components/form"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; module("Integration | Component | FormKit | Layout | Submit", function (hooks) { setupRenderingTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs index e32b875d9e2..95145378e09 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { module, test } from "qunit"; import HomeLogo from "discourse/components/header/home-logo"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js b/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js index 7fee9799ffc..989427ed082 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/invite-panel-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/light-dark-img-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/light-dark-img-test.gjs index f56b014ffd8..da52597c2ee 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/light-dark-img-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/components/light-dark-img-test.gjs @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { module, test } from "qunit"; import LigthDarkImg from "discourse/components/light-dark-img"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js b/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js index 2d695375405..9631e70ba4b 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/pending-post-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/reorder-categories-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/reorder-categories-test.gjs index a1dd706c795..b5435e8cb7c 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/reorder-categories-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/components/reorder-categories-test.gjs @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, fillIn, render } from "@ember/test-helpers"; import { module, test } from "qunit"; import ReorderCategories from "discourse/components/modal/reorder-categories"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/request-group-membership-form-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/request-group-membership-form-test.gjs index 7daf806202c..ee9d3388071 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/request-group-membership-form-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/components/request-group-membership-form-test.gjs @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, fillIn, render } from "@ember/test-helpers"; import { module, test } from "qunit"; import RequestGroupMembershipForm from "discourse/components/modal/request-group-membership-form"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js index 6ddab2dfcc5..2127e356d82 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/category-chooser-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js index e2e97bdec04..ee131f8367f 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/pinned-options-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js index d6a7e8e0fd1..b52739bcb2b 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-button-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js index d85f6da6397..dd24f162b8a 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/select-kit/topic-notifications-options-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.js b/app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.js index eebb600b307..3b1527229fa 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/topic-list-test.js b/app/assets/javascripts/discourse/tests/integration/components/topic-list-test.js index e2d089a3e9b..ef60c841945 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/topic-list-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/topic-list-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.gjs index 7be02975ef6..93fdf82617d 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.gjs @@ -1,5 +1,5 @@ // deprecated in favor of discourse/tests/integration/components/home-logo-test.gjs -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { module, test } from "qunit"; import MountWidget from "discourse/components/mount-widget"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js index ad133ba5f80..765a15d238b 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-stream-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js index 6a5897022aa..de62c1b11df 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/post-test.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import EmberObject from "@ember/object"; +import { getOwner } from "@ember/owner"; import { click, render, triggerEvent } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js index 5ba44c6e7a8..c5a6422a69d 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/topic-status-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/integration/helpers/raw-test.gjs b/app/assets/javascripts/discourse/tests/integration/helpers/raw-test.gjs index d0642bcd739..f119d9de3b4 100644 --- a/app/assets/javascripts/discourse/tests/integration/helpers/raw-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/helpers/raw-test.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render, settled } from "@ember/test-helpers"; import { module, test } from "qunit"; import RenderGlimmerContainer from "discourse/components/render-glimmer-container"; diff --git a/app/assets/javascripts/discourse/tests/setup-tests.js b/app/assets/javascripts/discourse/tests/setup-tests.js index c0c7c389117..61395152a5c 100644 --- a/app/assets/javascripts/discourse/tests/setup-tests.js +++ b/app/assets/javascripts/discourse/tests/setup-tests.js @@ -3,7 +3,7 @@ import Application from "../app"; import "./loader-shims"; /* eslint-enable simple-import-sort/imports */ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { getSettledState, isSettled, diff --git a/app/assets/javascripts/discourse/tests/unit/components/create-account-test.js b/app/assets/javascripts/discourse/tests/unit/components/create-account-test.js index 00e7dd45d53..dd355e4f575 100644 --- a/app/assets/javascripts/discourse/tests/unit/components/create-account-test.js +++ b/app/assets/javascripts/discourse/tests/unit/components/create-account-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { settled } from "@ember/test-helpers"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js b/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js index 7f609aedf45..8856530a0fa 100644 --- a/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js +++ b/app/assets/javascripts/discourse/tests/unit/controllers/topic-test.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import EmberObject from "@ember/object"; +import { getOwner } from "@ember/owner"; import { next } from "@ember/runloop"; import { settled } from "@ember/test-helpers"; import { setupTest } from "ember-qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/lib/build-quote-test.js b/app/assets/javascripts/discourse/tests/unit/lib/build-quote-test.js index c1bc263d606..562daac9d4f 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/build-quote-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/build-quote-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import { buildQuote } from "discourse/lib/quote"; diff --git a/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js b/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js index d41494f7dfd..53b5e7225f6 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/category-badge-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import $ from "jquery"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js b/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js index 0a1e5da2152..bf98055b8fa 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/computed-test.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import EmberObject from "@ember/object"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import sinon from "sinon"; diff --git a/app/assets/javascripts/discourse/tests/unit/lib/emoji-test.js b/app/assets/javascripts/discourse/tests/unit/lib/emoji-test.js index 3230bc69cf4..43296396de4 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/emoji-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/emoji-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { emojiSearch } from "pretty-text/emoji"; import { IMAGE_VERSION as v } from "pretty-text/emoji/version"; diff --git a/app/assets/javascripts/discourse/tests/unit/lib/form-kit/validator-test.js b/app/assets/javascripts/discourse/tests/unit/lib/form-kit/validator-test.js index 052a63db5bd..2f99ae79c27 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/form-kit/validator-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/form-kit/validator-test.js @@ -1,7 +1,7 @@ import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import Validator from "discourse/form-kit/lib/validator"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; module("Unit | Lib | FormKit | Validator", function (hooks) { setupTest(hooks); diff --git a/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js b/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js index dd1f4ac5409..9751d9d9b58 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/formatter-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import { diff --git a/app/assets/javascripts/discourse/tests/unit/lib/grant-badge-utils-test.js b/app/assets/javascripts/discourse/tests/unit/lib/grant-badge-utils-test.js index 0b6202b2a72..9124a8a7550 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/grant-badge-utils-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/grant-badge-utils-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import { diff --git a/app/assets/javascripts/discourse/tests/unit/lib/link-lookup-test.js b/app/assets/javascripts/discourse/tests/unit/lib/link-lookup-test.js index e117ba6c334..b5491226a7b 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/link-lookup-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/link-lookup-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import LinkLookup from "discourse/lib/link-lookup"; diff --git a/app/assets/javascripts/discourse/tests/unit/lib/plugin-api-test.js b/app/assets/javascripts/discourse/tests/unit/lib/plugin-api-test.js index 97b700f449f..cf88d1ed45c 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/plugin-api-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/plugin-api-test.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import EmberObject from "@ember/object"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import { withPluginApi } from "discourse/lib/plugin-api"; diff --git a/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js b/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js index 6134f342a83..9ebaf4d51d4 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/uploads-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import sinon from "sinon"; diff --git a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js index e44978973b0..089c9e35f06 100644 --- a/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js +++ b/app/assets/javascripts/discourse/tests/unit/lib/utilities-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import Handlebars from "handlebars"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/badge-test.js b/app/assets/javascripts/discourse/tests/unit/models/badge-test.js index 2a8550c718c..b264c0144b1 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/badge-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/badge-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import Badge from "discourse/models/badge"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/bookmark-test.js b/app/assets/javascripts/discourse/tests/unit/models/bookmark-test.js index 700e9033b02..ebdd64ee403 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/bookmark-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/bookmark-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/category-test.js b/app/assets/javascripts/discourse/tests/unit/models/category-test.js index f41b0dc912e..55527398239 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/category-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/category-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import sinon from "sinon"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/composer-test.js b/app/assets/javascripts/discourse/tests/unit/models/composer-test.js index 3f1851af6d8..603d6d0c2a6 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/composer-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/composer-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import { diff --git a/app/assets/javascripts/discourse/tests/unit/models/email-log-test.js b/app/assets/javascripts/discourse/tests/unit/models/email-log-test.js index 5319c622a41..d34347a3a3a 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/email-log-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/email-log-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import { setPrefix } from "discourse-common/lib/get-url"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/group-test.js b/app/assets/javascripts/discourse/tests/unit/models/group-test.js index b2830d9d88f..fa25e016107 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/group-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/group-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/invite-test.js b/app/assets/javascripts/discourse/tests/unit/models/invite-test.js index 6bcce8525fb..d22b00888a7 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/invite-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/invite-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/nav-item-test.js b/app/assets/javascripts/discourse/tests/unit/models/nav-item-test.js index da06b049ae4..c00eb588d85 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/nav-item-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/nav-item-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import Category from "discourse/models/category"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js b/app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js index 15d51dffee4..5545c469e73 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/pending-post-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { settled } from "@ember/test-helpers"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js b/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js index fad901fad09..3d8905952e2 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/post-stream-test.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import ArrayProxy from "@ember/array/proxy"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import sinon from "sinon"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/post-test.js b/app/assets/javascripts/discourse/tests/unit/models/post-test.js index 05986122996..3116bf5d9fc 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/post-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/post-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/private-message-topic-tracking-state-test.js b/app/assets/javascripts/discourse/tests/unit/models/private-message-topic-tracking-state-test.js index 09165cee978..0d68d76ac77 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/private-message-topic-tracking-state-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/private-message-topic-tracking-state-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import MessageBus from "message-bus-client"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/report-test.js b/app/assets/javascripts/discourse/tests/unit/models/report-test.js index a820275ea4b..6955a6f1812 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/report-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/report-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import { setPrefix } from "discourse-common/lib/get-url"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js b/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js index 925f53c3943..8772ecbe840 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/rest-model-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import sinon from "sinon"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/result-set-test.js b/app/assets/javascripts/discourse/tests/unit/models/result-set-test.js index b4487fcf29d..6e77708f870 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/result-set-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/result-set-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/site-test.js b/app/assets/javascripts/discourse/tests/unit/models/site-test.js index 156f7655430..dd8b5670576 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/site-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/site-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import Site from "discourse/models/site"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/staff-action-log-test.js b/app/assets/javascripts/discourse/tests/unit/models/staff-action-log-test.js index 5e9c26e9002..0bae105a513 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/staff-action-log-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/staff-action-log-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/tag-test.js b/app/assets/javascripts/discourse/tests/unit/models/tag-test.js index c7d954ba80a..278ad569dcb 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/tag-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/tag-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/theme-test.js b/app/assets/javascripts/discourse/tests/unit/models/theme-test.js index 2f1c831e755..264f1bfc162 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/theme-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/theme-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import ThemeSettings from "admin/models/theme-settings"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js b/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js index 695919afdd2..36206efae55 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/topic-details-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import User from "discourse/models/user"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/topic-test.js b/app/assets/javascripts/discourse/tests/unit/models/topic-test.js index 008a78de69a..b27ae1e08f8 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/topic-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/topic-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { IMAGE_VERSION as v } from "pretty-text/emoji/version"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js index 3d6e37c8775..bb831536166 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/user-action-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import UserAction from "discourse/models/user-action"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js index 5e07ec7604e..686dbec87ed 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/user-badge-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import UserBadge from "discourse/models/user-badge"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-drafts-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-drafts-test.js index 7c3465b5cb9..8cdf553d940 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/user-drafts-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/user-drafts-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import { NEW_TOPIC_KEY } from "discourse/models/composer"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js index f7d92e41ecf..7f13a6da8c9 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/user-stream-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import UserAction from "discourse/models/user-action"; diff --git a/app/assets/javascripts/discourse/tests/unit/models/user-test.js b/app/assets/javascripts/discourse/tests/unit/models/user-test.js index 4bfd0f88810..b97c8ae58cf 100644 --- a/app/assets/javascripts/discourse/tests/unit/models/user-test.js +++ b/app/assets/javascripts/discourse/tests/unit/models/user-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { settled } from "@ember/test-helpers"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/services/document-title-test.js b/app/assets/javascripts/discourse/tests/unit/services/document-title-test.js index 31ddfd6f324..6aba2d1e4cc 100644 --- a/app/assets/javascripts/discourse/tests/unit/services/document-title-test.js +++ b/app/assets/javascripts/discourse/tests/unit/services/document-title-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import { logIn } from "discourse/tests/helpers/qunit-helpers"; diff --git a/app/assets/javascripts/discourse/tests/unit/services/emoji-store-test.js b/app/assets/javascripts/discourse/tests/unit/services/emoji-store-test.js index a04f683c9fa..bfd5a5199a8 100644 --- a/app/assets/javascripts/discourse/tests/unit/services/emoji-store-test.js +++ b/app/assets/javascripts/discourse/tests/unit/services/emoji-store-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/services/header-test.js b/app/assets/javascripts/discourse/tests/unit/services/header-test.js index 30ea6cceed1..6de6da6bbcd 100644 --- a/app/assets/javascripts/discourse/tests/unit/services/header-test.js +++ b/app/assets/javascripts/discourse/tests/unit/services/header-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/services/lightbox-test.js b/app/assets/javascripts/discourse/tests/unit/services/lightbox-test.js index c705501ac9d..23fa113138e 100644 --- a/app/assets/javascripts/discourse/tests/unit/services/lightbox-test.js +++ b/app/assets/javascripts/discourse/tests/unit/services/lightbox-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click } from "@ember/test-helpers"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/services/presence-test.js b/app/assets/javascripts/discourse/tests/unit/services/presence-test.js index dc4ee026a7f..05ebb37e5ee 100644 --- a/app/assets/javascripts/discourse/tests/unit/services/presence-test.js +++ b/app/assets/javascripts/discourse/tests/unit/services/presence-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import sinon from "sinon"; diff --git a/app/assets/javascripts/discourse/tests/unit/services/site-settings-test.js b/app/assets/javascripts/discourse/tests/unit/services/site-settings-test.js index 6c4ae5e9189..f70090b12aa 100644 --- a/app/assets/javascripts/discourse/tests/unit/services/site-settings-test.js +++ b/app/assets/javascripts/discourse/tests/unit/services/site-settings-test.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import EmberObject, { computed } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/services/store-test.js b/app/assets/javascripts/discourse/tests/unit/services/store-test.js index 8d62fe3cfba..9755620d087 100644 --- a/app/assets/javascripts/discourse/tests/unit/services/store-test.js +++ b/app/assets/javascripts/discourse/tests/unit/services/store-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import pretender, { diff --git a/app/assets/javascripts/discourse/tests/unit/services/toasts-test.js b/app/assets/javascripts/discourse/tests/unit/services/toasts-test.js index 9a137c1bf81..3f93b5f788d 100644 --- a/app/assets/javascripts/discourse/tests/unit/services/toasts-test.js +++ b/app/assets/javascripts/discourse/tests/unit/services/toasts-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/app/assets/javascripts/discourse/tests/unit/services/user-tips-test.js b/app/assets/javascripts/discourse/tests/unit/services/user-tips-test.js index 13a192ce437..f21f211f3c4 100644 --- a/app/assets/javascripts/discourse/tests/unit/services/user-tips-test.js +++ b/app/assets/javascripts/discourse/tests/unit/services/user-tips-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import pretender, { response } from "discourse/tests/helpers/create-pretender"; diff --git a/app/assets/javascripts/float-kit/addon/components/d-inline-float.gjs b/app/assets/javascripts/float-kit/addon/components/d-inline-float.gjs index d56fbbf7287..4eb1db94679 100644 --- a/app/assets/javascripts/float-kit/addon/components/d-inline-float.gjs +++ b/app/assets/javascripts/float-kit/addon/components/d-inline-float.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { concat } from "@ember/helper"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { and } from "truth-helpers"; import DModal from "discourse/components/d-modal"; import concatClass from "discourse/helpers/concat-class"; diff --git a/app/assets/javascripts/float-kit/addon/components/d-menu.gjs b/app/assets/javascripts/float-kit/addon/components/d-menu.gjs index a2fecd1dc5f..ffedaf9426f 100644 --- a/app/assets/javascripts/float-kit/addon/components/d-menu.gjs +++ b/app/assets/javascripts/float-kit/addon/components/d-menu.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { concat } from "@ember/helper"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import { modifier } from "ember-modifier"; import { and } from "truth-helpers"; diff --git a/app/assets/javascripts/float-kit/addon/components/d-menus.gjs b/app/assets/javascripts/float-kit/addon/components/d-menus.gjs index ddc730277c8..6cd4a700974 100644 --- a/app/assets/javascripts/float-kit/addon/components/d-menus.gjs +++ b/app/assets/javascripts/float-kit/addon/components/d-menus.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import DHeadlessMenu from "float-kit/components/d-headless-menu"; export default class DMenus extends Component { diff --git a/app/assets/javascripts/float-kit/addon/components/d-tooltip.gjs b/app/assets/javascripts/float-kit/addon/components/d-tooltip.gjs index abfc6c75216..134590a52ee 100644 --- a/app/assets/javascripts/float-kit/addon/components/d-tooltip.gjs +++ b/app/assets/javascripts/float-kit/addon/components/d-tooltip.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { concat } from "@ember/helper"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import { modifier } from "ember-modifier"; import { and } from "truth-helpers"; diff --git a/app/assets/javascripts/float-kit/addon/components/d-tooltips.gjs b/app/assets/javascripts/float-kit/addon/components/d-tooltips.gjs index 8a199b87f16..444982d2d21 100644 --- a/app/assets/javascripts/float-kit/addon/components/d-tooltips.gjs +++ b/app/assets/javascripts/float-kit/addon/components/d-tooltips.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import DHeadlessTooltip from "float-kit/components/d-headless-tooltip"; export default class DTooltips extends Component { diff --git a/app/assets/javascripts/float-kit/addon/lib/d-menu-instance.js b/app/assets/javascripts/float-kit/addon/lib/d-menu-instance.js index 89261465fe7..c3fc9b65067 100644 --- a/app/assets/javascripts/float-kit/addon/lib/d-menu-instance.js +++ b/app/assets/javascripts/float-kit/addon/lib/d-menu-instance.js @@ -1,7 +1,7 @@ import { tracked } from "@glimmer/tracking"; -import { getOwner, setOwner } from "@ember/application"; import { action } from "@ember/object"; import { guidFor } from "@ember/object/internals"; +import { getOwner, setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { MENU } from "float-kit/lib/constants"; import FloatKitInstance from "float-kit/lib/float-kit-instance"; diff --git a/app/assets/javascripts/float-kit/addon/lib/d-toast-instance.js b/app/assets/javascripts/float-kit/addon/lib/d-toast-instance.js index 79cfde27f25..3a39fdd687f 100644 --- a/app/assets/javascripts/float-kit/addon/lib/d-toast-instance.js +++ b/app/assets/javascripts/float-kit/addon/lib/d-toast-instance.js @@ -1,5 +1,5 @@ -import { setOwner } from "@ember/application"; import { action } from "@ember/object"; +import { setOwner } from "@ember/owner"; import { service } from "@ember/service"; import uniqueId from "discourse/helpers/unique-id"; import { TOAST } from "float-kit/lib/constants"; diff --git a/app/assets/javascripts/float-kit/addon/lib/d-tooltip-instance.js b/app/assets/javascripts/float-kit/addon/lib/d-tooltip-instance.js index a1dd9836201..2b4d3873e0c 100644 --- a/app/assets/javascripts/float-kit/addon/lib/d-tooltip-instance.js +++ b/app/assets/javascripts/float-kit/addon/lib/d-tooltip-instance.js @@ -1,7 +1,7 @@ import { tracked } from "@glimmer/tracking"; -import { setOwner } from "@ember/application"; import { action } from "@ember/object"; import { guidFor } from "@ember/object/internals"; +import { setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { TOOLTIP } from "float-kit/lib/constants"; import FloatKitInstance from "float-kit/lib/float-kit-instance"; diff --git a/app/assets/javascripts/float-kit/addon/services/menu.js b/app/assets/javascripts/float-kit/addon/services/menu.js index 2a24f8b3c8b..ae90f7eee24 100644 --- a/app/assets/javascripts/float-kit/addon/services/menu.js +++ b/app/assets/javascripts/float-kit/addon/services/menu.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { schedule } from "@ember/runloop"; import Service from "@ember/service"; import { TrackedSet } from "@ember-compat/tracked-built-ins"; diff --git a/app/assets/javascripts/float-kit/addon/services/toasts.js b/app/assets/javascripts/float-kit/addon/services/toasts.js index 6121bb95300..102f5ffa5da 100644 --- a/app/assets/javascripts/float-kit/addon/services/toasts.js +++ b/app/assets/javascripts/float-kit/addon/services/toasts.js @@ -1,6 +1,6 @@ import { tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import Service from "@ember/service"; import { TrackedArray } from "@ember-compat/tracked-built-ins"; import DDefaultToast from "float-kit/components/d-default-toast"; diff --git a/app/assets/javascripts/float-kit/addon/services/tooltip.js b/app/assets/javascripts/float-kit/addon/services/tooltip.js index 90eb999737d..6bb9cf998d2 100644 --- a/app/assets/javascripts/float-kit/addon/services/tooltip.js +++ b/app/assets/javascripts/float-kit/addon/services/tooltip.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { schedule } from "@ember/runloop"; import Service from "@ember/service"; import { TrackedSet } from "@ember-compat/tracked-built-ins"; diff --git a/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs b/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs index 42b6e4bb316..41fbbfd807a 100644 --- a/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs +++ b/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { hash } from "@ember/helper"; import { LinkTo } from "@ember/routing"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import icon from "discourse-common/helpers/d-icon"; import i18n from "discourse-common/helpers/i18n"; import { diff --git a/plugins/automation/admin/assets/javascripts/admin/components/automation-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/automation-field.gjs index eaf2e8bbe05..56e8576ec5c 100644 --- a/plugins/automation/admin/assets/javascripts/admin/components/automation-field.gjs +++ b/plugins/automation/admin/assets/javascripts/admin/components/automation-field.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import DaBooleanField from "./fields/da-boolean-field"; import DaCategoriesField from "./fields/da-categories-field"; import DaCategoryField from "./fields/da-category-field"; diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-choices-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-choices-field.gjs index 78082136acc..e3e8130df2f 100644 --- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-choices-field.gjs +++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-choices-field.gjs @@ -1,5 +1,5 @@ import { hash } from "@ember/helper"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import ComboBox from "select-kit/components/combo-box"; import BaseField from "./da-base-field"; import DAFieldDescription from "./da-field-description"; diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-custom-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-custom-field.gjs index 9f5f223e697..139b2e0f9e4 100644 --- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-custom-field.gjs +++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-custom-field.gjs @@ -1,6 +1,6 @@ import { tracked } from "@glimmer/tracking"; import didInsert from "@ember/render-modifiers/modifiers/did-insert"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { bind } from "discourse-common/utils/decorators"; import ComboBox from "select-kit/components/combo-box"; import BaseField from "./da-base-field"; diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-custom-fields.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-custom-fields.gjs index 6f2866679a1..bab8509724c 100644 --- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-custom-fields.gjs +++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-custom-fields.gjs @@ -1,7 +1,7 @@ import { tracked } from "@glimmer/tracking"; import { hash } from "@ember/helper"; import didInsert from "@ember/render-modifiers/modifiers/did-insert"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { bind } from "discourse-common/utils/decorators"; import MultiSelect from "select-kit/components/multi-select"; import BaseField from "./da-base-field"; diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjs index 669b6887df9..bad63e4cceb 100644 --- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjs +++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjs @@ -3,7 +3,7 @@ import { hash } from "@ember/helper"; import { action } from "@ember/object"; import DButton from "discourse/components/d-button"; import ModalJsonSchemaEditor from "discourse/components/modal/json-schema-editor"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import BaseField from "./da-base-field"; import DAFieldDescription from "./da-field-description"; import DAFieldLabel from "./da-field-label"; diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-period-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-period-field.gjs index 73cb37e7bbb..9a0c7d259b5 100644 --- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-period-field.gjs +++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-period-field.gjs @@ -5,7 +5,7 @@ import { on } from "@ember/modifier"; import { action } from "@ember/object"; import { next } from "@ember/runloop"; import { TrackedObject } from "@ember-compat/tracked-built-ins"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import ComboBox from "select-kit/components/combo-box"; import BaseField from "./da-base-field"; import DAFieldDescription from "./da-field-description"; diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs index 2ad0b1e53c7..8aafd1ebe1b 100644 --- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs +++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs @@ -3,11 +3,11 @@ import { concat, fn } from "@ember/helper"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; import { next } from "@ember/runloop"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { TrackedArray, TrackedObject } from "@ember-compat/tracked-built-ins"; import DButton from "discourse/components/d-button"; import DEditor from "discourse/components/d-editor"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import PlaceholdersList from "../placeholders-list"; import BaseField from "./da-base-field"; import DAFieldLabel from "./da-field-label"; diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-trust-levels-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-trust-levels-field.gjs index a4a232664b7..a096ad96654 100644 --- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-trust-levels-field.gjs +++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-trust-levels-field.gjs @@ -1,4 +1,4 @@ -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import MultiSelect from "select-kit/components/multi-select"; import BaseField from "./da-base-field"; import DAFieldDescription from "./da-field-description"; diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-user-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-user-field.gjs index 6ede6d3939c..f02b802092d 100644 --- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-user-field.gjs +++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-user-field.gjs @@ -1,6 +1,6 @@ import { fn, hash } from "@ember/helper"; import { action } from "@ember/object"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import UserChooser from "select-kit/components/user-chooser"; import BaseField from "./da-base-field"; import DAFieldDescription from "./da-field-description"; diff --git a/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-edit.js b/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-edit.js index e3a53619c9f..5c1ecb503fb 100644 --- a/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-edit.js +++ b/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-edit.js @@ -2,10 +2,10 @@ import Controller from "@ember/controller"; import { action, computed, set } from "@ember/object"; import { filterBy, reads } from "@ember/object/computed"; import { schedule } from "@ember/runloop"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { extractError } from "discourse/lib/ajax-error"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; export default class AutomationEdit extends Controller { @service dialog; diff --git a/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-index.js b/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-index.js index 37ed88519ca..3671a9fd9a2 100644 --- a/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-index.js +++ b/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-index.js @@ -1,9 +1,9 @@ import Controller from "@ember/controller"; import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; import escape from "discourse-common/lib/escape"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; export default class AutomationIndex extends Controller { @service dialog; diff --git a/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-new.js b/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-new.js index f5a3d52022b..298007c854b 100644 --- a/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-new.js +++ b/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation-new.js @@ -1,6 +1,6 @@ import Controller from "@ember/controller"; import EmberObject, { action } from "@ember/object"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { extractError } from "discourse/lib/ajax-error"; export default class AutomationNew extends Controller { diff --git a/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation.js b/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation.js index 59a5d7c482b..c9526ef4ca6 100644 --- a/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation.js +++ b/plugins/automation/admin/assets/javascripts/admin/controllers/admin-plugins-discourse-automation.js @@ -1,6 +1,6 @@ import Controller from "@ember/controller"; import { action, computed } from "@ember/object"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; export default class Automation extends Controller { @service router; diff --git a/plugins/automation/admin/assets/javascripts/admin/lib/fabricators.js b/plugins/automation/admin/assets/javascripts/admin/lib/fabricators.js index 9a2392ed5dc..44cdc339e3e 100644 --- a/plugins/automation/admin/assets/javascripts/admin/lib/fabricators.js +++ b/plugins/automation/admin/assets/javascripts/admin/lib/fabricators.js @@ -5,8 +5,8 @@ styleguide to use them, and eventually to generate dummy data in a placeholder component. It should not be used for any other case. */ -import { setOwner } from "@ember/application"; import ApplicationInstance from "@ember/application/instance"; +import { setOwner } from "@ember/owner"; import { incrementSequence } from "discourse/lib/fabricators"; import Automation from "../models/discourse-automation-automation"; import Field from "../models/discourse-automation-field"; diff --git a/plugins/automation/test/javascripts/integration/components/da-boolean-field-test.js b/plugins/automation/test/javascripts/integration/components/da-boolean-field-test.js index 558c94b0541..67479378c2f 100644 --- a/plugins/automation/test/javascripts/integration/components/da-boolean-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-boolean-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-categories-field-test.js b/plugins/automation/test/javascripts/integration/components/da-categories-field-test.js index 23c47d7b032..521010b4553 100644 --- a/plugins/automation/test/javascripts/integration/components/da-categories-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-categories-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-category-field-test.js b/plugins/automation/test/javascripts/integration/components/da-category-field-test.js index 4de32b682e5..d0ce9bee65d 100644 --- a/plugins/automation/test/javascripts/integration/components/da-category-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-category-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-category-notification-level-field-test.js b/plugins/automation/test/javascripts/integration/components/da-category-notification-level-field-test.js index 61bff2b83e9..d1092e15880 100644 --- a/plugins/automation/test/javascripts/integration/components/da-category-notification-level-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-category-notification-level-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-choices-field-test.js b/plugins/automation/test/javascripts/integration/components/da-choices-field-test.js index b2561c56665..3062136d6ab 100644 --- a/plugins/automation/test/javascripts/integration/components/da-choices-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-choices-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-custom-field-test.js b/plugins/automation/test/javascripts/integration/components/da-custom-field-test.js index 3cd64487b1a..6a9a8eeee0c 100644 --- a/plugins/automation/test/javascripts/integration/components/da-custom-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-custom-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-date-time-field-test.js b/plugins/automation/test/javascripts/integration/components/da-date-time-field-test.js index 047233e4004..baf2c9696af 100644 --- a/plugins/automation/test/javascripts/integration/components/da-date-time-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-date-time-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { fillIn, render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-group-field-test.js b/plugins/automation/test/javascripts/integration/components/da-group-field-test.js index 8002dc09318..6d301503126 100644 --- a/plugins/automation/test/javascripts/integration/components/da-group-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-group-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-message-field-test.js b/plugins/automation/test/javascripts/integration/components/da-message-field-test.js index ab953eaef38..260b5266286 100644 --- a/plugins/automation/test/javascripts/integration/components/da-message-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-message-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { fillIn, render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-pms-field-test.js b/plugins/automation/test/javascripts/integration/components/da-pms-field-test.js index 75df028186d..7c3c997862b 100644 --- a/plugins/automation/test/javascripts/integration/components/da-pms-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-pms-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, fillIn, render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-post-field-test.js b/plugins/automation/test/javascripts/integration/components/da-post-field-test.js index 51de3bff6a5..07921da0515 100644 --- a/plugins/automation/test/javascripts/integration/components/da-post-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-post-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { fillIn, render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-tags-field-test.js b/plugins/automation/test/javascripts/integration/components/da-tags-field-test.js index bd8eced4c4c..630d587d348 100644 --- a/plugins/automation/test/javascripts/integration/components/da-tags-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-tags-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-text-field-test.js b/plugins/automation/test/javascripts/integration/components/da-text-field-test.js index 42261f2e08a..32c7998daf7 100644 --- a/plugins/automation/test/javascripts/integration/components/da-text-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-text-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { fillIn, render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-text-list-field-test.js b/plugins/automation/test/javascripts/integration/components/da-text-list-field-test.js index e8d1819fa8e..4ee50f5aa28 100644 --- a/plugins/automation/test/javascripts/integration/components/da-text-list-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-text-list-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-trust-levels-field-test.js b/plugins/automation/test/javascripts/integration/components/da-trust-levels-field-test.js index 401dbe94d02..a8c18e72e51 100644 --- a/plugins/automation/test/javascripts/integration/components/da-trust-levels-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-trust-levels-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-user-field-test.js b/plugins/automation/test/javascripts/integration/components/da-user-field-test.js index 1d57e24398e..26a347aa9d9 100644 --- a/plugins/automation/test/javascripts/integration/components/da-user-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-user-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/automation/test/javascripts/integration/components/da-users-field-test.js b/plugins/automation/test/javascripts/integration/components/da-users-field-test.js index 2cd8bedab0a..e4e379340c1 100644 --- a/plugins/automation/test/javascripts/integration/components/da-users-field-test.js +++ b/plugins/automation/test/javascripts/integration/components/da-users-field-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.gjs index 37d2347301b..b2ce7799d42 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-metadata.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import ChatChannelUnreadIndicator from "./chat-channel-unread-indicator"; export default class ChatChannelMetadata extends Component { diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs index 77399df0ce4..6b4e0f7b66c 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { cached, tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import didInsert from "@ember/render-modifiers/modifiers/did-insert"; import didUpdate from "@ember/render-modifiers/modifiers/did-update"; import willDestroy from "@ember/render-modifiers/modifiers/will-destroy"; @@ -18,7 +18,7 @@ import { import i18n from "discourse-common/helpers/i18n"; import discourseDebounce from "discourse-common/lib/debounce"; import { bind } from "discourse-common/utils/decorators"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import ChatChannelStatus from "discourse/plugins/chat/discourse/components/chat-channel-status"; import firstVisibleMessageId from "discourse/plugins/chat/discourse/helpers/first-visible-message-id"; import ChatChannelSubscriptionManager from "discourse/plugins/chat/discourse/lib/chat-channel-subscription-manager"; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer.js b/plugins/chat/assets/javascripts/discourse/components/chat-composer.js index 85083251d15..ec4ec7ee884 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-composer.js +++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer.js @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { cancel, next } from "@ember/runloop"; import { service } from "@ember/service"; import { isPresent } from "@ember/utils"; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs index 329a75e1a9a..29eb4b64b1b 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs @@ -1,9 +1,9 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { concat, hash } from "@ember/helper"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import didInsert from "@ember/render-modifiers/modifiers/did-insert"; import didUpdate from "@ember/render-modifiers/modifiers/did-update"; import willDestroy from "@ember/render-modifiers/modifiers/will-destroy"; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.gjs index c47461471c7..4b37aa8b26b 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.gjs @@ -1,9 +1,9 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { fn } from "@ember/helper"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import didInsert from "@ember/render-modifiers/modifiers/did-insert"; import { service } from "@ember/service"; import { and, or } from "truth-helpers"; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.gjs index 04e4aa78b69..b4c0a7f16a0 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.gjs @@ -5,7 +5,7 @@ import { action } from "@ember/object"; import { modifier } from "ember-modifier"; import concatClass from "discourse/helpers/concat-class"; import i18n from "discourse-common/helpers/i18n"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; const IS_PINNED_CLASS = "is-pinned"; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs index 03d1f04a600..0e25431bf2f 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs @@ -1,10 +1,10 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { Input } from "@ember/component"; import { fn } from "@ember/helper"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import didInsert from "@ember/render-modifiers/modifiers/did-insert"; import didUpdate from "@ember/render-modifiers/modifiers/did-update"; import willDestroy from "@ember/render-modifiers/modifiers/will-destroy"; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread-title-prompt.js b/plugins/chat/assets/javascripts/discourse/components/chat-thread-title-prompt.js index fcfae6d8b2a..d756dea8563 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-thread-title-prompt.js +++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread-title-prompt.js @@ -2,7 +2,7 @@ import Component from "@glimmer/component"; import { action } from "@ember/object"; import { next } from "@ember/runloop"; import { service } from "@ember/service"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import ThreadSettingsModal from "discourse/plugins/chat/discourse/components/chat/modal/thread-settings"; import { THREAD_TITLE_PROMPT_THRESHOLD } from "discourse/plugins/chat/discourse/lib/chat-constants"; import UserChatThreadMembership from "discourse/plugins/chat/discourse/models/user-chat-thread-membership"; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs index ebfd382dee7..203d43c47a5 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { cached, tracked } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import didInsert from "@ember/render-modifiers/modifiers/did-insert"; import willDestroy from "@ember/render-modifiers/modifiers/will-destroy"; import { cancel, next } from "@ember/runloop"; @@ -11,7 +11,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error"; import { NotificationLevels } from "discourse/lib/notification-levels"; import discourseDebounce from "discourse-common/lib/debounce"; import { bind } from "discourse-common/utils/decorators"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import ChatThreadTitlePrompt from "discourse/plugins/chat/discourse/components/chat-thread-title-prompt"; import firstVisibleMessageId from "discourse/plugins/chat/discourse/helpers/first-visible-message-id"; import ChatChannelThreadSubscriptionManager from "discourse/plugins/chat/discourse/lib/chat-channel-thread-subscription-manager"; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/lib/chatables-loader.js b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/lib/chatables-loader.js index fd3b556a800..03be57b98f4 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/lib/chatables-loader.js +++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/lib/chatables-loader.js @@ -1,4 +1,4 @@ -import { getOwner, setOwner } from "@ember/application"; +import { getOwner, setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjs index 92c7d256dfc..e454c588dff 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjs @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { LinkTo } from "@ember/routing"; import icon from "discourse-common/helpers/d-icon"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; export default class ChatNavbarBackButton extends Component { get icon() { diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs index cbb2f5e3269..d2f4022dc57 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs @@ -2,7 +2,7 @@ import Component from "@glimmer/component"; import { LinkTo } from "@ember/routing"; import { service } from "@ember/service"; import icon from "discourse-common/helpers/d-icon"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; export default class ChatNavbarBrowseChannelsButton extends Component { @service router; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs index d1137b7e9a5..1ed05792fc5 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs @@ -2,7 +2,7 @@ import Component from "@glimmer/component"; import { LinkTo } from "@ember/routing"; import { service } from "@ember/service"; import icon from "discourse-common/helpers/d-icon"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; export default class ChatNavbarCloseThreadsButton extends Component { @service site; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-direct-message-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-direct-message-button.gjs index 39d9714e77d..e12338689fa 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-direct-message-button.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-direct-message-button.gjs @@ -2,7 +2,7 @@ import Component from "@glimmer/component"; import { action } from "@ember/object"; import { service } from "@ember/service"; import DButton from "discourse/components/d-button"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message"; export default class ChatNavbarNewDirectMessageButton extends Component { diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjs index fe6c5ac3652..6b47f84c1fa 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjs @@ -3,7 +3,7 @@ import { LinkTo } from "@ember/routing"; import { service } from "@ember/service"; import concatClass from "discourse/helpers/concat-class"; import icon from "discourse-common/helpers/d-icon"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; import ThreadHeaderUnreadIndicator from "discourse/plugins/chat/discourse/components/chat/thread/header-unread-indicator"; export default class ChatNavbarThreadsListButton extends Component { diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjs index ca3b24f6ea6..fbe34c581a8 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import { not, or } from "truth-helpers"; import DButton from "discourse/components/d-button"; diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header-unread-indicator.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header-unread-indicator.gjs index ae4c3010055..884b5516ccd 100644 --- a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header-unread-indicator.gjs +++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header-unread-indicator.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { service } from "@ember/service"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; export default class ThreadHeaderUnreadIndicator extends Component { @service currentUser; diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.js index ba89ec206f3..f491c061075 100644 --- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.js +++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.js @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { cached } from "@glimmer/tracking"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.js index f24a99a15f5..57b2e5d0b3a 100644 --- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.js +++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; import { CHANNEL_STATUSES } from "discourse/plugins/chat/discourse/models/chat-channel"; diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.js index 18605fa7b62..64b58e21e1a 100644 --- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.js +++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import ChatMessagesManager from "discourse/plugins/chat/discourse/lib/chat-messages-manager"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.js index 2870ba46c85..c6f0870a8b4 100644 --- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.js +++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import ChatModalArchiveChannel from "discourse/plugins/chat/discourse/components/chat/modal/archive-channel"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.js index 60f1966646c..55b8a204fb7 100644 --- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.js +++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import ChatModalDeleteChannel from "discourse/plugins/chat/discourse/components/chat/modal/delete-channel"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.js index 3700697342c..b50da7e8eaf 100644 --- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.js +++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import ChatModalEditChannelDescription from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-description"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.js index 75390e030b3..59aa68951ef 100644 --- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.js +++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import ChatModalEditChannelName from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-name"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.js index d2596799a38..69989599824 100644 --- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.js +++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import ChatModalMoveMessageToChannel from "discourse/plugins/chat/discourse/components/chat/modal/move-message-to-channel"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.js index 7cb42f686d9..e21b915f190 100644 --- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.js +++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import ChatModalThreadSettings from "discourse/plugins/chat/discourse/components/chat/modal/thread-settings"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.js index 8e4e5fcbdbe..c0687cacba6 100644 --- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.js +++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import ChatModalToggleChannelStatus from "discourse/plugins/chat/discourse/components/chat/modal/toggle-channel-status"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-thread-list-item.js b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-thread-list-item.js index 53332749faa..a61b49ddc5e 100644 --- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-thread-list-item.js +++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-thread-list-item.js @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { service } from "@ember/service"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.js b/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.js index f2d301c84da..0b11af3e58f 100644 --- a/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.js +++ b/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.js @@ -1,5 +1,5 @@ import { tracked } from "@glimmer/tracking"; -import { getOwner, setOwner } from "@ember/application"; +import { getOwner, setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { cloneJSON } from "discourse-common/lib/object"; import { bind } from "discourse-common/utils/decorators"; diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-channel-thread-subscription-manager.js b/plugins/chat/assets/javascripts/discourse/lib/chat-channel-thread-subscription-manager.js index d11c49b1806..042b8256e43 100644 --- a/plugins/chat/assets/javascripts/discourse/lib/chat-channel-thread-subscription-manager.js +++ b/plugins/chat/assets/javascripts/discourse/lib/chat-channel-thread-subscription-manager.js @@ -1,5 +1,5 @@ import { tracked } from "@glimmer/tracking"; -import { getOwner, setOwner } from "@ember/application"; +import { getOwner, setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { cloneJSON } from "discourse-common/lib/object"; import { bind } from "discourse-common/utils/decorators"; diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.js b/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.js index e71acd07243..76d6a828b86 100644 --- a/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.js +++ b/plugins/chat/assets/javascripts/discourse/lib/chat-message-flag.js @@ -1,4 +1,4 @@ -import { setOwner } from "@ember/application"; +import { setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; import getURL from "discourse-common/lib/get-url"; diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js b/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js index b9a73e5e233..2990c6f289c 100644 --- a/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js +++ b/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js @@ -1,6 +1,6 @@ import { tracked } from "@glimmer/tracking"; -import { getOwner, setOwner } from "@ember/application"; import { action } from "@ember/object"; +import { getOwner, setOwner } from "@ember/owner"; import { service } from "@ember/service"; import BookmarkModal from "discourse/components/modal/bookmark"; import FlagModal from "discourse/components/modal/flag"; diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js index 57a7a51c063..1897da951e4 100644 --- a/plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js +++ b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-loader.js @@ -1,5 +1,5 @@ import { tracked } from "@glimmer/tracking"; -import { setOwner } from "@ember/application"; +import { setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-messages-manager.js b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-manager.js index 6063e2f7ff1..d707df19364 100644 --- a/plugins/chat/assets/javascripts/discourse/lib/chat-messages-manager.js +++ b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-manager.js @@ -1,5 +1,5 @@ import { cached, tracked } from "@glimmer/tracking"; -import { setOwner } from "@ember/application"; +import { setOwner } from "@ember/owner"; export default class ChatMessagesManager { @tracked messages = []; diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-threads-manager.js b/plugins/chat/assets/javascripts/discourse/lib/chat-threads-manager.js index 279e298c3aa..f07adb32a87 100644 --- a/plugins/chat/assets/javascripts/discourse/lib/chat-threads-manager.js +++ b/plugins/chat/assets/javascripts/discourse/lib/chat-threads-manager.js @@ -1,5 +1,5 @@ import { cached, tracked } from "@glimmer/tracking"; -import { setOwner } from "@ember/application"; +import { setOwner } from "@ember/owner"; import { service } from "@ember/service"; import { TrackedMap, TrackedObject } from "@ember-compat/tracked-built-ins"; import Promise from "rsvp"; diff --git a/plugins/chat/assets/javascripts/discourse/lib/extract-current-topic-info.js b/plugins/chat/assets/javascripts/discourse/lib/extract-current-topic-info.js index 4c8952ec8d1..7a5318117ec 100644 --- a/plugins/chat/assets/javascripts/discourse/lib/extract-current-topic-info.js +++ b/plugins/chat/assets/javascripts/discourse/lib/extract-current-topic-info.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; export function extractCurrentTopicInfo(context) { const topic = getOwner(context).lookup("controller:topic")?.model; diff --git a/plugins/chat/assets/javascripts/discourse/lib/fabricators.js b/plugins/chat/assets/javascripts/discourse/lib/fabricators.js index 2d02a06207c..84ec2b7cbd8 100644 --- a/plugins/chat/assets/javascripts/discourse/lib/fabricators.js +++ b/plugins/chat/assets/javascripts/discourse/lib/fabricators.js @@ -4,8 +4,8 @@ The following fabricators are available in lib folder to allow styleguide to use them, and eventually to generate dummy data in a placeholder component. It should not be used for any other case. */ -import { setOwner } from "@ember/application"; import ApplicationInstance from "@ember/application/instance"; +import { setOwner } from "@ember/owner"; import CoreFabricators, { incrementSequence } from "discourse/lib/fabricators"; import Category from "discourse/models/category"; import ChatChannel, { diff --git a/plugins/chat/assets/javascripts/discourse/lib/textarea-interactor.js b/plugins/chat/assets/javascripts/discourse/lib/textarea-interactor.js index cc7f5d4826c..fd71e1f94e1 100644 --- a/plugins/chat/assets/javascripts/discourse/lib/textarea-interactor.js +++ b/plugins/chat/assets/javascripts/discourse/lib/textarea-interactor.js @@ -1,6 +1,6 @@ -import { setOwner } from "@ember/application"; import { registerDestructor } from "@ember/destroyable"; import EmberObject from "@ember/object"; +import { setOwner } from "@ember/owner"; import { next, schedule } from "@ember/runloop"; import { service } from "@ember/service"; import TextareaTextManipulation from "discourse/mixins/textarea-text-manipulation"; diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-tracking-state.js b/plugins/chat/assets/javascripts/discourse/models/chat-tracking-state.js index 525d3eec5d8..d69862b7916 100644 --- a/plugins/chat/assets/javascripts/discourse/models/chat-tracking-state.js +++ b/plugins/chat/assets/javascripts/discourse/models/chat-tracking-state.js @@ -1,5 +1,5 @@ import { tracked } from "@glimmer/tracking"; -import { setOwner } from "@ember/application"; +import { setOwner } from "@ember/owner"; import { service } from "@ember/service"; export default class ChatTrackingState { diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-tracking-state-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-tracking-state-manager.js index f0f7bf66a60..619f749ab01 100644 --- a/plugins/chat/assets/javascripts/discourse/services/chat-tracking-state-manager.js +++ b/plugins/chat/assets/javascripts/discourse/services/chat-tracking-state-manager.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { cancel } from "@ember/runloop"; import Service, { service } from "@ember/service"; import discourseDebounce from "discourse-common/lib/debounce"; diff --git a/plugins/chat/test/javascripts/components/channel-icon-test.gjs b/plugins/chat/test/javascripts/components/channel-icon-test.gjs index a750d786ac3..ed4dd2f398f 100644 --- a/plugins/chat/test/javascripts/components/channel-icon-test.gjs +++ b/plugins/chat/test/javascripts/components/channel-icon-test.gjs @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { module, test } from "qunit"; import CoreFabricators from "discourse/lib/fabricators"; diff --git a/plugins/chat/test/javascripts/components/channel-name-test.gjs b/plugins/chat/test/javascripts/components/channel-name-test.gjs index 6ce8284af8c..35e4e7fd49d 100644 --- a/plugins/chat/test/javascripts/components/channel-name-test.gjs +++ b/plugins/chat/test/javascripts/components/channel-name-test.gjs @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { module, test } from "qunit"; import CoreFabricators from "discourse/lib/fabricators"; diff --git a/plugins/chat/test/javascripts/components/channel-title-test.gjs b/plugins/chat/test/javascripts/components/channel-title-test.gjs index 21d1257b7a4..7c1bd976daa 100644 --- a/plugins/chat/test/javascripts/components/channel-title-test.gjs +++ b/plugins/chat/test/javascripts/components/channel-title-test.gjs @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; diff --git a/plugins/chat/test/javascripts/components/chat-channel-card-test.js b/plugins/chat/test/javascripts/components/chat-channel-card-test.js index 167c4f281df..f6853c57945 100644 --- a/plugins/chat/test/javascripts/components/chat-channel-card-test.js +++ b/plugins/chat/test/javascripts/components/chat-channel-card-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-channel-leave-btn-test.js b/plugins/chat/test/javascripts/components/chat-channel-leave-btn-test.js index c26ad2a1534..b85c0d40283 100644 --- a/plugins/chat/test/javascripts/components/chat-channel-leave-btn-test.js +++ b/plugins/chat/test/javascripts/components/chat-channel-leave-btn-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-channel-metadata-test.js b/plugins/chat/test/javascripts/components/chat-channel-metadata-test.js index 51ab4a81fc6..15db0d1a458 100644 --- a/plugins/chat/test/javascripts/components/chat-channel-metadata-test.js +++ b/plugins/chat/test/javascripts/components/chat-channel-metadata-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-channel-preview-card-test.js b/plugins/chat/test/javascripts/components/chat-channel-preview-card-test.js index 915bf551a20..7abcd482a10 100644 --- a/plugins/chat/test/javascripts/components/chat-channel-preview-card-test.js +++ b/plugins/chat/test/javascripts/components/chat-channel-preview-card-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-channel-row-test.js b/plugins/chat/test/javascripts/components/chat-channel-row-test.js index 4acdbcb467e..89ded4b57c2 100644 --- a/plugins/chat/test/javascripts/components/chat-channel-row-test.js +++ b/plugins/chat/test/javascripts/components/chat-channel-row-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-channel-status-test.js b/plugins/chat/test/javascripts/components/chat-channel-status-test.js index 77253727527..ade8c623b86 100644 --- a/plugins/chat/test/javascripts/components/chat-channel-status-test.js +++ b/plugins/chat/test/javascripts/components/chat-channel-status-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-channel-test.js b/plugins/chat/test/javascripts/components/chat-channel-test.js index 8afcf5effa5..df6b23d487f 100644 --- a/plugins/chat/test/javascripts/components/chat-channel-test.js +++ b/plugins/chat/test/javascripts/components/chat-channel-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render, triggerEvent, waitFor } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-composer-message-details-test.js b/plugins/chat/test/javascripts/components/chat-composer-message-details-test.js index efe9ae6c4b4..a537450d5fb 100644 --- a/plugins/chat/test/javascripts/components/chat-composer-message-details-test.js +++ b/plugins/chat/test/javascripts/components/chat-composer-message-details-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-message-avatar-test.js b/plugins/chat/test/javascripts/components/chat-message-avatar-test.js index b0272be8c60..190f34baf7c 100644 --- a/plugins/chat/test/javascripts/components/chat-message-avatar-test.js +++ b/plugins/chat/test/javascripts/components/chat-message-avatar-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-message-info-test.js b/plugins/chat/test/javascripts/components/chat-message-info-test.js index 293d70c96e9..cba2a9d606a 100644 --- a/plugins/chat/test/javascripts/components/chat-message-info-test.js +++ b/plugins/chat/test/javascripts/components/chat-message-info-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-message-left-gutter-test.js b/plugins/chat/test/javascripts/components/chat-message-left-gutter-test.js index 80577b377ea..45085027675 100644 --- a/plugins/chat/test/javascripts/components/chat-message-left-gutter-test.js +++ b/plugins/chat/test/javascripts/components/chat-message-left-gutter-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-message-test.js b/plugins/chat/test/javascripts/components/chat-message-test.js index 2420c708844..016d00943d0 100644 --- a/plugins/chat/test/javascripts/components/chat-message-test.js +++ b/plugins/chat/test/javascripts/components/chat-message-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { clearRender, render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-modal-archive-channel-test.js b/plugins/chat/test/javascripts/components/chat-modal-archive-channel-test.js index 75f048e76d1..67bb5aa97b4 100644 --- a/plugins/chat/test/javascripts/components/chat-modal-archive-channel-test.js +++ b/plugins/chat/test/javascripts/components/chat-modal-archive-channel-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-modal-delete-channel-test.js b/plugins/chat/test/javascripts/components/chat-modal-delete-channel-test.js index bf7a5bcc9c0..c7fcc2ad9a1 100644 --- a/plugins/chat/test/javascripts/components/chat-modal-delete-channel-test.js +++ b/plugins/chat/test/javascripts/components/chat-modal-delete-channel-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-modal-move-message-to-channel-test.js b/plugins/chat/test/javascripts/components/chat-modal-move-message-to-channel-test.js index f627cc1337b..f3d39cf023a 100644 --- a/plugins/chat/test/javascripts/components/chat-modal-move-message-to-channel-test.js +++ b/plugins/chat/test/javascripts/components/chat-modal-move-message-to-channel-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-notices-test.js b/plugins/chat/test/javascripts/components/chat-notices-test.js index 5257dd37c0a..202cd153757 100644 --- a/plugins/chat/test/javascripts/components/chat-notices-test.js +++ b/plugins/chat/test/javascripts/components/chat-notices-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { click, render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-replying-indicator-test.js b/plugins/chat/test/javascripts/components/chat-replying-indicator-test.js index 5e2900d0d41..bfde33b42b6 100644 --- a/plugins/chat/test/javascripts/components/chat-replying-indicator-test.js +++ b/plugins/chat/test/javascripts/components/chat-replying-indicator-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-retention-reminder-text-test.js b/plugins/chat/test/javascripts/components/chat-retention-reminder-text-test.js index cfd98d9adcb..0478a117d15 100644 --- a/plugins/chat/test/javascripts/components/chat-retention-reminder-text-test.js +++ b/plugins/chat/test/javascripts/components/chat-retention-reminder-text-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-thread-header-test.js b/plugins/chat/test/javascripts/components/chat-thread-header-test.js index 883d838f390..a2c99273bb7 100644 --- a/plugins/chat/test/javascripts/components/chat-thread-header-test.js +++ b/plugins/chat/test/javascripts/components/chat-thread-header-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-thread-list-item-test.js b/plugins/chat/test/javascripts/components/chat-thread-list-item-test.js index 04dcf375904..a2e313f80c0 100644 --- a/plugins/chat/test/javascripts/components/chat-thread-list-item-test.js +++ b/plugins/chat/test/javascripts/components/chat-thread-list-item-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-thread-participants-test.js b/plugins/chat/test/javascripts/components/chat-thread-participants-test.js index f399d54d125..8e30580deae 100644 --- a/plugins/chat/test/javascripts/components/chat-thread-participants-test.js +++ b/plugins/chat/test/javascripts/components/chat-thread-participants-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-user-avatar-test.js b/plugins/chat/test/javascripts/components/chat-user-avatar-test.js index 50f100ae758..2043dcb4b3c 100644 --- a/plugins/chat/test/javascripts/components/chat-user-avatar-test.js +++ b/plugins/chat/test/javascripts/components/chat-user-avatar-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/chat-user-card-button-test.js b/plugins/chat/test/javascripts/components/chat-user-card-button-test.js index a0f200a695d..7318d858154 100644 --- a/plugins/chat/test/javascripts/components/chat-user-card-button-test.js +++ b/plugins/chat/test/javascripts/components/chat-user-card-button-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/components/thread-settings-test.gjs b/plugins/chat/test/javascripts/components/thread-settings-test.gjs index 19cc1d42b57..35669b61a9b 100644 --- a/plugins/chat/test/javascripts/components/thread-settings-test.gjs +++ b/plugins/chat/test/javascripts/components/thread-settings-test.gjs @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; diff --git a/plugins/chat/test/javascripts/unit/helpers/format-chat-date-test.js b/plugins/chat/test/javascripts/unit/helpers/format-chat-date-test.js index 0474992b312..991da1823ce 100644 --- a/plugins/chat/test/javascripts/unit/helpers/format-chat-date-test.js +++ b/plugins/chat/test/javascripts/unit/helpers/format-chat-date-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { render } from "@ember/test-helpers"; import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/unit/lib/chat-emoji-reaction-store-test.js b/plugins/chat/test/javascripts/unit/lib/chat-emoji-reaction-store-test.js index be1f6e3b966..e07d1c9b217 100644 --- a/plugins/chat/test/javascripts/unit/lib/chat-emoji-reaction-store-test.js +++ b/plugins/chat/test/javascripts/unit/lib/chat-emoji-reaction-store-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/unit/lib/get-reaction-text-test.js b/plugins/chat/test/javascripts/unit/lib/get-reaction-text-test.js index 38a97ec7739..0e36f635fb2 100644 --- a/plugins/chat/test/javascripts/unit/lib/get-reaction-text-test.js +++ b/plugins/chat/test/javascripts/unit/lib/get-reaction-text-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import CoreFabricators from "discourse/lib/fabricators"; diff --git a/plugins/chat/test/javascripts/unit/models/chat-message-test.js b/plugins/chat/test/javascripts/unit/models/chat-message-test.js index 751cd7298fe..ecca21dce2d 100644 --- a/plugins/chat/test/javascripts/unit/models/chat-message-test.js +++ b/plugins/chat/test/javascripts/unit/models/chat-message-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/test/javascripts/unit/services/chat-channel-info-route-origin-manager-test.js b/plugins/chat/test/javascripts/unit/services/chat-channel-info-route-origin-manager-test.js index faa764cd93e..7797263490e 100644 --- a/plugins/chat/test/javascripts/unit/services/chat-channel-info-route-origin-manager-test.js +++ b/plugins/chat/test/javascripts/unit/services/chat-channel-info-route-origin-manager-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import { ORIGINS } from "discourse/plugins/chat/discourse/services/chat-channel-info-route-origin-manager"; diff --git a/plugins/chat/test/javascripts/unit/services/chat-drafts-manager-test.js b/plugins/chat/test/javascripts/unit/services/chat-drafts-manager-test.js index 1d634b1a9c9..1a98e56b9f8 100644 --- a/plugins/chat/test/javascripts/unit/services/chat-drafts-manager-test.js +++ b/plugins/chat/test/javascripts/unit/services/chat-drafts-manager-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/test/javascripts/unit/services/chat-drawer-size-test.js b/plugins/chat/test/javascripts/unit/services/chat-drawer-size-test.js index 618bc46b40b..7ee7d2acce6 100644 --- a/plugins/chat/test/javascripts/unit/services/chat-drawer-size-test.js +++ b/plugins/chat/test/javascripts/unit/services/chat-drawer-size-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/unit/services/chat-emoji-picker-manager-test.js b/plugins/chat/test/javascripts/unit/services/chat-emoji-picker-manager-test.js index 570b32137da..4979945f780 100644 --- a/plugins/chat/test/javascripts/unit/services/chat-emoji-picker-manager-test.js +++ b/plugins/chat/test/javascripts/unit/services/chat-emoji-picker-manager-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { settled } from "@ember/test-helpers"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; diff --git a/plugins/chat/test/javascripts/unit/services/chat-guardian-test.js b/plugins/chat/test/javascripts/unit/services/chat-guardian-test.js index 32c1340f55b..72ebb20d6b4 100644 --- a/plugins/chat/test/javascripts/unit/services/chat-guardian-test.js +++ b/plugins/chat/test/javascripts/unit/services/chat-guardian-test.js @@ -1,5 +1,5 @@ -import { getOwner } from "@ember/application"; import { set } from "@ember/object"; +import { getOwner } from "@ember/owner"; import { test } from "qunit"; import { acceptance } from "discourse/tests/helpers/qunit-helpers"; import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators"; diff --git a/plugins/chat/test/javascripts/unit/services/chat-state-manager-test.js b/plugins/chat/test/javascripts/unit/services/chat-state-manager-test.js index 19ad25595a2..abd87f51022 100644 --- a/plugins/chat/test/javascripts/unit/services/chat-state-manager-test.js +++ b/plugins/chat/test/javascripts/unit/services/chat-state-manager-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import sinon from "sinon"; diff --git a/plugins/chat/test/javascripts/unit/utility/plugin-api-test.js b/plugins/chat/test/javascripts/unit/utility/plugin-api-test.js index 6c6d024b91d..a186af7e395 100644 --- a/plugins/chat/test/javascripts/unit/utility/plugin-api-test.js +++ b/plugins/chat/test/javascripts/unit/utility/plugin-api-test.js @@ -1,4 +1,4 @@ -import { getOwner } from "@ember/application"; +import { getOwner } from "@ember/owner"; import { setupTest } from "ember-qunit"; import { module, test } from "qunit"; import { withPluginApi } from "discourse/lib/plugin-api"; diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs index 68d88018686..06871de3e67 100644 --- a/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs +++ b/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { fn } from "@ember/helper"; import { action, get } from "@ember/object"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import DButton from "discourse/components/d-button"; import DropdownMenu from "discourse/components/dropdown-menu"; import icon from "discourse-common/helpers/d-icon"; diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs index 34bdb7ed928..047c3d66823 100644 --- a/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs +++ b/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs @@ -1,9 +1,9 @@ import Component from "@glimmer/component"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; import { relativeAge } from "discourse/lib/formatter"; import icon from "discourse-common/helpers/d-icon"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; const ON_VOTE = "on_vote"; const ON_CLOSE = "on_close"; diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice.gjs index a08c5bbd274..43f67c5beec 100644 --- a/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice.gjs +++ b/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; import DButton from "discourse/components/d-button"; import routeAction from "discourse/helpers/route-action"; diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs index 9e1ff67f1c1..7e407768366 100644 --- a/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs +++ b/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs @@ -2,7 +2,7 @@ import Component from "@glimmer/component"; import { fn } from "@ember/helper"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; import concatClass from "discourse/helpers/concat-class"; import routeAction from "discourse/helpers/route-action"; diff --git a/plugins/poll/assets/javascripts/discourse/components/poll.gjs b/plugins/poll/assets/javascripts/discourse/components/poll.gjs index 4934b8944f8..ab7e3278b8a 100644 --- a/plugins/poll/assets/javascripts/discourse/components/poll.gjs +++ b/plugins/poll/assets/javascripts/discourse/components/poll.gjs @@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; import didUpdate from "@ember/render-modifiers/modifiers/did-update"; -import { inject as service } from "@ember/service"; +import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/plugins/poll/test/javascripts/component/poll-buttons-dropdown-test.js b/plugins/poll/test/javascripts/component/poll-buttons-dropdown-test.js index 3660c15b027..c06d523fd84 100644 --- a/plugins/poll/test/javascripts/component/poll-buttons-dropdown-test.js +++ b/plugins/poll/test/javascripts/component/poll-buttons-dropdown-test.js @@ -3,7 +3,7 @@ import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { count, query } from "discourse/tests/helpers/qunit-helpers"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; module("Poll | Component | poll-buttons-dropdown", function (hooks) { setupRenderingTest(hooks); diff --git a/plugins/poll/test/javascripts/component/poll-info-test.js b/plugins/poll/test/javascripts/component/poll-info-test.js index c5be29f492c..01e3151e264 100644 --- a/plugins/poll/test/javascripts/component/poll-info-test.js +++ b/plugins/poll/test/javascripts/component/poll-info-test.js @@ -3,7 +3,7 @@ import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { query } from "discourse/tests/helpers/qunit-helpers"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; const OPTIONS = [ { id: "1ddc47be0d2315b9711ee8526ca9d83f", html: "This", votes: 2, rank: 0 }, diff --git a/plugins/poll/test/javascripts/component/poll-results-ranked-choice-test.js b/plugins/poll/test/javascripts/component/poll-results-ranked-choice-test.js index 19fb8ded937..224fd4cd785 100644 --- a/plugins/poll/test/javascripts/component/poll-results-ranked-choice-test.js +++ b/plugins/poll/test/javascripts/component/poll-results-ranked-choice-test.js @@ -3,7 +3,7 @@ import hbs from "htmlbars-inline-precompile"; import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { count, query } from "discourse/tests/helpers/qunit-helpers"; -import I18n from "I18n"; +import I18n from "discourse-i18n"; const RANKED_CHOICE_OUTCOME = { tied: false,