diff --git a/app/assets/javascripts/admin/addon/components/admin-area-settings.gjs b/app/assets/javascripts/admin/addon/components/admin-area-settings.gjs index b3f5fc08844..91011c2ff46 100644 --- a/app/assets/javascripts/admin/addon/components/admin-area-settings.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-area-settings.gjs @@ -5,7 +5,7 @@ import { service } from "@ember/service"; import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner"; import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item"; import { ajax } from "discourse/lib/ajax"; -import { bind } from "discourse-common/utils/decorators"; +import { bind } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import AdminConfigAreaEmptyList from "admin/components/admin-config-area-empty-list"; import AdminFilteredSiteSettings from "admin/components/admin-filtered-site-settings"; diff --git a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js index 0a02a657026..ce88566cda9 100644 --- a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js +++ b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js @@ -2,7 +2,7 @@ import Component from "@ember/component"; import { scheduleOnce } from "@ember/runloop"; import { classNames } from "@ember-decorators/component"; import { observes, on } from "@ember-decorators/object"; -import discourseDebounce from "discourse-common/lib/debounce"; +import discourseDebounce from "discourse/lib/debounce"; import { i18n } from "discourse-i18n"; @classNames("admin-backups-logs") 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 9da7d5899bb..376ec1f3f2c 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 @@ -5,7 +5,7 @@ import { service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { SYSTEM_FLAG_IDS } from "discourse/lib/constants"; -import { bind } from "discourse-common/utils/decorators"; +import { bind } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import AdminFlagItem from "admin/components/admin-flag-item"; diff --git a/app/assets/javascripts/admin/addon/components/admin-filtered-site-settings.gjs b/app/assets/javascripts/admin/addon/components/admin-filtered-site-settings.gjs index ae2c7fa2182..43c04cea848 100644 --- a/app/assets/javascripts/admin/addon/components/admin-filtered-site-settings.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-filtered-site-settings.gjs @@ -5,8 +5,8 @@ import { cancel } from "@ember/runloop"; import { service } from "@ember/service"; import { isEmpty } from "@ember/utils"; import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner"; +import discourseDebounce from "discourse/lib/debounce"; import SiteSettingFilter from "discourse/lib/site-setting-filter"; -import discourseDebounce from "discourse-common/lib/debounce"; import { i18n } from "discourse-i18n"; import AdminSiteSettingsFilterControls from "admin/components/admin-site-settings-filter-controls"; import SiteSetting from "admin/components/site-setting"; diff --git a/app/assets/javascripts/admin/addon/components/admin-flags-form.gjs b/app/assets/javascripts/admin/addon/components/admin-flags-form.gjs index b250e42ecd0..57754f648fb 100644 --- a/app/assets/javascripts/admin/addon/components/admin-flags-form.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-flags-form.gjs @@ -7,7 +7,7 @@ import BackButton from "discourse/components/back-button"; import Form from "discourse/components/form"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { bind } from "discourse-common/utils/decorators"; +import { bind } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import AdminConfigAreaCard from "admin/components/admin-config-area-card"; import MultiSelect from "select-kit/components/multi-select"; diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-history.js b/app/assets/javascripts/admin/addon/components/admin-penalty-history.js index 35206b8cc69..3aeb825842d 100644 --- a/app/assets/javascripts/admin/addon/components/admin-penalty-history.js +++ b/app/assets/javascripts/admin/addon/components/admin-penalty-history.js @@ -1,6 +1,6 @@ import Component from "@ember/component"; import { classNames } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; @classNames("penalty-history") export default class AdminPenaltyHistory extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js b/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js index 1d256185782..2670bba0360 100644 --- a/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js +++ b/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js @@ -1,9 +1,7 @@ import Component from "@ember/component"; import { action } from "@ember/object"; import { equal } from "@ember/object/computed"; -import discourseComputed, { - afterRender, -} from "discourse-common/utils/decorators"; +import discourseComputed, { afterRender } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; const ACTIONS = ["delete", "delete_replies", "edit", "none"]; diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js b/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js index 6a2f3aa4332..eaf589a95c6 100644 --- a/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js +++ b/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js @@ -2,7 +2,7 @@ import Component from "@ember/component"; import { action } from "@ember/object"; import { equal } from "@ember/object/computed"; import { tagName } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; const CUSTOM_REASON_KEY = "custom"; diff --git a/app/assets/javascripts/admin/addon/components/admin-permalink-form.gjs b/app/assets/javascripts/admin/addon/components/admin-permalink-form.gjs index eea8eed3f99..8f77fcd7247 100644 --- a/app/assets/javascripts/admin/addon/components/admin-permalink-form.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-permalink-form.gjs @@ -8,7 +8,7 @@ import { eq } from "truth-helpers"; import BackButton from "discourse/components/back-button"; import Form from "discourse/components/form"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { bind } from "discourse-common/utils/decorators"; +import { bind } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import AdminConfigAreaCard from "admin/components/admin-config-area-card"; import Permalink from "admin/models/permalink"; diff --git a/app/assets/javascripts/admin/addon/components/admin-report-chart.gjs b/app/assets/javascripts/admin/addon/components/admin-report-chart.gjs index e4522537a10..b35680bcd21 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-chart.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-report-chart.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { number } from "discourse/lib/formatter"; -import { makeArray } from "discourse-common/lib/helpers"; +import { makeArray } from "discourse/lib/helpers"; import Report from "admin/models/report"; import Chart from "./chart"; diff --git a/app/assets/javascripts/admin/addon/components/admin-report-radar.gjs b/app/assets/javascripts/admin/addon/components/admin-report-radar.gjs index 4b180fb0240..03dc4677b4e 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-radar.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-report-radar.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import { makeArray } from "discourse-common/lib/helpers"; +import { makeArray } from "discourse/lib/helpers"; import hexToRGBA from "admin/lib/hex-to-rgba"; import Report from "admin/models/report"; import Chart from "./chart"; diff --git a/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.gjs b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.gjs index fb04e15790d..7369e00ca91 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { number } from "discourse/lib/formatter"; -import { makeArray } from "discourse-common/lib/helpers"; +import { makeArray } from "discourse/lib/helpers"; import Report from "admin/models/report"; import Chart from "./chart"; diff --git a/app/assets/javascripts/admin/addon/components/admin-report-stacked-line-chart.gjs b/app/assets/javascripts/admin/addon/components/admin-report-stacked-line-chart.gjs index 6ef136df8eb..637d8d070c5 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-stacked-line-chart.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-report-stacked-line-chart.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { number } from "discourse/lib/formatter"; -import { makeArray } from "discourse-common/lib/helpers"; +import { makeArray } from "discourse/lib/helpers"; import hexToRGBA from "admin/lib/hex-to-rgba"; import Report from "admin/models/report"; import Chart from "./chart"; diff --git a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js index ffb3e4ebf1c..33301aa4b9a 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js @@ -2,7 +2,7 @@ import Component from "@ember/component"; import { alias } from "@ember/object/computed"; import { classNames } from "@ember-decorators/component"; import { setting } from "discourse/lib/computed"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import I18n, { i18n } from "discourse-i18n"; @classNames("admin-report-storage-stats") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js index 9bd4750376b..6ff59249eb9 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js @@ -6,7 +6,7 @@ import { classNames, tagName, } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; @tagName("td") @classNames("admin-report-table-cell") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-header.js b/app/assets/javascripts/admin/addon/components/admin-report-table-header.js index e27ad5a1f03..7c8b5ce2238 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table-header.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table-header.js @@ -5,7 +5,7 @@ import { classNames, tagName, } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; @tagName("th") @classNames("admin-report-table-header") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table.js b/app/assets/javascripts/admin/addon/components/admin-report-table.js index 494636a335e..ee1837ed08b 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table.js @@ -2,8 +2,8 @@ import Component from "@ember/component"; import { action } from "@ember/object"; import { alias } from "@ember/object/computed"; import { classNameBindings, classNames } from "@ember-decorators/component"; -import { makeArray } from "discourse-common/lib/helpers"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; +import { makeArray } from "discourse/lib/helpers"; const PAGES_LIMIT = 8; diff --git a/app/assets/javascripts/admin/addon/components/admin-report.js b/app/assets/javascripts/admin/addon/components/admin-report.js index 4f51e30c89d..f8853d2886f 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report.js +++ b/app/assets/javascripts/admin/addon/components/admin-report.js @@ -4,12 +4,12 @@ import { alias, and, equal, notEmpty, or } from "@ember/object/computed"; import { next } from "@ember/runloop"; import { isPresent } from "@ember/utils"; import { classNameBindings, classNames } from "@ember-decorators/component"; +import discourseComputed from "discourse/lib/decorators"; import { exportEntity } from "discourse/lib/export-csv"; import { outputExportResult } from "discourse/lib/export-result"; +import { makeArray } from "discourse/lib/helpers"; import ReportLoader from "discourse/lib/reports-loader"; import { isTesting } from "discourse-common/config/environment"; -import { makeArray } from "discourse-common/lib/helpers"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; import Report, { DAILY_LIMIT_DAYS, SCHEMA_VERSION } from "admin/models/report"; diff --git a/app/assets/javascripts/admin/addon/components/admin-reports.gjs b/app/assets/javascripts/admin/addon/components/admin-reports.gjs index 67f87b19465..a413dcd9cda 100644 --- a/app/assets/javascripts/admin/addon/components/admin-reports.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-reports.gjs @@ -8,7 +8,7 @@ import { htmlSafe } from "@ember/template"; import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner"; import dIcon from "discourse/helpers/d-icon"; import { ajax } from "discourse/lib/ajax"; -import { bind } from "discourse-common/utils/decorators"; +import { bind } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; export default class AdminReports extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js index ae540f1d897..174dcf053cb 100644 --- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js +++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js @@ -2,8 +2,8 @@ import Component from "@ember/component"; import { action, computed } from "@ember/object"; import { next } from "@ember/runloop"; import { fmt } from "discourse/lib/computed"; +import discourseComputed from "discourse/lib/decorators"; import { isDocumentRTL } from "discourse/lib/text-direction"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; export default class AdminThemeEditor extends Component { diff --git a/app/assets/javascripts/admin/addon/components/bulk-user-delete-confirmation.gjs b/app/assets/javascripts/admin/addon/components/bulk-user-delete-confirmation.gjs index 267d5d5f9f4..eb999b52614 100644 --- a/app/assets/javascripts/admin/addon/components/bulk-user-delete-confirmation.gjs +++ b/app/assets/javascripts/admin/addon/components/bulk-user-delete-confirmation.gjs @@ -8,7 +8,7 @@ import DButton from "discourse/components/d-button"; import DModal from "discourse/components/d-modal"; import { ajax } from "discourse/lib/ajax"; import { extractError } from "discourse/lib/ajax-error"; -import { bind } from "discourse-common/utils/decorators"; +import { bind } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; const BULK_DELETE_CHANNEL = "/bulk-user-delete"; diff --git a/app/assets/javascripts/admin/addon/components/dashboard-new-features.gjs b/app/assets/javascripts/admin/addon/components/dashboard-new-features.gjs index 5d066b79634..f8abe060481 100644 --- a/app/assets/javascripts/admin/addon/components/dashboard-new-features.gjs +++ b/app/assets/javascripts/admin/addon/components/dashboard-new-features.gjs @@ -5,7 +5,7 @@ import { service } from "@ember/service"; import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { bind } from "discourse-common/utils/decorators"; +import { bind } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import AdminConfigAreaCard from "admin/components/admin-config-area-card"; import AdminConfigAreaEmptyList from "admin/components/admin-config-area-empty-list"; diff --git a/app/assets/javascripts/admin/addon/components/email-styles-editor.js b/app/assets/javascripts/admin/addon/components/email-styles-editor.js index ccacf59a7e1..71ff2431f1f 100644 --- a/app/assets/javascripts/admin/addon/components/email-styles-editor.js +++ b/app/assets/javascripts/admin/addon/components/email-styles-editor.js @@ -2,7 +2,7 @@ import Component from "@ember/component"; import { action, computed } from "@ember/object"; import { reads } from "@ember/object/computed"; import { service } from "@ember/service"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; export default class EmailStylesEditor extends Component { diff --git a/app/assets/javascripts/admin/addon/components/emoji-uploader.js b/app/assets/javascripts/admin/addon/components/emoji-uploader.js index 316bec2edbc..d21702e5f39 100644 --- a/app/assets/javascripts/admin/addon/components/emoji-uploader.js +++ b/app/assets/javascripts/admin/addon/components/emoji-uploader.js @@ -3,8 +3,8 @@ import { action } from "@ember/object"; import { notEmpty } from "@ember/object/computed"; import { getOwner } from "@ember/owner"; import { isEmpty } from "@ember/utils"; +import discourseComputed from "discourse/lib/decorators"; import UppyUpload from "discourse/lib/uppy/uppy-upload"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; const DEFAULT_GROUP = "default"; diff --git a/app/assets/javascripts/admin/addon/components/emoji-value-list.js b/app/assets/javascripts/admin/addon/components/emoji-value-list.js index 37972ceb6a2..44b08ceca57 100644 --- a/app/assets/javascripts/admin/addon/components/emoji-value-list.js +++ b/app/assets/javascripts/admin/addon/components/emoji-value-list.js @@ -4,8 +4,8 @@ import { schedule } from "@ember/runloop"; import { service } from "@ember/service"; import { classNameBindings } from "@ember-decorators/component"; import EmojiPickerDetached from "discourse/components/emoji-picker/detached"; +import discourseComputed from "discourse/lib/decorators"; import { emojiUrlFor } from "discourse/lib/text"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; @classNameBindings(":value-list", ":emoji-list") diff --git a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js index d7ba4bc40c0..4618a97abf0 100644 --- a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js +++ b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js @@ -1,7 +1,7 @@ import Component from "@ember/component"; import { action } from "@ember/object"; import { classNames } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; @classNames("inline-edit") export default class InlineEditCheckbox extends Component { diff --git a/app/assets/javascripts/admin/addon/components/modal/install-theme.gjs b/app/assets/javascripts/admin/addon/components/modal/install-theme.gjs index 37e5ac48e7e..08583c306e3 100644 --- a/app/assets/javascripts/admin/addon/components/modal/install-theme.gjs +++ b/app/assets/javascripts/admin/addon/components/modal/install-theme.gjs @@ -14,7 +14,7 @@ import dIcon from "discourse/helpers/d-icon"; import withEventValue from "discourse/helpers/with-event-value"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { POPULAR_THEMES } from "discourse-common/lib/popular-themes"; +import { POPULAR_THEMES } from "discourse/lib/popular-themes"; import { i18n } from "discourse-i18n"; import InstallThemeItem from "admin/components/install-theme-item"; import { COMPONENTS, THEMES } from "admin/models/theme"; diff --git a/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js b/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js index 344a1e85219..bd88fb6b280 100644 --- a/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js +++ b/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js @@ -1,8 +1,8 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { service } from "@ember/service"; +import { bind } from "discourse/lib/decorators"; import DiscourseURL from "discourse/lib/url"; -import { bind } from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; export default class MergeUsersProgress extends Component { diff --git a/app/assets/javascripts/admin/addon/components/permalink-form.js b/app/assets/javascripts/admin/addon/components/permalink-form.js index e903e5a6bfa..031c849e393 100644 --- a/app/assets/javascripts/admin/addon/components/permalink-form.js +++ b/app/assets/javascripts/admin/addon/components/permalink-form.js @@ -4,7 +4,7 @@ import { schedule } from "@ember/runloop"; import { service } from "@ember/service"; import { tagName } from "@ember-decorators/component"; import { fmt } from "discourse/lib/computed"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; +import discourseComputed, { bind } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import Permalink from "admin/models/permalink"; diff --git a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs index 0335f70f41b..b2484c777bf 100644 --- a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs +++ b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor.gjs @@ -6,7 +6,7 @@ import { service } from "@ember/service"; import { gt } from "truth-helpers"; import DButton from "discourse/components/d-button"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { cloneJSON } from "discourse-common/lib/object"; +import { cloneJSON } from "discourse/lib/object"; import { i18n } from "discourse-i18n"; import Tree from "admin/components/schema-theme-setting/editor/tree"; import FieldInput from "admin/components/schema-theme-setting/field"; diff --git a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js index 452382823b7..186192d5f85 100644 --- a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js +++ b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js @@ -3,7 +3,7 @@ import { action } from "@ember/object"; import { schedule } from "@ember/runloop"; import { service } from "@ember/service"; import { classNames, tagName } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import ScreenedIpAddress from "admin/models/screened-ip-address"; diff --git a/app/assets/javascripts/admin/addon/components/simple-list.js b/app/assets/javascripts/admin/addon/components/simple-list.js index 2f89c313a78..3733bbb53f2 100644 --- a/app/assets/javascripts/admin/addon/components/simple-list.js +++ b/app/assets/javascripts/admin/addon/components/simple-list.js @@ -4,7 +4,7 @@ import { action } from "@ember/object"; import { empty } from "@ember/object/computed"; import { isEmpty } from "@ember/utils"; import { classNameBindings } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; @classNameBindings(":simple-list", ":value-list") export default class SimpleList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/site-settings/compact-list.gjs b/app/assets/javascripts/admin/addon/components/site-settings/compact-list.gjs index 438abc49eab..036ebd97a80 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/compact-list.gjs +++ b/app/assets/javascripts/admin/addon/components/site-settings/compact-list.gjs @@ -2,7 +2,7 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { hash } from "@ember/helper"; import { action } from "@ember/object"; -import { makeArray } from "discourse-common/lib/helpers"; +import { makeArray } from "discourse/lib/helpers"; import ListSetting from "select-kit/components/list-setting"; export default class CompactList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/site-settings/file-types-list.gjs b/app/assets/javascripts/admin/addon/components/site-settings/file-types-list.gjs index 2d5ea461726..fd246ce7791 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/file-types-list.gjs +++ b/app/assets/javascripts/admin/addon/components/site-settings/file-types-list.gjs @@ -5,7 +5,7 @@ import { action } from "@ember/object"; import { service } from "@ember/service"; import { isEmpty } from "@ember/utils"; import DButton from "discourse/components/d-button"; -import { makeArray } from "discourse-common/lib/helpers"; +import { makeArray } from "discourse/lib/helpers"; import { i18n } from "discourse-i18n"; import ListSetting from "select-kit/components/list-setting"; diff --git a/app/assets/javascripts/admin/addon/components/site-settings/tag-group-list.js b/app/assets/javascripts/admin/addon/components/site-settings/tag-group-list.js index 5d11c75027f..ea6382e4bcf 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/tag-group-list.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/tag-group-list.js @@ -1,6 +1,6 @@ import Component from "@ember/component"; import { action } from "@ember/object"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class TagGroupList extends Component { @discourseComputed("value") diff --git a/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js b/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js index 6f1b59c5eaf..2c2d6d2a340 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js @@ -1,6 +1,6 @@ import Component from "@ember/component"; import { action } from "@ember/object"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class TagList extends Component { @discourseComputed("value") diff --git a/app/assets/javascripts/admin/addon/components/site-text-summary.gjs b/app/assets/javascripts/admin/addon/components/site-text-summary.gjs index 5eb204fc135..2c0cc56079f 100644 --- a/app/assets/javascripts/admin/addon/components/site-text-summary.gjs +++ b/app/assets/javascripts/admin/addon/components/site-text-summary.gjs @@ -4,8 +4,8 @@ import { action } from "@ember/object"; import didInsert from "@ember/render-modifiers/modifiers/did-insert"; import DButton from "discourse/components/d-button"; import concatClass from "discourse/helpers/concat-class"; +import { bind } from "discourse/lib/decorators"; import highlightHTML from "discourse/lib/highlight-html"; -import { bind } from "discourse-common/utils/decorators"; export default class SiteTextSummary extends Component { @action diff --git a/app/assets/javascripts/admin/addon/components/themes-list-item.gjs b/app/assets/javascripts/admin/addon/components/themes-list-item.gjs index 5d92b83d83b..ef7adbd18e0 100644 --- a/app/assets/javascripts/admin/addon/components/themes-list-item.gjs +++ b/app/assets/javascripts/admin/addon/components/themes-list-item.gjs @@ -8,8 +8,8 @@ import { htmlSafe } from "@ember/template"; import PluginOutlet from "discourse/components/plugin-outlet"; import concatClass from "discourse/helpers/concat-class"; import icon from "discourse/helpers/d-icon"; -import escape from "discourse-common/lib/escape"; -import { iconHTML } from "discourse-common/lib/icon-library"; +import escape from "discourse/lib/escape"; +import { iconHTML } from "discourse/lib/icon-library"; import { i18n } from "discourse-i18n"; const MAX_COMPONENTS = 4; diff --git a/app/assets/javascripts/admin/addon/components/themes-list.js b/app/assets/javascripts/admin/addon/components/themes-list.js index bcfed2ee1dd..59e4c26c77f 100644 --- a/app/assets/javascripts/admin/addon/components/themes-list.js +++ b/app/assets/javascripts/admin/addon/components/themes-list.js @@ -4,7 +4,7 @@ import { equal, gt, gte } from "@ember/object/computed"; import { service } from "@ember/service"; import { classNames } from "@ember-decorators/component"; import DeleteThemesConfirm from "discourse/components/modal/delete-themes-confirm"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; +import discourseComputed, { bind } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import { COMPONENTS, THEMES } from "admin/models/theme"; diff --git a/app/assets/javascripts/admin/addon/components/value-list.js b/app/assets/javascripts/admin/addon/components/value-list.js index 9c37faabae8..eb8898d3897 100644 --- a/app/assets/javascripts/admin/addon/components/value-list.js +++ b/app/assets/javascripts/admin/addon/components/value-list.js @@ -2,8 +2,8 @@ import Component from "@ember/component"; import { action } from "@ember/object"; import { empty, reads } from "@ember/object/computed"; import { classNames } from "@ember-decorators/component"; -import { makeArray } from "discourse-common/lib/helpers"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; +import { makeArray } from "discourse/lib/helpers"; @classNames("value-list") export default class ValueList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/watched-word-form.js b/app/assets/javascripts/admin/addon/components/watched-word-form.js index df2ee1e0422..c9b9c99e05a 100644 --- a/app/assets/javascripts/admin/addon/components/watched-word-form.js +++ b/app/assets/javascripts/admin/addon/components/watched-word-form.js @@ -6,7 +6,7 @@ import { isEmpty } from "@ember/utils"; import { classNames, tagName } from "@ember-decorators/component"; import { observes } from "@ember-decorators/object"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import WatchedWord from "admin/models/watched-word"; diff --git a/app/assets/javascripts/admin/addon/components/webhook-events.js b/app/assets/javascripts/admin/addon/components/webhook-events.js index c4465bf49fa..20b4b46869c 100644 --- a/app/assets/javascripts/admin/addon/components/webhook-events.js +++ b/app/assets/javascripts/admin/addon/components/webhook-events.js @@ -5,7 +5,7 @@ import { gt, readOnly } from "@ember/object/computed"; import { service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { bind } from "discourse-common/utils/decorators"; +import { bind } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; export default class WebhookEvents extends Component { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js index 32d7bd07a4c..b5350484f6b 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js @@ -5,7 +5,7 @@ import { service } from "@ember/service"; import { isBlank } from "@ember/utils"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import ApiKeyUrlsModal from "../components/modal/api-key-urls"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js index 865133ec3fd..84233b36339 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js @@ -5,8 +5,8 @@ import { service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { computedI18n, setting } from "discourse/lib/computed"; -import getURL from "discourse-common/lib/get-url"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; +import getURL from "discourse/lib/get-url"; import { i18n } from "discourse-i18n"; export default class AdminBackupsIndexController extends Controller { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js index dc7d5735b26..f6398f9319a 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js @@ -5,7 +5,7 @@ import { service } from "@ember/service"; import { isNone } from "@ember/utils"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import getURL from "discourse-common/lib/get-url"; +import getURL from "discourse/lib/get-url"; import { i18n } from "discourse-i18n"; import BadgePreviewModal from "../../components/modal/badge-preview"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js index f8b5756e913..d9dece5aaaf 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js @@ -1,8 +1,8 @@ import Controller from "@ember/controller"; import { action, computed } from "@ember/object"; import { service } from "@ember/service"; +import discourseLater from "discourse/lib/later"; import { clipboardCopy } from "discourse/lib/utilities"; -import discourseLater from "discourse-common/lib/later"; import { i18n } from "discourse-i18n"; export default class AdminCustomizeColorsShowController extends Controller { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js index cbb3ff559d4..1fa992114f5 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js @@ -1,7 +1,7 @@ import Controller from "@ember/controller"; import EmberObject, { action } from "@ember/object"; import { service } from "@ember/service"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import ColorSchemeSelectBaseModal from "admin/components/modal/color-scheme-select-base"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js index 38d048e10f8..71d0764c394 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js @@ -1,7 +1,7 @@ import Controller from "@ember/controller"; import { action } from "@ember/object"; import { service } from "@ember/service"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; export default class AdminCustomizeEmailStyleEditController extends Controller { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js index 0114a52a284..f326158cb45 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js @@ -2,8 +2,8 @@ import Controller, { inject as controller } from "@ember/controller"; import { action } from "@ember/object"; import { service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseComputed from "discourse/lib/decorators"; import { bufferedProperty } from "discourse/mixins/buffered-content"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; export default class AdminCustomizeEmailTemplatesEditController extends Controller.extend( diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js index 18a301db91e..b53cf9c3a36 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js @@ -2,7 +2,7 @@ import Controller from "@ember/controller"; import { action } from "@ember/object"; import { service } from "@ember/service"; import { url } from "discourse/lib/computed"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; export default class AdminCustomizeThemesEditController extends Controller { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js index b4487152eab..11fd5630825 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js @@ -12,8 +12,8 @@ import { service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { url } from "discourse/lib/computed"; -import { makeArray } from "discourse-common/lib/helpers"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; +import { makeArray } from "discourse/lib/helpers"; import { i18n } from "discourse-i18n"; import ThemeSettingsEditor from "admin/components/theme-settings-editor"; import { COMPONENTS, THEMES } from "admin/models/theme"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js index 57049eaee5c..5e9a9881fee 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js @@ -1,5 +1,5 @@ import Controller from "@ember/controller"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { THEMES } from "admin/models/theme"; export default class AdminCustomizeThemesController extends Controller { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js index b9ad1f9b237..b46b9991045 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js @@ -2,9 +2,9 @@ import { inject as controller } from "@ember/controller"; import { computed } from "@ember/object"; import { service } from "@ember/service"; import { setting } from "discourse/lib/computed"; -import getURL from "discourse-common/lib/get-url"; -import { makeArray } from "discourse-common/lib/helpers"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; +import getURL from "discourse/lib/get-url"; +import { makeArray } from "discourse/lib/helpers"; import { i18n } from "discourse-i18n"; import AdminDashboard from "admin/models/admin-dashboard"; import Report from "admin/models/report"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js index a5fe8a27446..5c2199ff4ff 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js @@ -1,5 +1,5 @@ import { computed } from "@ember/object"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import AdminDashboardTabController from "./admin-dashboard-tab"; export default class AdminDashboardModerationController extends AdminDashboardTabController { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js index a7f615f68f0..e81df3b80c1 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js @@ -1,8 +1,8 @@ import Controller from "@ember/controller"; import { action, get } from "@ember/object"; +import discourseDebounce from "discourse/lib/debounce"; +import discourseComputed from "discourse/lib/decorators"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; -import discourseComputed from "discourse-common/utils/decorators"; export default class AdminDashboardReportsController extends Controller { filter = null; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js index 1d77fe281e4..9e1680a8918 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js @@ -2,7 +2,7 @@ import Controller, { inject as controller } from "@ember/controller"; import { action, computed } from "@ember/object"; import { service } from "@ember/service"; import { setting } from "discourse/lib/computed"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import AdminDashboard from "admin/models/admin-dashboard"; import VersionCheck from "admin/models/version-check"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js index 834d6fa9aa8..fbf706526c6 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js @@ -1,7 +1,7 @@ import { action } from "@ember/object"; import { observes } from "@ember-decorators/object"; +import discourseDebounce from "discourse/lib/debounce"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; import AdminEmailLogsController from "admin/controllers/admin-email-logs"; export default class AdminEmailBouncedController extends AdminEmailLogsController { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-received.js b/app/assets/javascripts/admin/addon/controllers/admin-email-received.js index 1f55fec6eb3..e8306f3b17d 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-received.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-received.js @@ -1,7 +1,7 @@ import { action } from "@ember/object"; import { observes } from "@ember-decorators/object"; +import discourseDebounce from "discourse/lib/debounce"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; import AdminEmailLogsController from "admin/controllers/admin-email-logs"; import IncomingEmail from "admin/models/incoming-email"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js index 60bfd89dd74..a33112ed383 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js @@ -1,7 +1,7 @@ import { action } from "@ember/object"; import { observes } from "@ember-decorators/object"; +import discourseDebounce from "discourse/lib/debounce"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; import AdminEmailLogsController from "admin/controllers/admin-email-logs"; import IncomingEmail from "admin/models/incoming-email"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js b/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js index ac0d7d43f33..d3156fbb7d5 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js @@ -1,6 +1,6 @@ import { observes } from "@ember-decorators/object"; +import discourseDebounce from "discourse/lib/debounce"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; import AdminEmailLogsController from "admin/controllers/admin-email-logs"; export default class AdminEmailSentController extends AdminEmailLogsController { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js b/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js index d7082aecd33..186514eb0ca 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js @@ -1,6 +1,6 @@ import { observes } from "@ember-decorators/object"; +import discourseDebounce from "discourse/lib/debounce"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; import AdminEmailLogsController from "admin/controllers/admin-email-logs"; export default class AdminEmailSkippedController extends AdminEmailLogsController { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-embedding-index.js b/app/assets/javascripts/admin/addon/controllers/admin-embedding-index.js index 2e86b8d194b..bb31066ff48 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-embedding-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-embedding-index.js @@ -2,7 +2,7 @@ import Controller, { inject as controller } from "@ember/controller"; import { action } from "@ember/object"; import { alias } from "@ember/object/computed"; import { service } from "@ember/service"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class AdminEmbeddingIndexController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js index 5157bf67ca6..4b805a1b425 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js @@ -2,10 +2,10 @@ import Controller from "@ember/controller"; import { action } from "@ember/object"; import { service } from "@ember/service"; import { observes } from "@ember-decorators/object"; +import discourseDebounce from "discourse/lib/debounce"; import { exportEntity } from "discourse/lib/export-csv"; import { outputExportResult } from "discourse/lib/export-result"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; import { i18n } from "discourse-i18n"; import ScreenedIpAddress from "admin/models/screened-ip-address"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js index 87836507465..35b1a58687a 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js @@ -2,9 +2,9 @@ import Controller from "@ember/controller"; import EmberObject, { action } from "@ember/object"; import { scheduleOnce } from "@ember/runloop"; import { service } from "@ember/service"; +import discourseComputed from "discourse/lib/decorators"; import { exportEntity } from "discourse/lib/export-csv"; import { outputExportResult } from "discourse/lib/export-result"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; import AdminStaffActionLogComponent from "../components/modal/staff-action-log-change"; import StaffActionLogDetailsModal from "../components/modal/staff-action-log-details"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-permalinks-index.js b/app/assets/javascripts/admin/addon/controllers/admin-permalinks-index.js index 35697f515c0..fc29a5f9ea5 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-permalinks-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-permalinks-index.js @@ -3,9 +3,9 @@ import { action } from "@ember/object"; import { or } from "@ember/object/computed"; import { service } from "@ember/service"; import { observes } from "@ember-decorators/object"; +import discourseDebounce from "discourse/lib/debounce"; import { clipboardCopy } from "discourse/lib/utilities"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; import { i18n } from "discourse-i18n"; import Permalink from "admin/models/permalink"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js b/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js index c84696338c7..d0118e3f00e 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js @@ -1,5 +1,5 @@ import Controller from "@ember/controller"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class AdminReportsShowController extends Controller { queryParams = ["start_date", "end_date", "filters", "chart_grouping", "mode"]; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js b/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js index 50202e00f32..03d1d1a9916 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js @@ -1,5 +1,5 @@ import Controller, { inject as controller } from "@ember/controller"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class AdminSiteSettingsCategoryController extends Controller { @controller adminSiteSettings; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js index 8bb488991e3..7ecad6bb810 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js @@ -3,9 +3,9 @@ import { action } from "@ember/object"; import { alias } from "@ember/object/computed"; import { service } from "@ember/service"; import { isEmpty } from "@ember/utils"; +import { debounce } from "discourse/lib/decorators"; import SiteSettingFilter from "discourse/lib/site-setting-filter"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import { debounce } from "discourse-common/utils/decorators"; export default class AdminSiteSettingsController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js index 9b89624ea2c..4f8774a094c 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js @@ -2,8 +2,8 @@ import Controller from "@ember/controller"; import { action } from "@ember/object"; import { service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseComputed from "discourse/lib/decorators"; import { bufferedProperty } from "discourse/mixins/buffered-content"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; export default class AdminSiteTextEdit extends Controller.extend( diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js index d4ce5a2dad9..07aa61b57ef 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js @@ -2,8 +2,8 @@ import { tracked } from "@glimmer/tracking"; import Controller from "@ember/controller"; import { action } from "@ember/object"; import { service } from "@ember/service"; +import discourseDebounce from "discourse/lib/debounce"; import { disableImplicitInjections } from "discourse/lib/implicit-injections"; -import discourseDebounce from "discourse-common/lib/debounce"; import ReseedModal from "admin/components/modal/reseed"; let lastSearch; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js index e0edecd5818..4bd6791f2f7 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js @@ -4,9 +4,9 @@ import { alias, empty, sort } from "@ember/object/computed"; import { next } from "@ember/runloop"; import { service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseComputed from "discourse/lib/decorators"; import { grantableBadges } from "discourse/lib/grant-badge-utils"; import UserBadge from "discourse/models/user-badge"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; import AdminUser from "admin/models/admin-user"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js index 4caad0d9435..5f4aab9ee3f 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js @@ -7,9 +7,9 @@ import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper"; import { fmt, propertyNotEqual, setting } from "discourse/lib/computed"; +import discourseComputed from "discourse/lib/decorators"; +import getURL from "discourse/lib/get-url"; import DiscourseURL, { userPath } from "discourse/lib/url"; -import getURL from "discourse-common/lib/get-url"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; import AdminUser from "admin/models/admin-user"; import DeletePostsConfirmationModal from "../components/modal/delete-posts-confirmation"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js index f087cbd9379..ac7e2114795 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js @@ -4,9 +4,9 @@ import { action, computed } from "@ember/object"; import { service } from "@ember/service"; import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper"; import { computedI18n, setting } from "discourse/lib/computed"; +import discourseDebounce from "discourse/lib/debounce"; +import discourseComputed, { bind } from "discourse/lib/decorators"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; import BulkUserDeleteConfirmation from "admin/components/bulk-user-delete-confirmation"; import AdminUser from "admin/models/admin-user"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js index 40050a96efb..078f8ca989f 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js @@ -5,7 +5,7 @@ import { schedule } from "@ember/runloop"; import { service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { fmt } from "discourse/lib/computed"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import WatchedWordTestingModal from "admin/components/modal/watched-word-testing"; import WatchedWord from "admin/models/watched-word"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js index 06f582b62f8..b65b2da2801 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js @@ -2,8 +2,8 @@ import Controller from "@ember/controller"; import EmberObject, { action } from "@ember/object"; import { isEmpty } from "@ember/utils"; import { observes } from "@ember-decorators/object"; +import discourseDebounce from "discourse/lib/debounce"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; export default class AdminWatchedWordsController extends Controller { filter = null; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js index 352cfe1c5fb..be9c433948d 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js @@ -4,7 +4,7 @@ import { alias } from "@ember/object/computed"; import { service } from "@ember/service"; import { isEmpty } from "@ember/utils"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; export default class AdminWebHooksEditController extends Controller { diff --git a/app/assets/javascripts/admin/addon/controllers/admin.js b/app/assets/javascripts/admin/addon/controllers/admin.js index 194fd4376d9..02e21d55224 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin.js +++ b/app/assets/javascripts/admin/addon/controllers/admin.js @@ -1,7 +1,7 @@ import Controller from "@ember/controller"; import { service } from "@ember/service"; import { dasherize } from "@ember/string"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class AdminController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/helpers/check-icon.js b/app/assets/javascripts/admin/addon/helpers/check-icon.js index 7b2c29d984b..0bbee5787b3 100644 --- a/app/assets/javascripts/admin/addon/helpers/check-icon.js +++ b/app/assets/javascripts/admin/addon/helpers/check-icon.js @@ -1,6 +1,6 @@ import { htmlSafe } from "@ember/template"; -import { registerRawHelper } from "discourse-common/lib/helpers"; -import { renderIcon } from "discourse-common/lib/icon-library"; +import { registerRawHelper } from "discourse/lib/helpers"; +import { renderIcon } from "discourse/lib/icon-library"; registerRawHelper("check-icon", checkIcon); diff --git a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js index ce0142d1471..0565912f0ba 100644 --- a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js +++ b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js @@ -1,6 +1,6 @@ import Helper from "@ember/component/helper"; import { htmlSafe } from "@ember/template"; -import { iconHTML } from "discourse-common/lib/icon-library"; +import { iconHTML } from "discourse/lib/icon-library"; export default class DispositionIcon extends Helper { compute([disposition]) { diff --git a/app/assets/javascripts/admin/addon/helpers/preserve-newlines.js b/app/assets/javascripts/admin/addon/helpers/preserve-newlines.js index 3d7f2e019e7..cf76ccd5f04 100644 --- a/app/assets/javascripts/admin/addon/helpers/preserve-newlines.js +++ b/app/assets/javascripts/admin/addon/helpers/preserve-newlines.js @@ -1,5 +1,5 @@ +import { htmlHelper } from "discourse/lib/helpers"; import { escapeExpression } from "discourse/lib/utilities"; -import { htmlHelper } from "discourse-common/lib/helpers"; export default htmlHelper((str) => escapeExpression(str).replace(/\n/g, "
") diff --git a/app/assets/javascripts/admin/addon/helpers/value-at-tl.js b/app/assets/javascripts/admin/addon/helpers/value-at-tl.js index 9aada034c79..6b599729471 100644 --- a/app/assets/javascripts/admin/addon/helpers/value-at-tl.js +++ b/app/assets/javascripts/admin/addon/helpers/value-at-tl.js @@ -1,4 +1,4 @@ -import { registerRawHelper } from "discourse-common/lib/helpers"; +import { registerRawHelper } from "discourse/lib/helpers"; registerRawHelper("value-at-tl", valueAtTl); diff --git a/app/assets/javascripts/admin/addon/lib/setting-object-helper.js b/app/assets/javascripts/admin/addon/lib/setting-object-helper.js index 9e67c100d50..a6d7da631a4 100644 --- a/app/assets/javascripts/admin/addon/lib/setting-object-helper.js +++ b/app/assets/javascripts/admin/addon/lib/setting-object-helper.js @@ -1,6 +1,6 @@ import { dependentKeyCompat } from "@ember/object/compat"; import { isPresent } from "@ember/utils"; -import { deepEqual } from "discourse-common/lib/object"; +import { deepEqual } from "discourse/lib/object"; import { i18n } from "discourse-i18n"; export default class SettingObjectHelper { diff --git a/app/assets/javascripts/admin/addon/mixins/setting-component.js b/app/assets/javascripts/admin/addon/mixins/setting-component.js index 58d7c867909..7253f19c0b2 100644 --- a/app/assets/javascripts/admin/addon/mixins/setting-component.js +++ b/app/assets/javascripts/admin/addon/mixins/setting-component.js @@ -10,8 +10,8 @@ import JsonSchemaEditorModal from "discourse/components/modal/json-schema-editor import { ajax } from "discourse/lib/ajax"; import { fmt, propertyNotEqual } from "discourse/lib/computed"; import { SITE_SETTING_REQUIRES_CONFIRMATION_TYPES } from "discourse/lib/constants"; +import { deepEqual } from "discourse/lib/object"; import { splitString } from "discourse/lib/utilities"; -import { deepEqual } from "discourse-common/lib/object"; import { i18n } from "discourse-i18n"; import SiteSettingDefaultCategoriesModal from "../components/modal/site-setting-default-categories"; diff --git a/app/assets/javascripts/admin/addon/models/admin-plugin.js b/app/assets/javascripts/admin/addon/models/admin-plugin.js index 53e86cf888b..097e7ccc233 100644 --- a/app/assets/javascripts/admin/addon/models/admin-plugin.js +++ b/app/assets/javascripts/admin/addon/models/admin-plugin.js @@ -1,6 +1,6 @@ import { cached, tracked } from "@glimmer/tracking"; import { capitalize, dasherize } from "@ember/string"; -import { snakeCaseToCamelCase } from "discourse-common/lib/case-converter"; +import { snakeCaseToCamelCase } from "discourse/lib/case-converter"; import I18n, { i18n } from "discourse-i18n"; export default class AdminPlugin { diff --git a/app/assets/javascripts/admin/addon/models/admin-user.js b/app/assets/javascripts/admin/addon/models/admin-user.js index 952918db661..9f45b4ae843 100644 --- a/app/assets/javascripts/admin/addon/models/admin-user.js +++ b/app/assets/javascripts/admin/addon/models/admin-user.js @@ -3,11 +3,11 @@ import { Promise } from "rsvp"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { propertyNotEqual } from "discourse/lib/computed"; +import discourseComputed from "discourse/lib/decorators"; +import getURL from "discourse/lib/get-url"; import { userPath } from "discourse/lib/url"; import Group from "discourse/models/group"; import User from "discourse/models/user"; -import getURL from "discourse-common/lib/get-url"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; export default class AdminUser extends User { diff --git a/app/assets/javascripts/admin/addon/models/api-key.js b/app/assets/javascripts/admin/addon/models/api-key.js index 228682544fd..785220552ba 100644 --- a/app/assets/javascripts/admin/addon/models/api-key.js +++ b/app/assets/javascripts/admin/addon/models/api-key.js @@ -1,8 +1,8 @@ import { computed } from "@ember/object"; import { ajax } from "discourse/lib/ajax"; import { fmt } from "discourse/lib/computed"; +import discourseComputed from "discourse/lib/decorators"; import RestModel from "discourse/models/rest"; -import discourseComputed from "discourse-common/utils/decorators"; import AdminUser from "admin/models/admin-user"; export default class ApiKey extends RestModel { diff --git a/app/assets/javascripts/admin/addon/models/backup-status.js b/app/assets/javascripts/admin/addon/models/backup-status.js index 095239d9c7f..175b2340cc2 100644 --- a/app/assets/javascripts/admin/addon/models/backup-status.js +++ b/app/assets/javascripts/admin/addon/models/backup-status.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; import { not } from "@ember/object/computed"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class BackupStatus extends EmberObject { @not("restoreEnabled") restoreDisabled; diff --git a/app/assets/javascripts/admin/addon/models/color-scheme-color.js b/app/assets/javascripts/admin/addon/models/color-scheme-color.js index 4c956de3645..0291868e2fb 100644 --- a/app/assets/javascripts/admin/addon/models/color-scheme-color.js +++ b/app/assets/javascripts/admin/addon/models/color-scheme-color.js @@ -1,7 +1,7 @@ import EmberObject from "@ember/object"; import { observes, on } from "@ember-decorators/object"; import { propertyNotEqual } from "discourse/lib/computed"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; export default class ColorSchemeColor extends EmberObject { diff --git a/app/assets/javascripts/admin/addon/models/color-scheme.js b/app/assets/javascripts/admin/addon/models/color-scheme.js index b6c62d75f58..e1d9745d78a 100644 --- a/app/assets/javascripts/admin/addon/models/color-scheme.js +++ b/app/assets/javascripts/admin/addon/models/color-scheme.js @@ -3,7 +3,7 @@ import ArrayProxy from "@ember/array/proxy"; import EmberObject from "@ember/object"; import { not } from "@ember/object/computed"; import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import ColorSchemeColor from "admin/models/color-scheme-color"; diff --git a/app/assets/javascripts/admin/addon/models/email-log.js b/app/assets/javascripts/admin/addon/models/email-log.js index 921c416e393..9023221bad4 100644 --- a/app/assets/javascripts/admin/addon/models/email-log.js +++ b/app/assets/javascripts/admin/addon/models/email-log.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; -import getURL from "discourse-common/lib/get-url"; +import getURL from "discourse/lib/get-url"; import AdminUser from "admin/models/admin-user"; export default class EmailLog extends EmberObject { diff --git a/app/assets/javascripts/admin/addon/models/flag-type.js b/app/assets/javascripts/admin/addon/models/flag-type.js index 9560ffa3809..21278565162 100644 --- a/app/assets/javascripts/admin/addon/models/flag-type.js +++ b/app/assets/javascripts/admin/addon/models/flag-type.js @@ -1,5 +1,5 @@ +import discourseComputed from "discourse/lib/decorators"; import RestModel from "discourse/models/rest"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; export default class FlagType extends RestModel { diff --git a/app/assets/javascripts/admin/addon/models/permalink.js b/app/assets/javascripts/admin/addon/models/permalink.js index 72f2fe42a33..67327877d59 100644 --- a/app/assets/javascripts/admin/addon/models/permalink.js +++ b/app/assets/javascripts/admin/addon/models/permalink.js @@ -1,8 +1,8 @@ import { ajax } from "discourse/lib/ajax"; +import discourseComputed from "discourse/lib/decorators"; import DiscourseURL from "discourse/lib/url"; import Category from "discourse/models/category"; import RestModel from "discourse/models/rest"; -import discourseComputed from "discourse-common/utils/decorators"; export default class Permalink extends RestModel { static findAll(filter) { diff --git a/app/assets/javascripts/admin/addon/models/report.js b/app/assets/javascripts/admin/addon/models/report.js index c77f6222b2b..b974e0425a0 100644 --- a/app/assets/javascripts/admin/addon/models/report.js +++ b/app/assets/javascripts/admin/addon/models/report.js @@ -2,7 +2,10 @@ import EmberObject from "@ember/object"; import { isEmpty } from "@ember/utils"; import { renderAvatar } from "discourse/helpers/user-avatar"; import { ajax } from "discourse/lib/ajax"; +import discourseComputed from "discourse/lib/decorators"; import { durationTiny, number } from "discourse/lib/formatter"; +import getURL from "discourse/lib/get-url"; +import { makeArray } from "discourse/lib/helpers"; import round from "discourse/lib/round"; import { escapeExpression, @@ -10,9 +13,6 @@ import { formatUsername, toNumber, } from "discourse/lib/utilities"; -import getURL from "discourse-common/lib/get-url"; -import { makeArray } from "discourse-common/lib/helpers"; -import discourseComputed from "discourse-common/utils/decorators"; import I18n, { i18n } from "discourse-i18n"; // Change this line each time report format change diff --git a/app/assets/javascripts/admin/addon/models/screened-email.js b/app/assets/javascripts/admin/addon/models/screened-email.js index df302ca76ec..2e632e0ad98 100644 --- a/app/assets/javascripts/admin/addon/models/screened-email.js +++ b/app/assets/javascripts/admin/addon/models/screened-email.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; export default class ScreenedEmail extends EmberObject { diff --git a/app/assets/javascripts/admin/addon/models/screened-ip-address.js b/app/assets/javascripts/admin/addon/models/screened-ip-address.js index 80d625dad5c..e80804262af 100644 --- a/app/assets/javascripts/admin/addon/models/screened-ip-address.js +++ b/app/assets/javascripts/admin/addon/models/screened-ip-address.js @@ -1,7 +1,7 @@ import EmberObject from "@ember/object"; import { equal } from "@ember/object/computed"; import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; export default class ScreenedIpAddress extends EmberObject { diff --git a/app/assets/javascripts/admin/addon/models/screened-url.js b/app/assets/javascripts/admin/addon/models/screened-url.js index 8d72617934a..8b88bd56538 100644 --- a/app/assets/javascripts/admin/addon/models/screened-url.js +++ b/app/assets/javascripts/admin/addon/models/screened-url.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; export default class ScreenedUrl extends EmberObject { diff --git a/app/assets/javascripts/admin/addon/models/site-setting.js b/app/assets/javascripts/admin/addon/models/site-setting.js index a7b6bd5451f..5a5c86f853b 100644 --- a/app/assets/javascripts/admin/addon/models/site-setting.js +++ b/app/assets/javascripts/admin/addon/models/site-setting.js @@ -1,7 +1,7 @@ import EmberObject from "@ember/object"; import { alias } from "@ember/object/computed"; import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import SettingObjectHelper from "admin/lib/setting-object-helper"; diff --git a/app/assets/javascripts/admin/addon/models/staff-action-log.js b/app/assets/javascripts/admin/addon/models/staff-action-log.js index 862ddf1755c..9be53840687 100644 --- a/app/assets/javascripts/admin/addon/models/staff-action-log.js +++ b/app/assets/javascripts/admin/addon/models/staff-action-log.js @@ -1,7 +1,7 @@ import { ajax } from "discourse/lib/ajax"; +import discourseComputed from "discourse/lib/decorators"; import { escapeExpression } from "discourse/lib/utilities"; import RestModel from "discourse/models/rest"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; import AdminUser from "admin/models/admin-user"; diff --git a/app/assets/javascripts/admin/addon/models/theme.js b/app/assets/javascripts/admin/addon/models/theme.js index 3d4df49ce55..9c4c3e3b2aa 100644 --- a/app/assets/javascripts/admin/addon/models/theme.js +++ b/app/assets/javascripts/admin/addon/models/theme.js @@ -2,8 +2,8 @@ import { get } from "@ember/object"; import { gt, or } from "@ember/object/computed"; import { isBlank, isEmpty } from "@ember/utils"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseComputed from "discourse/lib/decorators"; import RestModel from "discourse/models/rest"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; import ThemeSettings from "admin/models/theme-settings"; diff --git a/app/assets/javascripts/admin/addon/models/tl3-requirements.js b/app/assets/javascripts/admin/addon/models/tl3-requirements.js index 43a41362369..ae2a918407b 100644 --- a/app/assets/javascripts/admin/addon/models/tl3-requirements.js +++ b/app/assets/javascripts/admin/addon/models/tl3-requirements.js @@ -1,5 +1,5 @@ import EmberObject from "@ember/object"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class Tl3Requirements extends EmberObject { @discourseComputed("days_visited", "time_period") diff --git a/app/assets/javascripts/admin/addon/models/version-check.js b/app/assets/javascripts/admin/addon/models/version-check.js index baf029c3c47..43e8111cf41 100644 --- a/app/assets/javascripts/admin/addon/models/version-check.js +++ b/app/assets/javascripts/admin/addon/models/version-check.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class VersionCheck extends EmberObject { static find() { diff --git a/app/assets/javascripts/admin/addon/models/web-hook.js b/app/assets/javascripts/admin/addon/models/web-hook.js index 796ff4f8450..9a04da0cf77 100644 --- a/app/assets/javascripts/admin/addon/models/web-hook.js +++ b/app/assets/javascripts/admin/addon/models/web-hook.js @@ -2,10 +2,10 @@ import { tracked } from "@glimmer/tracking"; import { computed } from "@ember/object"; import { isEmpty } from "@ember/utils"; import { observes } from "@ember-decorators/object"; +import discourseComputed from "discourse/lib/decorators"; import Group from "discourse/models/group"; import RestModel from "discourse/models/rest"; import Site from "discourse/models/site"; -import discourseComputed from "discourse-common/utils/decorators"; class WebHookExtras { @tracked categories; diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups-index.js b/app/assets/javascripts/admin/addon/routes/admin-backups-index.js index fafbab34437..227d700e9cd 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-backups-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-backups-index.js @@ -1,5 +1,5 @@ import Route from "@ember/routing/route"; -import { bind } from "discourse-common/utils/decorators"; +import { bind } from "discourse/lib/decorators"; import Backup from "admin/models/backup"; export default class AdminBackupsIndexRoute extends Route { diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups.js b/app/assets/javascripts/admin/addon/routes/admin-backups.js index 18318685e17..70522523cf6 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-backups.js +++ b/app/assets/javascripts/admin/addon/routes/admin-backups.js @@ -2,10 +2,10 @@ import EmberObject, { action } from "@ember/object"; import { service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { extractError } from "discourse/lib/ajax-error"; +import { bind } from "discourse/lib/decorators"; +import getURL from "discourse/lib/get-url"; import PreloadStore from "discourse/lib/preload-store"; import DiscourseRoute from "discourse/routes/discourse"; -import getURL from "discourse-common/lib/get-url"; -import { bind } from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; import StartBackupModal from "admin/components/modal/start-backup"; import Backup from "admin/models/backup"; diff --git a/app/assets/javascripts/dialog-holder/addon/services/dialog.js b/app/assets/javascripts/dialog-holder/addon/services/dialog.js index 5ea9429a848..c9be6f14da4 100644 --- a/app/assets/javascripts/dialog-holder/addon/services/dialog.js +++ b/app/assets/javascripts/dialog-holder/addon/services/dialog.js @@ -1,7 +1,7 @@ import { schedule } from "@ember/runloop"; import Service from "@ember/service"; import A11yDialog from "a11y-dialog"; -import { bind } from "discourse-common/utils/decorators"; +import { bind } from "discourse/lib/decorators"; export default class DialogService extends Service { dialogInstance = null; diff --git a/app/assets/javascripts/discourse-common/addon/config/environment.js b/app/assets/javascripts/discourse-common/addon/config/environment.js index 2b2fba3de6a..cdeb31b0262 100644 --- a/app/assets/javascripts/discourse-common/addon/config/environment.js +++ b/app/assets/javascripts/discourse-common/addon/config/environment.js @@ -1,4 +1,4 @@ -import deprecated from "discourse-common/lib/deprecated"; +import deprecated from "discourse/lib/deprecated"; export const INPUT_DELAY = 250; diff --git a/app/assets/javascripts/discourse-common/addon/deprecation-workflow.js b/app/assets/javascripts/discourse-common/addon/deprecation-workflow.js deleted file mode 100644 index f80c3690057..00000000000 --- a/app/assets/javascripts/discourse-common/addon/deprecation-workflow.js +++ /dev/null @@ -1,11 +0,0 @@ -const DEPRECATION_WORKFLOW = [ - { handler: "silence", matchId: "template-action" }, // will be removed in Ember 6.0 - { handler: "silence", matchId: "deprecate-array-prototype-extensions" }, // will be removed in Ember 6.0 - { handler: "silence", matchId: "discourse.select-kit" }, - { - handler: "silence", - matchId: "discourse.decorate-widget.hamburger-widget-links", - }, -]; - -export default DEPRECATION_WORKFLOW; diff --git a/app/assets/javascripts/discourse-common/addon/lib/debounce.js b/app/assets/javascripts/discourse-common/addon/lib/debounce.js deleted file mode 100644 index 37171684b15..00000000000 --- a/app/assets/javascripts/discourse-common/addon/lib/debounce.js +++ /dev/null @@ -1,28 +0,0 @@ -import { debounce } from "@ember/runloop"; -import { isTesting } from "discourse-common/config/environment"; - -/** - Debounce a Javascript function. This means if it's called many times in a time limit it - should only be executed once (at the end of the limit counted from the last call made). - Original function will be called with the context and arguments from the last call made. -**/ - -export default function () { - if (isTesting()) { - const lastArgument = arguments[arguments.length - 1]; - const hasImmediateArgument = typeof lastArgument === "boolean"; - - let args = [].slice.call(arguments, 0, hasImmediateArgument ? -2 : -1); - - // Replace the time argument with 10ms - args.push(10); - - if (hasImmediateArgument) { - args.push(lastArgument); - } - - return debounce.apply(undefined, args); - } else { - return debounce(...arguments); - } -} diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js index 7bfb92a8427..50c92b802a6 100644 --- a/app/assets/javascripts/discourse-common/addon/resolver.js +++ b/app/assets/javascripts/discourse-common/addon/resolver.js @@ -1,9 +1,9 @@ import { dasherize, decamelize } from "@ember/string"; import Resolver from "ember-resolver"; -import deprecated from "discourse-common/lib/deprecated"; -import DiscourseTemplateMap from "discourse-common/lib/discourse-template-map"; -import { findHelper } from "discourse-common/lib/helpers"; -import SuffixTrie from "discourse-common/lib/suffix-trie"; +import deprecated from "discourse/lib/deprecated"; +import DiscourseTemplateMap from "discourse/lib/discourse-template-map"; +import { findHelper } from "discourse/lib/helpers"; +import SuffixTrie from "discourse/lib/suffix-trie"; let _options = {}; let moduleSuffixTrie = null; diff --git a/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js b/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js index 4a1a200bd58..c26cc1ab001 100644 --- a/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js +++ b/app/assets/javascripts/discourse-hbr/raw-handlebars-compiler.js @@ -152,8 +152,8 @@ TemplateCompiler.prototype.processString = function (string, relativePath) { ); return ` - import { template as compiler } from "discourse-common/lib/raw-handlebars"; - import { addRawTemplate } from "discourse-common/lib/raw-templates"; + import { template as compiler } from "discourse/lib/raw-handlebars"; + import { addRawTemplate } from "discourse/lib/raw-templates"; let template = compiler(${this.precompile(string, false)}); diff --git a/app/assets/javascripts/discourse-markdown-it/package.json b/app/assets/javascripts/discourse-markdown-it/package.json index 5f047f839ca..ef36cb759f3 100644 --- a/app/assets/javascripts/discourse-markdown-it/package.json +++ b/app/assets/javascripts/discourse-markdown-it/package.json @@ -30,6 +30,7 @@ "peerDependencies": { "discourse-i18n": "workspace:1.0.0", "pretty-text": "workspace:1.0.0", + "discourse": "workspace:0.0.0", "xss": "*" }, "engines": { diff --git a/app/assets/javascripts/discourse-markdown-it/src/features/bbcode-block.js b/app/assets/javascripts/discourse-markdown-it/src/features/bbcode-block.js index 422b57dc9b6..f2c519a9b01 100644 --- a/app/assets/javascripts/discourse-markdown-it/src/features/bbcode-block.js +++ b/app/assets/javascripts/discourse-markdown-it/src/features/bbcode-block.js @@ -1,4 +1,4 @@ -import { camelCaseToDash } from "discourse-common/lib/case-converter"; +import { camelCaseToDash } from "discourse/lib/case-converter"; let isWhiteSpace, escapeHtml; diff --git a/app/assets/javascripts/discourse-markdown-it/src/options.js b/app/assets/javascripts/discourse-markdown-it/src/options.js index c7899acba20..326d7d53aa3 100644 --- a/app/assets/javascripts/discourse-markdown-it/src/options.js +++ b/app/assets/javascripts/discourse-markdown-it/src/options.js @@ -1,4 +1,4 @@ -import { deepMerge } from "discourse-common/lib/object"; +import { deepMerge } from "discourse/lib/object"; // the options are passed here and must be explicitly allowed with // the const options & state below diff --git a/app/assets/javascripts/discourse-markdown-it/src/setup.js b/app/assets/javascripts/discourse-markdown-it/src/setup.js index e420b36d06d..35d9ccf5a78 100644 --- a/app/assets/javascripts/discourse-markdown-it/src/setup.js +++ b/app/assets/javascripts/discourse-markdown-it/src/setup.js @@ -1,6 +1,6 @@ import { textReplace } from "pretty-text/text-replace"; -import deprecated from "discourse-common/lib/deprecated"; -import { cloneJSON } from "discourse-common/lib/object"; +import deprecated from "discourse/lib/deprecated"; +import { cloneJSON } from "discourse/lib/object"; import makeEngine, { cook } from "./engine"; // note, this will mutate options due to the way the API is designed diff --git a/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js b/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js index e9c35a1fc60..7bfa8a98ff5 100644 --- a/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js +++ b/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js @@ -1,7 +1,7 @@ import { dateNode } from "discourse/helpers/node"; +import { iconNode } from "discourse/lib/icon-library"; import { avatarFor as avatar } from "discourse/widgets/post"; import rawHtml from "discourse/widgets/raw-html"; -import { iconNode } from "discourse-common/lib/icon-library"; export default { avatar, diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js index 9ebf4aa6916..69fccf0b7b3 100644 --- a/app/assets/javascripts/discourse/app/app.js +++ b/app/assets/javascripts/discourse/app/app.js @@ -1,4 +1,7 @@ -import "./deprecation-workflow"; +import setupDeprecationWorkflow from "ember-cli-deprecation-workflow"; +import DEPRECATION_WORKFLOW from "./deprecation-workflow"; +setupDeprecationWorkflow({ workflow: DEPRECATION_WORKFLOW }); + import "decorator-transforms/globals"; import "./loader-shims"; import "./discourse-common-loader-shims"; diff --git a/app/assets/javascripts/discourse/app/components/about-page.gjs b/app/assets/javascripts/discourse/app/components/about-page.gjs index b35c4391846..c031d957c8c 100644 --- a/app/assets/javascripts/discourse/app/components/about-page.gjs +++ b/app/assets/javascripts/discourse/app/components/about-page.gjs @@ -6,8 +6,8 @@ import { htmlSafe } from "@ember/template"; import AboutPageUsers from "discourse/components/about-page-users"; import PluginOutlet from "discourse/components/plugin-outlet"; import dIcon from "discourse/helpers/d-icon"; +import escape from "discourse/lib/escape"; import { number } from "discourse/lib/formatter"; -import escape from "discourse-common/lib/escape"; import I18n, { i18n } from "discourse-i18n"; const pluginActivitiesFuncs = []; diff --git a/app/assets/javascripts/discourse/app/components/ace-editor.gjs b/app/assets/javascripts/discourse/app/components/ace-editor.gjs index 5f062329e6b..6dda39b27bf 100644 --- a/app/assets/javascripts/discourse/app/components/ace-editor.gjs +++ b/app/assets/javascripts/discourse/app/components/ace-editor.gjs @@ -6,9 +6,9 @@ import { service } from "@ember/service"; import { buildWaiter } from "@ember/test-waiters"; import { modifier } from "ember-modifier"; import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner"; +import { bind } from "discourse/lib/decorators"; import loadAce from "discourse/lib/load-ace-editor"; import { isTesting } from "discourse-common/config/environment"; -import { bind } from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; const WAITER = buildWaiter("ace-editor"); diff --git a/app/assets/javascripts/discourse/app/components/avatar-uploader.js b/app/assets/javascripts/discourse/app/components/avatar-uploader.js index 2479c29367d..c5ad0b52b1e 100644 --- a/app/assets/javascripts/discourse/app/components/avatar-uploader.js +++ b/app/assets/javascripts/discourse/app/components/avatar-uploader.js @@ -3,8 +3,8 @@ import { action } from "@ember/object"; import { getOwner } from "@ember/owner"; import { isBlank } from "@ember/utils"; import { tagName } from "@ember-decorators/component"; +import discourseComputed from "discourse/lib/decorators"; import UppyUpload from "discourse/lib/uppy/uppy-upload"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; @tagName("span") diff --git a/app/assets/javascripts/discourse/app/components/badge-button.gjs b/app/assets/javascripts/discourse/app/components/badge-button.gjs index c5d22a5bca5..70e2d6d5b7b 100644 --- a/app/assets/javascripts/discourse/app/components/badge-button.gjs +++ b/app/assets/javascripts/discourse/app/components/badge-button.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import iconOrImage from "discourse/helpers/icon-or-image"; -import domFromString from "discourse-common/lib/dom-from-string"; +import domFromString from "discourse/lib/dom-from-string"; export default class BadgeButton extends Component { get title() { diff --git a/app/assets/javascripts/discourse/app/components/basic-topic-list.js b/app/assets/javascripts/discourse/app/components/basic-topic-list.js index 74f45be6fab..080a2d7f3bd 100644 --- a/app/assets/javascripts/discourse/app/components/basic-topic-list.js +++ b/app/assets/javascripts/discourse/app/components/basic-topic-list.js @@ -3,7 +3,7 @@ import { alias, not } from "@ember/object/computed"; import { service } from "@ember/service"; import { observes } from "@ember-decorators/object"; import $ from "jquery"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; +import discourseComputed, { bind } from "discourse/lib/decorators"; export default class BasicTopicList extends Component { @service site; diff --git a/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js index e1f9018086a..f5a1054a8f9 100644 --- a/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js +++ b/app/assets/javascripts/discourse/app/components/bookmark-actions-dropdown.js @@ -1,6 +1,6 @@ import { action } from "@ember/object"; import { classNames } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box"; import { diff --git a/app/assets/javascripts/discourse/app/components/bread-crumbs.js b/app/assets/javascripts/discourse/app/components/bread-crumbs.js index e12c953730c..ee6b2d511f2 100644 --- a/app/assets/javascripts/discourse/app/components/bread-crumbs.js +++ b/app/assets/javascripts/discourse/app/components/bread-crumbs.js @@ -1,8 +1,8 @@ import Component from "@ember/component"; import { filter } from "@ember/object/computed"; import { classNameBindings, tagName } from "@ember-decorators/component"; -import deprecated from "discourse-common/lib/deprecated"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; +import deprecated from "discourse/lib/deprecated"; // A breadcrumb including category drop downs @tagName("ol") diff --git a/app/assets/javascripts/discourse/app/components/card-contents-base.js b/app/assets/javascripts/discourse/app/components/card-contents-base.js index ce647bf79f5..ea333d45a15 100644 --- a/app/assets/javascripts/discourse/app/components/card-contents-base.js +++ b/app/assets/javascripts/discourse/app/components/card-contents-base.js @@ -2,12 +2,12 @@ import Component from "@ember/component"; import { alias, match } from "@ember/object/computed"; import { next, schedule, throttle } from "@ember/runloop"; import { service } from "@ember/service"; +import { bind } from "discourse/lib/decorators"; import { wantsNewWindow } from "discourse/lib/intercept-click"; +import discourseLater from "discourse/lib/later"; import { headerOffset } from "discourse/lib/offset-calculator"; import DiscourseURL from "discourse/lib/url"; import { escapeExpression } from "discourse/lib/utilities"; -import discourseLater from "discourse-common/lib/later"; -import { bind } from "discourse-common/utils/decorators"; const DEFAULT_SELECTOR = "#main-outlet"; const AVATAR_OVERFLOW_SIZE = 44; diff --git a/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js b/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js index 81201cfe9e7..0eb986cb352 100644 --- a/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js +++ b/app/assets/javascripts/discourse/app/components/categories-boxes-topic.js @@ -1,6 +1,6 @@ import Component from "@ember/component"; import { attributeBindings, tagName } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; @tagName("li") @attributeBindings("topic.id:data-topic-id") diff --git a/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js b/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js index 9d50bb3bb54..18aa465577c 100644 --- a/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js +++ b/app/assets/javascripts/discourse/app/components/categories-boxes-with-topics.js @@ -1,7 +1,7 @@ import Component from "@ember/component"; import { isEmpty } from "@ember/utils"; import { classNameBindings, tagName } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; @tagName("section") @classNameBindings( diff --git a/app/assets/javascripts/discourse/app/components/categories-boxes.js b/app/assets/javascripts/discourse/app/components/categories-boxes.js index 1dc84c0dad6..91bb02b62f6 100644 --- a/app/assets/javascripts/discourse/app/components/categories-boxes.js +++ b/app/assets/javascripts/discourse/app/components/categories-boxes.js @@ -1,7 +1,7 @@ import Component from "@ember/component"; import { isEmpty } from "@ember/utils"; import { classNameBindings, tagName } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; @tagName("section") @classNameBindings( diff --git a/app/assets/javascripts/discourse/app/components/categories-only.js b/app/assets/javascripts/discourse/app/components/categories-only.js index 33e2b2784fe..55a8188a165 100644 --- a/app/assets/javascripts/discourse/app/components/categories-only.js +++ b/app/assets/javascripts/discourse/app/components/categories-only.js @@ -1,7 +1,7 @@ import Component from "@ember/component"; import { action } from "@ember/object"; import { tagName } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; @tagName("") export default class CategoriesOnly extends Component { diff --git a/app/assets/javascripts/discourse/app/components/category-list-item.js b/app/assets/javascripts/discourse/app/components/category-list-item.js index 658ede566b5..21fe3877a09 100644 --- a/app/assets/javascripts/discourse/app/components/category-list-item.js +++ b/app/assets/javascripts/discourse/app/components/category-list-item.js @@ -1,7 +1,7 @@ import Component from "@ember/component"; import { tagName } from "@ember-decorators/component"; +import discourseComputed from "discourse/lib/decorators"; import { applyValueTransformer } from "discourse/lib/transformer"; -import discourseComputed from "discourse-common/utils/decorators"; const LIST_TYPE = { NORMAL: "normal", diff --git a/app/assets/javascripts/discourse/app/components/category-permission-row.gjs b/app/assets/javascripts/discourse/app/components/category-permission-row.gjs index a3528e25abd..c49ef155aed 100644 --- a/app/assets/javascripts/discourse/app/components/category-permission-row.gjs +++ b/app/assets/javascripts/discourse/app/components/category-permission-row.gjs @@ -3,8 +3,8 @@ import { action } from "@ember/object"; import { service } from "@ember/service"; import DButton from "discourse/components/d-button"; import concatClass from "discourse/helpers/concat-class"; +import getURL from "discourse/lib/get-url"; import PermissionType from "discourse/models/permission-type"; -import getURL from "discourse-common/lib/get-url"; import { i18n } from "discourse-i18n"; const EVERYONE = "everyone"; diff --git a/app/assets/javascripts/discourse/app/components/cdn-img.gjs b/app/assets/javascripts/discourse/app/components/cdn-img.gjs index 9a1efcc3871..81dcf90e178 100644 --- a/app/assets/javascripts/discourse/app/components/cdn-img.gjs +++ b/app/assets/javascripts/discourse/app/components/cdn-img.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { htmlSafe } from "@ember/template"; -import { getURLWithCDN } from "discourse-common/lib/get-url"; +import { getURLWithCDN } from "discourse/lib/get-url"; export default class CdnImg extends Component { get cdnSrc() { diff --git a/app/assets/javascripts/discourse/app/components/choose-message.gjs b/app/assets/javascripts/discourse/app/components/choose-message.gjs index e5461e29386..e30fc5bbe79 100644 --- a/app/assets/javascripts/discourse/app/components/choose-message.gjs +++ b/app/assets/javascripts/discourse/app/components/choose-message.gjs @@ -4,8 +4,8 @@ import { fn } from "@ember/helper"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; import { isEmpty } from "@ember/utils"; +import { debounce } from "discourse/lib/decorators"; import { searchForTerm } from "discourse/lib/search"; -import { debounce } from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; export default class ChooseMessage extends Component { diff --git a/app/assets/javascripts/discourse/app/components/choose-topic.js b/app/assets/javascripts/discourse/app/components/choose-topic.js index b4e58528fc4..7a0e3bfb9a9 100644 --- a/app/assets/javascripts/discourse/app/components/choose-topic.js +++ b/app/assets/javascripts/discourse/app/components/choose-topic.js @@ -3,9 +3,9 @@ import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; import { isEmpty, isPresent } from "@ember/utils"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import { debounce } from "discourse/lib/decorators"; import { searchForTerm } from "discourse/lib/search"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import { debounce } from "discourse-common/utils/decorators"; // args: // topicChangedCallback diff --git a/app/assets/javascripts/discourse/app/components/color-picker-choice.js b/app/assets/javascripts/discourse/app/components/color-picker-choice.js index 924905416b1..6e676dd9ea1 100644 --- a/app/assets/javascripts/discourse/app/components/color-picker-choice.js +++ b/app/assets/javascripts/discourse/app/components/color-picker-choice.js @@ -5,7 +5,7 @@ import { classNameBindings, tagName, } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; @tagName("button") diff --git a/app/assets/javascripts/discourse/app/components/composer-action-title.js b/app/assets/javascripts/discourse/app/components/composer-action-title.js index ae8b8e1a065..a5edc9c2ac8 100644 --- a/app/assets/javascripts/discourse/app/components/composer-action-title.js +++ b/app/assets/javascripts/discourse/app/components/composer-action-title.js @@ -2,6 +2,9 @@ import Component from "@ember/component"; import { alias } from "@ember/object/computed"; import { htmlSafe } from "@ember/template"; import { classNames } from "@ember-decorators/component"; +import discourseComputed from "discourse/lib/decorators"; +import escape from "discourse/lib/escape"; +import { iconHTML } from "discourse/lib/icon-library"; import { CREATE_SHARED_DRAFT, CREATE_TOPIC, @@ -10,9 +13,6 @@ import { PRIVATE_MESSAGE, REPLY, } from "discourse/models/composer"; -import escape from "discourse-common/lib/escape"; -import { iconHTML } from "discourse-common/lib/icon-library"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; const TITLES = { diff --git a/app/assets/javascripts/discourse/app/components/composer-body.js b/app/assets/javascripts/discourse/app/components/composer-body.js index 24cb6017a00..d2af2242110 100644 --- a/app/assets/javascripts/discourse/app/components/composer-body.js +++ b/app/assets/javascripts/discourse/app/components/composer-body.js @@ -2,12 +2,12 @@ import Component from "@ember/component"; import { cancel, schedule, throttle } from "@ember/runloop"; import { classNameBindings } from "@ember-decorators/component"; import { observes } from "@ember-decorators/object"; +import discourseDebounce from "discourse/lib/debounce"; +import discourseComputed, { bind } from "discourse/lib/decorators"; +import discourseLater from "discourse/lib/later"; import { headerOffset } from "discourse/lib/offset-calculator"; import { isiPad } from "discourse/lib/utilities"; import Composer from "discourse/models/composer"; -import discourseDebounce from "discourse-common/lib/debounce"; -import discourseLater from "discourse-common/lib/later"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; const START_DRAG_EVENTS = ["touchstart", "mousedown"]; const DRAG_EVENTS = ["touchmove", "mousemove"]; diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js index b8c7995136b..ec577dcac95 100644 --- a/app/assets/javascripts/discourse/app/components/composer-editor.js +++ b/app/assets/javascripts/discourse/app/components/composer-editor.js @@ -9,10 +9,14 @@ import { BasePlugin } from "@uppy/core"; import $ from "jquery"; import { resolveAllShortUrls } from "pretty-text/upload-short-url"; import { ajax } from "discourse/lib/ajax"; +import { tinyAvatar } from "discourse/lib/avatar-utils"; +import discourseComputed, { bind, debounce } from "discourse/lib/decorators"; import { fetchUnseenHashtagsInContext, linkSeenHashtagsInContext, } from "discourse/lib/hashtag-decorator"; +import { iconHTML } from "discourse/lib/icon-library"; +import discourseLater from "discourse/lib/later"; import { fetchUnseenMentions, linkSeenMentions, @@ -25,13 +29,6 @@ import { import UppyComposerUpload from "discourse/lib/uppy/composer-upload"; import { formatUsername } from "discourse/lib/utilities"; import Composer from "discourse/models/composer"; -import { tinyAvatar } from "discourse-common/lib/avatar-utils"; -import { iconHTML } from "discourse-common/lib/icon-library"; -import discourseLater from "discourse-common/lib/later"; -import discourseComputed, { - bind, - debounce, -} from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; let uploadHandlers = []; diff --git a/app/assets/javascripts/discourse/app/components/composer-message.js b/app/assets/javascripts/discourse/app/components/composer-message.js index db44b73f556..1eb0bbcebcc 100644 --- a/app/assets/javascripts/discourse/app/components/composer-message.js +++ b/app/assets/javascripts/discourse/app/components/composer-message.js @@ -1,7 +1,7 @@ import Component from "@ember/component"; import { getOwner } from "@ember/owner"; import { classNameBindings } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; @classNameBindings(":composer-popup", "message.extraClass") export default class ComposerMessage extends Component { diff --git a/app/assets/javascripts/discourse/app/components/composer-messages.js b/app/assets/javascripts/discourse/app/components/composer-messages.js index 6c14641160b..9963fbe01aa 100644 --- a/app/assets/javascripts/discourse/app/components/composer-messages.js +++ b/app/assets/javascripts/discourse/app/components/composer-messages.js @@ -5,9 +5,9 @@ import { not } from "@ember/object/computed"; import { service } from "@ember/service"; import { classNameBindings } from "@ember-decorators/component"; import { ajax } from "discourse/lib/ajax"; +import { debounce } from "discourse/lib/decorators"; import LinkLookup from "discourse/lib/link-lookup"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import { debounce } from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; let _messagesCache = {}; diff --git a/app/assets/javascripts/discourse/app/components/composer-title.js b/app/assets/javascripts/discourse/app/components/composer-title.js index 8117313a497..e3ffd13ff25 100644 --- a/app/assets/javascripts/discourse/app/components/composer-title.js +++ b/app/assets/javascripts/discourse/app/components/composer-title.js @@ -7,10 +7,10 @@ import { observes } from "@ember-decorators/object"; import { load } from "pretty-text/oneboxer"; import { lookupCache } from "pretty-text/oneboxer-cache"; import { ajax } from "discourse/lib/ajax"; +import discourseDebounce from "discourse/lib/debounce"; +import discourseComputed from "discourse/lib/decorators"; import putCursorAtEnd from "discourse/lib/put-cursor-at-end"; import { isTesting } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; @classNames("title-input") diff --git a/app/assets/javascripts/discourse/app/components/composer-toggles.js b/app/assets/javascripts/discourse/app/components/composer-toggles.js index 44479836643..7fd24dbcf4a 100644 --- a/app/assets/javascripts/discourse/app/components/composer-toggles.js +++ b/app/assets/javascripts/discourse/app/components/composer-toggles.js @@ -1,6 +1,6 @@ import Component from "@ember/component"; import { tagName } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; @tagName("") export default class ComposerToggles extends Component { diff --git a/app/assets/javascripts/discourse/app/components/composer-user-selector.js b/app/assets/javascripts/discourse/app/components/composer-user-selector.js index 69921636042..86c0ec9d8b4 100644 --- a/app/assets/javascripts/discourse/app/components/composer-user-selector.js +++ b/app/assets/javascripts/discourse/app/components/composer-user-selector.js @@ -1,6 +1,6 @@ import Component from "@ember/component"; import { action } from "@ember/object"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class ComposerUserSelector extends Component { _groups = []; diff --git a/app/assets/javascripts/discourse/app/components/composer/textarea-editor.gjs b/app/assets/javascripts/discourse/app/components/composer/textarea-editor.gjs index 5b0d57f61a2..beadea93fab 100644 --- a/app/assets/javascripts/discourse/app/components/composer/textarea-editor.gjs +++ b/app/assets/javascripts/discourse/app/components/composer/textarea-editor.gjs @@ -4,8 +4,8 @@ import { service } from "@ember/service"; import ItsATrap from "@discourse/itsatrap"; import { modifier } from "ember-modifier"; import DTextarea from "discourse/components/d-textarea"; +import { bind } from "discourse/lib/decorators"; import TextareaTextManipulation from "discourse/lib/textarea-text-manipulation"; -import { bind } from "discourse-common/utils/decorators"; export default class TextareaEditor extends Component { @service currentUser; diff --git a/app/assets/javascripts/discourse/app/components/copy-button.js b/app/assets/javascripts/discourse/app/components/copy-button.js index 98ead6db772..ee010f80da0 100644 --- a/app/assets/javascripts/discourse/app/components/copy-button.js +++ b/app/assets/javascripts/discourse/app/components/copy-button.js @@ -1,8 +1,8 @@ import Component from "@ember/component"; import { action } from "@ember/object"; import { tagName } from "@ember-decorators/component"; -import discourseDebounce from "discourse-common/lib/debounce"; -import { bind } from "discourse-common/utils/decorators"; +import discourseDebounce from "discourse/lib/debounce"; +import { bind } from "discourse/lib/decorators"; @tagName("") export default class CopyButton extends Component { diff --git a/app/assets/javascripts/discourse/app/components/create-invite-uploader.js b/app/assets/javascripts/discourse/app/components/create-invite-uploader.js index 71b0dc250b4..4b953a6401d 100644 --- a/app/assets/javascripts/discourse/app/components/create-invite-uploader.js +++ b/app/assets/javascripts/discourse/app/components/create-invite-uploader.js @@ -2,8 +2,8 @@ import Component from "@ember/component"; import { action } from "@ember/object"; import { getOwner } from "@ember/owner"; import { tagName } from "@ember-decorators/component"; +import discourseComputed from "discourse/lib/decorators"; import UppyUpload from "discourse/lib/uppy/uppy-upload"; -import discourseComputed from "discourse-common/utils/decorators"; @tagName("div") export default class CreateInviteUploader extends Component { diff --git a/app/assets/javascripts/discourse/app/components/custom-html.js b/app/assets/javascripts/discourse/app/components/custom-html.js index 076ac6799b1..864c56332d1 100644 --- a/app/assets/javascripts/discourse/app/components/custom-html.js +++ b/app/assets/javascripts/discourse/app/components/custom-html.js @@ -2,7 +2,7 @@ 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"; +import deprecated from "discourse/lib/deprecated"; export default class CustomHtml extends Component { triggerAppEvent = null; diff --git a/app/assets/javascripts/discourse/app/components/d-breadcrumbs-item.gjs b/app/assets/javascripts/discourse/app/components/d-breadcrumbs-item.gjs index a68e819f8ff..1764aa76b1b 100644 --- a/app/assets/javascripts/discourse/app/components/d-breadcrumbs-item.gjs +++ b/app/assets/javascripts/discourse/app/components/d-breadcrumbs-item.gjs @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { service } from "@ember/service"; import icon from "discourse/helpers/d-icon"; -import getURL from "discourse-common/lib/get-url"; +import getURL from "discourse/lib/get-url"; export default class DBreadcrumbsItem extends Component { @service breadcrumbs; diff --git a/app/assets/javascripts/discourse/app/components/d-button.gjs b/app/assets/javascripts/discourse/app/components/d-button.gjs index 1d4de483ebd..e89b7d028d8 100644 --- a/app/assets/javascripts/discourse/app/components/d-button.gjs +++ b/app/assets/javascripts/discourse/app/components/d-button.gjs @@ -9,7 +9,7 @@ import GlimmerComponentWithDeprecatedParentView from "discourse/components/glimm import concatClass from "discourse/helpers/concat-class"; import icon from "discourse/helpers/d-icon"; import element from "discourse/helpers/element"; -import deprecated from "discourse-common/lib/deprecated"; +import deprecated from "discourse/lib/deprecated"; import { i18n } from "discourse-i18n"; const ACTION_AS_STRING_DEPRECATION_ARGS = [ diff --git a/app/assets/javascripts/discourse/app/components/d-document.js b/app/assets/javascripts/discourse/app/components/d-document.js index 672efd8258e..3b7d287af4b 100644 --- a/app/assets/javascripts/discourse/app/components/d-document.js +++ b/app/assets/javascripts/discourse/app/components/d-document.js @@ -3,8 +3,8 @@ import { service } from "@ember/service"; import { tagName } from "@ember-decorators/component"; import { setLogoffCallback } from "discourse/lib/ajax"; import { clearAllBodyScrollLocks } from "discourse/lib/body-scroll-lock"; +import { bind } from "discourse/lib/decorators"; import logout from "discourse/lib/logout"; -import { bind } from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; let pluginCounterFunctions = []; diff --git a/app/assets/javascripts/discourse/app/components/d-editor.js b/app/assets/javascripts/discourse/app/components/d-editor.js index 789bbab3abc..494738f570a 100644 --- a/app/assets/javascripts/discourse/app/components/d-editor.js +++ b/app/assets/javascripts/discourse/app/components/d-editor.js @@ -15,12 +15,17 @@ import InsertHyperlink from "discourse/components/modal/insert-hyperlink"; import { ajax } from "discourse/lib/ajax"; import { SKIP } from "discourse/lib/autocomplete"; import Toolbar from "discourse/lib/composer/toolbar"; +import discourseDebounce from "discourse/lib/debounce"; +import discourseComputed, { bind } from "discourse/lib/decorators"; +import deprecated from "discourse/lib/deprecated"; +import { getRegister } from "discourse/lib/get-owner"; import { hashtagAutocompleteOptions } from "discourse/lib/hashtag-autocomplete"; import { linkSeenHashtagsInContext } from "discourse/lib/hashtag-decorator"; import { wantsNewWindow } from "discourse/lib/intercept-click"; import { PLATFORM_KEY_MODIFIER } from "discourse/lib/keyboard-shortcuts"; import { linkSeenMentions } from "discourse/lib/link-mentions"; import { loadOneboxes } from "discourse/lib/load-oneboxes"; +import { findRawTemplate } from "discourse/lib/raw-templates"; import { emojiUrlFor, generateCookFunction } from "discourse/lib/text"; import userSearch from "discourse/lib/user-search"; import { @@ -30,11 +35,6 @@ import { } from "discourse/lib/user-status-on-autocomplete"; import virtualElementFromTextRange from "discourse/lib/virtual-element-from-text-range"; import { isTesting } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; -import deprecated from "discourse-common/lib/deprecated"; -import { getRegister } from "discourse-common/lib/get-owner"; -import { findRawTemplate } from "discourse-common/lib/raw-templates"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; let _createCallbacks = []; diff --git a/app/assets/javascripts/discourse/app/components/d-lightbox.js b/app/assets/javascripts/discourse/app/components/d-lightbox.js index b09d89fddca..fd82251a7e4 100644 --- a/app/assets/javascripts/discourse/app/components/d-lightbox.js +++ b/app/assets/javascripts/discourse/app/components/d-lightbox.js @@ -2,6 +2,8 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; +import { bind } from "discourse/lib/decorators"; +import discourseLater from "discourse/lib/later"; import { ANIMATION_DURATION, KEYBOARD_SHORTCUTS, @@ -20,8 +22,6 @@ import { setCarouselScrollPosition, setSiteThemeColor, } from "discourse/lib/lightbox/helpers"; -import discourseLater from "discourse-common/lib/later"; -import { bind } from "discourse-common/utils/decorators"; export default class DLightbox extends Component { @service appEvents; diff --git a/app/assets/javascripts/discourse/app/components/d-modal.gjs b/app/assets/javascripts/discourse/app/components/d-modal.gjs index dc482b8c2f2..0a83c77fa6f 100644 --- a/app/assets/javascripts/discourse/app/components/d-modal.gjs +++ b/app/assets/javascripts/discourse/app/components/d-modal.gjs @@ -17,10 +17,10 @@ import { disableBodyScroll, enableBodyScroll, } from "discourse/lib/body-scroll-lock"; +import { bind } from "discourse/lib/decorators"; import { getMaxAnimationTimeMs } from "discourse/lib/swipe-events"; import swipe from "discourse/modifiers/swipe"; import trapTab from "discourse/modifiers/trap-tab"; -import { bind } from "discourse-common/utils/decorators"; export const CLOSE_INITIATED_BY_BUTTON = "initiatedByCloseButton"; export const CLOSE_INITIATED_BY_ESC = "initiatedByESC"; diff --git a/app/assets/javascripts/discourse/app/components/d-navigation-item.js b/app/assets/javascripts/discourse/app/components/d-navigation-item.js index 92f4f2f03de..bb10be80a85 100644 --- a/app/assets/javascripts/discourse/app/components/d-navigation-item.js +++ b/app/assets/javascripts/discourse/app/components/d-navigation-item.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { service } from "@ember/service"; -import { makeArray } from "discourse-common/lib/helpers"; +import { makeArray } from "discourse/lib/helpers"; export default class DNavigationItem extends Component { @service router; diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.js b/app/assets/javascripts/discourse/app/components/d-navigation.js index fc50b4d141d..3f0610c3df1 100644 --- a/app/assets/javascripts/discourse/app/components/d-navigation.js +++ b/app/assets/javascripts/discourse/app/components/d-navigation.js @@ -6,10 +6,10 @@ import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; import { tagName } from "@ember-decorators/component"; import { setting } from "discourse/lib/computed"; +import discourseComputed from "discourse/lib/decorators"; import { filterTypeForMode } from "discourse/lib/filter-mode"; import { NotificationLevels } from "discourse/lib/notification-levels"; import NavItem from "discourse/models/nav-item"; -import discourseComputed from "discourse-common/utils/decorators"; @tagName("") export default class DNavigation extends Component { diff --git a/app/assets/javascripts/discourse/app/components/d-page-header.gjs b/app/assets/javascripts/discourse/app/components/d-page-header.gjs index 8e1af6402cd..572ec7e749c 100644 --- a/app/assets/javascripts/discourse/app/components/d-page-header.gjs +++ b/app/assets/javascripts/discourse/app/components/d-page-header.gjs @@ -16,7 +16,7 @@ import { } from "discourse/components/d-page-action-button"; import DropdownMenu from "discourse/components/dropdown-menu"; import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav"; -import { bind } from "discourse-common/utils/decorators"; +import { bind } from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import DMenu from "float-kit/components/d-menu"; diff --git a/app/assets/javascripts/discourse/app/components/d-section.gjs b/app/assets/javascripts/discourse/app/components/d-section.gjs index 7e40e553671..0349e47412b 100644 --- a/app/assets/javascripts/discourse/app/components/d-section.gjs +++ b/app/assets/javascripts/discourse/app/components/d-section.gjs @@ -2,7 +2,7 @@ import Component from "@glimmer/component"; import { concat } from "@ember/helper"; import { notEq } from "truth-helpers"; import bodyClass from "discourse/helpers/body-class"; -import deprecated from "discourse-common/lib/deprecated"; +import deprecated from "discourse/lib/deprecated"; // Can add a body class from within a component export default class DSection extends Component { diff --git a/app/assets/javascripts/discourse/app/components/d-styles.gjs b/app/assets/javascripts/discourse/app/components/d-styles.gjs index a56edf4ef78..c8e0085cb36 100644 --- a/app/assets/javascripts/discourse/app/components/d-styles.gjs +++ b/app/assets/javascripts/discourse/app/components/d-styles.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { service } from "@ember/service"; -import { getURLWithCDN } from "discourse-common/lib/get-url"; +import { getURLWithCDN } from "discourse/lib/get-url"; export default class DStyles extends Component { @service session; diff --git a/app/assets/javascripts/discourse/app/components/d-virtual-height.gjs b/app/assets/javascripts/discourse/app/components/d-virtual-height.gjs index 06dcd36f184..444c4949b6c 100644 --- a/app/assets/javascripts/discourse/app/components/d-virtual-height.gjs +++ b/app/assets/javascripts/discourse/app/components/d-virtual-height.gjs @@ -1,9 +1,9 @@ import Component from "@glimmer/component"; import { cancel, scheduleOnce } from "@ember/runloop"; import { service } from "@ember/service"; +import discourseDebounce from "discourse/lib/debounce"; +import { bind } from "discourse/lib/decorators"; import isZoomed from "discourse/lib/zoom-check"; -import discourseDebounce from "discourse-common/lib/debounce"; -import { bind } from "discourse-common/utils/decorators"; export default class DVirtualHeight extends Component { @service site; diff --git a/app/assets/javascripts/discourse/app/components/date-input.js b/app/assets/javascripts/discourse/app/components/date-input.js index 6a5ee438384..b5ac5bdcd13 100644 --- a/app/assets/javascripts/discourse/app/components/date-input.js +++ b/app/assets/javascripts/discourse/app/components/date-input.js @@ -5,8 +5,8 @@ import { schedule } from "@ember/runloop"; import { classNames } from "@ember-decorators/component"; import { on } from "@ember-decorators/object"; import { Promise } from "rsvp"; +import discourseComputed from "discourse/lib/decorators"; import loadScript from "discourse/lib/load-script"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; function isInputDateSupported() { diff --git a/app/assets/javascripts/discourse/app/components/date-picker.js b/app/assets/javascripts/discourse/app/components/date-picker.js index 6fdfc4cb3ee..c2c6b96c926 100644 --- a/app/assets/javascripts/discourse/app/components/date-picker.js +++ b/app/assets/javascripts/discourse/app/components/date-picker.js @@ -4,8 +4,8 @@ import { computed } from "@ember/object"; import { schedule } from "@ember/runloop"; import { classNames } from "@ember-decorators/component"; import { on } from "@ember-decorators/object"; +import discourseComputed from "discourse/lib/decorators"; import loadScript from "discourse/lib/load-script"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; const DATE_FORMAT = "YYYY-MM-DD"; diff --git a/app/assets/javascripts/discourse/app/components/discourse-linked-text.js b/app/assets/javascripts/discourse/app/components/discourse-linked-text.js index fe8a94486c0..1d82196dad3 100644 --- a/app/assets/javascripts/discourse/app/components/discourse-linked-text.js +++ b/app/assets/javascripts/discourse/app/components/discourse-linked-text.js @@ -1,6 +1,6 @@ import Component from "@ember/component"; import { tagName } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; @tagName("span") diff --git a/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js b/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js index 390094d3d33..9ea4ca9add5 100644 --- a/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js +++ b/app/assets/javascripts/discourse/app/components/discourse-tag-bound.js @@ -4,8 +4,8 @@ import { classNameBindings, tagName, } from "@ember-decorators/component"; -import getURL from "discourse-common/lib/get-url"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; +import getURL from "discourse/lib/get-url"; @tagName("a") @classNameBindings(":discourse-tag", "style", "tagClass") diff --git a/app/assets/javascripts/discourse/app/components/discourse-topic.js b/app/assets/javascripts/discourse/app/components/discourse-topic.js index 77f927c2877..9186c9b6c5a 100644 --- a/app/assets/javascripts/discourse/app/components/discourse-topic.js +++ b/app/assets/javascripts/discourse/app/components/discourse-topic.js @@ -7,9 +7,9 @@ import { classNameBindings } from "@ember-decorators/component"; import { observes } from "@ember-decorators/object"; import $ from "jquery"; import ClickTrack from "discourse/lib/click-track"; +import { bind } from "discourse/lib/decorators"; import { highlightPost } from "discourse/lib/utilities"; import Scrolling from "discourse/mixins/scrolling"; -import { bind } from "discourse-common/utils/decorators"; @classNameBindings( "multiSelect", diff --git a/app/assets/javascripts/discourse/app/components/discovery/filter-navigation.js b/app/assets/javascripts/discourse/app/components/discovery/filter-navigation.js index 9f7febe9ba8..3e8435854a7 100644 --- a/app/assets/javascripts/discourse/app/components/discovery/filter-navigation.js +++ b/app/assets/javascripts/discourse/app/components/discovery/filter-navigation.js @@ -2,9 +2,9 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; import { service } from "@ember/service"; +import discourseDebounce from "discourse/lib/debounce"; +import { bind } from "discourse/lib/decorators"; import { resettableTracked } from "discourse/lib/tracked-tools"; -import discourseDebounce from "discourse-common/lib/debounce"; -import { bind } from "discourse-common/utils/decorators"; export default class DiscoveryFilterNavigation extends Component { @service site; diff --git a/app/assets/javascripts/discourse/app/components/edit-category-general.js b/app/assets/javascripts/discourse/app/components/edit-category-general.js index c041b7ecc82..c6329f9d3e2 100644 --- a/app/assets/javascripts/discourse/app/components/edit-category-general.js +++ b/app/assets/javascripts/discourse/app/components/edit-category-general.js @@ -4,10 +4,10 @@ import { cancel } from "@ember/runloop"; import { isEmpty } from "@ember/utils"; import { buildCategoryPanel } from "discourse/components/edit-category-panel"; import { categoryBadgeHTML } from "discourse/helpers/category-link"; +import discourseComputed from "discourse/lib/decorators"; +import getURL from "discourse/lib/get-url"; +import discourseLater from "discourse/lib/later"; import Category from "discourse/models/category"; -import getURL from "discourse-common/lib/get-url"; -import discourseLater from "discourse-common/lib/later"; -import discourseComputed from "discourse-common/utils/decorators"; export default class EditCategoryGeneral extends buildCategoryPanel("general") { @not("category.isUncategorizedCategory") canSelectParentCategory; diff --git a/app/assets/javascripts/discourse/app/components/edit-category-images.js b/app/assets/javascripts/discourse/app/components/edit-category-images.js index 27310f39b67..f47b1a5d0f8 100644 --- a/app/assets/javascripts/discourse/app/components/edit-category-images.js +++ b/app/assets/javascripts/discourse/app/components/edit-category-images.js @@ -1,6 +1,6 @@ import EmberObject, { action } from "@ember/object"; import { buildCategoryPanel } from "discourse/components/edit-category-panel"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class EditCategoryImages extends buildCategoryPanel("images") { @discourseComputed("category.uploaded_background.url") diff --git a/app/assets/javascripts/discourse/app/components/edit-category-security.js b/app/assets/javascripts/discourse/app/components/edit-category-security.js index 49edb4b9a04..ccb5ff33a03 100644 --- a/app/assets/javascripts/discourse/app/components/edit-category-security.js +++ b/app/assets/javascripts/discourse/app/components/edit-category-security.js @@ -1,8 +1,8 @@ import { action } from "@ember/object"; import { not } from "@ember/object/computed"; import { buildCategoryPanel } from "discourse/components/edit-category-panel"; +import discourseComputed from "discourse/lib/decorators"; import PermissionType from "discourse/models/permission-type"; -import discourseComputed from "discourse-common/utils/decorators"; export default class EditCategorySecurity extends buildCategoryPanel( "security" diff --git a/app/assets/javascripts/discourse/app/components/edit-category-settings.js b/app/assets/javascripts/discourse/app/components/edit-category-settings.js index 1db502d83ca..d43f7c72491 100644 --- a/app/assets/javascripts/discourse/app/components/edit-category-settings.js +++ b/app/assets/javascripts/discourse/app/components/edit-category-settings.js @@ -3,7 +3,7 @@ import { and, empty } from "@ember/object/computed"; import { buildCategoryPanel } from "discourse/components/edit-category-panel"; import { setting } from "discourse/lib/computed"; import { SEARCH_PRIORITIES } from "discourse/lib/constants"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; const categorySortCriteria = []; diff --git a/app/assets/javascripts/discourse/app/components/edit-category-tab.js b/app/assets/javascripts/discourse/app/components/edit-category-tab.js index 0073a251a78..8aec53f3819 100644 --- a/app/assets/javascripts/discourse/app/components/edit-category-tab.js +++ b/app/assets/javascripts/discourse/app/components/edit-category-tab.js @@ -5,9 +5,9 @@ import { scheduleOnce } from "@ember/runloop"; import { underscore } from "@ember/string"; import { classNameBindings, tagName } from "@ember-decorators/component"; import { propertyEqual } from "discourse/lib/computed"; +import discourseComputed from "discourse/lib/decorators"; +import getURL from "discourse/lib/get-url"; import DiscourseURL from "discourse/lib/url"; -import getURL from "discourse-common/lib/get-url"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; @tagName("li") diff --git a/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js index 1875a562aed..31bed394f15 100644 --- a/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js +++ b/app/assets/javascripts/discourse/app/components/edit-category-topic-template.js @@ -3,7 +3,7 @@ import { action } from "@ember/object"; import { schedule } from "@ember/runloop"; import { observes } from "@ember-decorators/object"; import { buildCategoryPanel } from "discourse/components/edit-category-panel"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; export default class EditCategoryTopicTemplate extends buildCategoryPanel( "topic-template" diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker/content.gjs b/app/assets/javascripts/discourse/app/components/emoji-picker/content.gjs index ae5a394c256..45bb6911718 100644 --- a/app/assets/javascripts/discourse/app/components/emoji-picker/content.gjs +++ b/app/assets/javascripts/discourse/app/components/emoji-picker/content.gjs @@ -21,11 +21,11 @@ import { disableBodyScroll, enableBodyScroll, } from "discourse/lib/body-scroll-lock"; +import discourseDebounce from "discourse/lib/debounce"; +import { bind } from "discourse/lib/decorators"; +import { makeArray } from "discourse/lib/helpers"; import { emojiUrlFor } from "discourse/lib/text"; import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; -import { makeArray } from "discourse-common/lib/helpers"; -import { bind } from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; import DiversityMenu from "./diversity-menu"; diff --git a/app/assets/javascripts/discourse/app/components/flag-action-type.js b/app/assets/javascripts/discourse/app/components/flag-action-type.js index e01e8360021..ecb1fa632c6 100644 --- a/app/assets/javascripts/discourse/app/components/flag-action-type.js +++ b/app/assets/javascripts/discourse/app/components/flag-action-type.js @@ -1,8 +1,8 @@ import Component from "@ember/component"; import { and, equal, not } from "@ember/object/computed"; import { tagName } from "@ember-decorators/component"; +import discourseComputed from "discourse/lib/decorators"; import { MAX_MESSAGE_LENGTH } from "discourse/models/post-action-type"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; @tagName("") diff --git a/app/assets/javascripts/discourse/app/components/flat-button.js b/app/assets/javascripts/discourse/app/components/flat-button.js index e77fc44a215..b3b85ec430e 100644 --- a/app/assets/javascripts/discourse/app/components/flat-button.js +++ b/app/assets/javascripts/discourse/app/components/flat-button.js @@ -4,7 +4,7 @@ import { classNames, tagName, } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; @tagName("button") diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/upload.gjs b/app/assets/javascripts/discourse/app/components/form-template-field/upload.gjs index e40cf0b688b..804b4b17b1e 100644 --- a/app/assets/javascripts/discourse/app/components/form-template-field/upload.gjs +++ b/app/assets/javascripts/discourse/app/components/form-template-field/upload.gjs @@ -5,9 +5,9 @@ import { dasherize } from "@ember/string"; import { htmlSafe } from "@ember/template"; import PickFilesButton from "discourse/components/pick-files-button"; import icon from "discourse/helpers/d-icon"; +import { bind } from "discourse/lib/decorators"; import { isAudio, isImage, isVideo } from "discourse/lib/uploads"; import UppyUpload from "discourse/lib/uppy/uppy-upload"; -import { bind } from "discourse-common/utils/decorators"; export default class FormTemplateFieldUpload extends Component { @tracked uploadValue; diff --git a/app/assets/javascripts/discourse/app/components/future-date-input.js b/app/assets/javascripts/discourse/app/components/future-date-input.js index 0e30724f42d..2407ccd8678 100644 --- a/app/assets/javascripts/discourse/app/components/future-date-input.js +++ b/app/assets/javascripts/discourse/app/components/future-date-input.js @@ -1,6 +1,7 @@ import Component from "@ember/component"; import { action } from "@ember/object"; import { and, empty, equal } from "@ember/object/computed"; +import discourseComputed from "discourse/lib/decorators"; import { extendedDefaultTimeShortcuts, formatTime, @@ -8,7 +9,6 @@ import { TIME_SHORTCUT_TYPES, timeShortcuts, } from "discourse/lib/time-shortcut"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; import { FORMAT } from "select-kit/components/future-date-input-selector"; diff --git a/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs b/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs index 58c6bc61f8d..a4e5f01745c 100644 --- a/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs +++ b/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs @@ -7,6 +7,8 @@ import { service } from "@ember/service"; import { waitForPromise } from "@ember/test-waiters"; import ItsATrap from "@discourse/itsatrap"; import concatClass from "discourse/helpers/concat-class"; +import { bind, debounce } from "discourse/lib/decorators"; +import discourseLater from "discourse/lib/later"; import scrollLock from "discourse/lib/scroll-lock"; import { getMaxAnimationTimeMs, @@ -15,8 +17,6 @@ import { import { isDocumentRTL } from "discourse/lib/text-direction"; import swipe from "discourse/modifiers/swipe"; import { isTesting } from "discourse-common/config/environment"; -import discourseLater from "discourse-common/lib/later"; -import { bind, debounce } from "discourse-common/utils/decorators"; import Header from "./header"; let _menuPanelClassesToForceDropdown = []; diff --git a/app/assets/javascripts/discourse/app/components/global-notice.js b/app/assets/javascripts/discourse/app/components/global-notice.js index 9d0a633ad34..e23cb8105aa 100644 --- a/app/assets/javascripts/discourse/app/components/global-notice.js +++ b/app/assets/javascripts/discourse/app/components/global-notice.js @@ -4,8 +4,8 @@ import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; import { tagName } from "@ember-decorators/component"; import cookie, { removeCookie } from "discourse/lib/cookie"; +import { bind } from "discourse/lib/decorators"; import { DeferredTrackedSet } from "discourse/lib/tracked-tools"; -import { bind } from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; const _pluginNotices = new DeferredTrackedSet(); diff --git a/app/assets/javascripts/discourse/app/components/google-search.js b/app/assets/javascripts/discourse/app/components/google-search.js index c6e16693864..627760e3db5 100644 --- a/app/assets/javascripts/discourse/app/components/google-search.js +++ b/app/assets/javascripts/discourse/app/components/google-search.js @@ -1,8 +1,8 @@ import Component from "@ember/component"; import { alias } from "@ember/object/computed"; import { classNameBindings, classNames } from "@ember-decorators/component"; -import getURL from "discourse-common/lib/get-url"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; +import getURL from "discourse/lib/get-url"; @classNames("google-search-form") @classNameBindings("hidden:hidden") diff --git a/app/assets/javascripts/discourse/app/components/group-card-contents.js b/app/assets/javascripts/discourse/app/components/group-card-contents.js index 282e15dfac6..62109722c3a 100644 --- a/app/assets/javascripts/discourse/app/components/group-card-contents.js +++ b/app/assets/javascripts/discourse/app/components/group-card-contents.js @@ -5,9 +5,9 @@ import { classNameBindings, classNames } from "@ember-decorators/component"; import { on } from "@ember-decorators/object"; import CardContentsBase from "discourse/components/card-contents-base"; import { setting } from "discourse/lib/computed"; +import discourseComputed from "discourse/lib/decorators"; import { wantsNewWindow } from "discourse/lib/intercept-click"; import { groupPath } from "discourse/lib/url"; -import discourseComputed from "discourse-common/utils/decorators"; const maxMembersToDisplay = 10; diff --git a/app/assets/javascripts/discourse/app/components/group-flair-inputs.js b/app/assets/javascripts/discourse/app/components/group-flair-inputs.js index d573685fb9c..de03bbc4d9b 100644 --- a/app/assets/javascripts/discourse/app/components/group-flair-inputs.js +++ b/app/assets/javascripts/discourse/app/components/group-flair-inputs.js @@ -4,10 +4,10 @@ import { classNames } from "@ember-decorators/component"; import { observes, on } from "@ember-decorators/object"; import $ from "jquery"; import { ajax } from "discourse/lib/ajax"; -import discourseDebounce from "discourse-common/lib/debounce"; -import getURL from "discourse-common/lib/get-url"; -import { convertIconClass } from "discourse-common/lib/icon-library"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseDebounce from "discourse/lib/debounce"; +import discourseComputed from "discourse/lib/decorators"; +import getURL from "discourse/lib/get-url"; +import { convertIconClass } from "discourse/lib/icon-library"; import { i18n } from "discourse-i18n"; @classNames("group-flair-inputs") diff --git a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js index 394de8dc1fc..280baa2c0c9 100644 --- a/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js +++ b/app/assets/javascripts/discourse/app/components/group-imap-email-settings.js @@ -5,8 +5,8 @@ import { tagName } from "@ember-decorators/component"; import { on } from "@ember-decorators/object"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseComputed from "discourse/lib/decorators"; import emailProviderDefaultSettings from "discourse/lib/email-provider-default-settings"; -import discourseComputed from "discourse-common/utils/decorators"; @tagName("") export default class GroupImapEmailSettings extends Component { diff --git a/app/assets/javascripts/discourse/app/components/group-manage-email-settings.js b/app/assets/javascripts/discourse/app/components/group-manage-email-settings.js index 499cfd3e048..6fe492a7e09 100644 --- a/app/assets/javascripts/discourse/app/components/group-manage-email-settings.js +++ b/app/assets/javascripts/discourse/app/components/group-manage-email-settings.js @@ -4,7 +4,7 @@ import { service } from "@ember/service"; import { isEmpty } from "@ember/utils"; import { tagName } from "@ember-decorators/component"; import { on } from "@ember-decorators/object"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; @tagName("") diff --git a/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js index b746e7b0ddc..f856a9ddf2b 100644 --- a/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js +++ b/app/assets/javascripts/discourse/app/components/group-manage-logs-filter.js @@ -1,6 +1,6 @@ import Component from "@ember/component"; import { tagName } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; @tagName("") diff --git a/app/assets/javascripts/discourse/app/components/group-manage-save-button.js b/app/assets/javascripts/discourse/app/components/group-manage-save-button.js index 33ed0cfd5ea..25c686efa09 100644 --- a/app/assets/javascripts/discourse/app/components/group-manage-save-button.js +++ b/app/assets/javascripts/discourse/app/components/group-manage-save-button.js @@ -5,7 +5,7 @@ import { service } from "@ember/service"; import GroupDefaultNotificationsModal from "discourse/components/modal/group-default-notifications"; import { popupAutomaticMembershipAlert } from "discourse/controllers/groups-new"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; export default class GroupManageSaveButton extends Component { diff --git a/app/assets/javascripts/discourse/app/components/group-membership-button.js b/app/assets/javascripts/discourse/app/components/group-membership-button.js index 6232f89b3e3..7270e66fb66 100644 --- a/app/assets/javascripts/discourse/app/components/group-membership-button.js +++ b/app/assets/javascripts/discourse/app/components/group-membership-button.js @@ -4,7 +4,7 @@ import { service } from "@ember/service"; import { classNames } from "@ember-decorators/component"; import { popupAjaxError } from "discourse/lib/ajax-error"; import cookie from "discourse/lib/cookie"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; import RequestGroupMembershipForm from "./modal/request-group-membership-form"; diff --git a/app/assets/javascripts/discourse/app/components/group-selector.js b/app/assets/javascripts/discourse/app/components/group-selector.js index e013a38e207..d10d6770241 100644 --- a/app/assets/javascripts/discourse/app/components/group-selector.js +++ b/app/assets/javascripts/discourse/app/components/group-selector.js @@ -2,8 +2,8 @@ import Component from "@ember/component"; import { isEmpty } from "@ember/utils"; import { observes, on } from "@ember-decorators/object"; import $ from "jquery"; -import { findRawTemplate } from "discourse-common/lib/raw-templates"; -import discourseComputed from "discourse-common/utils/decorators"; +import discourseComputed from "discourse/lib/decorators"; +import { findRawTemplate } from "discourse/lib/raw-templates"; import { i18n } from "discourse-i18n"; export default class GroupSelector extends Component { diff --git a/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js index cdb4a4d95b1..37d9a97670b 100644 --- a/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js +++ b/app/assets/javascripts/discourse/app/components/groups-form-interaction-fields.js @@ -1,7 +1,7 @@ import Component from "@ember/component"; import { or } from "@ember/object/computed"; +import discourseComputed from "discourse/lib/decorators"; import { NotificationLevels } from "discourse/lib/notification-levels"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; export default class GroupsFormInteractionFields extends Component { diff --git a/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js index 7b6fca0d2b0..4fe1e0460ff 100644 --- a/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js +++ b/app/assets/javascripts/discourse/app/components/groups-form-membership-fields.js @@ -1,8 +1,8 @@ import Component from "@ember/component"; import { action, computed } from "@ember/object"; import { not, readOnly } from "@ember/object/computed"; +import discourseComputed from "discourse/lib/decorators"; import AssociatedGroup from "discourse/models/associated-group"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; export default class GroupsFormMembershipFields extends Component { diff --git a/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js b/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js index 570589e9a52..7f5a7d5cf70 100644 --- a/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js +++ b/app/assets/javascripts/discourse/app/components/groups-form-profile-fields.js @@ -4,9 +4,9 @@ import { not } from "@ember/object/computed"; import { isEmpty } from "@ember/utils"; import { observes } from "@ember-decorators/object"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseDebounce from "discourse/lib/debounce"; +import discourseComputed from "discourse/lib/decorators"; import Group from "discourse/models/group"; -import discourseDebounce from "discourse-common/lib/debounce"; -import discourseComputed from "discourse-common/utils/decorators"; import { i18n } from "discourse-i18n"; export default class GroupsFormProfileFields extends Component { diff --git a/app/assets/javascripts/discourse/app/components/header-extra-info.js b/app/assets/javascripts/discourse/app/components/header-extra-info.js index 51977030ddb..b4a63b4e568 100644 --- a/app/assets/javascripts/discourse/app/components/header-extra-info.js +++ b/app/assets/javascripts/discourse/app/components/header-extra-info.js @@ -1,4 +1,4 @@ -import deprecated from "discourse-common/lib/deprecated"; +import deprecated from "discourse/lib/deprecated"; export function needsSecondRowIf() { deprecated( diff --git a/app/assets/javascripts/discourse/app/components/header/hamburger-dropdown-wrapper.gjs b/app/assets/javascripts/discourse/app/components/header/hamburger-dropdown-wrapper.gjs index d5b6f311f1a..46d5285d55d 100644 --- a/app/assets/javascripts/discourse/app/components/header/hamburger-dropdown-wrapper.gjs +++ b/app/assets/javascripts/discourse/app/components/header/hamburger-dropdown-wrapper.gjs @@ -4,10 +4,10 @@ import { on } from "@ember/modifier"; import { action } from "@ember/object"; import { service } from "@ember/service"; import { waitForPromise } from "@ember/test-waiters"; +import discourseLater from "discourse/lib/later"; import { isDocumentRTL } from "discourse/lib/text-direction"; import { prefersReducedMotion } from "discourse/lib/utilities"; import { isTesting } from "discourse-common/config/environment"; -import discourseLater from "discourse-common/lib/later"; import closeOnClickOutside from "../../modifiers/close-on-click-outside"; import SidebarHamburgerDropdown from "../sidebar/hamburger-dropdown"; diff --git a/app/assets/javascripts/discourse/app/components/header/home-logo.gjs b/app/assets/javascripts/discourse/app/components/header/home-logo.gjs index c4606ff489a..ba6fd906aed 100644 --- a/app/assets/javascripts/discourse/app/components/header/home-logo.gjs +++ b/app/assets/javascripts/discourse/app/components/header/home-logo.gjs @@ -5,10 +5,10 @@ import { action } from "@ember/object"; import { service } from "@ember/service"; import PluginOutlet from "discourse/components/plugin-outlet"; import concatClass from "discourse/helpers/concat-class"; +import getURL from "discourse/lib/get-url"; import { wantsNewWindow } from "discourse/lib/intercept-click"; import { applyValueTransformer } from "discourse/lib/transformer"; import DiscourseURL from "discourse/lib/url"; -import getURL from "discourse-common/lib/get-url"; import HomeLogoContents from "./home-logo-contents"; export default class HomeLogo extends Component { diff --git a/app/assets/javascripts/discourse/app/components/header/icons.gjs b/app/assets/javascripts/discourse/app/components/header/icons.gjs index a5f0596b3ec..a49b61afc03 100644 --- a/app/assets/javascripts/discourse/app/components/header/icons.gjs +++ b/app/assets/javascripts/discourse/app/components/header/icons.gjs @@ -3,7 +3,7 @@ import { action } from "@ember/object"; import { service } from "@ember/service"; import { eq } from "truth-helpers"; import DAG from "discourse/lib/dag"; -import getURL from "discourse-common/lib/get-url"; +import getURL from "discourse/lib/get-url"; import Dropdown from "./dropdown"; import UserDropdown from "./user-dropdown"; diff --git a/app/assets/javascripts/discourse/app/components/header/logo.gjs b/app/assets/javascripts/discourse/app/components/header/logo.gjs index 871be6e82c2..f801a82e4de 100644 --- a/app/assets/javascripts/discourse/app/components/header/logo.gjs +++ b/app/assets/javascripts/discourse/app/components/header/logo.gjs @@ -1,5 +1,5 @@ import { and, eq, notEq } from "truth-helpers"; -import getURL from "discourse-common/lib/get-url"; +import getURL from "discourse/lib/get-url"; const Logo =