mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
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.
This commit is contained in:
parent
70a07abfa4
commit
39af44c76d
@ -32,7 +32,7 @@
|
|||||||
"@discourse/itsatrap": "^2.0.10",
|
"@discourse/itsatrap": "^2.0.10",
|
||||||
"@ember-compat/tracked-built-ins": "^0.9.1",
|
"@ember-compat/tracked-built-ins": "^0.9.1",
|
||||||
"@ember/jquery": "^2.0.0",
|
"@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/optional-features": "^2.0.0",
|
||||||
"@ember/render-modifiers": "^2.1.0",
|
"@ember/render-modifiers": "^2.1.0",
|
||||||
"@ember/string": "^3.1.1",
|
"@ember/string": "^3.1.1",
|
||||||
|
@ -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;
|
|
||||||
}
|
|
@ -1163,10 +1163,10 @@
|
|||||||
jquery "^3.5.0"
|
jquery "^3.5.0"
|
||||||
resolve "^1.15.1"
|
resolve "^1.15.1"
|
||||||
|
|
||||||
"@ember/legacy-built-in-components@^0.4.2":
|
"@ember/legacy-built-in-components@^0.5.0-alpha.0":
|
||||||
version "0.4.2"
|
version "0.5.0-alpha.0"
|
||||||
resolved "https://registry.yarnpkg.com/@ember/legacy-built-in-components/-/legacy-built-in-components-0.4.2.tgz#79a97d66153ff17909759b368b2a117bc9e168e5"
|
resolved "https://registry.yarnpkg.com/@ember/legacy-built-in-components/-/legacy-built-in-components-0.5.0-alpha.0.tgz#35307110d88b911e6bf1bd56e1a7e304f3ff0fb4"
|
||||||
integrity sha512-rJulbyVQIVe1zEDQDqAQHechHy44DsS2qxO24+NmU/AYxwPFSzWC/OZNCDFSfLU+Y5BVd/00qjxF0pu7Nk+TNA==
|
integrity sha512-1FLeOfcTmXDvcNnlH+rdTsngq2Nr0LOLZ4JT9D7D1uT5qieZV07umxKUN33ImY00Zc265mDO+nyxuqfGntxh+A==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@embroider/macros" "^1.0.0"
|
"@embroider/macros" "^1.0.0"
|
||||||
ember-cli-babel "^7.26.6"
|
ember-cli-babel "^7.26.6"
|
||||||
|
Loading…
Reference in New Issue
Block a user