A platform for community discussion. Free, open, simple.
DEV: Restore ember-this-fallback runtime components (#39662)
David Taylor352156848686
diff --git a/frontend/discourse/app/lib/ember-this-fallback/deprecations-helper.js b/frontend/discourse/app/lib/ember-this-fallback/deprecations-helper.jsnew file mode 100644index 00000000000..0911940d09f--- /dev/null+++ b/frontend/discourse/app/lib/ember-this-fallback/deprecations-helper.js@@ -0,0 +1,8 @@+import { helper } from "@ember/component/helper";+import { deprecate } from "@ember/debug";++export default helper(([deprecationsJson]) => {+ for (const deprecation of JSON.parse(deprecationsJson)) {+ deprecate(...deprecation);+ }+});diff --git a/frontend/discourse/app/lib/ember-this-fallback/is-component.js b/frontend/discourse/app/lib/ember-this-fallback/is-component.jsnew file mode 100644index 00000000000..af68e05dd12--- /dev/null+++ b/frontend/discourse/app/lib/ember-this-fallback/is-component.js@@ -0,0 +1,8 @@+import Helper from "@ember/component/helper";+import { getOwner } from "@ember/owner";++export default class IsComponent extends Helper {+ compute([name]) {+ return Boolean(getOwner(this).factoryFor(`component:${name}`));+ }+}diff --git a/frontend/discourse/app/lib/ember-this-fallback/this-fallback-helper.js b/frontend/discourse/app/lib/ember-this-fallback/this-fallback-helper.jsnew file mode 100644index 00000000000..0831886f370--- /dev/null+++ b/frontend/discourse/app/lib/ember-this-fallback/this-fallback-helper.js@@ -0,0 +1,10 @@+import { helper } from "@ember/component/helper";+import { deprecate } from "@ember/debug";+import { get } from "@ember/object";++export default helper(([context, path, deprecationJson]) => {+ if (deprecationJson) {+ deprecate(...JSON.parse(deprecationJson));+ }+ return get(context, path);+});diff --git a/frontend/discourse/app/lib/ember-this-fallback/try-lookup-helper.js b/frontend/discourse/app/lib/ember-this-fallback/try-lookup-helper.jsnew file mode 100644index 00000000000..3bb2cb74dc9--- /dev/null+++ b/frontend/discourse/app/lib/ember-this-fallback/try-lookup-helper.js@@ -0,0 +1,8 @@+import Helper from "@ember/component/helper";+import { getOwner } from "@ember/owner";++export default class TryLookupHelper extends Helper {+ compute([name]) {+ return getOwner(this).factoryFor(`helper:${name}`)?.class;+ }+}diff --git a/frontend/discourse/app/loader-shims.js b/frontend/discourse/app/loader-shims.jsindex 1e244431e77..f6d8c804a83 100644--- a/frontend/discourse/app/loader-shims.js+++ b/frontend/discourse/app/loader-shims.js@@ -115,3 +115,15 @@ loaderShim("xss", () => importSync("xss"));loaderShim("discourse/lib/transformer/registry", () =>importSync("discourse/lib/registry/transformers"));+loaderShim("ember-this-fallback/deprecations-helper", () =>+ importSync("./lib/ember-this-fallback/deprecations-helper")+);+loaderShim("ember-this-fallback/is-component", () =>+ importSync("./lib/ember-this-fallback/is-component")+);+loaderShim("ember-this-fallback/this-fallback-helper", () =>+ importSync("./lib/ember-this-fallback/this-fallback-helper")+);+loaderShim("ember-this-fallback/try-lookup-helper", () =>+ importSync("./lib/ember-this-fallback/try-lookup-helper")+);diff --git a/spec/system/ember_deprecation_spec.rb b/spec/system/ember_deprecation_spec.rbindex c99bec66f10..50a45b64247 100644--- a/spec/system/ember_deprecation_spec.rb+++ b/spec/system/ember_deprecation_spec.rb@@ -54,6 +54,28 @@ describe "JS Deprecation Handling" doexpect(message).to have_text(SiteSetting.warn_critical_js_deprecations_message)end+ it "emits ember-this-fallback deprecation for theme .hbs connectors using property fallback" do+ t = Fabricate(:theme, name: "Theme With Hbs Connector")+ t.set_field(+ target: :extra_js,+ name: "discourse/connectors/below-footer/my-connector.hbs",+ value: "{{someProperty}}",+ )+ t.save!+ SiteSetting.default_theme_id = t.id++ visit "/latest"+ expect(find("#main-outlet-wrapper")).to be_visible++ try_until_success do+ expect(+ $playwright_logger.logs.any? do |log|+ log[:message].include?("ember-this-fallback.this-property-fallback")+ end,+ ).to eq(true)+ end+ end+it "can show warnings triggered during initial render" dosign_in Fabricate(:admin)