A platform for community discussion. Free, open, simple.
DEV: Migrate to @ember/reactive/collections (#38221)
Sérgio Saquetim375581ed9875
diff --git a/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjs b/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjsindex 8d8b32db8af..a155c89573a 100644--- a/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { cached } from "@glimmer/tracking";import { array } from "@ember/helper";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";import UpcomingChangeItem from "discourse/admin/components/admin-config-areas/upcoming-change-item";import AdminFilterControls from "discourse/admin/components/admin-filter-controls";@@ -16,8 +16,8 @@ export default class AdminConfigAreasUpcomingChanges extends Component {@cachedget upcomingChanges() {return this.args.upcomingChanges.map((change) => {- change.upcoming_change = new TrackedObject(change.upcoming_change);- return new TrackedObject(change);+ change.upcoming_change = trackedObject(change.upcoming_change);+ return trackedObject(change);});}diff --git a/frontend/discourse/admin/components/admin-filter-controls.gjs b/frontend/discourse/admin/components/admin-filter-controls.gjsindex fcb76db6af7..9e0d79a5646 100644--- a/frontend/discourse/admin/components/admin-filter-controls.gjs+++ b/frontend/discourse/admin/components/admin-filter-controls.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { fn, get, hash } from "@ember/helper";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { schedule } from "@ember/runloop";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import DButton from "discourse/components/d-button";import DSelect from "discourse/components/d-select";import FilterInput from "discourse/components/filter-input";@@ -42,7 +42,7 @@ export default class AdminFilterControls extends Component {@tracked dropdownFilter = "all";@trackedshowFilterDropdowns = this.args.filterDropdownsExpanded ?? isTesting();- dropdownFilters = new TrackedObject();+ dropdownFilters = trackedObject();constructor() {super(...arguments);diff --git a/frontend/discourse/admin/components/admin-logo-form.gjs b/frontend/discourse/admin/components/admin-logo-form.gjsindex 8d5dd010c13..4604d11d0fc 100644--- a/frontend/discourse/admin/components/admin-logo-form.gjs+++ b/frontend/discourse/admin/components/admin-logo-form.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { cached, tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import AdminConfigAreaCardSection from "discourse/admin/components/admin-config-area-card-section";import SimpleList from "discourse/admin/components/simple-list";import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";@@ -19,7 +19,7 @@ export default class AdminLogoForm extends Component {@service toasts;@tracked loading = false;- placeholders = new TrackedObject();+ placeholders = trackedObject();constructor() {super(...arguments);diff --git a/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs b/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjsindex 82df59876de..822b356bee9 100644--- a/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs+++ b/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { modifier as modifierFn } from "ember-modifier";import DButton from "discourse/components/d-button";import DModal from "discourse/components/d-modal";@@ -19,7 +19,7 @@ export default class BulkUserDeleteConfirmation extends Component {@tracked confirmButtonDisabled = true;@tracked deleteStarted = false;- logs = new TrackedArray();+ logs = trackedArray();failedUsernames = [];callAfterBulkDelete = false;diff --git a/frontend/discourse/admin/components/schema-setting/editor.gjs b/frontend/discourse/admin/components/schema-setting/editor.gjsindex 7a406ea5fe8..1053a91f9e6 100644--- a/frontend/discourse/admin/components/schema-setting/editor.gjs+++ b/frontend/discourse/admin/components/schema-setting/editor.gjs@@ -3,8 +3,8 @@ import { tracked } from "@glimmer/tracking";import { isArray } from "@ember/array";import { fn } from "@ember/helper";import { action } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import Tree from "discourse/admin/components/schema-setting/editor/tree";import FieldInput from "discourse/admin/components/schema-setting/field";import DButton from "discourse/components/d-button";@@ -331,9 +331,7 @@ export default class SchemaSettingNewEditor extends Component {// If input is an array, convert it to a TrackedArray and recursively convert its itemsif (isArray(input)) {- return new TrackedArray(- input.map((item) => this.#trackNestedArrays(item))- );+ return trackedArray(input.map((item) => this.#trackNestedArrays(item)));}// If input is an object, recursively convert its valuesdiff --git a/frontend/discourse/admin/components/simple-list.gjs b/frontend/discourse/admin/components/simple-list.gjsindex 94ddd9e9e8f..13c4e2abafe 100644--- a/frontend/discourse/admin/components/simple-list.gjs+++ b/frontend/discourse/admin/components/simple-list.gjs@@ -3,7 +3,7 @@ import { cached, tracked } from "@glimmer/tracking";import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import DButton from "discourse/components/d-button";import withEventValue from "discourse/helpers/with-event-value";import ComboBox from "discourse/select-kit/components/combo-box";@@ -16,7 +16,7 @@ export default class SimpleList extends Component {@cachedget collection() {- return new TrackedArray(+ return trackedArray(this.args.values?.split(this.args.inputDelimiter || "\n").filter(Boolean) || []diff --git a/frontend/discourse/admin/controllers/admin-site-text/index.js b/frontend/discourse/admin/controllers/admin-site-text/index.jsindex c225d80c00c..2ddad312f75 100644--- a/frontend/discourse/admin/controllers/admin-site-text/index.js+++ b/frontend/discourse/admin/controllers/admin-site-text/index.js@@ -1,8 +1,8 @@import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import ReseedModal from "discourse/admin/components/modal/reseed";import discourseDebounce from "discourse/lib/debounce";import { disableImplicitInjections } from "discourse/lib/implicit-injections";@@ -39,7 +39,7 @@ export default class AdminSiteTextIndexController extends Controller {];#page = 0;- #results = new TrackedArray();+ #results = trackedArray();get siteTexts() {return this.#results.flat();diff --git a/frontend/discourse/admin/controllers/admin-users-list/show.js b/frontend/discourse/admin/controllers/admin-users-list/show.jsindex 5f5abb77a42..7f301258ffd 100644--- a/frontend/discourse/admin/controllers/admin-users-list/show.js+++ b/frontend/discourse/admin/controllers/admin-users-list/show.js@@ -1,8 +1,8 @@import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import { action, computed } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import BulkUserDeleteConfirmation from "discourse/admin/components/bulk-user-delete-confirmation";import AdminUser from "discourse/admin/models/admin-user";import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";@@ -35,7 +35,7 @@ export default class AdminUsersListShowController extends Controller {@computedI18n("search_hint") searchHint;_page = 1;- _results = new TrackedArray();+ _results = trackedArray();_canLoadMore = true;get users() {diff --git a/frontend/discourse/admin/controllers/admin-watched-words.js b/frontend/discourse/admin/controllers/admin-watched-words.jsindex 23150f6ed15..1bff2b3896f 100644--- a/frontend/discourse/admin/controllers/admin-watched-words.js+++ b/frontend/discourse/admin/controllers/admin-watched-words.js@@ -2,9 +2,9 @@import { tracked } from "@glimmer/tracking";import Controller from "@ember/controller";import EmberObject, { action } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { observes } from "@ember-decorators/object";import WatchedWord from "discourse/admin/models/watched-word";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -68,7 +68,7 @@ export default class AdminWatchedWordsController extends Controller {EmberObject.create({nameKey: wordsForAction.nameKey,name: wordsForAction.name,- words: new TrackedArray(wordRecords),+ words: trackedArray(wordRecords),}));});diff --git a/frontend/discourse/admin/models/watched-word.js b/frontend/discourse/admin/models/watched-word.jsindex 85089786c9c..39c487853bb 100644--- a/frontend/discourse/admin/models/watched-word.js+++ b/frontend/discourse/admin/models/watched-word.js@@ -1,5 +1,5 @@import EmberObject from "@ember/object";-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import { ajax } from "discourse/lib/ajax";import { i18n } from "discourse-i18n";@@ -20,7 +20,7 @@ export default class WatchedWord extends EmberObject {return EmberObject.create({nameKey,name: i18n("admin.watched_words.actions." + nameKey),- words: new TrackedArray(actions[nameKey]),+ words: trackedArray(actions[nameKey]),compiledRegularExpression: list.compiled_regular_expressions[nameKey],});});diff --git a/frontend/discourse/admin/routes/admin-config/color-palettes/index.js b/frontend/discourse/admin/routes/admin-config/color-palettes/index.jsindex 08be82cbefe..e582575f92b 100644--- a/frontend/discourse/admin/routes/admin-config/color-palettes/index.js+++ b/frontend/discourse/admin/routes/admin-config/color-palettes/index.js@@ -1,5 +1,5 @@+import { trackedArray } from "@ember/reactive/collections";import Route from "@ember/routing/route";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import ColorScheme from "discourse/admin/models/color-scheme";import Theme from "discourse/admin/models/theme";import { ajax } from "discourse/lib/ajax";@@ -17,9 +17,7 @@ export default class AdminConfigColorPalettesIndexRoute extends Route {: null;controller.set("model",- new TrackedArray(- model.palettes.map((palette) => ColorScheme.create(palette))- )+ trackedArray(model.palettes.map((palette) => ColorScheme.create(palette))));controller.set("defaultTheme", defaultTheme);diff --git a/frontend/discourse/admin/routes/admin-config/customize/themes.js b/frontend/discourse/admin/routes/admin-config/customize/themes.jsindex 47d5aa68502..4d5f481901a 100644--- a/frontend/discourse/admin/routes/admin-config/customize/themes.js+++ b/frontend/discourse/admin/routes/admin-config/customize/themes.js@@ -1,4 +1,4 @@-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import Theme from "discourse/admin/models/theme";import { ajax } from "discourse/lib/ajax";import DiscourseRoute from "discourse/routes/discourse";@@ -13,7 +13,7 @@ export default class AdminConfigThemesAndComponentsThemesRoute extends Discourseasync model(params) {const data = await ajax("/admin/config/customize/themes");return {- themes: new TrackedArray(+ themes: trackedArray(data.themes.map((theme) =>// TODO(osama) MEGA HACK. remove the __type and __state properties when// we have rebuilt the theme "show" page and stopped requiring alldiff --git a/frontend/discourse/admin/routes/admin-user/badges.js b/frontend/discourse/admin/routes/admin-user/badges.jsindex 235de0d2140..54641783ef9 100644--- a/frontend/discourse/admin/routes/admin-user/badges.js+++ b/frontend/discourse/admin/routes/admin-user/badges.js@@ -1,4 +1,4 @@-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import Badge from "discourse/models/badge";import UserBadge from "discourse/models/user-badge";import DiscourseRoute from "discourse/routes/discourse";@@ -10,7 +10,7 @@ export default class AdminUserBadgesRoute extends DiscourseRoute {}async setupController(controller, model) {- super.setupController(controller, new TrackedArray(model));+ super.setupController(controller, trackedArray(model));// Find all badges.controller.loading = true;diff --git a/frontend/discourse/admin/routes/admin/backups/index.js b/frontend/discourse/admin/routes/admin/backups/index.jsindex 2d901bac597..c4311cfe703 100644--- a/frontend/discourse/admin/routes/admin/backups/index.js+++ b/frontend/discourse/admin/routes/admin/backups/index.js@@ -1,5 +1,5 @@+import { trackedArray } from "@ember/reactive/collections";import Route from "@ember/routing/route";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import Backup from "discourse/admin/models/backup";import { bind } from "discourse/lib/decorators";@@ -14,7 +14,7 @@ export default class AdminBackupsIndexRoute extends Route {async model() {const backups = await Backup.find();- return new TrackedArray(backups.map((backup) => Backup.create(backup)));+ return trackedArray(backups.map((backup) => Backup.create(backup)));}@binddiff --git a/frontend/discourse/admin/services/site-setting-change-tracker.js b/frontend/discourse/admin/services/site-setting-change-tracker.jsindex c9b9cba7402..43dece3c5d9 100644--- a/frontend/discourse/admin/services/site-setting-change-tracker.js+++ b/frontend/discourse/admin/services/site-setting-change-tracker.js@@ -1,6 +1,6 @@import { tracked } from "@glimmer/tracking";+import { trackedSet } from "@ember/reactive/collections";import Service, { service } from "@ember/service";-import { TrackedSet } from "@ember-compat/tracked-built-ins";import { DEFAULT_TEXT_SIZES } from "discourse/admin/lib/constants";import SiteSetting from "discourse/admin/models/site-setting";import { ajax } from "discourse/lib/ajax";@@ -15,7 +15,7 @@ export default class SiteSettingChangeTracker extends Service {@service site;@service siteSettings;- @tracked dirtySiteSettings = new TrackedSet();+ @tracked dirtySiteSettings = trackedSet();add(setting) {this.dirtySiteSettings.add(setting);diff --git a/frontend/discourse/app/components/admin-onboarding/banner.gjs b/frontend/discourse/app/components/admin-onboarding/banner.gjsindex 3feb7d44865..084f5705364 100644--- a/frontend/discourse/app/components/admin-onboarding/banner.gjs+++ b/frontend/discourse/app/components/admin-onboarding/banner.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { hash } from "@ember/helper";import { action } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import SiteSetting from "discourse/admin/models/site-setting";import PredefinedTopicsOptionsModal from "discourse/components/admin-onboarding/modal/predefined-topics-options";import StartPostingOptions from "discourse/components/admin-onboarding/modal/start-posting-options";@@ -38,7 +38,7 @@ const STEPS = [@actionperformAction() {this.modal.show(CreateInvite, {- model: { invites: new TrackedArray() },+ model: { invites: trackedArray() },});}},diff --git a/frontend/discourse/app/components/d-otp/index.gjs b/frontend/discourse/app/components/d-otp/index.gjsindex 7aabae2f6f4..1e48bc4c6a3 100644--- a/frontend/discourse/app/components/d-otp/index.gjs+++ b/frontend/discourse/app/components/d-otp/index.gjs@@ -3,9 +3,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";import { isBlank } from "@ember/utils";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import autoFocus from "discourse/modifiers/auto-focus";import preventScrollOnFocus from "discourse/modifiers/prevent-scroll-on-focus";import { i18n } from "discourse-i18n";@@ -33,7 +33,7 @@ export default class DOTP extends Component {@tracked isFocused = false;@tracked isAllSelected = false;- otp = new TrackedArray(Array(this.slots).fill(""));+ otp = trackedArray(Array(this.slots).fill(""));get slots() {return this.args.slots ?? DEFAULT_SLOTS;diff --git a/frontend/discourse/app/components/decorated-html.gjs b/frontend/discourse/app/components/decorated-html.gjsindex d02efba8848..ef5070496dc 100644--- a/frontend/discourse/app/components/decorated-html.gjs+++ b/frontend/discourse/app/components/decorated-html.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { untrack } from "@glimmer/validator";+import { trackedArray } from "@ember/reactive/collections";import { isHTMLSafe, trustHTML } from "@ember/template";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import helperFn from "discourse/helpers/helper-fn";import deprecated from "discourse/lib/deprecated";import {@@ -111,7 +111,7 @@ export function resetHtmlDecorators() {* @param {string} [id] - ID attribute for the wrapper div*/export default class DecoratedHtml extends Component {- renderGlimmerInfos = new TrackedArray();+ renderGlimmerInfos = trackedArray();decoratedContent = helperFn(({ decorateArgs }, on) => {const cookedDiv = this.elementToDecorate;diff --git a/frontend/discourse/app/components/discovery/filter-navigation-menu.gjs b/frontend/discourse/app/components/discovery/filter-navigation-menu.gjsindex 4207932e829..a949ccdada3 100644--- a/frontend/discourse/app/components/discovery/filter-navigation-menu.gjs+++ b/frontend/discourse/app/components/discovery/filter-navigation-menu.gjs@@ -3,11 +3,11 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { cancel } from "@ember/runloop";import { service } from "@ember/service";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import DButton from "discourse/components/d-button";import DropdownMenu from "discourse/components/dropdown-menu";import { VISIBILITY_OPTIMIZERS } from "discourse/float-kit/lib/constants";@@ -71,7 +71,7 @@ export default class FilterNavigationMenu extends Component {lastSuggestionInput = "";suggestionRequestId = 0;- trackedMenuListData = new TrackedObject({+ trackedMenuListData = trackedObject({suggestions: [],selectedIndex: null,selectItem: this.selectItem,diff --git a/frontend/discourse/app/components/modal/edit-topic-timer.gjs b/frontend/discourse/app/components/modal/edit-topic-timer.gjsindex ebccaeafa78..b14882e0ff9 100644--- a/frontend/discourse/app/components/modal/edit-topic-timer.gjs+++ b/frontend/discourse/app/components/modal/edit-topic-timer.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import { next } from "@ember/runloop";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import DButton from "discourse/components/d-button";import DModal from "discourse/components/d-modal";import EditTopicTimerForm from "discourse/components/edit-topic-timer-form";@@ -29,11 +29,11 @@ export default class EditTopicTimer extends Component {super(...arguments);if (this.args.model.topic?.topic_timer) {- this.topicTimer = new TrackedObject(this.args.model.topic?.topic_timer);+ this.topicTimer = trackedObject(this.args.model.topic?.topic_timer);} else {// TODO: next() is a hack, to-be-removednext(() => {- this.topicTimer = new TrackedObject(this.createDefaultTimer());+ this.topicTimer = trackedObject(this.createDefaultTimer());});}}diff --git a/frontend/discourse/app/components/modal/user-status.gjs b/frontend/discourse/app/components/modal/user-status.gjsindex ac6d6718692..61694611b03 100644--- a/frontend/discourse/app/components/modal/user-status.gjs+++ b/frontend/discourse/app/components/modal/user-status.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { Input } from "@ember/component";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";import ItsATrap from "@discourse/itsatrap";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import DButton from "discourse/components/d-button";import DModal from "discourse/components/d-modal";import DModalCancel from "discourse/components/d-modal-cancel";@@ -20,7 +20,7 @@ export default class UserStatusModal extends Component {@service currentUser;@service dialog;- status = new TrackedObject({ ...this.args.model.status });+ status = trackedObject({ ...this.args.model.status });timeShortcuts = this.#buildTimeShortcuts();_itsatrap = new ItsATrap();diff --git a/frontend/discourse/app/components/post.gjs b/frontend/discourse/app/components/post.gjsindex 6fccc3543c9..5cea1979be5 100644--- a/frontend/discourse/app/components/post.gjs+++ b/frontend/discourse/app/components/post.gjs@@ -4,8 +4,8 @@ import { concat, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { getOwner } from "@ember/owner";+import { trackedArray, trackedMap } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedArray, TrackedMap } from "@ember-compat/tracked-built-ins";import { TrackedAsyncData } from "ember-async-data";import { modifier } from "ember-modifier";import DButton from "discourse/components/d-button";@@ -55,8 +55,8 @@ export default class Post extends Component {@tracked isTogglingReplies = false;@tracked isLoadingMoreReplies = false;- repliesBelow = new TrackedArray();- decoratorState = new TrackedMap();+ repliesBelow = trackedArray();+ decoratorState = trackedMap();addEventListeners = modifier((element, [listeners]) => {for (const { event, callback } of listeners) {diff --git a/frontend/discourse/app/components/post/cooked-html.gjs b/frontend/discourse/app/components/post/cooked-html.gjsindex 3a961faa6a0..14618778706 100644--- a/frontend/discourse/app/components/post/cooked-html.gjs+++ b/frontend/discourse/app/components/post/cooked-html.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { getOwner } from "@ember/owner";+import { trackedMap } from "@ember/reactive/collections";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import { TrackedMap } from "@ember-compat/tracked-built-ins";import curryComponent from "ember-curry-component";import DecoratedHtml, {applyHtmlDecorators,@@ -36,7 +36,7 @@ export default class PostCookedHtml extends Component {@service currentUser;#pendingDecoratorCleanup = [];- #decoratorState = this.args.decoratorState || new TrackedMap();+ #decoratorState = this.args.decoratorState || trackedMap();willDestroy() {super.willDestroy(...arguments);@@ -66,7 +66,7 @@ export default class PostCookedHtml extends Component {if (this.#decoratorState.has(decorator)) {decoratorState = this.#decoratorState.get(decorator);} else {- decoratorState = new TrackedMap();+ decoratorState = trackedMap();this.#decoratorState.set(decorator, decoratorState);}diff --git a/frontend/discourse/app/components/post/small-action.gjs b/frontend/discourse/app/components/post/small-action.gjsindex 5556f51fbbc..800d5c35101 100644--- a/frontend/discourse/app/components/post/small-action.gjs+++ b/frontend/discourse/app/components/post/small-action.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { cached } from "@glimmer/tracking";import { concat } from "@ember/helper";+import { trackedMap } from "@ember/reactive/collections";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import { TrackedMap } from "@ember-compat/tracked-built-ins";import DButton from "discourse/components/d-button";import PostCookedHtml from "discourse/components/post/cooked-html";import UserAvatar from "discourse/components/user-avatar";@@ -58,7 +58,7 @@ export function resetGroupPostSmallActionCodes() {export default class PostSmallAction extends Component {@service a11y;- decoratorState = new TrackedMap();+ decoratorState = trackedMap();@cachedget CustomComponent() {diff --git a/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjs b/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjsindex 3a794e31510..e5a1fbb90e6 100644--- a/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjs+++ b/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjs@@ -3,9 +3,9 @@ import { tracked } from "@glimmer/tracking";import { concat, fn, get } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";+import { trackedSet } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import { TrackedSet } from "@ember-compat/tracked-built-ins";import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import DecoratedHtml from "discourse/components/decorated-html";import EditNavigationMenuModal from "discourse/components/sidebar/edit-navigation-menu/modal";@@ -30,9 +30,7 @@ export default class SidebarEditNavigationMenuCategoriesModal extends Component@tracked fetchedCategoriesGroupings = [];@tracked loadingMore = false;@tracked- selectedCategoryIds = new TrackedSet([- ...this.currentUser.sidebar_category_ids,- ]);+ selectedCategoryIds = trackedSet([...this.currentUser.sidebar_category_ids]);selectedFilter = "";selectedMode = "everything";fetchedCategories;@@ -218,7 +216,7 @@ export default class SidebarEditNavigationMenuCategoriesModal extends Component@actionresetToDefaults() {- this.selectedCategoryIds = new TrackedSet(+ this.selectedCategoryIds = trackedSet(this.siteSettings.default_navigation_menu_categories.split("|").map((id) => parseInt(id, 10))diff --git a/frontend/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.gjs b/frontend/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.gjsindex 359bf6ca91d..6bdbb77634d 100644--- a/frontend/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.gjs+++ b/frontend/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.gjs@@ -3,9 +3,9 @@ import { tracked } from "@glimmer/tracking";import { concat, fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";+import { trackedSet } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import { TrackedSet } from "@ember-compat/tracked-built-ins";import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import loadingSpinner from "discourse/helpers/loading-spinner";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -22,7 +22,7 @@ export default class SidebarEditNavigationMenuTagsModal extends Component {@tracked disableFiltering = false;@tracked saving = false;- @tracked selectedTags = new TrackedSet([...this.currentUser.sidebarTagNames]);+ @tracked selectedTags = trackedSet([...this.currentUser.sidebarTagNames]);@tracked tags = [];@tracked tagsLoading = false;observer;@@ -140,7 +140,7 @@ export default class SidebarEditNavigationMenuTagsModal extends Component {@actionresetToDefaults() {- this.selectedTags = new TrackedSet(+ this.selectedTags = trackedSet(this.siteSettings.default_navigation_menu_tags.split("|"));}diff --git a/frontend/discourse/app/lib/array-tools.js b/frontend/discourse/app/lib/array-tools.jsindex 3da92612c1b..26c16d747ab 100644--- a/frontend/discourse/app/lib/array-tools.js+++ b/frontend/discourse/app/lib/array-tools.js@@ -1,6 +1,7 @@import { get } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { compare } from "@ember/utils";-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { isTrackedArray } from "discourse/lib/tracked-tools";/*** Adds a value to the array if it does not already exist in the array.@@ -160,7 +161,7 @@ export function uniqueItemsFromArray(array, selector) {? [...new Set(array)]: dedupeBy(array, buildSelector(selector));- return array instanceof TrackedArray ? new TrackedArray(items) : items;+ return isTrackedArray(array) ? trackedArray(items) : items;}/**diff --git a/frontend/discourse/app/lib/blocks/-internals/debug-hooks.js b/frontend/discourse/app/lib/blocks/-internals/debug-hooks.jsindex 0d0460760be..c58c79022c9 100644--- a/frontend/discourse/app/lib/blocks/-internals/debug-hooks.js+++ b/frontend/discourse/app/lib/blocks/-internals/debug-hooks.js@@ -13,7 +13,7 @@* @module discourse/lib/blocks/-internals/debug-hooks*/-import { TrackedMap } from "@ember-compat/tracked-built-ins";+import { trackedMap } from "@ember/reactive/collections";import { FAILURE_TYPE } from "discourse/lib/blocks/-internals/patterns";/**@@ -48,9 +48,9 @@ class DebugHooks {* Tracked callback registry for debug hooks.* Using TrackedMap enables reactivity when callbacks are set/cleared.*- * @type {TrackedMap<string, Function|null>}+ * @type {Map<string, Function|null>}*/- #callbacks = new TrackedMap(+ #callbacks = trackedMap(Object.values(DEBUG_CALLBACK).map((key) => [key, null]));diff --git a/frontend/discourse/app/lib/blocks/-internals/registry/block.js b/frontend/discourse/app/lib/blocks/-internals/registry/block.jsindex a24d3868d61..54014bea169 100644--- a/frontend/discourse/app/lib/blocks/-internals/registry/block.js+++ b/frontend/discourse/app/lib/blocks/-internals/registry/block.js@@ -1,6 +1,6 @@// @ts-checkimport { DEBUG } from "@glimmer/env";-import { TrackedMap } from "@ember-compat/tracked-built-ins";+import { trackedMap } from "@ember/reactive/collections";import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";import { raiseBlockError } from "discourse/lib/blocks/-internals/error";import {@@ -74,14 +74,14 @@ const blockRegistry = new Map();* Cache for resolved factory functions.* Once a factory is resolved, the result is stored here to avoid re-resolving.*- * This is a TrackedMap so that components calling `tryResolveBlock()` will+ * This is a tracked map so that components calling `tryResolveBlock()` will* automatically re-render when a factory they depend on finishes resolving.- * TrackedMap tracks per-key, so only components waiting on specific blocks+ * The tracked map tracks per-key, so only components waiting on specific blocks* are invalidated.*- * @type {TrackedMap<string, BlockClass>}+ * @type {Map<string, BlockClass>}*/-const resolvedFactoryCache = new TrackedMap();+const resolvedFactoryCache = trackedMap();/*** Tracks in-flight resolution promises to prevent duplicate concurrent attempts.diff --git a/frontend/discourse/app/lib/legacy-array-like-object.js b/frontend/discourse/app/lib/legacy-array-like-object.jsindex 2137f4929c6..4c80e66d919 100644--- a/frontend/discourse/app/lib/legacy-array-like-object.js+++ b/frontend/discourse/app/lib/legacy-array-like-object.js@@ -20,8 +20,9 @@*/import EmberObject from "@ember/object";-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import deprecated from "discourse/lib/deprecated";+import { isTrackedArray } from "discourse/lib/tracked-tools";const EMBER_OBJECT_PROPERTIES = new Set(["constructor",@@ -152,8 +153,7 @@ export default class LegacyArrayLikeObject extends EmberObject {);}- this.#content =- content instanceof TrackedArray ? content : new TrackedArray(content);+ this.#content = isTrackedArray(content) ? content : trackedArray(content);return createProxy(this, this.#content);}diff --git a/frontend/discourse/app/lib/password-validation-helper.js b/frontend/discourse/app/lib/password-validation-helper.jsindex aca557416df..c2eea98d8d0 100644--- a/frontend/discourse/app/lib/password-validation-helper.js+++ b/frontend/discourse/app/lib/password-validation-helper.js@@ -1,7 +1,7 @@import { tracked } from "@glimmer/tracking";import { dependentKeyCompat } from "@ember/object/compat";+import { trackedArray, trackedMap } from "@ember/reactive/collections";import { isEmpty } from "@ember/utils";-import { TrackedArray, TrackedMap } from "@ember-compat/tracked-built-ins";import { i18n } from "discourse-i18n";function failedResult(attrs) {@@ -18,8 +18,8 @@ function validResult(attrs) {}export default class PasswordValidationHelper {- @tracked rejectedPasswords = new TrackedArray();- @tracked rejectedPasswordsMessages = new TrackedMap();+ @tracked rejectedPasswords = trackedArray();+ @tracked rejectedPasswordsMessages = trackedMap();constructor(owner) {this.owner = owner;diff --git a/frontend/discourse/app/lib/post-bulk-select-helper.js b/frontend/discourse/app/lib/post-bulk-select-helper.jsindex 985f03bc087..3fa50c672d7 100644--- a/frontend/discourse/app/lib/post-bulk-select-helper.js+++ b/frontend/discourse/app/lib/post-bulk-select-helper.js@@ -1,7 +1,7 @@import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { getOwner, setOwner } from "@ember/owner";-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";/*** Helper class for managing bulk selection of posts@@ -18,7 +18,7 @@ export default class PostBulkSelectHelper {@tracked lastClickedPost = null;@tracked bulkSelectEnabled = false;@tracked posts = null;- selected = new TrackedArray();+ selected = trackedArray();constructor(context, posts = null) {setOwner(this, getOwner(context));diff --git a/frontend/discourse/app/lib/textarea-text-manipulation.js b/frontend/discourse/app/lib/textarea-text-manipulation.jsindex abae76ea70b..79943a417ba 100644--- a/frontend/discourse/app/lib/textarea-text-manipulation.js+++ b/frontend/discourse/app/lib/textarea-text-manipulation.js@@ -1,10 +1,10 @@/* eslint-disable ember/no-jquery */// @ts-checkimport { getOwner, setOwner } from "@ember/owner";+import { trackedObject } from "@ember/reactive/collections";import { next, schedule } from "@ember/runloop";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import $ from "jquery";import { bind } from "discourse/lib/decorators";import { isTesting } from "discourse/lib/environment";@@ -73,7 +73,7 @@ export default class TextareaTextManipulation {placeholder;/** @type {import("discourse/lib/composer/text-manipulation").ToolbarState} */- state = new TrackedObject();+ state = trackedObject();constructor(owner, { markdownOptions, textarea, eventPrefix = "composer" }) {setOwner(this, owner);diff --git a/frontend/discourse/app/lib/tracked-tools.js b/frontend/discourse/app/lib/tracked-tools.jsindex 5d64da555b5..77290b39525 100644--- a/frontend/discourse/app/lib/tracked-tools.js+++ b/frontend/discourse/app/lib/tracked-tools.js@@ -1,9 +1,14 @@+import { setCustomTagFor } from "@glimmer/manager";import { tracked } from "@glimmer/tracking";-import { tagFor, track, updateTag } from "@glimmer/validator";+import { dirtyTagFor, tagFor, track, updateTag } from "@glimmer/validator";import { meta as metaFor, peekMeta } from "@ember/-internals/meta";import { TrackedDescriptor } from "@ember/-internals/metal";+import {+ trackedArray,+ trackedObject,+ trackedSet,+} from "@ember/reactive/collections";import { next } from "@ember/runloop";-import { TrackedArray, TrackedSet } from "@ember-compat/tracked-built-ins";/*** Define a tracked property on an object without needing to use the @tracked decorator.@@ -20,6 +25,39 @@ export function defineTrackedProperty(target, key, value) {);}+/**+ * Creates a tracked object that bridges Ember's native autotracking system with+ * the classic `@computed` / `@discourseComputed` dependent key chain observation.+ *+ * Ember's native `trackedObject()` only dirties internal Cell tags on property set,+ * which are invisible to `@computed("obj.prop")` chains that use `tagFor()` from+ * `TRACKED_TAGS`. It also uses data descriptors on its Proxy target, which causes+ * Ember's `setupMandatorySetter` to install a mandatory setter that blocks all+ * subsequent direct property assignments.+ *+ * This wrapper:+ * 1. Registers `setCustomTagFor` so `tagForProperty()` bypasses `setupMandatorySetter`+ * 2. Intercepts `set` to also call `dirtyTagFor()` for classic chain tag invalidation+ *+ * @param {Object} obj - The object to wrap in a tracked proxy.+ * @returns {Proxy} A proxy that supports both native autotracking and classic `@computed` chains.+ */+export function trackedObjectWithComputedSupport(obj) {+ const inner = trackedObject(obj);++ const outer = new Proxy(inner, {+ set(target, prop, value) {+ const result = Reflect.set(target, prop, value);+ dirtyTagFor(outer, prop);+ return result;+ },+ });++ setCustomTagFor(outer, (_obj, key) => tagFor(outer, key));++ return outer;+}+class ResettableTrackedState {@tracked currentValue;previousUpstreamValue;@@ -130,7 +168,7 @@ export class DeferredTrackedSet {#set;constructor(value) {- this.#set = new TrackedSet(value);+ this.#set = trackedSet(value);}has(value) {@@ -180,6 +218,27 @@ export class DeferredTrackedSet {}}+// Capture the prototype shared by all tracked arrays returned by Ember's+// trackedArray(). The constructor returns a Proxy whose getPrototypeOf trap+// yields this prototype, so isPrototypeOf can detect them without access+// to the (unexported) TrackedArray class.+const trackedArrayPrototype = Object.getPrototypeOf(trackedArray());++/**+ * Checks whether a value is a tracked array created by Ember's native+ * `trackedArray()` from `@ember/reactive/collections`.+ *+ * This does NOT detect instances of the legacy `TrackedArray` class from+ * `@ember-compat/tracked-built-ins`. Only arrays produced by Ember's+ * `trackedArray()` function share the prototype used for detection.+ *+ * @param {unknown} value - The value to check.+ * @returns {boolean} `true` if the value is a tracked array, `false` otherwise.+ */+export function isTrackedArray(value) {+ return value != null && trackedArrayPrototype.isPrototypeOf(value);+}+/*** Converts a value to TrackedArray if needed and validates the type.*@@ -193,12 +252,12 @@ function ensureTrackedArray(value, propertyName) {return value;}- if (value instanceof TrackedArray) {+ if (isTrackedArray(value)) {return value;}if (Array.isArray(value)) {- return new TrackedArray(value);+ return trackedArray(value);}throw new Error(diff --git a/frontend/discourse/app/lib/uppy/uppy-upload.js b/frontend/discourse/app/lib/uppy/uppy-upload.jsindex bbbad4dbac8..5e7a02f74f3 100644--- a/frontend/discourse/app/lib/uppy/uppy-upload.js+++ b/frontend/discourse/app/lib/uppy/uppy-upload.js@@ -2,9 +2,9 @@ import { tracked } from "@glimmer/tracking";import { warn } from "@ember/debug";import EmberObject from "@ember/object";import { getOwner, setOwner } from "@ember/owner";+import { trackedArray } from "@ember/reactive/collections";import { run } from "@ember/runloop";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import AwsS3 from "@uppy/aws-s3";import Uppy from "@uppy/core";import DropTarget from "@uppy/drop-target";@@ -98,7 +98,7 @@ export default class UppyUpload {@tracked filesAwaitingUpload = false;@tracked cancellable = false;- inProgressUploads = new TrackedArray();+ inProgressUploads = trackedArray();uppyWrapper;diff --git a/frontend/discourse/app/lib/user-fields-validation-helper.js b/frontend/discourse/app/lib/user-fields-validation-helper.jsindex daa2cf23a0d..49b71663ba4 100644--- a/frontend/discourse/app/lib/user-fields-validation-helper.js+++ b/frontend/discourse/app/lib/user-fields-validation-helper.js@@ -1,6 +1,6 @@import { tracked } from "@glimmer/tracking";+import { trackedArray } from "@ember/reactive/collections";import { compare, isEmpty } from "@ember/utils";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { i18n } from "discourse-i18n";const addCustomUserFieldValidationCallbacks = [];@@ -76,7 +76,7 @@ class TrackedUserField {}export default class UserFieldsValidationHelper {- @tracked userFields = new TrackedArray();+ @tracked userFields = trackedArray();@tracked validationVisible = true;constructor({@@ -94,7 +94,7 @@ export default class UserFieldsValidationHelper {let userFields = this.getUserFields();if (userFields) {const getValidationVisible = () => this.validationVisible;- this.userFields = new TrackedArray(+ this.userFields = trackedArray(userFields.sort((a, b) => compare(a?.position, b?.position)).map((f) => {diff --git a/frontend/discourse/app/loader-shims.js b/frontend/discourse/app/loader-shims.jsindex e5581d0b999..a84aa8117f0 100644--- a/frontend/discourse/app/loader-shims.js+++ b/frontend/discourse/app/loader-shims.js@@ -42,6 +42,9 @@ loaderShim("@ember/object/observers", () =>importSync("@ember/object/observers"));loaderShim("@ember/owner", () => importSync("@ember/owner"));+loaderShim("@ember/reactive/collections", () =>+ importSync("@ember/reactive/collections")+);loaderShim("@ember/render-modifiers/modifiers/did-insert", () =>importSync("@ember/render-modifiers/modifiers/did-insert"));diff --git a/frontend/discourse/app/models/category.js b/frontend/discourse/app/models/category.jsindex 48caf2986c9..962eab9b078 100644--- a/frontend/discourse/app/models/category.js+++ b/frontend/discourse/app/models/category.js@@ -2,9 +2,9 @@ import { tracked } from "@glimmer/tracking";import { warn } from "@ember/debug";import { computed, get } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";+import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";import { compare } from "@ember/utils";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import { ajax } from "discourse/lib/ajax";import {addUniqueValueToArray,@@ -497,7 +497,7 @@ export default class Category extends RestModel {}setupCategoryTypes() {- this.categoryTypes = new TrackedObject(this.category_types);+ this.categoryTypes = trackedObject(this.category_types);}setupGroupsAndPermissions() {@@ -508,7 +508,7 @@ export default class Category extends RestModel {if (this.group_permissions) {this.permissions = this.group_permissions.map((elem) => {removeValueFromArray(this.available_groups, elem.group_name);- return new TrackedObject(elem);+ return trackedObject(elem);});}}@@ -889,7 +889,7 @@ export default class Category extends RestModel {}addPermission(permission) {- addUniqueValueToArray(this.permissions, new TrackedObject(permission));+ addUniqueValueToArray(this.permissions, trackedObject(permission));removeValueFromArray(this.available_groups, permission.group_name);}diff --git a/frontend/discourse/app/models/group.js b/frontend/discourse/app/models/group.jsindex 46ce47db027..c449e115f9a 100644--- a/frontend/discourse/app/models/group.js+++ b/frontend/discourse/app/models/group.js@@ -2,8 +2,8 @@import EmberObject, { computed } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";import { equal } from "@ember/object/computed";+import { trackedArray } from "@ember/reactive/collections";import { isEmpty } from "@ember/utils";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { observes } from "@ember-decorators/object";import { ajax } from "discourse/lib/ajax";import { autoTrackedArray } from "discourse/lib/tracked-tools";@@ -436,7 +436,7 @@ export default class Group extends RestModel {data: { offset, filters },}).then((results) => {return EmberObject.create({- logs: new TrackedArray(+ logs: trackedArray(results["logs"].map((log) => GroupHistory.create(log))),all_loaded: results["all_loaded"],@@ -463,7 +463,7 @@ export default class Group extends RestModel {Site.current().updateCategory(category);});- return new TrackedArray(+ return trackedArray(result.posts.map((p) => {p.user = User.create(p.user);p.topic = Topic.create(p.topic);diff --git a/frontend/discourse/app/models/invite.js b/frontend/discourse/app/models/invite.jsindex 80615f95eda..7c3b2706ffe 100644--- a/frontend/discourse/app/models/invite.js+++ b/frontend/discourse/app/models/invite.js@@ -1,7 +1,7 @@import EmberObject, { computed } from "@ember/object";import { alias } from "@ember/object/computed";+import { trackedArray } from "@ember/reactive/collections";import { isNone } from "@ember/utils";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { userPath } from "discourse/lib/url";@@ -35,9 +35,7 @@ export default class Invite extends EmberObject {data,});- result.invites = new TrackedArray(- result.invites.map((i) => Invite.create(i))- );+ result.invites = trackedArray(result.invites.map((i) => Invite.create(i)));return EmberObject.create(result);}diff --git a/frontend/discourse/app/models/post-stream.js b/frontend/discourse/app/models/post-stream.jsindex 2e7dac98aa9..8bff5e60ce4 100644--- a/frontend/discourse/app/models/post-stream.js+++ b/frontend/discourse/app/models/post-stream.js@@ -1,10 +1,10 @@import { cached, tracked } from "@glimmer/tracking";import { get } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";+import { trackedObject } from "@ember/reactive/collections";import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import { Promise } from "rsvp";import { ajax } from "discourse/lib/ajax";import {@@ -179,7 +179,7 @@ export default class PostStream extends RestModel {**/@dependentKeyCompatget streamFilters() {- const result = new TrackedObject();+ const result = trackedObject();if (this.filter) {result.filter = this.filter;@@ -1075,8 +1075,8 @@ export default class PostStream extends RestModel {// Update our attributespostStreamData.gaps = {- before: new TrackedObject(postStreamData.gaps?.before || {}),- after: new TrackedObject(postStreamData.gaps?.after || {}),+ before: trackedObject(postStreamData.gaps?.before || {}),+ after: trackedObject(postStreamData.gaps?.after || {}),};this.setProperties(postStreamData);}diff --git a/frontend/discourse/app/models/site.js b/frontend/discourse/app/models/site.jsindex 6fd8e1db91d..0e835d951cd 100644--- a/frontend/discourse/app/models/site.js+++ b/frontend/discourse/app/models/site.js@@ -2,10 +2,10 @@ import { cached } from "@glimmer/tracking";import EmberObject, { computed, get } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";import { alias, sort } from "@ember/object/computed";+import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { removeValueFromArray } from "discourse/lib/array-tools";import { AUTO_GROUPS } from "discourse/lib/constants";import deprecated, { withSilencedDeprecations } from "discourse/lib/deprecated";@@ -200,7 +200,7 @@ export default class Site extends RestModel {if (!postActionTypes) {return [];}- return new TrackedArray(postActionTypes.filter((type) => type.is_flag));+ return trackedArray(postActionTypes.filter((type) => type.is_flag));}collectUserFields(fields) {diff --git a/frontend/discourse/app/models/topic-tracking-state.js b/frontend/discourse/app/models/topic-tracking-state.jsindex bc1200307b2..8a1d16aaddd 100644--- a/frontend/discourse/app/models/topic-tracking-state.js+++ b/frontend/discourse/app/models/topic-tracking-state.js@@ -1,8 +1,8 @@import { tracked } from "@glimmer/tracking";import EmberObject, { get } from "@ember/object";+import { trackedArray, trackedMap } from "@ember/reactive/collections";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";-import { TrackedArray, TrackedMap } from "@ember-compat/tracked-built-ins";import { bind } from "discourse/lib/decorators";import { NotificationLevels } from "discourse/lib/notification-levels";import { deepEqual, deepMerge } from "discourse/lib/object";@@ -62,7 +62,7 @@ export default class TopicTrackingState extends EmberObject {@tracked filterTagName;@tracked filterTagId;@tracked filter;- states = new TrackedMap();+ states = trackedMap();stateChangeCallbacks = {};_trackedTopicLimit = 4000;@@ -342,7 +342,7 @@ export default class TopicTrackingState extends EmberObject {* @method resetTracking*/resetTracking() {- this.newIncoming = new TrackedArray();+ this.newIncoming = trackedArray();this.incomingCount = 0;}@@ -353,7 +353,7 @@ export default class TopicTrackingState extends EmberObject {*/clearIncoming(topicIds) {const toRemove = new Set(topicIds);- this.newIncoming = new TrackedArray(+ this.newIncoming = trackedArray(this.newIncoming.filter((topicId) => !toRemove.has(topicId)));this.incomingCount = this.newIncoming.length;@@ -375,7 +375,7 @@ export default class TopicTrackingState extends EmberObject {* @param {Number} opts.tagId - The ID of the tag to filter by.*/trackIncoming(filter, { tagId } = {}) {- this.newIncoming = new TrackedArray();+ this.newIncoming = trackedArray();let category, tagName;diff --git a/frontend/discourse/app/models/user.js b/frontend/discourse/app/models/user.jsindex c88f25c484a..772e8cdf2de 100644--- a/frontend/discourse/app/models/user.js+++ b/frontend/discourse/app/models/user.js@@ -5,12 +5,12 @@ import { dependentKeyCompat } from "@ember/object/compat";import { alias, equal, filterBy, gt, mapBy, or } from "@ember/object/computed";import Evented from "@ember/object/evented";import { getOwner, setOwner } from "@ember/owner";+import { trackedArray } from "@ember/reactive/collections";import { cancel } from "@ember/runloop";import { service } from "@ember/service";import { camelize } from "@ember/string";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { Promise } from "rsvp";import { ajax } from "discourse/lib/ajax";import {@@ -1398,7 +1398,7 @@ User.reopenClass({responses.set("count", responses.get("count") + stat.get("count"));});- const result = new TrackedArray();+ const result = trackedArray();result.push(...stats.filter((stat) => !stat.isResponse));let insertAt = 0;diff --git a/frontend/discourse/app/routes/group/activity/posts.js b/frontend/discourse/app/routes/group/activity/posts.jsindex 49cabb5fc3b..7240c09500b 100644--- a/frontend/discourse/app/routes/group/activity/posts.js+++ b/frontend/discourse/app/routes/group/activity/posts.js@@ -1,5 +1,5 @@import { action } from "@ember/object";-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import DiscourseRoute from "discourse/routes/discourse";import { i18n } from "discourse-i18n";@@ -21,7 +21,7 @@ export function buildGroupPage(type) {categoryId,});- return new TrackedArray(posts);+ return trackedArray(posts);}setupController(controller, model) {diff --git a/frontend/discourse/app/routes/new-invite.js b/frontend/discourse/app/routes/new-invite.jsindex 83377828637..c7057b6311a 100644--- a/frontend/discourse/app/routes/new-invite.js+++ b/frontend/discourse/app/routes/new-invite.js@@ -1,6 +1,6 @@+import { trackedArray } from "@ember/reactive/collections";import { next } from "@ember/runloop";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import CreateInvite from "discourse/components/modal/create-invite";import { defaultHomepage } from "discourse/lib/utilities";import DiscourseRoute from "discourse/routes/discourse";@@ -36,7 +36,7 @@ export default class extends DiscourseRoute {next(() => {if (this.currentUser.can_invite_to_forum) {this.modal.show(CreateInvite, {- model: { invites: new TrackedArray() },+ model: { invites: trackedArray() },});} else {this.dialog.alert(i18n("user.invited.cannot_invite_to_forum"));diff --git a/frontend/discourse/app/routes/posts.js b/frontend/discourse/app/routes/posts.jsindex 2df2061929b..8362c1c24be 100644--- a/frontend/discourse/app/routes/posts.js+++ b/frontend/discourse/app/routes/posts.js@@ -1,10 +1,10 @@-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import Posts from "discourse/models/posts";import DiscourseRoute from "discourse/routes/discourse";export default class PostsRoute extends DiscourseRoute {async model() {const posts = await Posts.find();- return new TrackedArray(posts);+ return trackedArray(posts);}}diff --git a/frontend/discourse/app/routes/user-activity/bookmarks.js b/frontend/discourse/app/routes/user-activity/bookmarks.jsindex 40b116aaadb..b8575462d31 100644--- a/frontend/discourse/app/routes/user-activity/bookmarks.js+++ b/frontend/discourse/app/routes/user-activity/bookmarks.js@@ -1,7 +1,7 @@/* eslint-disable ember/no-jquery */import { action } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import $ from "jquery";import { Promise } from "rsvp";import { ajax } from "discourse/lib/ajax";@@ -53,7 +53,7 @@ export default class UserActivityBookmarks extends DiscourseRoute {await Bookmark.applyTransformations(bookmarks);const loadMoreUrl = response.user_bookmark_list.more_bookmarks_url;- const model = { bookmarks: new TrackedArray(bookmarks), loadMoreUrl };+ const model = { bookmarks: trackedArray(bookmarks), loadMoreUrl };this.session.set("bookmarksModel", model);return model;})diff --git a/frontend/discourse/app/services/a11y.js b/frontend/discourse/app/services/a11y.jsindex 4b20b56be72..22bf72d612b 100644--- a/frontend/discourse/app/services/a11y.js+++ b/frontend/discourse/app/services/a11y.js@@ -1,7 +1,7 @@import { tracked } from "@glimmer/tracking";+import { trackedMap } from "@ember/reactive/collections";import { cancel } from "@ember/runloop";import Service from "@ember/service";-import { TrackedMap } from "@ember-compat/tracked-built-ins";import { isRailsTesting, isTesting } from "discourse/lib/environment";import discourseLater from "discourse/lib/later";@@ -79,13 +79,13 @@ export default class A11y extends Service {* Map of screen reader announcements by type* @type {TrackedMap<string, string>}*/- #messages = new TrackedMap();+ #messages = trackedMap();/*** Map of announcement clear timers by type* @type {TrackedMap<string, EmberRunTimer>}*/- #timers = new TrackedMap();+ #timers = trackedMap();/*** Sets an announcement message with auto-clearingdiff --git a/frontend/discourse/app/services/emoji-store.js b/frontend/discourse/app/services/emoji-store.jsindex f0d9b0f546e..02739191c01 100644--- a/frontend/discourse/app/services/emoji-store.js+++ b/frontend/discourse/app/services/emoji-store.js@@ -1,6 +1,6 @@import { tracked } from "@glimmer/tracking";+import { trackedArray, trackedObject } from "@ember/reactive/collections";import Service from "@ember/service";-import { TrackedArray, TrackedObject } from "@ember-compat/tracked-built-ins";import { isSkinTonableEmoji } from "pretty-text/emoji";import KeyValueStore from "discourse/lib/key-value-store";@@ -16,7 +16,7 @@ export default class EmojiStore extends Service {store = new KeyValueStore(STORE_NAMESPACE);- contexts = new TrackedObject();+ contexts = trackedObject();@tracked _diversity;@@ -31,7 +31,7 @@ export default class EmojiStore extends Service {trackEmojiForContext(emoji, context) {const recentEmojis = this.#addEmojiToContext(emoji, context);- this.contexts[context] = new TrackedArray(recentEmojis);+ this.contexts[context] = trackedArray(recentEmojis);this.#persistRecentEmojisForContext(recentEmojis, context);return recentEmojis;}diff --git a/frontend/discourse/app/services/footer.js b/frontend/discourse/app/services/footer.jsindex 34fc9445eaa..aac4c330e16 100644--- a/frontend/discourse/app/services/footer.js+++ b/frontend/discourse/app/services/footer.js@@ -1,13 +1,13 @@import { tracked } from "@glimmer/tracking";import { registerDestructor } from "@ember/destroyable";+import { trackedSet } from "@ember/reactive/collections";import Service from "@ember/service";-import { TrackedSet } from "@ember-compat/tracked-built-ins";import EmbedMode from "discourse/lib/embed-mode";import { disableImplicitInjections } from "discourse/lib/implicit-injections";@disableImplicitInjectionsexport default class FooterService extends Service {- #hiders = new TrackedSet();+ #hiders = trackedSet();@tracked _showFooterOverride = null;get showFooter() {diff --git a/frontend/discourse/app/services/header.js b/frontend/discourse/app/services/header.jsindex 97faed82d95..25424758096 100644--- a/frontend/discourse/app/services/header.js+++ b/frontend/discourse/app/services/header.js@@ -1,8 +1,8 @@import { tracked } from "@glimmer/tracking";import { registerDestructor } from "@ember/destroyable";import { dependentKeyCompat } from "@ember/object/compat";+import { trackedMap } from "@ember/reactive/collections";import Service, { service } from "@ember/service";-import { TrackedMap } from "@ember-compat/tracked-built-ins";import deprecated from "discourse/lib/deprecated";import { disableImplicitInjections } from "discourse/lib/implicit-injections";import { SCROLLED_UP } from "./scroll-direction";@@ -31,7 +31,7 @@ export default class Header extends Service {@tracked hamburgerVisible = false;@tracked userVisible = false;- #hiders = new TrackedMap();+ #hiders = trackedMap();get topic() {deprecated(diff --git a/frontend/discourse/app/services/history-store.js b/frontend/discourse/app/services/history-store.jsindex 353578e0878..d1f29c5257a 100644--- a/frontend/discourse/app/services/history-store.js+++ b/frontend/discourse/app/services/history-store.js@@ -1,7 +1,7 @@import { DEBUG } from "@glimmer/env";import { cached } from "@glimmer/tracking";+import { trackedMap } from "@ember/reactive/collections";import Service from "@ember/service";-import { TrackedMap } from "@ember-compat/tracked-built-ins";import { bind } from "discourse/lib/decorators";import { isTesting } from "discourse/lib/environment";import { disableImplicitInjections } from "discourse/lib/implicit-injections";@@ -17,9 +17,9 @@ const HANDLED_TRANSITIONS = new WeakSet();*/@disableImplicitInjectionsexport default class HistoryStore extends Service {- #routeData = new TrackedMap();+ #routeData = trackedMap();#uuid;- #pendingStore = DEBUG && isTesting() ? new TrackedMap() : null;+ #pendingStore = DEBUG && isTesting() ? trackedMap() : null;get #currentStore() {return this.#pendingStore || this.#dataFor(this.#uuid);@@ -97,7 +97,7 @@ export default class HistoryStore extends Service {return data;}- data = new TrackedMap();+ data = trackedMap();this.#routeData.set(uuid, data);this.#pruneOldData();@@ -129,12 +129,12 @@ export default class HistoryStore extends Service {// A normal ember transition. The history uuid will only change **after** models are resolved.// To allow routes to store data for the upcoming uuid, we set up a temporary data store// and then persist it if/when the transition succeeds.- pendingStoreForThisTransition = new TrackedMap();+ pendingStoreForThisTransition = trackedMap();} else {// A transition initiated by the browser back/forward buttons. We might already have some stored// data for this route. If so, take a copy of it and use that as the pending store. As with normal transitions,// it'll be persisted if/when the transition succeeds.- pendingStoreForThisTransition = new TrackedMap(+ pendingStoreForThisTransition = trackedMap(this.#dataFor(window.history.state?.uuid)?.entries());}diff --git a/frontend/discourse/app/services/pm-topic-tracking-state.js b/frontend/discourse/app/services/pm-topic-tracking-state.jsindex ea16d7fc02d..843e0ab0c10 100644--- a/frontend/discourse/app/services/pm-topic-tracking-state.js+++ b/frontend/discourse/app/services/pm-topic-tracking-state.js@@ -1,6 +1,6 @@import { tracked } from "@glimmer/tracking";+import { trackedArray, trackedMap } from "@ember/reactive/collections";import Service, { service } from "@ember/service";-import { TrackedArray, TrackedMap } from "@ember-compat/tracked-built-ins";import { Promise } from "rsvp";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -27,8 +27,8 @@ class PrivateMessageTopicTrackingState extends Service {@tracked inbox = null;@tracked filter = null;@tracked activeGroup = null;- @tracked newIncoming = new TrackedArray();- states = new TrackedMap();+ @tracked newIncoming = trackedArray();+ states = trackedMap();stateChangeCallbacks = new Map();willDestroy() {@@ -98,18 +98,18 @@ class PrivateMessageTopicTrackingState extends Service {if (topicIds) {const topicIdSet = new Set(topicIds);- this.newIncoming = new TrackedArray(+ this.newIncoming = trackedArray(this.newIncoming.filter((id) => !topicIdSet.has(id)));} else {- this.newIncoming = new TrackedArray();+ this.newIncoming = trackedArray();}}stopIncomingTracking() {if (this.isTrackingIncoming) {this.isTrackingIncoming = false;- this.newIncoming = new TrackedArray();+ this.newIncoming = trackedArray();}}diff --git a/frontend/discourse/app/services/sidebar-state.js b/frontend/discourse/app/services/sidebar-state.jsindex 3c5341932b2..511da64edcd 100644--- a/frontend/discourse/app/services/sidebar-state.js+++ b/frontend/discourse/app/services/sidebar-state.js@@ -1,7 +1,7 @@import { tracked } from "@glimmer/tracking";import { registerDestructor } from "@ember/destroyable";+import { trackedSet } from "@ember/reactive/collections";import Service, { service } from "@ember/service";-import { TrackedSet } from "@ember-compat/tracked-built-ins";import escapeRegExp from "discourse/lib/escape-regexp";import { disableImplicitInjections } from "discourse/lib/implicit-injections";import {@@ -27,10 +27,10 @@ export default class SidebarState extends Service {@tracked forcingSidebarPanel = null;panels = panels;- activeExpandedSections = new TrackedSet();- collapsedSections = new TrackedSet();+ activeExpandedSections = trackedSet();+ collapsedSections = trackedSet();previousState = {};- #hiders = new TrackedSet();+ #hiders = trackedSet();get sidebarHidden() {return this.#hiders.size > 0;diff --git a/frontend/discourse/app/services/site-settings.js b/frontend/discourse/app/services/site-settings.jsindex 9e400b31cd9..990baefec53 100644--- a/frontend/discourse/app/services/site-settings.js+++ b/frontend/discourse/app/services/site-settings.js@@ -1,6 +1,6 @@-import { TrackedObject } from "@ember-compat/tracked-built-ins";import { disableImplicitInjections } from "discourse/lib/implicit-injections";import PreloadStore from "discourse/lib/preload-store";+import { trackedObjectWithComputedSupport } from "discourse/lib/tracked-tools";import i18n from "discourse-i18n";export function createSiteSettingsFromPreloaded(@@ -9,7 +9,7 @@ export function createSiteSettingsFromPreloaded(currentUser,upcomingChanges) {- const settings = new TrackedObject(siteSettings);+ const settings = trackedObjectWithComputedSupport(siteSettings);if (themeSiteSettingOverrides) {for (const [key, value] of Object.entries(themeSiteSettingOverrides)) {diff --git a/frontend/discourse/app/services/user-tips.js b/frontend/discourse/app/services/user-tips.jsindex 49a0fc0500f..c0c6aacd064 100644--- a/frontend/discourse/app/services/user-tips.js+++ b/frontend/discourse/app/services/user-tips.js@@ -1,6 +1,6 @@+import { trackedSet } from "@ember/reactive/collections";import Service, { service } from "@ember/service";import { compare } from "@ember/utils";-import { TrackedSet } from "@ember-compat/tracked-built-ins";import discourseDebounce from "discourse/lib/debounce";import { isTesting } from "discourse/lib/environment";import { disableImplicitInjections } from "discourse/lib/implicit-injections";@@ -12,7 +12,7 @@ export default class UserTips extends Service {#availableTips = new Set();#renderedId;- #shouldRenderSet = new TrackedSet();+ #shouldRenderSet = trackedSet();#updateRenderedId() {if (this.isDestroying || this.isDestroyed) {diff --git a/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjs b/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjsindex a5424d09785..5fd2cd7aa15 100644--- a/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjs+++ b/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjs@@ -2,13 +2,13 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { getOwner } from "@ember/owner";+import { trackedArray } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { next } from "@ember/runloop";import { service } from "@ember/service";import "../extensions/register-default";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { baseKeymap } from "prosemirror-commands";import * as ProsemirrorCommands from "prosemirror-commands";import { dropCursor } from "prosemirror-dropcursor";@@ -86,8 +86,8 @@ export default class ProsemirrorEditor extends Component {schema = createSchema(this.extensions, this.args.includeDefault);view;- /** @type {TrackedArray<GlimmerNodeView>} */- glimmerNodeViews = new TrackedArray();+ /** @type {Array<GlimmerNodeView>} */+ glimmerNodeViews = trackedArray();#lastSerialized;/** @type {undefined | (() => void)} */#destructor;diff --git a/frontend/discourse/app/static/prosemirror/extensions/link-toolbar.js b/frontend/discourse/app/static/prosemirror/extensions/link-toolbar.jsindex 950de488941..58e1ac25e7e 100644--- a/frontend/discourse/app/static/prosemirror/extensions/link-toolbar.js+++ b/frontend/discourse/app/static/prosemirror/extensions/link-toolbar.js@@ -1,4 +1,4 @@-import { TrackedObject } from "@ember-compat/tracked-built-ins";+import { trackedObject } from "@ember/reactive/collections";import { NodeSelection, TextSelection } from "prosemirror-state";import ToolbarButtons from "discourse/components/composer/toolbar-buttons";import UpsertHyperlink from "discourse/components/modal/upsert-hyperlink";@@ -139,7 +139,7 @@ class LinkToolbarPluginView {};if (!this.#linkToolbar) {- this.#linkState = new TrackedObject(attrs);+ this.#linkState = trackedObject(attrs);this.#linkToolbar = new LinkToolbar({editLink: () => this.#openLinkEditor(),diff --git a/frontend/discourse/app/static/prosemirror/lib/text-manipulation.js b/frontend/discourse/app/static/prosemirror/lib/text-manipulation.jsindex afed1b07813..caeea30da7f 100644--- a/frontend/discourse/app/static/prosemirror/lib/text-manipulation.js+++ b/frontend/discourse/app/static/prosemirror/lib/text-manipulation.js@@ -1,8 +1,8 @@// @ts-checkimport { getOwner, setOwner } from "@ember/owner";+import { trackedObject } from "@ember/reactive/collections";import { next } from "@ember/runloop";import { isEmpty } from "@ember/utils";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import { lift, setBlockType, toggleMark, wrapIn } from "prosemirror-commands";import { Slice } from "prosemirror-model";import {@@ -37,7 +37,7 @@ export default class ProsemirrorTextManipulation {/** @type {AutocompleteHandler} */autocompleteHandler;/** @type {ToolbarState} */- state = new TrackedObject({});+ state = trackedObject({});convertFromMarkdown;convertToMarkdown;diff --git a/frontend/discourse/float-kit/services/menu.js b/frontend/discourse/float-kit/services/menu.jsindex 5636ff7e25d..e36b125da00 100644--- a/frontend/discourse/float-kit/services/menu.js+++ b/frontend/discourse/float-kit/services/menu.js@@ -1,12 +1,12 @@import { action } from "@ember/object";import { getOwner } from "@ember/owner";+import { trackedSet } from "@ember/reactive/collections";import { schedule } from "@ember/runloop";import Service from "@ember/service";-import { TrackedSet } from "@ember-compat/tracked-built-ins";import DMenuInstance from "discourse/float-kit/lib/d-menu-instance";export default class Menu extends Service {- registeredMenus = new TrackedSet();+ registeredMenus = trackedSet();/*** Render a menudiff --git a/frontend/discourse/float-kit/services/toasts.js b/frontend/discourse/float-kit/services/toasts.jsindex 0852979799d..6c6987c971b 100644--- a/frontend/discourse/float-kit/services/toasts.js+++ b/frontend/discourse/float-kit/services/toasts.js@@ -1,13 +1,13 @@import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { getOwner } from "@ember/owner";+import { trackedArray } from "@ember/reactive/collections";import Service from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import DDefaultToast from "discourse/float-kit/components/d-default-toast";import DToastInstance from "discourse/float-kit/lib/d-toast-instance";export default class Toasts extends Service {- @tracked activeToasts = new TrackedArray();+ @tracked activeToasts = trackedArray();/*** Render a toast@@ -114,7 +114,7 @@ export default class Toasts extends Service {*/@actionclose(toast) {- this.activeToasts = new TrackedArray(+ this.activeToasts = trackedArray(this.activeToasts.filter((activeToast) => activeToast.id !== toast.id));}diff --git a/frontend/discourse/float-kit/services/tooltip.js b/frontend/discourse/float-kit/services/tooltip.jsindex 298a4fdfd45..15e62575e39 100644--- a/frontend/discourse/float-kit/services/tooltip.js+++ b/frontend/discourse/float-kit/services/tooltip.js@@ -1,12 +1,12 @@import { action } from "@ember/object";import { getOwner } from "@ember/owner";+import { trackedSet } from "@ember/reactive/collections";import { schedule } from "@ember/runloop";import Service from "@ember/service";-import { TrackedSet } from "@ember-compat/tracked-built-ins";import DTooltipInstance from "discourse/float-kit/lib/d-tooltip-instance";export default class Tooltip extends Service {- registeredTooltips = new TrackedSet();+ registeredTooltips = trackedSet();/*** Render a tooltipdiff --git a/frontend/discourse/tests/integration/components/user-status-picker-test.gjs b/frontend/discourse/tests/integration/components/user-status-picker-test.gjsindex b21acdfa4c8..e507cf9fe68 100644--- a/frontend/discourse/tests/integration/components/user-status-picker-test.gjs+++ b/frontend/discourse/tests/integration/components/user-status-picker-test.gjs@@ -1,5 +1,5 @@+import { trackedObject } from "@ember/reactive/collections";import { click, fillIn, render } from "@ember/test-helpers";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import { module, test } from "qunit";import UserStatusPicker from "discourse/components/user-status-picker";import { setupRenderingTest } from "discourse/tests/helpers/component-test";@@ -13,7 +13,7 @@ module("Integration | Component | user-status-picker", function (hooks) {});test("it renders current status", async function (assert) {- const status = new TrackedObject({+ const status = trackedObject({emoji: "tooth",description: "off to dentist",});@@ -29,14 +29,14 @@ module("Integration | Component | user-status-picker", function (hooks) {});test("it focuses the input on insert", async function (assert) {- const status = new TrackedObject({});+ const status = trackedObject({});await render(<template><UserStatusPicker @status={{status}} /></template>);assert.dom(".user-status-description").isFocused();});test("it picks emoji", async function (assert) {- const status = new TrackedObject({+ const status = trackedObject({emoji: "tooth",description: "off to dentist",});@@ -52,7 +52,7 @@ module("Integration | Component | user-status-picker", function (hooks) {});test("it sets default emoji when user starts typing a description", async function (assert) {- const status = new TrackedObject({});+ const status = trackedObject({});await render(<template><UserStatusPicker @status={{status}} /></template>);diff --git a/frontend/discourse/tests/integration/helpers/slice-test.gjs b/frontend/discourse/tests/integration/helpers/slice-test.gjsindex f7e50b6ba8a..07492205266 100644--- a/frontend/discourse/tests/integration/helpers/slice-test.gjs+++ b/frontend/discourse/tests/integration/helpers/slice-test.gjs@@ -1,6 +1,6 @@+import { trackedArray } from "@ember/reactive/collections";import { run } from "@ember/runloop";import { render } from "@ember/test-helpers";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { setupRenderingTest } from "ember-qunit";import { module, test } from "qunit";import slice from "discourse/helpers/slice";@@ -25,7 +25,7 @@ module("Integration | Helper | {{slice}}", function (hooks) {});test("it recomputes the slice if an item in the array changes", async function (assert) {- let array = new TrackedArray([2, 4, 6]);+ let array = trackedArray([2, 4, 6]);this.set("array", array);await render(<template>{{slice 1 3 this.array}}</template>);diff --git a/frontend/discourse/tests/unit/lib/array-tools-test.js b/frontend/discourse/tests/unit/lib/array-tools-test.jsindex 90687f2ff0c..2c1d1af980e 100644--- a/frontend/discourse/tests/unit/lib/array-tools-test.js+++ b/frontend/discourse/tests/unit/lib/array-tools-test.js@@ -1,4 +1,4 @@-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import { module, test } from "qunit";import {addUniqueValuesToArray,@@ -8,6 +8,7 @@ import {removeValuesFromArray,uniqueItemsFromArray,} from "discourse/lib/array-tools";+import { isTrackedArray } from "discourse/lib/tracked-tools";module("Unit | Lib | array-tools", function () {module("addUniqueValueToArray()", function () {@@ -40,7 +41,7 @@ module("Unit | Lib | array-tools", function () {});test("works with TrackedArray and preserves instance", function (assert) {- const tracked = new TrackedArray([1]);+ const tracked = trackedArray([1]);const result = addUniqueValueToArray(tracked, 2);assert.strictEqual(@@ -170,11 +171,11 @@ module("Unit | Lib | array-tools", function () {});test("preserves TrackedArray instance and appends only missing entries", function (assert) {- const tracked = new TrackedArray([1, 2]);+ const tracked = trackedArray([1, 2]);const result = addUniqueValuesToArray(tracked, [2, 3, 4, 3]);assert.strictEqual(result, undefined, "function returns void");- assert.true(tracked instanceof TrackedArray, "still a TrackedArray");+ assert.true(isTrackedArray(tracked), "still a TrackedArray");assert.deepEqual(Array.from(tracked),[1, 2, 3, 4],@@ -301,7 +302,7 @@ module("Unit | Lib | array-tools", function () {});test("removes all occurrences from a TrackedArray", function (assert) {- const tracked = new TrackedArray([1, 2, 3, 2, 4]);+ const tracked = trackedArray([1, 2, 3, 2, 4]);const result = removeValueFromArray(tracked, 2);assert.strictEqual(@@ -398,7 +399,7 @@ module("Unit | Lib | array-tools", function () {});test("works with TrackedArray and maintains same instance", function (assert) {- const tracked = new TrackedArray([1, 2, 3, 4, 5, 2, 4]);+ const tracked = trackedArray([1, 2, 3, 4, 5, 2, 4]);const result = removeValuesFromArray(tracked, [2, 4]);assert.strictEqual(result, tracked, "same TrackedArray instance");@@ -611,10 +612,10 @@ module("Unit | Lib | array-tools", function () {});test("returns TrackedArray when input is TrackedArray", function (assert) {- const tracked = new TrackedArray([1, 2, 2, 3, 3, 3]);+ const tracked = trackedArray([1, 2, 2, 3, 3, 3]);const result = uniqueItemsFromArray(tracked);- assert.true(result instanceof TrackedArray, "result is a TrackedArray");+ assert.true(isTrackedArray(result), "result is a TrackedArray");assert.deepEqual(Array.from(result), [1, 2, 3], "deduplicated correctly");assert.notStrictEqual(result,diff --git a/frontend/discourse/tests/unit/lib/legacy-array-like-object-test.js b/frontend/discourse/tests/unit/lib/legacy-array-like-object-test.jsindex 2da28540296..58ba0d30d20 100644--- a/frontend/discourse/tests/unit/lib/legacy-array-like-object-test.js+++ b/frontend/discourse/tests/unit/lib/legacy-array-like-object-test.js@@ -1,5 +1,5 @@import { getOwner } from "@ember/owner";-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import { setupTest } from "ember-qunit";import { module, test } from "qunit";import { withSilencedDeprecations } from "discourse/lib/deprecated";@@ -38,7 +38,7 @@ module("Unit | lib | LegacyArrayLikeObject", function (hooks) {withSilencedDeprecations("discourse.legacy-array-like-object.proxied-array",() => {- const arr = new TrackedArray([4, 5]);+ const arr = trackedArray([4, 5]);const obj = LegacyArrayLikeObject.create({ content: arr });assert.strictEqual(obj[0], 4);assert.strictEqual(obj[1], 5);diff --git a/frontend/discourse/tests/unit/lib/tracked-tools-test.gjs b/frontend/discourse/tests/unit/lib/tracked-tools-test.gjsindex 0db4f90921d..25dbeb45417 100644--- a/frontend/discourse/tests/unit/lib/tracked-tools-test.gjs+++ b/frontend/discourse/tests/unit/lib/tracked-tools-test.gjs@@ -1,8 +1,8 @@import { cached, tracked } from "@glimmer/tracking";import { computed } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { run } from "@ember/runloop";import { settled } from "@ember/test-helpers";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { module, test } from "qunit";import {autoTrackedArray,@@ -10,6 +10,8 @@ import {DeferredTrackedSet,enumerateTrackedEntries,enumerateTrackedKeys,+ isTrackedArray,+ trackedObjectWithComputedSupport,} from "discourse/lib/tracked-tools";module("Unit | tracked-tools", function () {@@ -125,6 +127,29 @@ module("Unit | tracked-tools", function () {assert.deepEqual([...player.letters], ["a", "b", "c", "d", "e", "f"]);});+ module("isTrackedArray", function () {+ test("returns true for trackedArray() instances", function (assert) {+ assert.true(isTrackedArray(trackedArray()), "empty tracked array");+ assert.true(+ isTrackedArray(trackedArray([1, 2, 3])),+ "tracked array with data"+ );+ });++ test("returns false for plain arrays", function (assert) {+ assert.false(isTrackedArray([]), "empty array");+ assert.false(isTrackedArray([1, 2, 3]), "array with data");+ });++ test("returns false for null, undefined, and non-array values", function (assert) {+ assert.false(isTrackedArray(null), "null");+ assert.false(isTrackedArray(undefined), "undefined");+ assert.false(isTrackedArray(42), "number");+ assert.false(isTrackedArray("string"), "string");+ assert.false(isTrackedArray({}), "plain object");+ });+ });+module("@autoTrackedArray", function () {test("initializes with an array", function (assert) {class TestClass {@@ -133,8 +158,8 @@ module("Unit | tracked-tools", function () {const instance = new TestClass();assert.true(- instance.items instanceof TrackedArray,- "should wrap initial array in TrackedArray"+ isTrackedArray(instance.items),+ "should wrap initial array in tracked array");assert.deepEqual(Array.from(instance.items),@@ -178,8 +203,8 @@ module("Unit | tracked-tools", function () {instance.items = ["x", "y", "z"];assert.true(- instance.items instanceof TrackedArray,- "should wrap new array in TrackedArray"+ isTrackedArray(instance.items),+ "should wrap new array in tracked array");assert.deepEqual(Array.from(instance.items),@@ -188,19 +213,19 @@ module("Unit | tracked-tools", function () {);});- test("accepts TrackedArray instances directly", function (assert) {+ test("accepts tracked array instances directly", function (assert) {class TestClass {@autoTrackedArray items = [];}const instance = new TestClass();- const trackedArr = new TrackedArray(["foo", "bar"]);+ const trackedArr = trackedArray(["foo", "bar"]);instance.items = trackedArr;assert.strictEqual(instance.items,trackedArr,- "should use the provided TrackedArray instance"+ "should use the provided tracked array instance");assert.deepEqual(Array.from(instance.items),@@ -706,7 +731,7 @@ module("Unit | tracked-tools", function () {const obj = Object.fromEntries(result);assert.strictEqual(obj.name, "test");- assert.true(obj.items instanceof TrackedArray);+ assert.true(isTrackedArray(obj.items));assert.deepEqual(Array.from(obj.items), ["a", "b", "c"]);assert.strictEqual(obj.regularProp, undefined);});@@ -853,4 +878,115 @@ module("Unit | tracked-tools", function () {);});});++ module("trackedObjectWithComputedSupport", function () {+ test("basic get and set", function (assert) {+ const obj = trackedObjectWithComputedSupport({ name: "Alice", age: 30 });++ assert.strictEqual(obj.name, "Alice");+ assert.strictEqual(obj.age, 30);++ obj.name = "Bob";+ obj.age = 25;++ assert.strictEqual(obj.name, "Bob");+ assert.strictEqual(obj.age, 25);+ });++ test("autotracking with @cached getter", function (assert) {+ const obj = trackedObjectWithComputedSupport({ count: 0 });+ let evaluations = 0;++ class Reader {+ @cached+ get doubleCount() {+ evaluations++;+ return obj.count * 2;+ }+ }++ const reader = new Reader();+ assert.strictEqual(reader.doubleCount, 0);+ assert.strictEqual(evaluations, 1);++ obj.count = 5;+ assert.strictEqual(reader.doubleCount, 10);+ assert.strictEqual(evaluations, 2);++ // Reading again without changes should not re-evaluate+ assert.strictEqual(reader.doubleCount, 10);+ assert.strictEqual(evaluations, 2);+ });++ test("@computed chain observation recomputes on property change", function (assert) {+ const obj = trackedObjectWithComputedSupport({ title: "original" });+ let computeCount = 0;++ class Observer {+ obj = obj;++ @computed("obj.title")+ get display() {+ computeCount++;+ return `Title: ${this.obj.title}`;+ }+ }++ const observer = new Observer();+ assert.strictEqual(observer.display, "Title: original");+ assert.strictEqual(computeCount, 1);++ // Changing a property observed by @computed should trigger recomputation+ obj.title = "updated";+ assert.strictEqual(observer.display, "Title: updated");+ assert.strictEqual(computeCount, 2);+ });++ test("no mandatory setter assertion on property assignment", function (assert) {+ const obj = trackedObjectWithComputedSupport({ title: "original" });++ class Observer {+ obj = obj;++ @computed("obj.title")+ get display() {+ return this.obj.title;+ }+ }++ const observer = new Observer();++ // Force chain tag setup by reading the @computed property+ assert.strictEqual(observer.display, "original");++ // This assignment would throw a mandatory setter assertion without the fix,+ // because setupMandatorySetter would have installed a throwing setter on the+ // Proxy target's data descriptor. If the fix doesn't work, this line throws.+ obj.title = "updated";++ assert.strictEqual(obj.title, "updated");+ assert.strictEqual(observer.display, "updated");+ });++ test("Object.keys returns expected keys", function (assert) {+ const obj = trackedObjectWithComputedSupport({ a: 1, b: 2, c: 3 });+ assert.deepEqual(Object.keys(obj).sort(), ["a", "b", "c"]);+ });++ test("new properties can be added", function (assert) {+ const obj = trackedObjectWithComputedSupport({ existing: true });++ obj.newProp = "hello";+ assert.strictEqual(obj.newProp, "hello");+ assert.true(obj.existing);+ });++ test("delete operator works", function (assert) {+ const obj = trackedObjectWithComputedSupport({ a: 1, b: 2 });++ delete obj.a;+ assert.strictEqual(obj.a, undefined);+ assert.deepEqual(Object.keys(obj), ["b"]);+ });+ });});diff --git a/package.json b/package.jsonindex d9a531f8991..3da462aaebe 100644--- a/package.json+++ b/package.json@@ -5,7 +5,7 @@"license": "GPL-2.0-only","devDependencies": {"@babel/plugin-proposal-decorators": "^7.29.0",- "@discourse/lint-configs": "^2.43.0",+ "@discourse/lint-configs": "^2.44.0","@discourse/moment-timezone-names-translations": "^1.0.0","@fortawesome/fontawesome-free": "7.1.0","@glint/ember-tsc": "^1.2.3",diff --git a/patches/[email protected] b/patches/[email protected]index c0282ab8751..487b646a786 100644--- a/patches/[email protected]+++ b/patches/[email protected]@@ -50,6 +50,89 @@ index eef5d6ae929bab0143de25287ff7f9b096e9323c..6bbda75ae1a4b7cf2d6ab4294adbba1a});}function destroyChildren(destroyable) {+diff --git a/dist/packages/@glimmer/validator/index.js b/dist/packages/@glimmer/validator/index.js+index 1119353624a19235372b59453c040d2a342aad69..8b1b069800dd981a994c9033995fe0c3a00c3672 100644+--- a/dist/packages/@glimmer/validator/index.js++++ b/dist/packages/@glimmer/validator/index.js+@@ -530,16 +530,17 @@ class TrackedMap {+ }+ // **** ALL GETTERS ****+ entries() {+- return consumeTag(this.#collection), this.#vals.entries();++ return this[Symbol.iterator]();+ }+ keys() {+ return consumeTag(this.#collection), this.#vals.keys();+ }+ values() {+- return consumeTag(this.#collection), this.#vals.values();++ let iterator = this[Symbol.iterator]();++ return { next() { let { value, done } = iterator.next(); return { value: done ? void 0 : value[1], done }; }, [Symbol.iterator]() { return this; } };+ }+ forEach(fn) {+- consumeTag(this.#collection), this.#vals.forEach(fn);++ for (let [key, value] of this) fn(value, key, this);+ }+ get size() {+ return consumeTag(this.#collection), this.#vals.size;+@@ -565,6 +566,9 @@ class TrackedMap {+ done: false+ };+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion++ },++ [Symbol.iterator]() {++ return this;+ }+ };+ }+@@ -572,11 +576,11 @@ class TrackedMap {+ return this.#vals[Symbol.toStringTag];+ }+ set(key, value) {+- let existing = this.#vals.get(key);+- return existing && this.#options.equals(existing, value) || (this.#dirtyStorageFor(key), existing || DIRTY_TAG(this.#collection), this.#vals.set(key, value)), this;++ let existing = this.#vals.has(key);++ return existing && this.#options.equals(this.#vals.get(key), value) || (this.#dirtyStorageFor(key), existing || DIRTY_TAG(this.#collection), this.#vals.set(key, value)), this;+ }+ delete(key) {+- return !this.#vals.has(key) || (this.#dirtyStorageFor(key), DIRTY_TAG(this.#collection), this.#storages.delete(key), this.#vals.delete(key));++ return !!this.#vals.has(key) && (this.#dirtyStorageFor(key), DIRTY_TAG(this.#collection), this.#storages.delete(key), this.#vals.delete(key));+ }+ clear() {+ 0 !== this.#vals.size && (this.#storages.forEach(s => DIRTY_TAG(s)), this.#storages.clear(), DIRTY_TAG(this.#collection), this.#vals.clear());+@@ -711,7 +715,7 @@ class TrackedSet {+ return this.#dirtyStorageFor(value), this.#vals.add(value), this;+ }+ delete(value) {+- return !this.#vals.has(value) || (this.#dirtyStorageFor(value), DIRTY_TAG(this.#collection), this.#storages.delete(value), this.#vals.delete(value));++ return !!this.#vals.has(value) && (this.#dirtyStorageFor(value), DIRTY_TAG(this.#collection), this.#storages.delete(value), this.#vals.delete(value));+ }+ // **** ALL SETTERS ****+ clear() {+@@ -754,11 +758,11 @@ class TrackedWeakMap {+ return consumeTag(this.#storageFor(key)), this.#vals.has(key);+ }+ set(key, value) {+- let existing = this.#vals.get(key);+- return existing && this.#options.equals(existing, value) || (this.#dirtyStorageFor(key), this.#vals.set(key, value)), this;++ let existing = this.#vals.has(key);++ return existing && this.#options.equals(this.#vals.get(key), value) || (this.#dirtyStorageFor(key), this.#vals.set(key, value)), this;+ }+ delete(key) {+- return !this.#vals.has(key) || (this.#dirtyStorageFor(key), this.#storages.delete(key), this.#vals.delete(key));++ return !!this.#vals.has(key) && (this.#dirtyStorageFor(key), this.#storages.delete(key), this.#vals.delete(key));+ }+ get [Symbol.toStringTag]() {+ return this.#vals[Symbol.toStringTag];+@@ -810,7 +814,7 @@ class TrackedWeakSet {+ this.#vals.add(value), this.#dirtyStorageFor(value)), this;+ }+ delete(value) {+- return !this.#vals.has(value) || (this.#dirtyStorageFor(value), this.#storages.delete(value), this.#vals.delete(value));++ return !!this.#vals.has(value) && (this.#dirtyStorageFor(value), this.#storages.delete(value), this.#vals.delete(value));+ }+ get [Symbol.toStringTag]() {+ return this.#vals[Symbol.toStringTag];diff --git a/dist/packages/shared-chunks/array-CVk-fNjW.js b/dist/packages/shared-chunks/array-CVk-fNjW.jsindex c5a84d367d2d2643b395afffb103b7a2136eb5e9..08bce6a08b93dd13b77c099d57e4836f5a0638fe 100644--- a/dist/packages/shared-chunks/array-CVk-fNjW.jsdiff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-period-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-period-field.gjsindex e369c1c40df..01036d0f0ac 100644--- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-period-field.gjs+++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-period-field.gjs@@ -3,8 +3,8 @@ import { Input } from "@ember/component";import { hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import { next } from "@ember/runloop";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import ComboBox from "discourse/select-kit/components/combo-box";import { i18n } from "discourse-i18n";import BaseField from "./da-base-field";@@ -20,7 +20,7 @@ export default class PeriodField extends BaseField {next(() => {if (!this.args.field.metadata.value) {- this.args.field.metadata.value = new TrackedObject({+ this.args.field.metadata.value = trackedObject({interval: 1,frequency: null,});diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjsindex e76be9c6dfd..bbcd56627e7 100644--- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs+++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs@@ -2,9 +2,9 @@ import { Input } from "@ember/component";import { concat, fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";+import { trackedArray, trackedObject } from "@ember/reactive/collections";import { next } from "@ember/runloop";import { service } from "@ember/service";-import { TrackedArray, TrackedObject } from "@ember-compat/tracked-built-ins";import DButton from "discourse/components/d-button";import DEditor from "discourse/components/d-editor";import { removeValueFromArray } from "discourse/lib/array-tools";@@ -129,9 +129,9 @@ export default class PmsField extends BaseField {// a hack to prevent warnings about modifying multiple times in the same runloopnext(() => {- this.args.field.metadata.value = new TrackedArray(+ this.args.field.metadata.value = trackedArray((this.args.field.metadata.value || []).map((pm) => {- return new TrackedObject(pm);+ return trackedObject(pm);}));});@@ -150,7 +150,7 @@ export default class PmsField extends BaseField {@actioninsertPM() {this.args.field.metadata.value.push(- new TrackedObject({+ trackedObject({title: "",raw: "",delay: 0,diff --git a/plugins/automation/admin/assets/javascripts/admin/models/discourse-automation-field.js b/plugins/automation/admin/assets/javascripts/admin/models/discourse-automation-field.jsindex 72c2e3f38bf..548d7a1baa8 100644--- a/plugins/automation/admin/assets/javascripts/admin/models/discourse-automation-field.js+++ b/plugins/automation/admin/assets/javascripts/admin/models/discourse-automation-field.js@@ -1,5 +1,5 @@import { tracked } from "@glimmer/tracking";-import { TrackedObject } from "@ember-compat/tracked-built-ins";+import { trackedObject } from "@ember/reactive/collections";export default class DiscourseAutomationField {static create(template, target, json = {}) {@@ -27,16 +27,16 @@ export default class DiscourseAutomationField {}field.isRequired = template.is_required;- field.extra = new TrackedObject(template.extra);+ field.extra = trackedObject(template.extra);return field;}@tracked acceptsPlaceholders = false;@tracked component;- @tracked extra = new TrackedObject();+ @tracked extra = trackedObject();@tracked isDisabled = false;@tracked isRequired = false;- @tracked metadata = new TrackedObject();+ @tracked metadata = trackedObject();@tracked name;@tracked targetType;@tracked targetName;diff --git a/plugins/chat/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-incoming-webhooks/index.js b/plugins/chat/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-incoming-webhooks/index.jsindex 0048e90c91a..db4cf1eb3fd 100644--- a/plugins/chat/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-incoming-webhooks/index.js+++ b/plugins/chat/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-chat-incoming-webhooks/index.js@@ -1,6 +1,6 @@import EmberObject from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import DiscourseRoute from "discourse/routes/discourse";@@ -22,7 +22,7 @@ export default class DiscourseChatIncomingWebhooksIndex extends DiscourseRoute {ChatChannel.create(channel));- model.incoming_chat_webhooks = new TrackedArray(+ model.incoming_chat_webhooks = trackedArray(model.incoming_chat_webhooks.map((webhook) => {webhook.chat_channel = ChatChannel.create(webhook.chat_channel);return EmberObject.create(webhook);diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-threads-manager.js b/plugins/chat/assets/javascripts/discourse/lib/chat-threads-manager.jsindex c77b94204e9..92c372ed372 100644--- a/plugins/chat/assets/javascripts/discourse/lib/chat-threads-manager.js+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-threads-manager.js@@ -1,7 +1,7 @@import { cached, tracked } from "@glimmer/tracking";import { setOwner } from "@ember/owner";+import { trackedMap, trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedMap, TrackedObject } from "@ember-compat/tracked-built-ins";import Promise from "rsvp";import ChatThread from "discourse/plugins/chat/discourse/models/chat-thread";@@ -17,8 +17,8 @@ export default class ChatThreadsManager {@service chatChannelsManager;@service chatApi;- @tracked _cached = new TrackedObject();- @tracked _unreadThreadOverview = new TrackedMap();+ @tracked _cached = trackedObject();+ @tracked _unreadThreadOverview = trackedMap();constructor(owner) {setOwner(this, owner);diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-message.js b/plugins/chat/assets/javascripts/discourse/models/chat-message.jsindex c963aac81ac..16f5ca3a5ac 100644--- a/plugins/chat/assets/javascripts/discourse/models/chat-message.js+++ b/plugins/chat/assets/javascripts/discourse/models/chat-message.js@@ -1,5 +1,5 @@import { cached, tracked } from "@glimmer/tracking";-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import { removeValueFromArray } from "discourse/lib/array-tools";import { getOwnerWithFallback } from "discourse/lib/get-owner";import getURL from "discourse/lib/get-url";@@ -93,7 +93,7 @@ export default class ChatMessage {? ChatMessage.create(channel, args.in_reply_to ?? args.replyToMsg): null);this.reactions = this.#initChatMessageReactionModel(args.reactions);- this.uploads = new TrackedArray(args.uploads || []);+ this.uploads = trackedArray(args.uploads || []);this.user = this.#initUserModel(args.user);this.bookmark = args.bookmark ? Bookmark.create(args.bookmark) : null;this.mentionedUsers = this.#initMentionedUsers(args.mentioned_users);diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channel-notices-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-channel-notices-manager.jsindex 5e7c558b0b7..7af1ecd9827 100644--- a/plugins/chat/assets/javascripts/discourse/services/chat-channel-notices-manager.js+++ b/plugins/chat/assets/javascripts/discourse/services/chat-channel-notices-manager.js@@ -1,18 +1,16 @@import { tracked } from "@glimmer/tracking";+import { trackedArray } from "@ember/reactive/collections";import Service from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import ChatNotice from "../models/chat-notice";export default class ChatChannelNoticesManager extends Service {- @tracked notices = new TrackedArray();+ @tracked notices = trackedArray();handleNotice(data) {this.notices.push(ChatNotice.create(data));}clearNotice(notice) {- this.notices = new TrackedArray(- this.notices.filter((n) => n.id !== notice.id)- );+ this.notices = trackedArray(this.notices.filter((n) => n.id !== notice.id));}}diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channel-scroll-positions.js b/plugins/chat/assets/javascripts/discourse/services/chat-channel-scroll-positions.jsindex 70602e94fa5..b7d4a5e0501 100644--- a/plugins/chat/assets/javascripts/discourse/services/chat-channel-scroll-positions.js+++ b/plugins/chat/assets/javascripts/discourse/services/chat-channel-scroll-positions.js@@ -1,9 +1,9 @@import { tracked } from "@glimmer/tracking";+import { trackedMap } from "@ember/reactive/collections";import Service from "@ember/service";-import { TrackedMap } from "@ember-compat/tracked-built-ins";export default class ChatChannelScrollPositions extends Service {- @tracked positions = new TrackedMap();+ @tracked positions = trackedMap();get(id) {return this.positions.get(id);diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.jsindex a78f11d3f66..cbe9b9a66fc 100644--- a/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js+++ b/plugins/chat/assets/javascripts/discourse/services/chat-channels-manager.js@@ -1,6 +1,6 @@import { cached, tracked } from "@glimmer/tracking";+import { trackedObject } from "@ember/reactive/collections";import Service, { service } from "@ember/service";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import Promise from "rsvp";import { popupAjaxError } from "discourse/lib/ajax-error";import { debounce } from "discourse/lib/decorators";@@ -24,7 +24,7 @@ export default class ChatChannelsManager extends Service {@service siteSettings;@tracked userHasThreads = false;- @tracked _cached = new TrackedObject();+ @tracked _cached = trackedObject();async find(id, options = { fetchIfNotFound: true }) {const existingChannel = this.#findStale(id);diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/discourse/routes/admin-plugins/show/house-ads.js b/plugins/discourse-adplugin/admin/assets/javascripts/discourse/routes/admin-plugins/show/house-ads.jsindex 1ece41cdc31..e66284e325b 100644--- a/plugins/discourse-adplugin/admin/assets/javascripts/discourse/routes/admin-plugins/show/house-ads.js+++ b/plugins/discourse-adplugin/admin/assets/javascripts/discourse/routes/admin-plugins/show/house-ads.js@@ -1,5 +1,5 @@import EmberObject from "@ember/object";-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import { ajax } from "discourse/lib/ajax";import DiscourseRoute from "discourse/routes/discourse";@@ -8,7 +8,7 @@ export default class AdminPluginsShowHouseAds extends DiscourseRoute {const data = await ajax("/admin/plugins/discourse-adplugin/house-ads");return {- houseAds: new TrackedArray(+ houseAds: trackedArray(data.house_ads.map((ad) => EmberObject.create(ad))),houseAdsSettings: EmberObject.create(data.settings),diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/discourse/routes/admin-plugins/show/house-ads/show.js b/plugins/discourse-adplugin/admin/assets/javascripts/discourse/routes/admin-plugins/show/house-ads/show.jsindex b707ac0b348..d5f85848c36 100644--- a/plugins/discourse-adplugin/admin/assets/javascripts/discourse/routes/admin-plugins/show/house-ads/show.js+++ b/plugins/discourse-adplugin/admin/assets/javascripts/discourse/routes/admin-plugins/show/house-ads/show.js@@ -1,4 +1,4 @@-import { TrackedObject } from "@ember-compat/tracked-built-ins";+import { trackedObject } from "@ember/reactive/collections";import DiscourseRoute from "discourse/routes/discourse";export default class AdminPluginsShowHouseAdsShow extends DiscourseRoute {@@ -6,7 +6,7 @@ export default class AdminPluginsShowHouseAdsShow extends DiscourseRoute {const parentModel = this.modelFor("adminPlugins.show.houseAds");if (params.id === "new") {- return new TrackedObject({+ return trackedObject({name: null,html: null,visible_to_logged_in_users: true,@@ -27,7 +27,7 @@ export default class AdminPluginsShowHouseAdsShow extends DiscourseRoute {);}- return new TrackedObject(houseAd);+ return trackedObject(houseAd);}}diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjsindex 43dfa64f981..2ebc7d3bfa2 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs@@ -4,9 +4,9 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { modifier } from "ember-modifier";import DButton from "discourse/components/d-button";import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";@@ -154,7 +154,7 @@ export default class AdminReportSentimentAnalysis extends Component {});}- return new TrackedArray(list);+ return trackedArray(list);}get postFilters() {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/admin/models/ai-tool.js b/plugins/discourse-ai/assets/javascripts/discourse/admin/models/ai-tool.jsindex d712509c4a6..28de382bc65 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/admin/models/ai-tool.js+++ b/plugins/discourse-ai/assets/javascripts/discourse/admin/models/ai-tool.js@@ -1,4 +1,4 @@-import { TrackedArray, TrackedObject } from "@ember-compat/tracked-built-ins";+import { trackedArray, trackedObject } from "@ember/reactive/collections";import RestModel from "discourse/models/rest";const CREATE_ATTRIBUTES = [@@ -28,12 +28,12 @@ export default class AiTool extends RestModel {}trackParameters(parameters) {- return new TrackedArray(+ return trackedArray(parameters?.map((p) => {- const parameter = new TrackedObject(p);+ const parameter = trackedObject(p);if (parameter.enum && parameter.enum.length) {- parameter.enum = new TrackedArray(parameter.enum);+ parameter.enum = trackedArray(parameter.enum);} else {parameter.enum = null;}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjsindex a519cf74296..509c058c811 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjs@@ -5,11 +5,11 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { getOwner } from "@ember/owner";+import { trackedArray } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { scheduleOnce } from "@ember/runloop";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { tagName } from "@ember-decorators/component";import { modifier } from "ember-modifier";import DButton from "discourse/components/d-button";@@ -46,7 +46,7 @@ export default class AiBotConversations extends Component {@tracked creditStatus = null;@tracked selectedLlmId = null;- @tracked uploads = new TrackedArray();+ @tracked uploads = trackedArray();// Don't track this directly - we'll get it from uppyUploadtextarea = null;@@ -330,7 +330,7 @@ export default class AiBotConversations extends Component {@actionremoveUpload(upload) {- this.uploads = new TrackedArray(this.uploads.filter((u) => u !== upload));+ this.uploads = trackedArray(this.uploads.filter((u) => u !== upload));}@action@@ -347,7 +347,7 @@ export default class AiBotConversations extends Component {uploads: this.uploads,inProgressUploadsCount: this.inProgressUploads.length,});- this.uploads = new TrackedArray();+ this.uploads = trackedArray();} catch (error) {popupAjaxError(error);}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/services/ai-bot-conversations-hidden-submit.js b/plugins/discourse-ai/assets/javascripts/discourse/services/ai-bot-conversations-hidden-submit.jsindex 188f9dc167c..af188909892 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/services/ai-bot-conversations-hidden-submit.js+++ b/plugins/discourse-ai/assets/javascripts/discourse/services/ai-bot-conversations-hidden-submit.js@@ -1,7 +1,7 @@+import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { next } from "@ember/runloop";import Service, { service } from "@ember/service";-import { tracked } from "@ember-compat/tracked-built-ins";import { ajax } from "discourse/lib/ajax";import { getUploadMarkdown } from "discourse/lib/uploads";import { i18n } from "discourse-i18n";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/services/ai-conversations-sidebar-manager.js b/plugins/discourse-ai/assets/javascripts/discourse/services/ai-conversations-sidebar-manager.jsindex 016036a8979..3f1de3d1a5e 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/services/ai-conversations-sidebar-manager.js+++ b/plugins/discourse-ai/assets/javascripts/discourse/services/ai-conversations-sidebar-manager.js@@ -1,8 +1,8 @@import { tracked } from "@glimmer/tracking";+import { trackedArray } from "@ember/reactive/collections";import { scheduleOnce } from "@ember/runloop";import Service, { service } from "@ember/service";import { trustHTML } from "@ember/template";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { ajax } from "discourse/lib/ajax";import discourseDebounce from "discourse/lib/debounce";import { autoUpdatingRelativeAge } from "discourse/lib/formatter";@@ -24,7 +24,7 @@ export default class AiConversationsSidebarManager extends Service {@service router;@tracked topics = [];- @tracked sections = new TrackedArray();+ @tracked sections = trackedArray();@tracked isLoading = true;api = null;@@ -248,7 +248,7 @@ export default class AiConversationsSidebarManager extends Service {const todaySection = {name: "today",title: i18n("discourse_ai.ai_bot.conversations.today"),- links: new TrackedArray(),+ links: trackedArray(),};fresh.push(todaySection);@@ -289,7 +289,7 @@ export default class AiConversationsSidebarManager extends Service {default:title = autoUpdatingRelativeAge(new Date(t.last_posted_at));}- sec = { name: dateGroup, title, links: new TrackedArray() };+ sec = { name: dateGroup, title, links: trackedArray() };fresh.push(sec);}@@ -303,7 +303,7 @@ export default class AiConversationsSidebarManager extends Service {});});- this.sections = new TrackedArray(fresh);+ this.sections = trackedArray(fresh);// register each new section oncefor (let sec of fresh) {diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/assign-user.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/assign-user.gjsindex 7b521b8fe08..6a21ec9afd3 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/assign-user.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/assign-user.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import { TrackedObject } from "@ember-compat/tracked-built-ins";+import { trackedObject } from "@ember/reactive/collections";import DButton from "discourse/components/d-button";import AssignUserForm from "../assign-user-form";export default class AssignUser extends Component {- model = new TrackedObject({});+ model = trackedObject({});// `submit` property will be mutated by the `AssignUserForm` componentformApi = {diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/bulk-assign-user.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/bulk-assign-user.gjsindex f150090d3ca..f70e2feba7e 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/bulk-assign-user.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/bulk-assign-user.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import AssignUserForm from "discourse/plugins/discourse-assign/discourse/components/assign-user-form";export default class BulkActionsAssignUser extends Component {- model = new TrackedObject({});+ model = trackedObject({});formApi = {submit() {},diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjsindex 934b16d7310..7d5073d0248 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import DButton from "discourse/components/d-button";import DModal from "discourse/components/d-modal";import DModalCancel from "discourse/components/d-modal-cancel";@@ -11,7 +11,7 @@ import AssignUserForm from "../assign-user-form";export default class AssignUser extends Component {@service taskActions;- model = new TrackedObject(this.args.model);+ model = trackedObject(this.args.model);// `submit` property will be mutated by the `AssignUserForm` componentformApi = {diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-event.js b/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-event.jsindex e90c1274fba..126b053619a 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-event.js+++ b/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-event.js@@ -1,6 +1,6 @@import { tracked } from "@glimmer/tracking";import EmberObject from "@ember/object";-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import { bind } from "discourse/lib/decorators";import { optionalRequire } from "discourse/lib/utilities";import User from "discourse/models/user";@@ -115,7 +115,7 @@ export default class DiscoursePostEventEvent {}set sampleInvitees(invitees = []) {- this._sampleInvitees = new TrackedArray(+ this._sampleInvitees = trackedArray(invitees.map((i) => DiscoursePostEventInvitee.create(i)));}@@ -133,7 +133,7 @@ export default class DiscoursePostEventEvent {}set reminders(reminders = []) {- this._reminders = new TrackedArray(reminders);+ this._reminders = trackedArray(reminders);}get creator() {diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-invitees.js b/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-invitees.jsindex 64391f2769f..261517b3afc 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-invitees.js+++ b/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-invitees.js@@ -1,5 +1,5 @@import { tracked } from "@glimmer/tracking";-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import User from "discourse/models/user";import DiscoursePostEventInvitee from "./discourse-post-event-invitee";@@ -21,7 +21,7 @@ export default class DiscoursePostEventInvitees {}set invitees(invitees = []) {- this._invitees = new TrackedArray(+ this._invitees = trackedArray(invitees.map((i) => DiscoursePostEventInvitee.create(i)));}@@ -31,7 +31,7 @@ export default class DiscoursePostEventInvitees {}set suggestedUsers(suggestedUsers = []) {- this._suggestedUsers = new TrackedArray(+ this._suggestedUsers = trackedArray(suggestedUsers.map((su) => User.create(su)));}diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards.js b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards.jsindex 3d63b71416d..dc70d0306cd 100644--- a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards.js+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards.js@@ -1,6 +1,6 @@import EmberObject from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import DiscourseRoute from "discourse/routes/discourse";import GamificationLeaderboard from "discourse/plugins/discourse-gamification/discourse/models/gamification-leaderboard";@@ -14,7 +14,7 @@ export default class DiscourseGamificationLeaderboards extends DiscourseRoute {const gamificationPlugin = this.adminPluginNavManager.currentPlugin;return EmberObject.create({- leaderboards: new TrackedArray(+ leaderboards: trackedArray(gamificationPlugin.extras.gamification_leaderboards.map((leaderboard) =>GamificationLeaderboard.create(leaderboard))diff --git a/plugins/discourse-patreon/assets/javascripts/discourse/routes/admin-plugins/patreon.js b/plugins/discourse-patreon/assets/javascripts/discourse/routes/admin-plugins/patreon.jsindex 0b3aab54313..b4671c4d485 100644--- a/plugins/discourse-patreon/assets/javascripts/discourse/routes/admin-plugins/patreon.js+++ b/plugins/discourse-patreon/assets/javascripts/discourse/routes/admin-plugins/patreon.js@@ -1,4 +1,4 @@-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import { Promise } from "rsvp";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -51,7 +51,7 @@ export default class AdminPluginsPatreon extends DiscourseRoute {});controller.setProperties({- model: new TrackedArray(filtersArray),+ model: trackedArray(filtersArray),groups,rewards,last_sync_at: model.last_sync_at,diff --git a/plugins/discourse-policy/assets/javascripts/discourse/components/modal/policy-builder.gjs b/plugins/discourse-policy/assets/javascripts/discourse/components/modal/policy-builder.gjsindex d898deda007..1242c1f5617 100644--- a/plugins/discourse-policy/assets/javascripts/discourse/components/modal/policy-builder.gjs+++ b/plugins/discourse-policy/assets/javascripts/discourse/components/modal/policy-builder.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action, set } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import { isBlank, isPresent } from "@ember/utils";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import DButton from "discourse/components/d-button";import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";@@ -15,7 +15,7 @@ export default class PolicyBuilder extends Component {@tracked isSaving = false;@tracked flash;policy =- this.args.model.policy || new TrackedObject({ reminder: null, version: 1 });+ this.args.model.policy || trackedObject({ reminder: null, version: 1 });@actioninsertPolicy() {diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjsindex fca22c51d0a..eae7f483a5e 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import DButton from "discourse/components/d-button";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import { bind } from "discourse/lib/decorators";@@ -18,7 +18,7 @@ export default class DiscourseReactionsCounter extends Component {@service site;@service siteSettings;- reactionsUsers = new TrackedObject();+ reactionsUsers = trackedObject();get elementId() {return `discourse-reactions-counter-${this.args.post.id}-${diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/routes/user-activity/reactions.js b/plugins/discourse-reactions/assets/javascripts/discourse/routes/user-activity/reactions.jsindex 814d0f3d8fb..e76106defef 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/routes/user-activity/reactions.js+++ b/plugins/discourse-reactions/assets/javascripts/discourse/routes/user-activity/reactions.js@@ -1,4 +1,4 @@-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import DiscourseRoute from "discourse/routes/discourse";import CustomReaction, {PAGE_SIZE,@@ -11,7 +11,7 @@ export default class UserActivityReactions extends DiscourseRoute {this.modelFor("user").username);- return new TrackedArray(+ return trackedArray(list.map((reaction) => CustomReaction.flattenForPostList(reaction)));}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/routes/user-notifications/reactions-received.js b/plugins/discourse-reactions/assets/javascripts/discourse/routes/user-notifications/reactions-received.jsindex 2e1ca183de6..42b549dd57a 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/routes/user-notifications/reactions-received.js+++ b/plugins/discourse-reactions/assets/javascripts/discourse/routes/user-notifications/reactions-received.js@@ -1,4 +1,4 @@-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import DiscourseRoute from "discourse/routes/discourse";import CustomReaction, {PAGE_SIZE,@@ -23,7 +23,7 @@ export default class UserNotificationsReactionsReceived extends DiscourseRoute {});- return new TrackedArray(+ return trackedArray(list.map((reaction) => CustomReaction.flattenForPostList(reaction)));}diff --git a/plugins/discourse-rss-polling/assets/javascripts/discourse/routes/admin-plugins/rss-polling.js b/plugins/discourse-rss-polling/assets/javascripts/discourse/routes/admin-plugins/rss-polling.jsindex a17cc06892f..1cd44c2ad3b 100644--- a/plugins/discourse-rss-polling/assets/javascripts/discourse/routes/admin-plugins/rss-polling.js+++ b/plugins/discourse-rss-polling/assets/javascripts/discourse/routes/admin-plugins/rss-polling.js@@ -1,11 +1,11 @@-import { TrackedArray } from "@ember-compat/tracked-built-ins";+import { trackedArray } from "@ember/reactive/collections";import DiscourseRoute from "discourse/routes/discourse";import RssPollingFeedSettings from "../../../admin/models/rss-polling-feed-settings";export default class AdminPluginsRssPolling extends DiscourseRoute {async model() {const result = await RssPollingFeedSettings.show();- return new TrackedArray(result.feed_settings);+ return trackedArray(result.feed_settings);}setupController(controller, model) {diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/index.js b/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/index.jsindex f5461cde123..bc5d8436322 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/index.js+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/routes/admin-plugins/discourse-subscriptions/products/index.js@@ -1,7 +1,7 @@import { action } from "@ember/object";+import { trackedArray } from "@ember/reactive/collections";import Route from "@ember/routing/route";import { service } from "@ember/service";-import { TrackedArray } from "@ember-compat/tracked-built-ins";import { removeValueFromArray } from "discourse/lib/array-tools";import { i18n } from "discourse-i18n";import AdminProduct from "discourse/plugins/discourse-subscriptions/discourse/models/admin-product";@@ -11,7 +11,7 @@ export default class AdminPluginsDiscourseSubscriptionsProductsIndexRoute extendasync model() {const products = await AdminProduct.findAll();- return new TrackedArray(products);+ return trackedArray(products);}@actiondiff --git a/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.gjs b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.gjsindex 787010890de..5e23ba4c937 100644--- a/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.gjs@@ -4,8 +4,8 @@ import { Textarea } from "@ember/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import DButton from "discourse/components/d-button";import DModal from "discourse/components/d-modal";import DToggleSwitch from "discourse/components/d-toggle-switch";@@ -57,7 +57,7 @@ export default class PollUiBuilderModal extends Component {@tracked pollType = REGULAR_POLL_TYPE;@tracked publicPoll = this.siteSettings.poll_default_public;@tracked showAdvanced = false;- @autoTrackedArray pollOptions = [new TrackedObject({ value: "" })];+ @autoTrackedArray pollOptions = [trackedObject({ value: "" })];get showNumber() {return this.showAdvanced || this.isNumber;@@ -334,7 +334,7 @@ export default class PollUiBuilderModal extends Component {onOptionsTextChange(e) {this.pollOptions = e.target.value.split("\n")- .map((value) => new TrackedObject({ value }));+ .map((value) => trackedObject({ value }));this.enforceMinMaxValues();}@@ -408,7 +408,7 @@ export default class PollUiBuilderModal extends Component {atIndex = this.pollOptions.length;}- const option = new TrackedObject({ value: "" });+ const option = trackedObject({ value: "" });this.pollOptions.splice(atIndex, 0, option);this.enforceMinMaxValues();}diff --git a/plugins/poll/assets/javascripts/discourse/components/poll.gjs b/plugins/poll/assets/javascripts/discourse/components/poll.gjsindex 09a7a0f3585..6c160b2432f 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -225,7 +225,7 @@ export default class PollComponent extends Component {this.hasSavedVote = true;if (!this.args.post.polls_votes) {- this.args.post.polls_votes = new TrackedObject();+ this.args.post.polls_votes = trackedObject();}this.args.post.polls_votes[this.poll.name] = this.vote;Object.assign(this.poll, poll);diff --git a/plugins/poll/assets/javascripts/discourse/initializers/extend-for-poll.gjs b/plugins/poll/assets/javascripts/discourse/initializers/extend-for-poll.gjsindex 6a39e79a42a..1cb060fbbd0 100644--- a/plugins/poll/assets/javascripts/discourse/initializers/extend-for-poll.gjs+++ b/plugins/poll/assets/javascripts/discourse/initializers/extend-for-poll.gjs@@ -1,6 +1,6 @@import { tracked } from "@glimmer/tracking";import EmberObject from "@ember/object";-import { TrackedObject } from "@ember-compat/tracked-built-ins";+import { trackedObject } from "@ember/reactive/collections";import { bind } from "discourse/lib/decorators";import { withPluginApi } from "discourse/lib/plugin-api";import { PIE_CHART_TYPE } from "../components/modal/poll-ui-builder";@@ -27,7 +27,7 @@ function attachPolls(elem, helper) {if (quotedId && post.quoted[quotedId]) {pollPost = EmberObject.create(post.quoted[quotedId]);- poll = new TrackedObject(pollPost.polls.find((p) => p.name === pollName));+ poll = trackedObject(pollPost.polls.find((p) => p.name === pollName));}if (poll) {@@ -92,8 +92,8 @@ function initializePolls(api) {"model:post",(Superclass) =>class extends Superclass {- @tracked polls_votes = new TrackedObject();- @tracked pollsObject = new TrackedObject();+ @tracked polls_votes = trackedObject();+ @tracked pollsObject = trackedObject();@tracked _polls;get polls() {@@ -108,7 +108,7 @@ function initializePolls(api) {_refreshPollsObject() {for (const rawPoll of this.polls) {const name = rawPoll.name;- this.pollsObject[name] ||= new TrackedObject();+ this.pollsObject[name] ||= trackedObject();Object.assign(this.pollsObject[name], rawPoll);}}diff --git a/plugins/poll/test/javascripts/component/poll-test.gjs b/plugins/poll/test/javascripts/component/poll-test.gjsindex 681e994f01d..55ae01d0851 100644--- a/plugins/poll/test/javascripts/component/poll-test.gjs+++ b/plugins/poll/test/javascripts/component/poll-test.gjs@@ -1,6 +1,6 @@import EmberObject from "@ember/object";+import { trackedObject } from "@ember/reactive/collections";import { click, render } from "@ember/test-helpers";-import { TrackedObject } from "@ember-compat/tracked-built-ins";import { module, test } from "qunit";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import pretender, { response } from "discourse/tests/helpers/create-pretender";@@ -66,7 +66,7 @@ module("Poll | Component | poll", function (hooks) {],},}),- poll: new TrackedObject({+ poll: trackedObject({name: "poll",type: "ranked_choice",status: "open",@@ -113,7 +113,7 @@ module("Poll | Component | poll", function (hooks) {},user_id: 29,}),- poll: new TrackedObject({+ poll: trackedObject({name: "poll",type: "ranked_choice",status: "open",@@ -183,7 +183,7 @@ module("Poll | Component | poll", function (hooks) {},user_id: 29,}),- poll: new TrackedObject({+ poll: trackedObject({name: "poll",type: "regular",status: "closed",@@ -214,7 +214,7 @@ module("Poll | Component | poll", function (hooks) {},user_id: 29,}),- poll: new TrackedObject({+ poll: trackedObject({name: "poll",type: "regular",status: "open",@@ -245,7 +245,7 @@ module("Poll | Component | poll", function (hooks) {},user_id: 29,}),- poll: new TrackedObject({+ poll: trackedObject({name: "poll",type: "regular",status: "open",@@ -286,7 +286,7 @@ module("Poll | Component | poll", function (hooks) {},user_id: 29,}),- poll: new TrackedObject({+ poll: trackedObject({name: "poll",type: "regular",status: "open",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex ce97619be7d..79d566de9eb 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -15,7 +15,7 @@ patchedDependencies:hash: 387f93bad78f3a98b20dc742f4f0b7a165c7e6ebc65cc60356748346c0725c7fpath: patches/[email protected]- hash: 6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9+ hash: 85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926path: patches/[email protected]hash: 31c150a292037db2b05d9030a75069bb0a9518a4a7e0969b9b4e14d957134e45@@ -35,8 +35,8 @@ importers:specifier: ^7.29.0version: 7.29.0(@babel/[email protected])'@discourse/lint-configs':- specifier: ^2.43.0+ specifier: ^2.44.0+ version: 2.44.0([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]([email protected]))'@discourse/moment-timezone-names-translations':specifier: ^1.0.0version: 1.0.0@@ -165,13 +165,13 @@ importers:version: link:../discourse-pluginsember-cli-htmlbars:specifier: ^7.0.0- version: 7.0.0(@babel/[email protected])([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))+ version: 7.0.0(@babel/[email protected])([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))ember-source:specifier: ~6.10.0- version: 6.10.1(patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])+ version: 6.10.1(patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])ember-this-fallback:specifier: ^0.4.0- version: 0.4.0(patch_hash=31c150a292037db2b05d9030a75069bb0a9518a4a7e0969b9b4e14d957134e45)([email protected](@babel/[email protected])([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])))([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))+ version: 0.4.0(patch_hash=31c150a292037db2b05d9030a75069bb0a9518a4a7e0969b9b4e14d957134e45)([email protected](@babel/[email protected])([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])))([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))fastestsmallesttextencoderdecoder:specifier: ^1.0.22version: 1.0.22@@ -309,7 +309,7 @@ importers:version: 1.0.3ember-source:specifier: ~6.10.0- version: 6.10.1(patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])+ version: 6.10.1(patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])ember-tracked-storage-polyfill:specifier: ^1.0.0version: 1.0.0@@ -412,7 +412,7 @@ importers:version: 3.0.0(@types/[email protected])'@ember/render-modifiers':specifier: ^3.0.0- version: 3.0.0(@glint/[email protected])([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))+ version: 3.0.0(@glint/[email protected])([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))'@ember/string':specifier: ^4.0.1version: 4.0.1@@ -523,7 +523,7 @@ importers:ember-cli-app-version:specifier: ^7.0.0- version: 7.0.0([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))+ version: 7.0.0([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))ember-cli-babel:specifier: ^8.2.0version: 8.3.1(@babel/[email protected])@@ -532,7 +532,7 @@ importers:version: 4.0.1(@babel/[email protected])ember-cli-htmlbars:specifier: ^7.0.0- version: 7.0.0(@babel/[email protected])([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))+ version: 7.0.0(@babel/[email protected])([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))ember-cli-inject-live-reload:specifier: ^2.1.0version: 2.1.0@@ -550,10 +550,10 @@ importers:version: 6.1.1ember-exam:specifier: ^10.1.0- version: 10.1.0(@glint/[email protected])([email protected](@babel/[email protected])(@ember/[email protected](@babel/[email protected])(@glint/[email protected]))(@glint/[email protected])([email protected]))([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))([email protected])([email protected](@swc/[email protected])([email protected]))+ version: 10.1.0(@glint/[email protected])([email protected](@babel/[email protected])(@ember/[email protected](@babel/[email protected])(@glint/[email protected]))(@glint/[email protected])([email protected]))([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))([email protected])([email protected](@swc/[email protected])([email protected]))ember-load-initializers:specifier: ^3.0.1- version: 3.0.1([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))+ version: 3.0.1([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))ember-modifier:specifier: ^4.3.0version: 4.3.0(@babel/[email protected])@@ -676,13 +676,13 @@ importers:version: 8.3.1(@babel/[email protected])ember-cli-htmlbars:specifier: ^7.0.0- version: 7.0.0(@babel/[email protected])([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))+ version: 7.0.0(@babel/[email protected])([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))ember-template-imports:specifier: ^4.4.0version: 4.4.0ember-this-fallback:specifier: ^0.4.0- version: 0.4.0(patch_hash=31c150a292037db2b05d9030a75069bb0a9518a4a7e0969b9b4e14d957134e45)([email protected](@babel/[email protected])([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])))([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))+ version: 0.4.0(patch_hash=31c150a292037db2b05d9030a75069bb0a9518a4a7e0969b9b4e14d957134e45)([email protected](@babel/[email protected])([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])))([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))devDependencies:ember-cli:specifier: ~6.11.0@@ -718,7 +718,7 @@ importers:version: 8.3.1(@babel/[email protected])ember-cli-htmlbars:specifier: ^7.0.0- version: 7.0.0(@babel/[email protected])([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))+ version: 7.0.0(@babel/[email protected])([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))xss:specifier: ^1.0.15version: 1.0.15@@ -761,13 +761,13 @@ importers:version: 1.1.3ember-load-initializers:specifier: ^3.0.1- version: 3.0.1([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))+ version: 3.0.1([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))ember-resolver:specifier: ^13.2.0version: 13.2.0ember-source:specifier: ~6.10.0- version: 6.10.1(patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])+ version: 6.10.1(patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])ember-source-channel-url:specifier: ^3.0.0version: 3.0.0([email protected])@@ -1775,6 +1775,14 @@ packages:peerDependencies:prettier: 3.8.1+ '@discourse/[email protected]':+ resolution: {integrity: sha512-BkMj2AjiXgcut39cFwVj0LwO2PCL2vinE1KA0C7RBniWvnUlus39qeRvTcuLlN5l7HUkL+7NrZR59lVFscHT9w==}+ peerDependencies:+ ember-template-lint: 7.9.3+ eslint: 9.39.2+ prettier: 3.8.1+ stylelint: 17.4.0+'@discourse/[email protected]':resolution: {integrity: sha512-4xr1QWQ0nzmFa2ZXQgWZA+dtE/BU2ePA+qkJWPFzNpq4ZnQi8MmMMAS2285t3rc2ySMBQqYaAArmcSUiufUgRA==}@@ -10608,6 +10616,36 @@ snapshots:- postcss- supports-color+ '@discourse/[email protected]([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]([email protected]))':+ dependencies:+ '@babel/core': 7.29.0([email protected])+ '@babel/plugin-proposal-decorators': 7.29.0(@babel/[email protected])+ '@eslint/js': 9.39.4+ ember-eslint-parser: 0.5.13(@babel/[email protected])([email protected]([email protected]))([email protected])+ ember-template-lint: 7.9.3+ eslint: 9.39.2([email protected])+ eslint-plugin-decorator-position: 6.0.0(@babel/[email protected](@babel/[email protected])([email protected]([email protected])))([email protected]([email protected]))+ eslint-plugin-ember: 12.7.5(@babel/[email protected])([email protected]([email protected]))([email protected])+ eslint-plugin-import: 2.32.0([email protected]([email protected]))+ eslint-plugin-qunit: 8.2.6([email protected]([email protected]))+ eslint-plugin-simple-import-sort: 12.1.1([email protected]([email protected]))+ eslint-plugin-sort-class-members: 1.21.0([email protected]([email protected]))+ globals: 17.4.0+ prettier: 3.8.1+ prettier-plugin-ember-template-tag: 2.1.3([email protected])+ stylelint: 17.4.0([email protected])+ stylelint-config-standard: 40.0.0([email protected]([email protected]))+ stylelint-scss: 7.0.0([email protected]([email protected]))+ typescript: 5.9.3+ transitivePeerDependencies:+ - '@typescript-eslint/parser'+ - eslint-import-resolver-typescript+ - eslint-import-resolver-webpack+ - postcss+ - supports-color+'@discourse/[email protected]': {}'@discourse/[email protected]': {}@@ -10698,13 +10736,13 @@ snapshots:- '@types/node'- supports-color- '@ember/[email protected](@glint/[email protected])([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))':+ '@ember/[email protected](@glint/[email protected])([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))':dependencies:'@babel/core': 7.29.0([email protected])'@embroider/macros': 1.20.1(@babel/[email protected])(@glint/[email protected])ember-cli-babel: 8.3.1(@babel/[email protected])ember-modifier-manager-polyfill: 1.2.0(@babel/[email protected])- ember-source: 6.10.1(patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])+ ember-source: 6.10.1(patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])optionalDependencies:'@glint/template': 1.7.7transitivePeerDependencies:@@ -14099,10 +14137,10 @@ snapshots:- '@babel/core'- supports-color- [email protected]([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])):+ [email protected]([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])):dependencies:ember-cli-babel: 7.26.11- ember-source: 6.10.1(patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])+ ember-source: 6.10.1(patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])git-repo-info: 2.1.1transitivePeerDependencies:- supports-color@@ -14208,7 +14246,7 @@ snapshots:transitivePeerDependencies:- supports-color- [email protected](@babel/[email protected])([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])):+ [email protected](@babel/[email protected])([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])):dependencies:'@babel/core': 7.29.0([email protected])'@ember/edition-utils': 1.2.0@@ -14216,7 +14254,7 @@ snapshots:broccoli-debug: 0.6.5broccoli-persistent-filter: 3.1.3broccoli-plugin: 4.0.7- ember-source: 6.10.1(patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])+ ember-source: 6.10.1(patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])fs-tree-diff: 2.0.1heimdalljs-logger: 0.1.10js-string-escape: 1.0.1@@ -14498,7 +14536,7 @@ snapshots:- eslint- typescript- [email protected](@glint/[email protected])([email protected](@babel/[email protected])(@ember/[email protected](@babel/[email protected])(@glint/[email protected]))(@glint/[email protected])([email protected]))([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))([email protected])([email protected](@swc/[email protected])([email protected])):+ [email protected](@glint/[email protected])([email protected](@babel/[email protected])(@ember/[email protected](@babel/[email protected])(@glint/[email protected]))(@glint/[email protected])([email protected]))([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))([email protected])([email protected](@swc/[email protected])([email protected])):dependencies:'@babel/core': 7.29.0([email protected])chalk: 5.6.2@@ -14507,7 +14545,7 @@ snapshots:ember-auto-import: 2.12.1(@glint/[email protected])([email protected](@swc/[email protected])([email protected]))ember-cli-babel: 8.3.1(@babel/[email protected])ember-qunit: 9.0.4(@babel/[email protected])(@ember/[email protected](@babel/[email protected])(@glint/[email protected]))(@glint/[email protected])([email protected])- ember-source: 6.10.1(patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])+ ember-source: 6.10.1(patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])execa: 8.0.1fs-extra: 11.3.4js-yaml: 4.1.1@@ -14521,9 +14559,9 @@ snapshots:- supports-color- webpack- [email protected]([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])):+ [email protected]([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])):dependencies:- ember-source: 6.10.1(patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])+ ember-source: 6.10.1(patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])[email protected](@babel/[email protected]):dependencies:@@ -14578,7 +14616,7 @@ snapshots:transitivePeerDependencies:- encoding- [email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]):+ [email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]):dependencies:'@babel/core': 7.29.0([email protected])'@ember/edition-utils': 1.2.0@@ -14647,15 +14685,15 @@ snapshots:transitivePeerDependencies:- supports-color- [email protected](patch_hash=31c150a292037db2b05d9030a75069bb0a9518a4a7e0969b9b4e14d957134e45)([email protected](@babel/[email protected])([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])))([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])):+ [email protected](patch_hash=31c150a292037db2b05d9030a75069bb0a9518a4a7e0969b9b4e14d957134e45)([email protected](@babel/[email protected])([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])))([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])):dependencies:'@glimmer/syntax': 0.84.3babel-plugin-ember-template-compilation: 2.4.1debug: 4.4.3([email protected])ember-cli-babel: 7.26.11- ember-cli-htmlbars: 7.0.0(@babel/[email protected])([email protected](patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected]))+ ember-cli-htmlbars: 7.0.0(@babel/[email protected])([email protected](patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected]))ember-cli-typescript: 5.3.0- ember-source: 6.10.1(patch_hash=6736d1b31cc47a0225a1720f11791dd11fb7908489da041cfa1b195b8240e5e9)(@glimmer/[email protected])([email protected])+ ember-source: 6.10.1(patch_hash=85ff9a16d08431e3bdc9aea8d55280e14f437f1c2a7d8e461de56c614ad48926)(@glimmer/[email protected])([email protected])lodash: 4.17.23winston: 3.14.2zod: 3.25.76