From 979325c500df6143e3e257b665fd3998f8bd1ca9 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 13 Jan 2025 09:36:11 +0000
Subject: [PATCH] DEV: Move `discourse-common/` helpers to `discourse/`
 (#30728)

`discourse-common` was created in the past to share logic between the
'wizard' app and the main 'discourse' app. Since then, the wizard has
been consolidated into the main app, so the separation of
`discourse-common` is no longer useful.

This commit moves `discourse-common/helpers/*` into
`discourse/helpers/*`, removes `discourse-common` from the Ember
resolver config, and adds shims for the imports.
---
 .../components/admin-config-area-card.gjs     |  2 +-
 .../admin/addon/components/admin-notice.gjs   |  2 +-
 .../components/admin-plugins-list-item.gjs    |  2 +-
 .../admin/addon/components/admin-reports.gjs  |  2 +-
 .../components/admin-section-landing-item.gjs |  2 +-
 .../components/dashboard-new-feature-item.gjs |  2 +-
 .../addon/components/dashboard-problems.gjs   |  2 +-
 .../addon/components/install-theme-item.gjs   |  2 +-
 .../addon/components/modal/install-theme.gjs  |  2 +-
 .../editor/child-tree-node.gjs                |  2 +-
 .../editor/child-tree.gjs                     |  2 +-
 .../schema-theme-setting/editor/tree-node.gjs |  2 +-
 .../schema-theme-setting/editor/tree.gjs      |  2 +-
 .../admin/addon/components/tags-uploader.gjs  |  2 +-
 .../addon/components/themes-grid-card.gjs     |  2 +-
 .../addon/components/themes-list-item.gjs     |  2 +-
 .../discourse-common/addon/resolver.js        |  1 -
 app/assets/javascripts/discourse/app/app.js   |  1 +
 .../discourse/app/components/about-page.gjs   |  2 +-
 .../app/components/actions-summary.gjs        |  2 +-
 .../discourse/app/components/back-button.gjs  |  2 +-
 .../discourse/app/components/badge-card.gjs   |  2 +-
 .../app/components/bookmark-icon.gjs          |  2 +-
 .../app/components/bookmark-menu.gjs          |  2 +-
 .../bulk-select-topics-dropdown.gjs           |  2 +-
 .../app/components/d-breadcrumbs-item.gjs     |  2 +-
 .../discourse/app/components/d-button.gjs     |  2 +-
 .../app/components/d-toggle-switch.gjs        |  2 +-
 .../app/components/discourse-banner.gjs       |  2 +-
 .../app/components/emoji-picker/index.gjs     |  2 +-
 .../discourse/app/components/filter-input.gjs |  2 +-
 .../form-template-field/multi-select.gjs      |  2 +-
 .../components/form-template-field/upload.gjs |  2 +-
 .../components/header/home-logo-contents.gjs  |  2 +-
 .../app/components/header/sidebar-toggle.gjs  |  2 +-
 .../components/header/topic/featured-link.gjs |  2 +-
 .../app/components/header/topic/info.gjs      |  2 +-
 .../components/header/topic/participant.gjs   |  2 +-
 .../app/components/header/topic/status.gjs    |  2 +-
 .../header/user-dropdown/notifications.gjs    |  2 +-
 .../discourse/app/components/input-tip.gjs    |  2 +-
 .../app/components/navigation-bar.gjs         |  2 +-
 .../app/components/notifications-tracking.gjs |  2 +-
 .../app/components/post/menu/buttons/like.gjs |  2 +-
 .../components/post/menu/buttons/replies.gjs  |  2 +-
 .../app/components/powered-by-discourse.gjs   |  2 +-
 .../app/components/private-message-glyph.gjs  |  2 +-
 .../components/reviewable-created-by-name.gjs |  2 +-
 .../app/components/reviewable-created-by.gjs  |  2 +-
 .../app/components/sidebar/back-to-forum.gjs  |  2 +-
 .../sidebar/edit-navigation-menu/modal.gjs    |  2 +-
 .../components/sidebar/more-section-links.gjs |  2 +-
 .../components/sidebar/section-form-link.gjs  |  2 +-
 .../sidebar/section-link-button.gjs           |  2 +-
 .../sidebar/section-link-prefix.gjs           |  2 +-
 .../app/components/sidebar/section-link.gjs   |  2 +-
 .../app/components/sidebar/section.gjs        |  2 +-
 .../app/components/table-header-toggle.gjs    |  2 +-
 .../app/components/topic-admin-menu.gjs       |  2 +-
 .../app/components/topic-list/action-list.gjs |  2 +-
 .../topic-list/header/bulk-select-cell.gjs    |  2 +-
 .../topic-list/header/sortable-column.gjs     |  2 +-
 .../components/topic-list/item/likes-cell.gjs |  2 +-
 .../topic-list/item/op-likes-cell.gjs         |  2 +-
 .../topic-list/participant-groups.gjs         |  2 +-
 .../topic-list/unread-indicator.gjs           |  2 +-
 .../topic-map/private-message-map.gjs         |  2 +-
 .../topic-map/topic-map-summary.gjs           |  2 +-
 .../discourse/app/components/topic-status.gjs |  2 +-
 .../components/topic-timeline/container.gjs   |  2 +-
 .../app/components/user-flag-percentage.gjs   |  2 +-
 .../app/components/user-menu/icon-avatar.gjs  |  2 +-
 .../discourse/app/components/user-stat.gjs    |  2 +-
 .../app/discourse-common-loader-shims.js      | 37 +++++++++++++++++++
 .../app/form-kit/components/fk/alert.gjs      |  2 +-
 .../form-kit/components/fk/control/menu.gjs   |  2 +-
 .../form-kit/components/fk/errors-summary.gjs |  2 +-
 .../app/form-kit/components/fk/errors.gjs     |  2 +-
 .../app}/helpers/base-path.js                 |  0
 .../app}/helpers/base-url.js                  |  0
 .../app}/helpers/bound-i18n.js                |  0
 .../app}/helpers/component-for-collection.js  |  0
 .../app}/helpers/component-for-row.js         |  0
 .../addon => discourse/app}/helpers/d-icon.js |  0
 .../app}/helpers/fa-icon.js                   |  0
 .../app}/helpers/get-url.js                   |  0
 .../app}/helpers/html-safe.js                 |  0
 .../app}/helpers/i18n-yes-no.js               |  0
 .../addon => discourse/app}/helpers/i18n.js   |  0
 .../plugin-outlet-debug/args-table.gjs        |  2 +-
 .../dev-tools/plugin-outlet-debug/button.gjs  |  2 +-
 .../plugin-outlet-debug/outlet-info.gjs       |  2 +-
 .../app/static/dev-tools/safe-mode/button.gjs |  2 +-
 .../app/static/dev-tools/toolbar.gjs          |  2 +-
 .../dev-tools/verbose-localization/button.gjs |  2 +-
 .../static/wizard/components/fields/radio.gjs |  2 +-
 .../addon/components/d-default-toast.gjs      |  2 +-
 .../float-kit/addon/components/d-tooltip.gjs  |  2 +-
 .../category-drop-more-collection.gjs         |  2 +-
 99 files changed, 123 insertions(+), 86 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/app/discourse-common-loader-shims.js
 rename app/assets/javascripts/{discourse-common/addon => discourse/app}/helpers/base-path.js (100%)
 rename app/assets/javascripts/{discourse-common/addon => discourse/app}/helpers/base-url.js (100%)
 rename app/assets/javascripts/{discourse-common/addon => discourse/app}/helpers/bound-i18n.js (100%)
 rename app/assets/javascripts/{discourse-common/addon => discourse/app}/helpers/component-for-collection.js (100%)
 rename app/assets/javascripts/{discourse-common/addon => discourse/app}/helpers/component-for-row.js (100%)
 rename app/assets/javascripts/{discourse-common/addon => discourse/app}/helpers/d-icon.js (100%)
 rename app/assets/javascripts/{discourse-common/addon => discourse/app}/helpers/fa-icon.js (100%)
 rename app/assets/javascripts/{discourse-common/addon => discourse/app}/helpers/get-url.js (100%)
 rename app/assets/javascripts/{discourse-common/addon => discourse/app}/helpers/html-safe.js (100%)
 rename app/assets/javascripts/{discourse-common/addon => discourse/app}/helpers/i18n-yes-no.js (100%)
 rename app/assets/javascripts/{discourse-common/addon => discourse/app}/helpers/i18n.js (100%)

diff --git a/app/assets/javascripts/admin/addon/components/admin-config-area-card.gjs b/app/assets/javascripts/admin/addon/components/admin-config-area-card.gjs
index 6eb1f5a4481..c9f317fa9c9 100644
--- a/app/assets/javascripts/admin/addon/components/admin-config-area-card.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-config-area-card.gjs
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import DButton from "discourse/components/d-button";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class AdminConfigAreaCard extends Component {
diff --git a/app/assets/javascripts/admin/addon/components/admin-notice.gjs b/app/assets/javascripts/admin/addon/components/admin-notice.gjs
index 59b6703d304..4e31fcaa23f 100644
--- a/app/assets/javascripts/admin/addon/components/admin-notice.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-notice.gjs
@@ -3,7 +3,7 @@ import { action } from "@ember/object";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import DButton from "discourse/components/d-button";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 export default class AdminNotice extends Component {
   @service currentUser;
diff --git a/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs b/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs
index 6176115332d..4aba0ef6d62 100644
--- a/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-plugins-list-item.gjs
@@ -6,8 +6,8 @@ import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 import DToggleSwitch from "discourse/components/d-toggle-switch";
 import PluginOutlet from "discourse/components/plugin-outlet";
+import icon from "discourse/helpers/d-icon";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import SiteSetting from "admin/models/site-setting";
 import PluginCommitHash from "./plugin-commit-hash";
diff --git a/app/assets/javascripts/admin/addon/components/admin-reports.gjs b/app/assets/javascripts/admin/addon/components/admin-reports.gjs
index 48f8a35d563..67f87b19465 100644
--- a/app/assets/javascripts/admin/addon/components/admin-reports.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-reports.gjs
@@ -6,8 +6,8 @@ import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 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 dIcon from "discourse-common/helpers/d-icon";
 import { bind } from "discourse-common/utils/decorators";
 import { i18n } from "discourse-i18n";
 
diff --git a/app/assets/javascripts/admin/addon/components/admin-section-landing-item.gjs b/app/assets/javascripts/admin/addon/components/admin-section-landing-item.gjs
index 8bd55918e44..34642b4f0db 100644
--- a/app/assets/javascripts/admin/addon/components/admin-section-landing-item.gjs
+++ b/app/assets/javascripts/admin/addon/components/admin-section-landing-item.gjs
@@ -7,7 +7,7 @@ import {
   PrimaryButton,
 } from "discourse/components/d-page-action-button";
 import concatClass from "discourse/helpers/concat-class";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class AdminSectionLandingItem extends Component {
diff --git a/app/assets/javascripts/admin/addon/components/dashboard-new-feature-item.gjs b/app/assets/javascripts/admin/addon/components/dashboard-new-feature-item.gjs
index a086209a3e1..a93fe4368c2 100644
--- a/app/assets/javascripts/admin/addon/components/dashboard-new-feature-item.gjs
+++ b/app/assets/javascripts/admin/addon/components/dashboard-new-feature-item.gjs
@@ -7,9 +7,9 @@ import { htmlSafe } from "@ember/template";
 import { and, not } from "truth-helpers";
 import CookText from "discourse/components/cook-text";
 import DToggleSwitch from "discourse/components/d-toggle-switch";
+import dIcon from "discourse/helpers/d-icon";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import dIcon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import DTooltip from "float-kit/components/d-tooltip";
 
diff --git a/app/assets/javascripts/admin/addon/components/dashboard-problems.gjs b/app/assets/javascripts/admin/addon/components/dashboard-problems.gjs
index 6db1c8ac0f2..61cb594303c 100644
--- a/app/assets/javascripts/admin/addon/components/dashboard-problems.gjs
+++ b/app/assets/javascripts/admin/addon/components/dashboard-problems.gjs
@@ -5,9 +5,9 @@ import { eq } from "truth-helpers";
 import ConditionalLoadingSection from "discourse/components/conditional-loading-section";
 import DButton from "discourse/components/d-button";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import AdminNotice from "admin/components/admin-notice";
 
diff --git a/app/assets/javascripts/admin/addon/components/install-theme-item.gjs b/app/assets/javascripts/admin/addon/components/install-theme-item.gjs
index e53cfefa663..a5a2f2b01bc 100644
--- a/app/assets/javascripts/admin/addon/components/install-theme-item.gjs
+++ b/app/assets/javascripts/admin/addon/components/install-theme-item.gjs
@@ -1,5 +1,5 @@
 import RadioButton from "discourse/components/radio-button";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 const InstallThemeItem = <template>
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 9fd13ca761a..37e5ac48e7e 100644
--- a/app/assets/javascripts/admin/addon/components/modal/install-theme.gjs
+++ b/app/assets/javascripts/admin/addon/components/modal/install-theme.gjs
@@ -10,10 +10,10 @@ import ConditionalLoadingSection from "discourse/components/conditional-loading-
 import CopyButton from "discourse/components/copy-button";
 import DButton from "discourse/components/d-button";
 import DModal from "discourse/components/d-modal";
+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 dIcon from "discourse-common/helpers/d-icon";
 import { POPULAR_THEMES } from "discourse-common/lib/popular-themes";
 import { i18n } from "discourse-i18n";
 import InstallThemeItem from "admin/components/install-theme-item";
diff --git a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/child-tree-node.gjs b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/child-tree-node.gjs
index 31500e6f2d2..aae1fe68be5 100644
--- a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/child-tree-node.gjs
+++ b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/child-tree-node.gjs
@@ -1,5 +1,5 @@
 import { on } from "@ember/modifier";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 
 <template>
   <li
diff --git a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/child-tree.gjs b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/child-tree.gjs
index 1e3064f732e..86c007d102c 100644
--- a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/child-tree.gjs
+++ b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/child-tree.gjs
@@ -4,7 +4,7 @@ import { fn } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import DButton from "discourse/components/d-button";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 import ChildTreeNode from "admin/components/schema-theme-setting/editor/child-tree-node";
 
 export default class SchemaThemeSettingNewEditorChildTree extends Component {
diff --git a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/tree-node.gjs b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/tree-node.gjs
index fef04453482..3ac30b49558 100644
--- a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/tree-node.gjs
+++ b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/tree-node.gjs
@@ -5,7 +5,7 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import { gt } from "truth-helpers";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 import ChildTree from "admin/components/schema-theme-setting/editor/child-tree";
 
 export default class SchemaThemeSettingNewEditorTreeNode extends Component {
diff --git a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/tree.gjs b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/tree.gjs
index e2ee9f26116..ce45d53bac4 100644
--- a/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/tree.gjs
+++ b/app/assets/javascripts/admin/addon/components/schema-theme-setting/editor/tree.gjs
@@ -2,7 +2,7 @@ import { fn } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { eq } from "truth-helpers";
 import DButton from "discourse/components/d-button";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 import TreeNode from "admin/components/schema-theme-setting/editor/tree-node";
 
 <template>
diff --git a/app/assets/javascripts/admin/addon/components/tags-uploader.gjs b/app/assets/javascripts/admin/addon/components/tags-uploader.gjs
index 0c87109eb66..05b0707b45a 100644
--- a/app/assets/javascripts/admin/addon/components/tags-uploader.gjs
+++ b/app/assets/javascripts/admin/addon/components/tags-uploader.gjs
@@ -4,8 +4,8 @@ import { getOwner } from "@ember/owner";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import { service } from "@ember/service";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import UppyUpload from "discourse/lib/uppy/uppy-upload";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class TagsUploader extends Component {
diff --git a/app/assets/javascripts/admin/addon/components/themes-grid-card.gjs b/app/assets/javascripts/admin/addon/components/themes-grid-card.gjs
index 74b66ed41e8..8f43214a541 100644
--- a/app/assets/javascripts/admin/addon/components/themes-grid-card.gjs
+++ b/app/assets/javascripts/admin/addon/components/themes-grid-card.gjs
@@ -5,8 +5,8 @@ import { action } from "@ember/object";
 import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import DropdownMenu from "discourse/components/dropdown-menu";
+import icon from "discourse/helpers/d-icon";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import AdminConfigAreaCard from "admin/components/admin-config-area-card";
 import DMenu from "float-kit/components/d-menu";
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 a28af72c6b9..5d92b83d83b 100644
--- a/app/assets/javascripts/admin/addon/components/themes-list-item.gjs
+++ b/app/assets/javascripts/admin/addon/components/themes-list-item.gjs
@@ -7,7 +7,7 @@ import { action } from "@ember/object";
 import { htmlSafe } from "@ember/template";
 import PluginOutlet from "discourse/components/plugin-outlet";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import escape from "discourse-common/lib/escape";
 import { iconHTML } from "discourse-common/lib/icon-library";
 import { i18n } from "discourse-i18n";
diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js
index fc5030d3649..7bfb92a8427 100644
--- a/app/assets/javascripts/discourse-common/addon/resolver.js
+++ b/app/assets/javascripts/discourse-common/addon/resolver.js
@@ -132,7 +132,6 @@ function lookupModuleBySuffix(suffix) {
     moduleSuffixTrie = new SuffixTrie("/");
     const searchPaths = [
       "discourse/", // Includes themes/plugins
-      "discourse-common/",
       "select-kit/",
       "admin/",
     ];
diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
index 44ee3a702d4..9ebf4aa6916 100644
--- a/app/assets/javascripts/discourse/app/app.js
+++ b/app/assets/javascripts/discourse/app/app.js
@@ -1,6 +1,7 @@
 import "./deprecation-workflow";
 import "decorator-transforms/globals";
 import "./loader-shims";
+import "./discourse-common-loader-shims";
 import "./global-compat";
 import { registerDiscourseImplicitInjections } from "discourse/lib/implicit-injections";
 
diff --git a/app/assets/javascripts/discourse/app/components/about-page.gjs b/app/assets/javascripts/discourse/app/components/about-page.gjs
index 5bccb0c9ef2..b35c4391846 100644
--- a/app/assets/javascripts/discourse/app/components/about-page.gjs
+++ b/app/assets/javascripts/discourse/app/components/about-page.gjs
@@ -5,8 +5,8 @@ import { service } from "@ember/service";
 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 { number } from "discourse/lib/formatter";
-import dIcon from "discourse-common/helpers/d-icon";
 import escape from "discourse-common/lib/escape";
 import I18n, { i18n } from "discourse-i18n";
 
diff --git a/app/assets/javascripts/discourse/app/components/actions-summary.gjs b/app/assets/javascripts/discourse/app/components/actions-summary.gjs
index 4401d23e783..d9f2a1a1e07 100644
--- a/app/assets/javascripts/discourse/app/components/actions-summary.gjs
+++ b/app/assets/javascripts/discourse/app/components/actions-summary.gjs
@@ -1,6 +1,6 @@
 import avatar from "discourse/helpers/bound-avatar-template";
+import dIcon from "discourse/helpers/d-icon";
 import formatDate from "discourse/helpers/format-date";
-import dIcon from "discourse-common/helpers/d-icon";
 
 const ActionsSummary = <template>
   {{#each @data.actionsSummary as |as|}}
diff --git a/app/assets/javascripts/discourse/app/components/back-button.gjs b/app/assets/javascripts/discourse/app/components/back-button.gjs
index 0a8c6e8533a..b729fddb304 100644
--- a/app/assets/javascripts/discourse/app/components/back-button.gjs
+++ b/app/assets/javascripts/discourse/app/components/back-button.gjs
@@ -1,6 +1,6 @@
 import { LinkTo } from "@ember/routing";
 import { or } from "truth-helpers";
-import dIcon from "discourse-common/helpers/d-icon";
+import dIcon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 <template>
diff --git a/app/assets/javascripts/discourse/app/components/badge-card.gjs b/app/assets/javascripts/discourse/app/components/badge-card.gjs
index 9c7b9add024..02795450cf7 100644
--- a/app/assets/javascripts/discourse/app/components/badge-card.gjs
+++ b/app/assets/javascripts/discourse/app/components/badge-card.gjs
@@ -5,10 +5,10 @@ import { htmlSafe } from "@ember/template";
 import { isEmpty } from "@ember/utils";
 import { eq, not } from "truth-helpers";
 import DButton from "discourse/components/d-button";
+import dIcon from "discourse/helpers/d-icon";
 import iconOrImage from "discourse/helpers/icon-or-image";
 import number from "discourse/helpers/number";
 import { emojiUnescape, sanitize } from "discourse/lib/text";
-import dIcon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import PluginOutlet from "./plugin-outlet";
 
diff --git a/app/assets/javascripts/discourse/app/components/bookmark-icon.gjs b/app/assets/javascripts/discourse/app/components/bookmark-icon.gjs
index a1facfcbb73..a1b490a686c 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-icon.gjs
+++ b/app/assets/javascripts/discourse/app/components/bookmark-icon.gjs
@@ -1,9 +1,9 @@
 import Component from "@glimmer/component";
+import icon from "discourse/helpers/d-icon";
 import {
   NO_REMINDER_ICON,
   WITH_REMINDER_ICON,
 } from "discourse/models/bookmark";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class BookmarkIcon extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs b/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs
index be920a0a47d..01d31699ad7 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs
+++ b/app/assets/javascripts/discourse/app/components/bookmark-menu.gjs
@@ -7,12 +7,12 @@ import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import DropdownMenu from "discourse/components/dropdown-menu";
 import BookmarkModal from "discourse/components/modal/bookmark";
+import icon from "discourse/helpers/d-icon";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import {
   TIME_SHORTCUT_TYPES,
   timeShortcuts,
 } from "discourse/lib/time-shortcut";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import DMenu from "float-kit/components/d-menu";
 
diff --git a/app/assets/javascripts/discourse/app/components/bulk-select-topics-dropdown.gjs b/app/assets/javascripts/discourse/app/components/bulk-select-topics-dropdown.gjs
index a3d09d166a9..8d65963873f 100644
--- a/app/assets/javascripts/discourse/app/components/bulk-select-topics-dropdown.gjs
+++ b/app/assets/javascripts/discourse/app/components/bulk-select-topics-dropdown.gjs
@@ -10,7 +10,7 @@ import BulkTopicActions, {
 import DismissNew from "discourse/components/modal/dismiss-new";
 import DismissReadModal from "discourse/components/modal/dismiss-read";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import DMenu from "float-kit/components/d-menu";
 
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 108b01e4ac5..a68e819f8ff 100644
--- a/app/assets/javascripts/discourse/app/components/d-breadcrumbs-item.gjs
+++ b/app/assets/javascripts/discourse/app/components/d-breadcrumbs-item.gjs
@@ -1,6 +1,6 @@
 import Component from "@glimmer/component";
 import { service } from "@ember/service";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import getURL from "discourse-common/lib/get-url";
 
 export default class DBreadcrumbsItem extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/d-button.gjs b/app/assets/javascripts/discourse/app/components/d-button.gjs
index 5dcaf8b633d..1d4de483ebd 100644
--- a/app/assets/javascripts/discourse/app/components/d-button.gjs
+++ b/app/assets/javascripts/discourse/app/components/d-button.gjs
@@ -7,8 +7,8 @@ import { htmlSafe } from "@ember/template";
 import { or } from "truth-helpers";
 import GlimmerComponentWithDeprecatedParentView from "discourse/components/glimmer-component-with-deprecated-parent-view";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import element from "discourse/helpers/element";
-import icon from "discourse-common/helpers/d-icon";
 import deprecated from "discourse-common/lib/deprecated";
 import { i18n } from "discourse-i18n";
 
diff --git a/app/assets/javascripts/discourse/app/components/d-toggle-switch.gjs b/app/assets/javascripts/discourse/app/components/d-toggle-switch.gjs
index 0ca3df95791..5e80405ac4d 100644
--- a/app/assets/javascripts/discourse/app/components/d-toggle-switch.gjs
+++ b/app/assets/javascripts/discourse/app/components/d-toggle-switch.gjs
@@ -1,5 +1,5 @@
 import Component from "@glimmer/component";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class DToggleSwitch extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/discourse-banner.gjs b/app/assets/javascripts/discourse/app/components/discourse-banner.gjs
index 2b8c802394e..f187470de0d 100644
--- a/app/assets/javascripts/discourse/app/components/discourse-banner.gjs
+++ b/app/assets/javascripts/discourse/app/components/discourse-banner.gjs
@@ -5,7 +5,7 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import DButton from "discourse/components/d-button";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class DiscourseBanner extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/emoji-picker/index.gjs b/app/assets/javascripts/discourse/app/components/emoji-picker/index.gjs
index 07429aef4dd..21a89e65417 100644
--- a/app/assets/javascripts/discourse/app/components/emoji-picker/index.gjs
+++ b/app/assets/javascripts/discourse/app/components/emoji-picker/index.gjs
@@ -3,8 +3,8 @@ import { concat } from "@ember/helper";
 import { action } from "@ember/object";
 import EmojiPickerContent from "discourse/components/emoji-picker/content";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import replaceEmoji from "discourse/helpers/replace-emoji";
-import icon from "discourse-common/helpers/d-icon";
 import DMenu from "float-kit/components/d-menu";
 
 export default class EmojiPicker extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/filter-input.gjs b/app/assets/javascripts/discourse/app/components/filter-input.gjs
index 5a8002d0254..25883535c6e 100644
--- a/app/assets/javascripts/discourse/app/components/filter-input.gjs
+++ b/app/assets/javascripts/discourse/app/components/filter-input.gjs
@@ -4,8 +4,8 @@ import { Input } from "@ember/component";
 import { on } from "@ember/modifier";
 import { modifier } from "ember-modifier";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import noop from "discourse/helpers/noop";
-import icon from "discourse-common/helpers/d-icon";
 
 export default class FilterInput extends Component {
   @tracked isFocused = false;
diff --git a/app/assets/javascripts/discourse/app/components/form-template-field/multi-select.gjs b/app/assets/javascripts/discourse/app/components/form-template-field/multi-select.gjs
index 97d72629d68..1e51d82c1c3 100644
--- a/app/assets/javascripts/discourse/app/components/form-template-field/multi-select.gjs
+++ b/app/assets/javascripts/discourse/app/components/form-template-field/multi-select.gjs
@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { action } from "@ember/object";
 import { htmlSafe } from "@ember/template";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 export default class FormTemplateFieldMultiSelect extends Component {
   @action
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 a24136ef0b5..e40cf0b688b 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
@@ -4,9 +4,9 @@ import { getOwner } from "@ember/owner";
 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 { isAudio, isImage, isVideo } from "discourse/lib/uploads";
 import UppyUpload from "discourse/lib/uppy/uppy-upload";
-import icon from "discourse-common/helpers/d-icon";
 import { bind } from "discourse-common/utils/decorators";
 
 export default class FormTemplateFieldUpload extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/header/home-logo-contents.gjs b/app/assets/javascripts/discourse/app/components/header/home-logo-contents.gjs
index a87822d8915..bae421f1134 100644
--- a/app/assets/javascripts/discourse/app/components/header/home-logo-contents.gjs
+++ b/app/assets/javascripts/discourse/app/components/header/home-logo-contents.gjs
@@ -1,4 +1,4 @@
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import Logo from "./logo";
 
 const HomeLogoContents = <template>
diff --git a/app/assets/javascripts/discourse/app/components/header/sidebar-toggle.gjs b/app/assets/javascripts/discourse/app/components/header/sidebar-toggle.gjs
index fae63755c03..fd0ab2311f4 100644
--- a/app/assets/javascripts/discourse/app/components/header/sidebar-toggle.gjs
+++ b/app/assets/javascripts/discourse/app/components/header/sidebar-toggle.gjs
@@ -3,7 +3,7 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class SidebarToggle extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/header/topic/featured-link.gjs b/app/assets/javascripts/discourse/app/components/header/topic/featured-link.gjs
index 1eec5be0e7b..9bef47be77c 100644
--- a/app/assets/javascripts/discourse/app/components/header/topic/featured-link.gjs
+++ b/app/assets/javascripts/discourse/app/components/header/topic/featured-link.gjs
@@ -1,6 +1,6 @@
 import Component from "@glimmer/component";
+import icon from "discourse/helpers/d-icon";
 import { extractLinkMeta } from "discourse/lib/render-topic-featured-link";
-import icon from "discourse-common/helpers/d-icon";
 
 export default class FeaturedLink extends Component {
   get meta() {
diff --git a/app/assets/javascripts/discourse/app/components/header/topic/info.gjs b/app/assets/javascripts/discourse/app/components/header/topic/info.gjs
index 391503feb33..d619d5c9a26 100644
--- a/app/assets/javascripts/discourse/app/components/header/topic/info.gjs
+++ b/app/assets/javascripts/discourse/app/components/header/topic/info.gjs
@@ -7,10 +7,10 @@ import { htmlSafe } from "@ember/template";
 import { and, gt, not, or } from "truth-helpers";
 import categoryLink from "discourse/helpers/category-link";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import renderTags from "discourse/lib/render-tags";
 import DiscourseURL from "discourse/lib/url";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import PluginOutlet from "../../plugin-outlet";
 import FeaturedLink from "./featured-link";
diff --git a/app/assets/javascripts/discourse/app/components/header/topic/participant.gjs b/app/assets/javascripts/discourse/app/components/header/topic/participant.gjs
index a1afac38aaf..bf9387012fb 100644
--- a/app/assets/javascripts/discourse/app/components/header/topic/participant.gjs
+++ b/app/assets/javascripts/discourse/app/components/header/topic/participant.gjs
@@ -5,7 +5,7 @@ import { action } from "@ember/object";
 import { service } from "@ember/service";
 import { eq } from "truth-helpers";
 import avatar from "discourse/helpers/bound-avatar-template";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import getURL from "discourse-common/lib/get-url";
 
 export default class Participant extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/header/topic/status.gjs b/app/assets/javascripts/discourse/app/components/header/topic/status.gjs
index 7ee0971646a..f0beede7949 100644
--- a/app/assets/javascripts/discourse/app/components/header/topic/status.gjs
+++ b/app/assets/javascripts/discourse/app/components/header/topic/status.gjs
@@ -3,9 +3,9 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import TopicStatusIcons from "discourse/helpers/topic-status-icons";
 import { escapeExpression } from "discourse/lib/utilities";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class Status extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/header/user-dropdown/notifications.gjs b/app/assets/javascripts/discourse/app/components/header/user-dropdown/notifications.gjs
index 3e047d25879..8b8ab18fc38 100644
--- a/app/assets/javascripts/discourse/app/components/header/user-dropdown/notifications.gjs
+++ b/app/assets/javascripts/discourse/app/components/header/user-dropdown/notifications.gjs
@@ -3,12 +3,12 @@ import { hash } from "@ember/helper";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import PluginOutlet from "discourse/components/plugin-outlet";
+import icon from "discourse/helpers/d-icon";
 import {
   addExtraUserClasses,
   renderAvatar,
 } from "discourse/helpers/user-avatar";
 import { applyValueTransformer } from "discourse/lib/transformer";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import UserTip from "../../user-tip";
 import UserStatusBubble from "./user-status-bubble";
diff --git a/app/assets/javascripts/discourse/app/components/input-tip.gjs b/app/assets/javascripts/discourse/app/components/input-tip.gjs
index 6c47c813854..12902c8d7da 100644
--- a/app/assets/javascripts/discourse/app/components/input-tip.gjs
+++ b/app/assets/javascripts/discourse/app/components/input-tip.gjs
@@ -1,4 +1,4 @@
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 const InputTip = <template>
   <div
diff --git a/app/assets/javascripts/discourse/app/components/navigation-bar.gjs b/app/assets/javascripts/discourse/app/components/navigation-bar.gjs
index 894ef8a568a..fdfc2737e00 100644
--- a/app/assets/javascripts/discourse/app/components/navigation-bar.gjs
+++ b/app/assets/javascripts/discourse/app/components/navigation-bar.gjs
@@ -6,9 +6,9 @@ import { service } from "@ember/service";
 import DropdownMenu from "discourse/components/dropdown-menu";
 import NavigationItem from "discourse/components/navigation-item";
 import PluginOutlet from "discourse/components/plugin-outlet";
+import icon from "discourse/helpers/d-icon";
 import { filterTypeForMode } from "discourse/lib/filter-mode";
 import { applyValueTransformer } from "discourse/lib/transformer";
-import icon from "discourse-common/helpers/d-icon";
 import DMenu from "float-kit/components/d-menu";
 
 export default class NavigationBarComponent extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/notifications-tracking.gjs b/app/assets/javascripts/discourse/app/components/notifications-tracking.gjs
index 4ac1ba103cf..bfa35e549b8 100644
--- a/app/assets/javascripts/discourse/app/components/notifications-tracking.gjs
+++ b/app/assets/javascripts/discourse/app/components/notifications-tracking.gjs
@@ -6,8 +6,8 @@ import DButton from "discourse/components/d-button";
 import DropdownMenu from "discourse/components/dropdown-menu";
 import PluginOutlet from "discourse/components/plugin-outlet";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import { allLevels, buttonDetails } from "discourse/lib/notification-levels";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import DMenu from "float-kit/components/d-menu";
 
diff --git a/app/assets/javascripts/discourse/app/components/post/menu/buttons/like.gjs b/app/assets/javascripts/discourse/app/components/post/menu/buttons/like.gjs
index 6bb0960ad14..37b7da0b00b 100644
--- a/app/assets/javascripts/discourse/app/components/post/menu/buttons/like.gjs
+++ b/app/assets/javascripts/discourse/app/components/post/menu/buttons/like.gjs
@@ -4,7 +4,7 @@ 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 icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import discourseLater from "discourse-common/lib/later";
 import { i18n } from "discourse-i18n";
 
diff --git a/app/assets/javascripts/discourse/app/components/post/menu/buttons/replies.gjs b/app/assets/javascripts/discourse/app/components/post/menu/buttons/replies.gjs
index 1b586993569..7f62bcdeb51 100644
--- a/app/assets/javascripts/discourse/app/components/post/menu/buttons/replies.gjs
+++ b/app/assets/javascripts/discourse/app/components/post/menu/buttons/replies.gjs
@@ -3,7 +3,7 @@ import { concat } from "@ember/helper";
 import { service } from "@ember/service";
 import { and, not } from "truth-helpers";
 import DButton from "discourse/components/d-button";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class PostMenuRepliesButton extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/powered-by-discourse.gjs b/app/assets/javascripts/discourse/app/components/powered-by-discourse.gjs
index 5919e0e4659..6cbbbc868b2 100644
--- a/app/assets/javascripts/discourse/app/components/powered-by-discourse.gjs
+++ b/app/assets/javascripts/discourse/app/components/powered-by-discourse.gjs
@@ -1,4 +1,4 @@
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 const PoweredByDiscourse = <template>
diff --git a/app/assets/javascripts/discourse/app/components/private-message-glyph.gjs b/app/assets/javascripts/discourse/app/components/private-message-glyph.gjs
index 4108aa918be..79860d269ea 100644
--- a/app/assets/javascripts/discourse/app/components/private-message-glyph.gjs
+++ b/app/assets/javascripts/discourse/app/components/private-message-glyph.gjs
@@ -1,4 +1,4 @@
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 const PrivateMessageGlyph = <template>
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-created-by-name.gjs b/app/assets/javascripts/discourse/app/components/reviewable-created-by-name.gjs
index 28fb1108a9e..727c65acf4e 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-created-by-name.gjs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-created-by-name.gjs
@@ -1,7 +1,7 @@
 import { hash } from "@ember/helper";
 import PluginOutlet from "discourse/components/plugin-outlet";
 import UserLink from "discourse/components/user-link";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 const ReviewableCreatedByName = <template>
diff --git a/app/assets/javascripts/discourse/app/components/reviewable-created-by.gjs b/app/assets/javascripts/discourse/app/components/reviewable-created-by.gjs
index 7a6a9a30184..02a826633df 100644
--- a/app/assets/javascripts/discourse/app/components/reviewable-created-by.gjs
+++ b/app/assets/javascripts/discourse/app/components/reviewable-created-by.gjs
@@ -1,6 +1,6 @@
 import UserLink from "discourse/components/user-link";
 import avatar from "discourse/helpers/avatar";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 const ReviewableCreatedBy = <template>
   <div class="created-by">
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/back-to-forum.gjs b/app/assets/javascripts/discourse/app/components/sidebar/back-to-forum.gjs
index 4bb86b4aaec..fb771ef88fc 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/back-to-forum.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/back-to-forum.gjs
@@ -1,4 +1,4 @@
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import getURL from "discourse-common/lib/get-url";
 import { i18n } from "discourse-i18n";
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.gjs b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.gjs
index 70246328f0a..621724be154 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/edit-navigation-menu/modal.gjs
@@ -5,8 +5,8 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import DButton from "discourse/components/d-button";
 import DModal from "discourse/components/d-modal";
+import icon from "discourse/helpers/d-icon";
 import withEventValue from "discourse/helpers/with-event-value";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import DropdownSelectBox from "select-kit/components/dropdown-select-box";
 
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.gjs b/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.gjs
index 1b36e6ef803..b926e2ba1c8 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/more-section-links.gjs
@@ -6,7 +6,7 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";
 import { service } from "@ember/service";
 import { isEmpty } from "@ember/utils";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { bind } from "discourse-common/utils/decorators";
 import { i18n } from "discourse-i18n";
 import MoreSectionLink from "./more-section-link";
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.gjs b/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.gjs
index 4de63801d0f..8445d2d8e4e 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-form-link.gjs
@@ -7,8 +7,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 icon from "discourse/helpers/d-icon";
 import withEventValue from "discourse/helpers/with-event-value";
-import icon from "discourse-common/helpers/d-icon";
 import discourseLater from "discourse-common/lib/later";
 import { i18n } from "discourse-i18n";
 import IconPicker from "select-kit/components/icon-picker";
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link-button.gjs b/app/assets/javascripts/discourse/app/components/sidebar/section-link-button.gjs
index d3e001eff48..a2f11c92cf7 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link-button.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link-button.gjs
@@ -1,5 +1,5 @@
 import { on } from "@ember/modifier";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 const SidebarSectionLinkButton = <template>
   <div class="sidebar-section-link-wrapper">
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.gjs b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.gjs
index f383bfd83e3..e01020554c7 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link-prefix.gjs
@@ -4,7 +4,7 @@ import { htmlSafe } from "@ember/template";
 import { eq } from "truth-helpers";
 import { isHex } from "discourse/components/sidebar/section-link";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 export default class SidebarSectionLinkPrefix extends Component {
   get prefixValue() {
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section-link.gjs b/app/assets/javascripts/discourse/app/components/sidebar/section-link.gjs
index f8746eff7c9..4772835f96d 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section-link.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section-link.gjs
@@ -8,7 +8,7 @@ import { schedule } from "@ember/runloop";
 import { service } from "@ember/service";
 import { eq, or } from "truth-helpers";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import deprecated from "discourse-common/lib/deprecated";
 import { bind } from "discourse-common/utils/decorators";
 import SectionLinkPrefix from "./section-link-prefix";
diff --git a/app/assets/javascripts/discourse/app/components/sidebar/section.gjs b/app/assets/javascripts/discourse/app/components/sidebar/section.gjs
index 79d30d98749..e588fb066ce 100644
--- a/app/assets/javascripts/discourse/app/components/sidebar/section.gjs
+++ b/app/assets/javascripts/discourse/app/components/sidebar/section.gjs
@@ -6,11 +6,11 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import { service } from "@ember/service";
 import { isEmpty } from "@ember/utils";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import {
   getCollapsedSidebarSectionKey,
   getSidebarSectionContentId,
 } from "discourse/lib/sidebar/helpers";
-import icon from "discourse-common/helpers/d-icon";
 import { bind } from "discourse-common/utils/decorators";
 import { i18n } from "discourse-i18n";
 import DropdownSelectBox from "select-kit/components/dropdown-select-box";
diff --git a/app/assets/javascripts/discourse/app/components/table-header-toggle.gjs b/app/assets/javascripts/discourse/app/components/table-header-toggle.gjs
index 3e8422f9b54..ad9530eb74b 100644
--- a/app/assets/javascripts/discourse/app/components/table-header-toggle.gjs
+++ b/app/assets/javascripts/discourse/app/components/table-header-toggle.gjs
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { schedule } from "@ember/runloop";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class TableHeaderToggle extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs b/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs
index 6b88c55135a..463d2d8c97a 100644
--- a/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-admin-menu.gjs
@@ -6,7 +6,7 @@ import { and, not, or } from "truth-helpers";
 import DButton from "discourse/components/d-button";
 import DropdownMenu from "discourse/components/dropdown-menu";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import getURL from "discourse-common/lib/get-url";
 import DMenu from "float-kit/components/d-menu";
 
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/action-list.gjs b/app/assets/javascripts/discourse/app/components/topic-list/action-list.gjs
index 1cfb2225622..d471a772a3f 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/action-list.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/action-list.gjs
@@ -1,4 +1,4 @@
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 const ActionList = <template>
   {{#if @postNumbers}}
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/header/bulk-select-cell.gjs b/app/assets/javascripts/discourse/app/components/topic-list/header/bulk-select-cell.gjs
index cdb07a28462..a46f13d1dd4 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/header/bulk-select-cell.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/header/bulk-select-cell.gjs
@@ -1,5 +1,5 @@
 import { on } from "@ember/modifier";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 const BulkSelectCell = <template>
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/header/sortable-column.gjs b/app/assets/javascripts/discourse/app/components/topic-list/header/sortable-column.gjs
index 093886a5800..5d3b3e354f8 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/header/sortable-column.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/header/sortable-column.gjs
@@ -7,7 +7,7 @@ import PluginOutlet from "discourse/components/plugin-outlet";
 import NewListHeaderControls from "discourse/components/topic-list/new-list-header-controls";
 import TopicBulkSelectDropdown from "discourse/components/topic-list/topic-bulk-select-dropdown";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class SortableColumn extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/item/likes-cell.gjs b/app/assets/javascripts/discourse/app/components/topic-list/item/likes-cell.gjs
index dbb49bff161..3869ffed4d3 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/item/likes-cell.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/item/likes-cell.gjs
@@ -1,6 +1,6 @@
 import { gt } from "truth-helpers";
+import icon from "discourse/helpers/d-icon";
 import number from "discourse/helpers/number";
-import icon from "discourse-common/helpers/d-icon";
 
 const LikesCell = <template>
   <td class="num likes topic-list-data">
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/item/op-likes-cell.gjs b/app/assets/javascripts/discourse/app/components/topic-list/item/op-likes-cell.gjs
index 8b3dee48824..15685a57e12 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/item/op-likes-cell.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/item/op-likes-cell.gjs
@@ -1,6 +1,6 @@
 import { gt } from "truth-helpers";
+import icon from "discourse/helpers/d-icon";
 import number from "discourse/helpers/number";
-import icon from "discourse-common/helpers/d-icon";
 
 const OpLikesCell = <template>
   <td class="num likes">
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/participant-groups.gjs b/app/assets/javascripts/discourse/app/components/topic-list/participant-groups.gjs
index 2c07cad1dca..87f1a9f9776 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/participant-groups.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/participant-groups.gjs
@@ -1,4 +1,4 @@
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 const ParticipantGroups = <template>
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/unread-indicator.gjs b/app/assets/javascripts/discourse/app/components/topic-list/unread-indicator.gjs
index 79866942fc4..6b1395e72ef 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/unread-indicator.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/unread-indicator.gjs
@@ -1,6 +1,6 @@
 import Component from "@glimmer/component";
 import { service } from "@ember/service";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { bind } from "discourse-common/utils/decorators";
 import { i18n } from "discourse-i18n";
 
diff --git a/app/assets/javascripts/discourse/app/components/topic-map/private-message-map.gjs b/app/assets/javascripts/discourse/app/components/topic-map/private-message-map.gjs
index 210ea5925d2..c6b144895bc 100644
--- a/app/assets/javascripts/discourse/app/components/topic-map/private-message-map.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-map/private-message-map.gjs
@@ -6,8 +6,8 @@ import { service } from "@ember/service";
 import { and } from "truth-helpers";
 import DButton from "discourse/components/d-button";
 import avatar from "discourse/helpers/bound-avatar-template";
+import dIcon from "discourse/helpers/d-icon";
 import { groupPath } from "discourse/lib/url";
-import dIcon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class PrivateMessageMap extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/topic-map/topic-map-summary.gjs b/app/assets/javascripts/discourse/app/components/topic-map/topic-map-summary.gjs
index 2a82cef830e..e1b2723f79c 100644
--- a/app/assets/javascripts/discourse/app/components/topic-map/topic-map-summary.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-map/topic-map-summary.gjs
@@ -14,10 +14,10 @@ import TopicViews from "discourse/components/topic-map/topic-views";
 import TopicViewsChart from "discourse/components/topic-map/topic-views-chart";
 import avatar from "discourse/helpers/bound-avatar-template";
 import concatClass from "discourse/helpers/concat-class";
+import dIcon from "discourse/helpers/d-icon";
 import number from "discourse/helpers/number";
 import { ajax } from "discourse/lib/ajax";
 import { emojiUnescape } from "discourse/lib/text";
-import dIcon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import DMenu from "float-kit/components/d-menu";
 
diff --git a/app/assets/javascripts/discourse/app/components/topic-status.gjs b/app/assets/javascripts/discourse/app/components/topic-status.gjs
index 68171b5ad9f..9e7cc23d907 100644
--- a/app/assets/javascripts/discourse/app/components/topic-status.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-status.gjs
@@ -5,7 +5,7 @@ import { action } from "@ember/object";
 import { service } from "@ember/service";
 import { and } from "truth-helpers";
 import PluginOutlet from "discourse/components/plugin-outlet";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class TopicStatus extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/topic-timeline/container.gjs b/app/assets/javascripts/discourse/app/components/topic-timeline/container.gjs
index 97065b2be47..65b68e073f4 100644
--- a/app/assets/javascripts/discourse/app/components/topic-timeline/container.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-timeline/container.gjs
@@ -13,11 +13,11 @@ import TopicAdminMenu from "discourse/components/topic-admin-menu";
 import UserTip from "discourse/components/user-tip";
 import ageWithTooltip from "discourse/helpers/age-with-tooltip";
 import categoryLink from "discourse/helpers/category-link";
+import icon from "discourse/helpers/d-icon";
 import discourseTags from "discourse/helpers/discourse-tags";
 import topicFeaturedLink from "discourse/helpers/topic-featured-link";
 import { headerOffset } from "discourse/lib/offset-calculator";
 import { actionDescriptionHtml } from "discourse/widgets/post-small-action";
-import icon from "discourse-common/helpers/d-icon";
 import { bind, debounce } from "discourse-common/utils/decorators";
 import domUtils from "discourse-common/utils/dom-utils";
 import { i18n } from "discourse-i18n";
diff --git a/app/assets/javascripts/discourse/app/components/user-flag-percentage.gjs b/app/assets/javascripts/discourse/app/components/user-flag-percentage.gjs
index f362ff925e8..3ca53b307c4 100644
--- a/app/assets/javascripts/discourse/app/components/user-flag-percentage.gjs
+++ b/app/assets/javascripts/discourse/app/components/user-flag-percentage.gjs
@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { cached } from "@glimmer/tracking";
 import { gte } from "truth-helpers";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class UserFlagPercentage extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/user-menu/icon-avatar.gjs b/app/assets/javascripts/discourse/app/components/user-menu/icon-avatar.gjs
index 2be977517c9..ab5bdb6b838 100644
--- a/app/assets/javascripts/discourse/app/components/user-menu/icon-avatar.gjs
+++ b/app/assets/javascripts/discourse/app/components/user-menu/icon-avatar.gjs
@@ -1,5 +1,5 @@
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { avatarUrl, translateSize } from "discourse-common/lib/avatar-utils";
 
 const avatarPx = translateSize("medium");
diff --git a/app/assets/javascripts/discourse/app/components/user-stat.gjs b/app/assets/javascripts/discourse/app/components/user-stat.gjs
index 59ef1cdf320..c8f03bb3119 100644
--- a/app/assets/javascripts/discourse/app/components/user-stat.gjs
+++ b/app/assets/javascripts/discourse/app/components/user-stat.gjs
@@ -1,8 +1,8 @@
 import Component from "@glimmer/component";
 import { htmlSafe } from "@ember/template";
+import icon from "discourse/helpers/d-icon";
 import formatDuration from "discourse/helpers/format-duration";
 import number from "discourse/helpers/number";
-import icon from "discourse-common/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class UserStat extends Component {
diff --git a/app/assets/javascripts/discourse/app/discourse-common-loader-shims.js b/app/assets/javascripts/discourse/app/discourse-common-loader-shims.js
new file mode 100644
index 00000000000..b2b774ba6d2
--- /dev/null
+++ b/app/assets/javascripts/discourse/app/discourse-common-loader-shims.js
@@ -0,0 +1,37 @@
+import { importSync } from "@embroider/macros";
+import loaderShim from "discourse-common/lib/loader-shim";
+
+// Soon-to-be-deprecated discourse-common imports
+loaderShim("discourse-common/helpers/base-path", () =>
+  importSync("discourse/helpers/base-path")
+);
+loaderShim("discourse-common/helpers/base-url", () =>
+  importSync("discourse/helpers/base-url")
+);
+loaderShim("discourse-common/helpers/bound-i18n", () =>
+  importSync("discourse/helpers/bound-i18n")
+);
+loaderShim("discourse-common/helpers/component-for-collection", () =>
+  importSync("discourse/helpers/component-for-collection")
+);
+loaderShim("discourse-common/helpers/component-for-row", () =>
+  importSync("discourse/helpers/component-for-row")
+);
+loaderShim("discourse-common/helpers/d-icon", () =>
+  importSync("discourse/helpers/d-icon")
+);
+loaderShim("discourse-common/helpers/fa-icon", () =>
+  importSync("discourse/helpers/fa-icon")
+);
+loaderShim("discourse-common/helpers/get-url", () =>
+  importSync("discourse/helpers/get-url")
+);
+loaderShim("discourse-common/helpers/html-safe", () =>
+  importSync("discourse/helpers/html-safe")
+);
+loaderShim("discourse-common/helpers/i18n-yes-no", () =>
+  importSync("discourse/helpers/i18n-yes-no")
+);
+loaderShim("discourse-common/helpers/i18n", () =>
+  importSync("discourse/helpers/i18n")
+);
diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/alert.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/alert.gjs
index 624ec83a7f9..04d56fa7235 100644
--- a/app/assets/javascripts/discourse/app/form-kit/components/fk/alert.gjs
+++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/alert.gjs
@@ -1,5 +1,5 @@
 import Component from "@glimmer/component";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 export default class FKAlert extends Component {
   get type() {
diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/control/menu.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/control/menu.gjs
index ca4d39064f6..8582629a681 100644
--- a/app/assets/javascripts/discourse/app/form-kit/components/fk/control/menu.gjs
+++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/control/menu.gjs
@@ -7,7 +7,7 @@ import DropdownMenu from "discourse/components/dropdown-menu";
 import FKControlMenuContainer from "discourse/form-kit/components/fk/control/menu/container";
 import FKControlMenuDivider from "discourse/form-kit/components/fk/control/menu/divider";
 import FKControlMenuItem from "discourse/form-kit/components/fk/control/menu/item";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 export default class FKControlMenu extends Component {
   static controlType = "menu";
diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/errors-summary.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/errors-summary.gjs
index b655c5504df..40dba520394 100644
--- a/app/assets/javascripts/discourse/app/form-kit/components/fk/errors-summary.gjs
+++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/errors-summary.gjs
@@ -1,6 +1,6 @@
 import Component from "@glimmer/component";
 import { concat } from "@ember/helper";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 
 export default class FKErrorsSummary extends Component {
diff --git a/app/assets/javascripts/discourse/app/form-kit/components/fk/errors.gjs b/app/assets/javascripts/discourse/app/form-kit/components/fk/errors.gjs
index 25899088679..a2f3a3194b8 100644
--- a/app/assets/javascripts/discourse/app/form-kit/components/fk/errors.gjs
+++ b/app/assets/javascripts/discourse/app/form-kit/components/fk/errors.gjs
@@ -1,5 +1,5 @@
 import Component from "@glimmer/component";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 export default class FKErrors extends Component {
   concatErrors(errors) {
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/base-path.js b/app/assets/javascripts/discourse/app/helpers/base-path.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/addon/helpers/base-path.js
rename to app/assets/javascripts/discourse/app/helpers/base-path.js
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/base-url.js b/app/assets/javascripts/discourse/app/helpers/base-url.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/addon/helpers/base-url.js
rename to app/assets/javascripts/discourse/app/helpers/base-url.js
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js b/app/assets/javascripts/discourse/app/helpers/bound-i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js
rename to app/assets/javascripts/discourse/app/helpers/bound-i18n.js
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/component-for-collection.js b/app/assets/javascripts/discourse/app/helpers/component-for-collection.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/addon/helpers/component-for-collection.js
rename to app/assets/javascripts/discourse/app/helpers/component-for-collection.js
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/component-for-row.js b/app/assets/javascripts/discourse/app/helpers/component-for-row.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/addon/helpers/component-for-row.js
rename to app/assets/javascripts/discourse/app/helpers/component-for-row.js
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/d-icon.js b/app/assets/javascripts/discourse/app/helpers/d-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/addon/helpers/d-icon.js
rename to app/assets/javascripts/discourse/app/helpers/d-icon.js
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js b/app/assets/javascripts/discourse/app/helpers/fa-icon.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js
rename to app/assets/javascripts/discourse/app/helpers/fa-icon.js
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/get-url.js b/app/assets/javascripts/discourse/app/helpers/get-url.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/addon/helpers/get-url.js
rename to app/assets/javascripts/discourse/app/helpers/get-url.js
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/html-safe.js b/app/assets/javascripts/discourse/app/helpers/html-safe.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/addon/helpers/html-safe.js
rename to app/assets/javascripts/discourse/app/helpers/html-safe.js
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/i18n-yes-no.js b/app/assets/javascripts/discourse/app/helpers/i18n-yes-no.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/addon/helpers/i18n-yes-no.js
rename to app/assets/javascripts/discourse/app/helpers/i18n-yes-no.js
diff --git a/app/assets/javascripts/discourse-common/addon/helpers/i18n.js b/app/assets/javascripts/discourse/app/helpers/i18n.js
similarity index 100%
rename from app/assets/javascripts/discourse-common/addon/helpers/i18n.js
rename to app/assets/javascripts/discourse/app/helpers/i18n.js
diff --git a/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/args-table.gjs b/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/args-table.gjs
index 03168b2dff9..2963a975380 100644
--- a/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/args-table.gjs
+++ b/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/args-table.gjs
@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { fn } from "@ember/helper";
 import { on } from "@ember/modifier";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 let globalI = 1;
 
diff --git a/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjs b/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjs
index 54ee5ff477b..0b5bbfb8a94 100644
--- a/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjs
+++ b/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjs
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import devToolsState from "../state";
 
 export default class PluginOutletDebugButton extends Component {
diff --git a/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjs b/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjs
index 642ab4cb545..74057925b53 100644
--- a/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjs
+++ b/app/assets/javascripts/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjs
@@ -4,7 +4,7 @@ import { array, hash } from "@ember/helper";
 import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import DTooltip from "float-kit/components/d-tooltip";
 import devToolsState from "../state";
 import ArgsTable from "./args-table";
diff --git a/app/assets/javascripts/discourse/app/static/dev-tools/safe-mode/button.gjs b/app/assets/javascripts/discourse/app/static/dev-tools/safe-mode/button.gjs
index 1c02e90f8ce..e8ebfed33cd 100644
--- a/app/assets/javascripts/discourse/app/static/dev-tools/safe-mode/button.gjs
+++ b/app/assets/javascripts/discourse/app/static/dev-tools/safe-mode/button.gjs
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 export default class PluginOutletDebugButton extends Component {
   get safeModeActive() {
diff --git a/app/assets/javascripts/discourse/app/static/dev-tools/toolbar.gjs b/app/assets/javascripts/discourse/app/static/dev-tools/toolbar.gjs
index 5f33fd09058..97aeab978bf 100644
--- a/app/assets/javascripts/discourse/app/static/dev-tools/toolbar.gjs
+++ b/app/assets/javascripts/discourse/app/static/dev-tools/toolbar.gjs
@@ -3,9 +3,9 @@ import { tracked } from "@glimmer/tracking";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { htmlSafe } from "@ember/template";
+import icon from "discourse/helpers/d-icon";
 import draggable from "discourse/modifiers/draggable";
 import onResize from "discourse/modifiers/on-resize";
-import icon from "discourse-common/helpers/d-icon";
 import I18n from "discourse-i18n";
 import PluginOutletDebugButton from "./plugin-outlet-debug/button";
 import SafeModeButton from "./safe-mode/button";
diff --git a/app/assets/javascripts/discourse/app/static/dev-tools/verbose-localization/button.gjs b/app/assets/javascripts/discourse/app/static/dev-tools/verbose-localization/button.gjs
index d71a9fd4a0e..8f7db20d489 100644
--- a/app/assets/javascripts/discourse/app/static/dev-tools/verbose-localization/button.gjs
+++ b/app/assets/javascripts/discourse/app/static/dev-tools/verbose-localization/button.gjs
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import I18n from "discourse-i18n";
 
 export default class VerboseLocalizationButton extends Component {
diff --git a/app/assets/javascripts/discourse/app/static/wizard/components/fields/radio.gjs b/app/assets/javascripts/discourse/app/static/wizard/components/fields/radio.gjs
index 7227cbae25d..3412641137e 100644
--- a/app/assets/javascripts/discourse/app/static/wizard/components/fields/radio.gjs
+++ b/app/assets/javascripts/discourse/app/static/wizard/components/fields/radio.gjs
@@ -4,8 +4,8 @@ import { on } from "@ember/modifier";
 import { action, set } from "@ember/object";
 import PluginOutlet from "discourse/components/plugin-outlet";
 import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
 import withEventValue from "discourse/helpers/with-event-value";
-import icon from "discourse-common/helpers/d-icon";
 
 export default class Radio extends Component {
   constructor() {
diff --git a/app/assets/javascripts/float-kit/addon/components/d-default-toast.gjs b/app/assets/javascripts/float-kit/addon/components/d-default-toast.gjs
index 68336795675..1c6f1da0ed5 100644
--- a/app/assets/javascripts/float-kit/addon/components/d-default-toast.gjs
+++ b/app/assets/javascripts/float-kit/addon/components/d-default-toast.gjs
@@ -3,7 +3,7 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import { or } from "truth-helpers";
 import DButton from "discourse/components/d-button";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 
 const DDefaultToast = <template>
   <div
diff --git a/app/assets/javascripts/float-kit/addon/components/d-tooltip.gjs b/app/assets/javascripts/float-kit/addon/components/d-tooltip.gjs
index 3e4d3f86d0f..b82bc5e8ee8 100644
--- a/app/assets/javascripts/float-kit/addon/components/d-tooltip.gjs
+++ b/app/assets/javascripts/float-kit/addon/components/d-tooltip.gjs
@@ -5,7 +5,7 @@ import { service } from "@ember/service";
 import { modifier } from "ember-modifier";
 import { and } from "truth-helpers";
 import concatClass from "discourse/helpers/concat-class";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import DFloatBody from "float-kit/components/d-float-body";
 import { TOOLTIP } from "float-kit/lib/constants";
 import DTooltipInstance from "float-kit/lib/d-tooltip-instance";
diff --git a/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs b/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs
index 23ea8868f0d..f7842178b87 100644
--- a/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs
+++ b/app/assets/javascripts/select-kit/addon/components/category-drop-more-collection.gjs
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
 import { hash } from "@ember/helper";
 import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
-import icon from "discourse-common/helpers/d-icon";
+import icon from "discourse/helpers/d-icon";
 import { i18n } from "discourse-i18n";
 import {
   ALL_CATEGORIES_ID,