From 39af44c76d927f68ab63d341391c5a93729b8782 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 29 Sep 2023 22:16:22 +0100
Subject: [PATCH] DEV: Bump ember-legacy-built-in-components (#23734)

This bump includes the fix we were waiting for, and so we can remove our patch file.
---
 app/assets/javascripts/discourse/package.json |  2 +-
 ...ber+legacy-built-in-components+0.4.2.patch | 28 -------------------
 app/assets/javascripts/yarn.lock              |  8 +++---
 3 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 app/assets/javascripts/patches/@ember+legacy-built-in-components+0.4.2.patch

diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index b2e43f1f9aa..f9489e74f1c 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -32,7 +32,7 @@
     "@discourse/itsatrap": "^2.0.10",
     "@ember-compat/tracked-built-ins": "^0.9.1",
     "@ember/jquery": "^2.0.0",
-    "@ember/legacy-built-in-components": "^0.4.2",
+    "@ember/legacy-built-in-components": "^0.5.0-alpha.0",
     "@ember/optional-features": "^2.0.0",
     "@ember/render-modifiers": "^2.1.0",
     "@ember/string": "^3.1.1",
diff --git a/app/assets/javascripts/patches/@ember+legacy-built-in-components+0.4.2.patch b/app/assets/javascripts/patches/@ember+legacy-built-in-components+0.4.2.patch
deleted file mode 100644
index e0285dfe3af..00000000000
--- a/app/assets/javascripts/patches/@ember+legacy-built-in-components+0.4.2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/node_modules/@ember/legacy-built-in-components/addon/mixins/_target_action_support.js b/node_modules/@ember/legacy-built-in-components/addon/mixins/_target_action_support.js
-index d95b013..60f4ddf 100644
---- a/node_modules/@ember/legacy-built-in-components/addon/mixins/_target_action_support.js
-+++ b/node_modules/@ember/legacy-built-in-components/addon/mixins/_target_action_support.js
-@@ -3,8 +3,8 @@
- /**
- @module ember
- */
--
--import { context } from '../components/_internals';
-+// This change has been merged upstream, but not yet released
-+// see https://github.com/emberjs/ember-legacy-built-in-components/commit/61b1a048
- import { get, computed } from '@ember/object';
- import Mixin from '@ember/object/mixin';
- import { assert } from '@ember/debug';
-@@ -29,11 +29,7 @@ export default Mixin.create({
-     let actionContext = get(this, 'actionContext');
- 
-     if (typeof actionContext === 'string') {
--      let value = get(this, actionContext);
--      if (value === undefined) {
--        value = get(context.lookup, actionContext);
--      }
--      return value;
-+      return get(this, actionContext);
-     } else {
-       return actionContext;
-     }
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index cc5cb69b360..98d772a5ac7 100644
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -1163,10 +1163,10 @@
     jquery "^3.5.0"
     resolve "^1.15.1"
 
-"@ember/legacy-built-in-components@^0.4.2":
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@ember/legacy-built-in-components/-/legacy-built-in-components-0.4.2.tgz#79a97d66153ff17909759b368b2a117bc9e168e5"
-  integrity sha512-rJulbyVQIVe1zEDQDqAQHechHy44DsS2qxO24+NmU/AYxwPFSzWC/OZNCDFSfLU+Y5BVd/00qjxF0pu7Nk+TNA==
+"@ember/legacy-built-in-components@^0.5.0-alpha.0":
+  version "0.5.0-alpha.0"
+  resolved "https://registry.yarnpkg.com/@ember/legacy-built-in-components/-/legacy-built-in-components-0.5.0-alpha.0.tgz#35307110d88b911e6bf1bd56e1a7e304f3ff0fb4"
+  integrity sha512-1FLeOfcTmXDvcNnlH+rdTsngq2Nr0LOLZ4JT9D7D1uT5qieZV07umxKUN33ImY00Zc265mDO+nyxuqfGntxh+A==
   dependencies:
     "@embroider/macros" "^1.0.0"
     ember-cli-babel "^7.26.6"