diff --git a/.template-lintrc.cjs b/.template-lintrc.cjs index e584598109f4a..7049fde55e76e 100644 --- a/.template-lintrc.cjs +++ b/.template-lintrc.cjs @@ -8,6 +8,5 @@ module.exports = { "require-button-type": false, "no-action": true, "require-strict-mode": true, - "discourse/plugin-outlet-lazy-hash": false, }, }; diff --git a/app/assets/javascripts/admin/addon/components/admin-badges-show.gjs b/app/assets/javascripts/admin/addon/components/admin-badges-show.gjs index ff2c31cb6cfed..1936cd7a59ec6 100644 --- a/app/assets/javascripts/admin/addon/components/admin-badges-show.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-badges-show.gjs @@ -8,6 +8,7 @@ import Form from "discourse/components/form"; import PluginOutlet from "discourse/components/plugin-outlet"; import icon from "discourse/helpers/d-icon"; import iconOrImage from "discourse/helpers/icon-or-image"; +import lazyHash from "discourse/helpers/lazy-hash"; import routeAction from "discourse/helpers/route-action"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; @@ -555,7 +556,7 @@ export default class AdminBadgesShow extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-config-areas/webhooks-form.gjs b/app/assets/javascripts/admin/addon/components/admin-config-areas/webhooks-form.gjs index 7d19f2b8f8529..1e3e99cdad52c 100644 --- a/app/assets/javascripts/admin/addon/components/admin-config-areas/webhooks-form.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-config-areas/webhooks-form.gjs @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; import { cached, tracked } from "@glimmer/tracking"; -import { concat, hash } from "@ember/helper"; +import { concat } from "@ember/helper"; import { action } from "@ember/object"; import { service } from "@ember/service"; import { eq } from "truth-helpers"; @@ -9,6 +9,7 @@ import ConditionalLoadingSection from "discourse/components/conditional-loading- import Form from "discourse/components/form"; import GroupSelector from "discourse/components/group-selector"; import PluginOutlet from "discourse/components/plugin-outlet"; +import lazyHash from "discourse/helpers/lazy-hash"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { i18n } from "discourse-i18n"; import WebhookEventChooser from "admin/components/webhook-event-chooser"; @@ -260,7 +261,7 @@ export default class AdminConfigAreasWebhookForm extends Component {
@@ -109,7 +110,7 @@ export default class AdminPluginsListItem extends Component {
{{@plugin.version}}
@@ -122,7 +123,7 @@ export default class AdminPluginsListItem extends Component {
{{#if @plugin.enabledSetting}} {{#if this.showPluginSettingsButton}} {{#if @plugin.useNewShowRoute}} diff --git a/app/assets/javascripts/admin/addon/components/admin-user-fields-form.gjs b/app/assets/javascripts/admin/addon/components/admin-user-fields-form.gjs index 0695499ba493e..63269b5d153c4 100644 --- a/app/assets/javascripts/admin/addon/components/admin-user-fields-form.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-user-fields-form.gjs @@ -1,6 +1,5 @@ import Component from "@glimmer/component"; import { cached, tracked } from "@glimmer/tracking"; -import { hash } from "@ember/helper"; import { action } from "@ember/object"; import didInsert from "@ember/render-modifiers/modifiers/did-insert"; import { schedule } from "@ember/runloop"; @@ -8,6 +7,7 @@ import { service } from "@ember/service"; import { eq, or } from "truth-helpers"; import Form from "discourse/components/form"; import PluginOutlet from "discourse/components/plugin-outlet"; +import lazyHash from "discourse/helpers/lazy-hash"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { i18n } from "discourse-i18n"; import ValueList from "admin/components/value-list"; @@ -250,7 +250,7 @@ export default class AdminUserFieldsForm extends Component { 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 ef7adbd18e05f..c4b1952212e0e 100644 --- a/app/assets/javascripts/admin/addon/components/themes-list-item.gjs +++ b/app/assets/javascripts/admin/addon/components/themes-list-item.gjs @@ -1,13 +1,13 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { Input } from "@ember/component"; -import { hash } from "@ember/helper"; import { on } from "@ember/modifier"; 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/helpers/d-icon"; +import lazyHash from "discourse/helpers/lazy-hash"; import escape from "discourse/lib/escape"; import { iconHTML } from "discourse/lib/icon-library"; import { i18n } from "discourse-i18n"; @@ -88,7 +88,7 @@ export default class ThemesListItem extends Component { diff --git a/app/assets/javascripts/admin/addon/components/version-checks.gjs b/app/assets/javascripts/admin/addon/components/version-checks.gjs index ad947d9b079ad..8872bd6acb7ef 100644 --- a/app/assets/javascripts/admin/addon/components/version-checks.gjs +++ b/app/assets/javascripts/admin/addon/components/version-checks.gjs @@ -1,9 +1,9 @@ import Component from "@ember/component"; -import { hash } from "@ember/helper"; import CustomHtml from "discourse/components/custom-html"; import PluginOutlet from "discourse/components/plugin-outlet"; import icon from "discourse/helpers/d-icon"; import dashIfEmpty from "discourse/helpers/dash-if-empty"; +import lazyHash from "discourse/helpers/lazy-hash"; import { i18n } from "discourse-i18n"; export default class VersionChecks extends Component { @@ -150,7 +150,7 @@ export default class VersionChecks extends Component {
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-show.gjs b/app/assets/javascripts/admin/addon/templates/customize-themes-show.gjs index 09a15d52664b2..caeec2b6e93ad 100644 --- a/app/assets/javascripts/admin/addon/templates/customize-themes-show.gjs +++ b/app/assets/javascripts/admin/addon/templates/customize-themes-show.gjs @@ -12,6 +12,7 @@ import icon from "discourse/helpers/d-icon"; import formatDate from "discourse/helpers/format-date"; import formatUsername from "discourse/helpers/format-username"; import htmlSafe from "discourse/helpers/html-safe"; +import lazyHash from "discourse/helpers/lazy-hash"; import { i18n } from "discourse-i18n"; import InlineEditCheckbox from "admin/components/inline-edit-checkbox"; import ThemeSettingEditor from "admin/components/theme-setting-editor"; @@ -55,7 +56,7 @@ export default RouteTemplate( @@ -84,7 +85,7 @@ export default RouteTemplate( {{#each @controller.model.errors as |error|}} @@ -564,7 +565,7 @@ export default RouteTemplate( diff --git a/app/assets/javascripts/admin/addon/templates/embedding-index.gjs b/app/assets/javascripts/admin/addon/templates/embedding-index.gjs index 4f2c5c9cf11b7..14d7b655539f5 100644 --- a/app/assets/javascripts/admin/addon/templates/embedding-index.gjs +++ b/app/assets/javascripts/admin/addon/templates/embedding-index.gjs @@ -1,7 +1,7 @@ -import { hash } from "@ember/helper"; import RouteTemplate from "ember-route-template"; import PluginOutlet from "discourse/components/plugin-outlet"; import htmlSafe from "discourse/helpers/html-safe"; +import lazyHash from "discourse/helpers/lazy-hash"; import { i18n } from "discourse-i18n"; import AdminConfigAreaCard from "admin/components/admin-config-area-card"; import AdminConfigAreaEmptyList from "admin/components/admin-config-area-empty-list"; @@ -60,7 +60,7 @@ export default RouteTemplate( ); diff --git a/app/assets/javascripts/admin/addon/templates/plugins-index.gjs b/app/assets/javascripts/admin/addon/templates/plugins-index.gjs index a48660cb2317e..e88e284235813 100644 --- a/app/assets/javascripts/admin/addon/templates/plugins-index.gjs +++ b/app/assets/javascripts/admin/addon/templates/plugins-index.gjs @@ -1,10 +1,10 @@ -import { hash } from "@ember/helper"; import RouteTemplate from "ember-route-template"; import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item"; import DPageHeader from "discourse/components/d-page-header"; import NavItem from "discourse/components/nav-item"; import PluginOutlet from "discourse/components/plugin-outlet"; import icon from "discourse/helpers/d-icon"; +import lazyHash from "discourse/helpers/lazy-hash"; import { i18n } from "discourse-i18n"; import AdminPluginsList from "admin/components/admin-plugins-list"; @@ -64,7 +64,7 @@ export default RouteTemplate( diff --git a/app/assets/javascripts/admin/addon/templates/user-badges.gjs b/app/assets/javascripts/admin/addon/templates/user-badges.gjs index 633b36d91f9e8..18fdd5a319e7b 100644 --- a/app/assets/javascripts/admin/addon/templates/user-badges.gjs +++ b/app/assets/javascripts/admin/addon/templates/user-badges.gjs @@ -9,6 +9,7 @@ import UserBadge from "discourse/components/user-badge"; import ageWithTooltip from "discourse/helpers/age-with-tooltip"; import avatar from "discourse/helpers/avatar"; import icon from "discourse/helpers/d-icon"; +import lazyHash from "discourse/helpers/lazy-hash"; import { i18n } from "discourse-i18n"; import ComboBox from "select-kit/components/combo-box"; @@ -34,7 +35,7 @@ export default RouteTemplate( {{else}} @@ -80,7 +81,7 @@ export default RouteTemplate( {{#if @controller.canCheckEmails}} @@ -319,7 +320,7 @@ export default RouteTemplate( @@ -940,7 +941,7 @@ export default RouteTemplate( diff --git a/app/assets/javascripts/admin/addon/templates/users-list-show.gjs b/app/assets/javascripts/admin/addon/templates/users-list-show.gjs index 25f6e09c0ee28..fdd12ccf4cdcb 100644 --- a/app/assets/javascripts/admin/addon/templates/users-list-show.gjs +++ b/app/assets/javascripts/admin/addon/templates/users-list-show.gjs @@ -1,4 +1,4 @@ -import { concat, fn, get, hash } from "@ember/helper"; +import { concat, fn, get } from "@ember/helper"; import { on } from "@ember/modifier"; import { LinkTo } from "@ember/routing"; import RouteTemplate from "ember-route-template"; @@ -17,6 +17,7 @@ import icon from "discourse/helpers/d-icon"; import formatDuration from "discourse/helpers/format-duration"; import htmlSafe from "discourse/helpers/html-safe"; import i18nYesNo from "discourse/helpers/i18n-yes-no"; +import lazyHash from "discourse/helpers/lazy-hash"; import number from "discourse/helpers/number"; import rawDate from "discourse/helpers/raw-date"; import { i18n } from "discourse-i18n"; @@ -195,7 +196,10 @@ export default RouteTemplate( {{/if}} {{#if @controller.siteSettings.must_approve_users}} @@ -370,7 +374,7 @@ export default RouteTemplate( {{#if @controller.siteSettings.must_approve_users}} @@ -415,7 +419,7 @@ export default RouteTemplate( diff --git a/app/assets/javascripts/discourse/app/components/about-page.gjs b/app/assets/javascripts/discourse/app/components/about-page.gjs index bcbd56f3621ab..aaa6adc3fcd46 100644 --- a/app/assets/javascripts/discourse/app/components/about-page.gjs +++ b/app/assets/javascripts/discourse/app/components/about-page.gjs @@ -1,5 +1,4 @@ import Component from "@glimmer/component"; -import { hash } from "@ember/helper"; import { LinkTo } from "@ember/routing"; import { service } from "@ember/service"; import { htmlSafe } from "@ember/template"; @@ -8,6 +7,7 @@ import AboutPageExtraGroups from "discourse/components/about-page-extra-groups"; import AboutPageUsers from "discourse/components/about-page-users"; import PluginOutlet from "discourse/components/plugin-outlet"; import icon from "discourse/helpers/d-icon"; +import lazyHash from "discourse/helpers/lazy-hash"; import escape from "discourse/lib/escape"; import { number } from "discourse/lib/formatter"; import I18n, { i18n } from "discourse-i18n"; @@ -259,7 +259,7 @@ export default class AboutPage extends Component {
@@ -289,7 +289,7 @@ export default class AboutPage extends Component { {{#if @model.moderators.length}} @@ -301,7 +301,7 @@ export default class AboutPage extends Component { {{#if this.showExtraGroups}} diff --git a/app/assets/javascripts/discourse/app/components/badge-card.gjs b/app/assets/javascripts/discourse/app/components/badge-card.gjs index 2005210a77805..c635a5a9c5b76 100644 --- a/app/assets/javascripts/discourse/app/components/badge-card.gjs +++ b/app/assets/javascripts/discourse/app/components/badge-card.gjs @@ -1,12 +1,12 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; -import { hash } from "@ember/helper"; import { htmlSafe } from "@ember/template"; import { isEmpty } from "@ember/utils"; import { eq, not } from "truth-helpers"; import DButton from "discourse/components/d-button"; import icon from "discourse/helpers/d-icon"; import iconOrImage from "discourse/helpers/icon-or-image"; +import lazyHash from "discourse/helpers/lazy-hash"; import number from "discourse/helpers/number"; import { emojiUnescape, sanitize } from "discourse/lib/text"; import { i18n } from "discourse-i18n"; @@ -52,7 +52,7 @@ export default class BadgeCard extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/bread-crumbs.gjs b/app/assets/javascripts/discourse/app/components/bread-crumbs.gjs index decf0bc3c7115..f5b887ab88628 100644 --- a/app/assets/javascripts/discourse/app/components/bread-crumbs.gjs +++ b/app/assets/javascripts/discourse/app/components/bread-crumbs.gjs @@ -5,6 +5,7 @@ import { classNameBindings, tagName } from "@ember-decorators/component"; // A breadcrumb including category drop downs import PluginOutlet from "discourse/components/plugin-outlet"; import categoryVariables from "discourse/helpers/category-variables"; +import lazyHash from "discourse/helpers/lazy-hash"; import discourseComputed from "discourse/lib/decorators"; import deprecated from "discourse/lib/deprecated"; import CategoryDrop from "select-kit/components/category-drop"; @@ -134,7 +135,7 @@ export default class BreadCrumbs extends Component {
diff --git a/app/assets/javascripts/discourse/app/components/categories-boxes.gjs b/app/assets/javascripts/discourse/app/components/categories-boxes.gjs index 1d793eee4e6e0..3d4a3606e1dd3 100644 --- a/app/assets/javascripts/discourse/app/components/categories-boxes.gjs +++ b/app/assets/javascripts/discourse/app/components/categories-boxes.gjs @@ -1,5 +1,4 @@ import Component from "@ember/component"; -import { hash } from "@ember/helper"; import { htmlSafe } from "@ember/template"; import { isEmpty } from "@ember/utils"; import { classNameBindings, tagName } from "@ember-decorators/component"; @@ -12,6 +11,7 @@ import categoryColorVariable from "discourse/helpers/category-color-variable"; import categoryLink, { categoryBadgeHTML, } from "discourse/helpers/category-link"; +import lazyHash from "discourse/helpers/lazy-hash"; import discourseComputed from "discourse/lib/decorators"; @tagName("section") @@ -43,12 +43,12 @@ export default class CategoriesBoxes extends Component { } diff --git a/app/assets/javascripts/discourse/app/components/categories-only.gjs b/app/assets/javascripts/discourse/app/components/categories-only.gjs index 59d7b58f0cfbc..ace003835d410 100644 --- a/app/assets/javascripts/discourse/app/components/categories-only.gjs +++ b/app/assets/javascripts/discourse/app/components/categories-only.gjs @@ -1,11 +1,11 @@ import Component from "@ember/component"; -import { hash } from "@ember/helper"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; import { tagName } from "@ember-decorators/component"; import ParentCategoryRow from "discourse/components/parent-category-row"; import PluginOutlet from "discourse/components/plugin-outlet"; import icon from "discourse/helpers/d-icon"; +import lazyHash from "discourse/helpers/lazy-hash"; import discourseComputed from "discourse/lib/decorators"; import { i18n } from "discourse-i18n"; @@ -63,7 +63,7 @@ export default class CategoriesOnly extends Component { } diff --git a/app/assets/javascripts/discourse/app/components/category-name-fields.gjs b/app/assets/javascripts/discourse/app/components/category-name-fields.gjs index 906a01fad59e8..dbc61bf29be3e 100644 --- a/app/assets/javascripts/discourse/app/components/category-name-fields.gjs +++ b/app/assets/javascripts/discourse/app/components/category-name-fields.gjs @@ -1,14 +1,14 @@ import Component from "@ember/component"; -import { hash } from "@ember/helper"; import PluginOutlet from "discourse/components/plugin-outlet"; import TextField from "discourse/components/text-field"; +import lazyHash from "discourse/helpers/lazy-hash"; import { i18n } from "discourse-i18n"; export default class CategoryNameFields extends Component { diff --git a/app/assets/javascripts/discourse/app/components/topic-list/item.gjs b/app/assets/javascripts/discourse/app/components/topic-list/item.gjs index 6d8b064b24e42..8243eb36e63a9 100644 --- a/app/assets/javascripts/discourse/app/components/topic-list/item.gjs +++ b/app/assets/javascripts/discourse/app/components/topic-list/item.gjs @@ -1,5 +1,5 @@ import Component from "@glimmer/component"; -import { concat, hash } from "@ember/helper"; +import { concat } from "@ember/helper"; import { on } from "@ember/modifier"; import { action } from "@ember/object"; import { next } from "@ember/runloop"; @@ -17,6 +17,7 @@ import categoryLink from "discourse/helpers/category-link"; import concatClass from "discourse/helpers/concat-class"; import discourseTags from "discourse/helpers/discourse-tags"; import formatDate from "discourse/helpers/format-date"; +import lazyHash from "discourse/helpers/lazy-hash"; import topicFeaturedLink from "discourse/helpers/topic-featured-link"; import { wantsNewWindow } from "discourse/lib/intercept-click"; import { @@ -260,13 +261,13 @@ export default class Item extends Component { > {{! Do not include @columns as argument to the wrapper outlet below ~}} {{! We don't want it to be able to override core behavior just copy/pasting the code ~}}