From 04659b0e41c8c7b8be7b0a3852fdb0f562c14243 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Fri, 24 Feb 2023 10:50:52 +0100 Subject: [PATCH] DEV: Fix decorator deprecations (#20438) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …and correctly fix the decorateCookedElement id arg --- .../admin/addon/components/ace-editor.js | 4 ++-- .../admin/addon/components/admin-backups-logs.js | 2 +- .../admin/addon/components/color-input.js | 2 +- .../admin/addon/components/highlighted-code.js | 2 +- .../admin/addon/components/secret-value-list.js | 2 +- .../admin/addon/components/simple-list.js | 3 ++- .../admin/addon/components/site-text-summary.js | 2 +- .../admin/addon/components/value-list.js | 3 ++- .../admin/addon/components/watched-word-form.js | 3 ++- .../acceptance/topic-post-decorate-cooked-test.js | 15 +++++++-------- 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/admin/addon/components/ace-editor.js b/app/assets/javascripts/admin/addon/components/ace-editor.js index fa464549a00..84aa4351e15 100644 --- a/app/assets/javascripts/admin/addon/components/ace-editor.js +++ b/app/assets/javascripts/admin/addon/components/ace-editor.js @@ -1,11 +1,11 @@ import { action } from "@ember/object"; import { classNames } from "@ember-decorators/component"; -import { on } from "@ember-decorators/object"; +import { observes, on } from "@ember-decorators/object"; import Component from "@ember/component"; import getURL from "discourse-common/lib/get-url"; import loadScript from "discourse/lib/load-script"; import I18n from "I18n"; -import { bind, observes } from "discourse-common/utils/decorators"; +import { bind } from "discourse-common/utils/decorators"; const COLOR_VARS_REGEX = /\$(primary|secondary|tertiary|quaternary|header_background|header_primary|highlight|danger|success|love)(\s|;|-(low|medium|high))/g; diff --git a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js index 424979543e2..e1c12d04a32 100644 --- a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js +++ b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js @@ -1,5 +1,5 @@ import { classNames } from "@ember-decorators/component"; -import { observes, on } from "discourse-common/utils/decorators"; +import { observes, on } from "@ember-decorators/object"; import Component from "@ember/component"; import I18n from "I18n"; import discourseDebounce from "discourse-common/lib/debounce"; diff --git a/app/assets/javascripts/admin/addon/components/color-input.js b/app/assets/javascripts/admin/addon/components/color-input.js index 662b6eb714b..9c1c67f0442 100644 --- a/app/assets/javascripts/admin/addon/components/color-input.js +++ b/app/assets/javascripts/admin/addon/components/color-input.js @@ -1,7 +1,7 @@ import { classNames } from "@ember-decorators/component"; import { action, computed } from "@ember/object"; import Component from "@ember/component"; -import { observes } from "discourse-common/utils/decorators"; +import { observes } from "@ember-decorators/object"; /** An input field for a color. diff --git a/app/assets/javascripts/admin/addon/components/highlighted-code.js b/app/assets/javascripts/admin/addon/components/highlighted-code.js index 5f0331fac5c..782754682f3 100644 --- a/app/assets/javascripts/admin/addon/components/highlighted-code.js +++ b/app/assets/javascripts/admin/addon/components/highlighted-code.js @@ -1,4 +1,4 @@ -import { observes, on } from "discourse-common/utils/decorators"; +import { observes, on } from "@ember-decorators/object"; import Component from "@ember/component"; import highlightSyntax from "discourse/lib/highlight-syntax"; diff --git a/app/assets/javascripts/admin/addon/components/secret-value-list.js b/app/assets/javascripts/admin/addon/components/secret-value-list.js index 4530393fe57..eae2a34d6dc 100644 --- a/app/assets/javascripts/admin/addon/components/secret-value-list.js +++ b/app/assets/javascripts/admin/addon/components/secret-value-list.js @@ -2,7 +2,7 @@ import { classNameBindings } from "@ember-decorators/component"; import Component from "@ember/component"; import I18n from "I18n"; import { isEmpty } from "@ember/utils"; -import { on } from "discourse-common/utils/decorators"; +import { on } from "@ember-decorators/object"; import { action, set } from "@ember/object"; @classNameBindings(":value-list", ":secret-value-list") diff --git a/app/assets/javascripts/admin/addon/components/simple-list.js b/app/assets/javascripts/admin/addon/components/simple-list.js index d7e0bf69f32..e30d06c0725 100644 --- a/app/assets/javascripts/admin/addon/components/simple-list.js +++ b/app/assets/javascripts/admin/addon/components/simple-list.js @@ -2,7 +2,8 @@ import { classNameBindings } from "@ember-decorators/component"; import { empty } from "@ember/object/computed"; import Component from "@ember/component"; import { action } from "@ember/object"; -import discourseComputed, { on } from "discourse-common/utils/decorators"; +import discourseComputed from "discourse-common/utils/decorators"; +import { on } from "@ember-decorators/object"; @classNameBindings(":simple-list", ":value-list") export default class SimpleList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/site-text-summary.js b/app/assets/javascripts/admin/addon/components/site-text-summary.js index 15ad253a68d..a8706d5ba55 100644 --- a/app/assets/javascripts/admin/addon/components/site-text-summary.js +++ b/app/assets/javascripts/admin/addon/components/site-text-summary.js @@ -1,7 +1,7 @@ import { classNameBindings, classNames } from "@ember-decorators/component"; import Component from "@ember/component"; import highlightHTML from "discourse/lib/highlight-html"; -import { on } from "discourse-common/utils/decorators"; +import { on } from "@ember-decorators/object"; @classNames("site-text") @classNameBindings("siteText.overridden") diff --git a/app/assets/javascripts/admin/addon/components/value-list.js b/app/assets/javascripts/admin/addon/components/value-list.js index 917caa4a7b3..078fbab2133 100644 --- a/app/assets/javascripts/admin/addon/components/value-list.js +++ b/app/assets/javascripts/admin/addon/components/value-list.js @@ -1,7 +1,8 @@ import { action } from "@ember/object"; import { classNames } from "@ember-decorators/component"; +import discourseComputed from "discourse-common/utils/decorators"; +import { on } from "@ember-decorators/object"; import { empty, reads } from "@ember/object/computed"; -import discourseComputed, { on } from "discourse-common/utils/decorators"; import Component from "@ember/component"; import { makeArray } from "discourse-common/lib/helpers"; diff --git a/app/assets/javascripts/admin/addon/components/watched-word-form.js b/app/assets/javascripts/admin/addon/components/watched-word-form.js index 9867f5dbbd5..e3ab1c7b212 100644 --- a/app/assets/javascripts/admin/addon/components/watched-word-form.js +++ b/app/assets/javascripts/admin/addon/components/watched-word-form.js @@ -2,7 +2,8 @@ import { action } from "@ember/object"; import { classNames, tagName } from "@ember-decorators/component"; import { inject as service } from "@ember/service"; import { equal, not } from "@ember/object/computed"; -import discourseComputed, { observes } from "discourse-common/utils/decorators"; +import discourseComputed from "discourse-common/utils/decorators"; +import { observes } from "@ember-decorators/object"; import Component from "@ember/component"; import I18n from "I18n"; import WatchedWord from "admin/models/watched-word"; diff --git a/app/assets/javascripts/discourse/tests/acceptance/topic-post-decorate-cooked-test.js b/app/assets/javascripts/discourse/tests/acceptance/topic-post-decorate-cooked-test.js index 2bc38d59933..b9b7c3d07bf 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/topic-post-decorate-cooked-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/topic-post-decorate-cooked-test.js @@ -23,10 +23,9 @@ acceptance("Acceptance | decorateCookedElement", function () { DemoComponent ); - withPluginApi( - 0, - (api) => { - api.decorateCookedElement((cooked, helper) => { + withPluginApi(0, (api) => { + api.decorateCookedElement( + (cooked, helper) => { if (helper.getModel().post_number !== 1) { return; } @@ -47,10 +46,10 @@ acceptance("Acceptance | decorateCookedElement", function () { cooked.querySelector(".existing-wrapper"), hbs` with more content from glimmer` ); - }); - }, - { id: "render-glimmer-test" } - ); + }, + { id: "render-glimmer-test" } + ); + }); await visit("/t/internationalization-localization/280");