From 75672a902b3907e5438a82cf73ee8c14cbb740b9 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Wed, 1 Nov 2023 21:22:56 +0000 Subject: [PATCH] Enabled emoji picker in feature image caption (#18824) closes https://github.com/TryGhost/Koenig/pull/1038 - updated `` to load `` and compose it into the editor unless used with `` - bumped Koenig packages so `EmojiPickerPlugin` is available to import from `koenig-lexical` --- .../components/koenig-lexical-editor-input.js | 14 + ghost/admin/package.json | 2 +- ghost/core/package.json | 10 +- ghost/email-service/package.json | 2 +- ghost/importer-revue/package.json | 2 +- yarn.lock | 242 +++++++++++------- 6 files changed, 165 insertions(+), 107 deletions(-) diff --git a/ghost/admin/app/components/koenig-lexical-editor-input.js b/ghost/admin/app/components/koenig-lexical-editor-input.js index f33d6985af..950859846c 100644 --- a/ghost/admin/app/components/koenig-lexical-editor-input.js +++ b/ghost/admin/app/components/koenig-lexical-editor-input.js @@ -40,6 +40,11 @@ const HtmlOutputPlugin = ({editorResource, ...props}) => { return <_HtmlOutputPlugin {...props} />; }; +const EmojiPickerPlugin = ({editorResource, ...props}) => { + const {EmojiPickerPlugin: _EmojiPickerPlugin} = editorResource.read(); + return <_EmojiPickerPlugin {...props} />; +}; + export default class KoenigLexicalEditorInput extends Component { @service ajax; @service feature; @@ -50,6 +55,14 @@ export default class KoenigLexicalEditorInput extends Component { editorResource = this.koenig.resource; + get emojiPicker() { + if (!this.feature.editorEmojiPicker) { + return false; + } + + return this.args.emojiPicker ?? true; + } + @action onError(error) { // ensure we're still showing errors in development @@ -89,6 +102,7 @@ export default class KoenigLexicalEditorInput extends Component { placeholderClassName="koenig-lexical-editor-input-placeholder" > + {this.emojiPicker ? : null} diff --git a/ghost/admin/package.json b/ghost/admin/package.json index 7e5cba38d6..673d3f8c5d 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -44,7 +44,7 @@ "@tryghost/ember-promise-modals": "2.0.1", "@tryghost/helpers": "1.1.88", "@tryghost/kg-clean-basic-html": "3.0.40", - "@tryghost/kg-converters": "0.0.21", + "@tryghost/kg-converters": "0.0.22", "@tryghost/koenig-lexical": "0.5.14", "@tryghost/limit-service": "1.2.12", "@tryghost/members-csv": "0.0.0", diff --git a/ghost/core/package.json b/ghost/core/package.json index cd3d208d36..1c0eafd93e 100644 --- a/ghost/core/package.json +++ b/ghost/core/package.json @@ -98,14 +98,14 @@ "@tryghost/importer-handler-content-files": "0.0.0", "@tryghost/importer-revue": "0.0.0", "@tryghost/job-manager": "0.0.0", - "@tryghost/kg-card-factory": "4.0.14", - "@tryghost/kg-converters": "0.0.21", + "@tryghost/kg-card-factory": "4.0.15", + "@tryghost/kg-converters": "0.0.22", "@tryghost/kg-default-atoms": "4.0.3", - "@tryghost/kg-default-cards": "9.1.8", + "@tryghost/kg-default-cards": "9.1.9", "@tryghost/kg-default-nodes": "0.2.7", "@tryghost/kg-html-to-lexical": "0.1.8", "@tryghost/kg-lexical-html-renderer": "0.3.44", - "@tryghost/kg-mobiledoc-html-renderer": "6.0.14", + "@tryghost/kg-mobiledoc-html-renderer": "6.0.15", "@tryghost/limit-service": "1.2.12", "@tryghost/link-redirects": "0.0.0", "@tryghost/link-replacer": "0.0.0", @@ -225,7 +225,7 @@ "yjs": "13.6.8" }, "optionalDependencies": { - "@tryghost/html-to-mobiledoc": "2.0.40", + "@tryghost/html-to-mobiledoc": "2.0.41", "sqlite3": "5.1.6" }, "devDependencies": { diff --git a/ghost/email-service/package.json b/ghost/email-service/package.json index 4e258417f4..9b4246fa0a 100644 --- a/ghost/email-service/package.json +++ b/ghost/email-service/package.json @@ -29,7 +29,7 @@ "@tryghost/email-events": "0.0.0", "@tryghost/errors": "1.2.26", "@tryghost/html-to-plaintext": "0.0.0", - "@tryghost/kg-default-cards": "9.1.8", + "@tryghost/kg-default-cards": "9.1.9", "@tryghost/logging": "2.4.8", "@tryghost/tpl": "0.1.26", "@tryghost/validator": "0.2.6", diff --git a/ghost/importer-revue/package.json b/ghost/importer-revue/package.json index ffb91b64dd..a81b18a99f 100644 --- a/ghost/importer-revue/package.json +++ b/ghost/importer-revue/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@tryghost/debug": "0.1.26", - "@tryghost/kg-default-cards": "9.1.8", + "@tryghost/kg-default-cards": "9.1.9", "@tryghost/string": "0.2.10", "lodash": "4.17.21", "papaparse": "5.3.2", diff --git a/yarn.lock b/yarn.lock index 5631ae208c..282e731006 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2659,15 +2659,15 @@ resolved "https://registry.yarnpkg.com/@ebay/nice-modal-react/-/nice-modal-react-1.2.13.tgz#7e8229fe3a48a11f27cd7f5e21190d82d6f609ce" integrity sha512-jx8xIWe/Up4tpNuM02M+rbnLoxdngTGk3Y8LjJsLGXXcSoKd/+eZStZcAlIO/jwxyz/bhPZnpqPJZWAmhOofuA== -"@elastic/elasticsearch@8.10.0": - version "8.10.0" - resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-8.10.0.tgz#48842b3358b8ea4d37d75cff29fdd37fdf0b2996" - integrity sha512-RIEyqz0D18bz/dK+wJltaak+7wKaxDELxuiwOJhuMrvbrBsYDFnEoTdP/TZ0YszHBgnRPGqBDBgH/FHNgHObiQ== +"@elastic/elasticsearch@8.10.0", "@elastic/elasticsearch@8.5.0": + version "8.5.0" + resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-8.5.0.tgz#407aee0950a082ee76735a567f2571cf4301d4ea" + integrity sha512-iOgr/3zQi84WmPhAplnK2W13R89VXD2oc6WhlQmH3bARQwmI+De23ZJKBEn7bvuG/AHMAqasPXX7uJIiJa2MqQ== dependencies: - "@elastic/transport" "^8.3.4" + "@elastic/transport" "^8.2.0" tslib "^2.4.0" -"@elastic/transport@^8.3.4": +"@elastic/transport@^8.2.0": version "8.3.4" resolved "https://registry.yarnpkg.com/@elastic/transport/-/transport-8.3.4.tgz#43c852e848dc8502bbd7f23f2d61bd5665cded99" integrity sha512-+0o8o74sbzu3BO7oOZiP9ycjzzdOt4QwmMEjFc1zfO7M0Fh7QX1xrpKqZbSd8vBwihXNlSq/EnMPfgD2uFEmFg== @@ -2863,7 +2863,7 @@ ember-cli-babel "^7.22.1" ember-compatibility-helpers "^1.1.1" -"@ember/render-modifiers@2.1.0", "@ember/render-modifiers@^1.0.2 || ^2.0.0", "@ember/render-modifiers@^2.0.4": +"@ember/render-modifiers@2.1.0", "@ember/render-modifiers@^1.0.2 || ^2.0.0", "@ember/render-modifiers@^2.0.0", "@ember/render-modifiers@^2.0.4": version "2.1.0" resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.1.0.tgz#f4fff95a8b5cfbe947ec46644732d511711c5bf9" integrity sha512-LruhfoDv2itpk0fA0IC76Sxjcnq/7BC6txpQo40hOko8Dn6OxwQfxkPIbZGV0Cz7df+iX+VJrcYzNIvlc3w2EQ== @@ -2994,6 +2994,19 @@ resolve "^1.8.1" semver "^7.3.2" +"@embroider/macros@0.47.2", "@embroider/macros@^0.47.2": + version "0.47.2" + resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.47.2.tgz#23cbe92cac3c24747f054e1eea2a22538bf7ebd0" + integrity sha512-ViNWluJCeM5OPlM3rs8kdOz3RV5rpfXX5D2rDnc/q86xRS0xf4NFEjYRV7W6fBcD0b3v5jSHDTwrjq9Kee4rHg== + dependencies: + "@embroider/shared-internals" "0.47.2" + assert-never "^1.2.1" + ember-cli-babel "^7.26.6" + find-up "^5.0.0" + lodash "^4.17.21" + resolve "^1.20.0" + semver "^7.3.2" + "@embroider/macros@1.13.2", "@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.12.2", "@embroider/macros@^1.2.0", "@embroider/macros@^1.8.0", "@embroider/macros@^1.8.3", "@embroider/macros@^1.9.0": version "1.13.2" resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.13.2.tgz#07dda11313a2539f403404881b729e622a80ca17" @@ -3021,6 +3034,19 @@ semver "^7.3.2" typescript-memoize "^1.0.0-alpha.3" +"@embroider/shared-internals@0.47.2": + version "0.47.2" + resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.47.2.tgz#24e9fa0dd9c529d5c996ee1325729ea08d1fa19f" + integrity sha512-SxdZYjAE0fiM5zGDz+12euWIsQZ1tsfR1k+NKmiWMyLhA5T3pNgbR2/Djvx/cVIxOtEavGGSllYbzRKBtV4xMg== + dependencies: + babel-import-util "^0.2.0" + ember-rfc176-data "^0.3.17" + fs-extra "^9.1.0" + lodash "^4.17.21" + resolve-package-path "^4.0.1" + semver "^7.3.5" + typescript-memoize "^1.0.1" + "@embroider/shared-internals@2.5.0", "@embroider/shared-internals@^2.0.0": version "2.5.0" resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.5.0.tgz#4a0b5127c589718fae60fc22f81374ed558b944a" @@ -3081,6 +3107,15 @@ broccoli-funnel "^3.0.5" ember-cli-babel "^7.23.1" +"@embroider/util@^0.47.2": + version "0.47.2" + resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.47.2.tgz#d06497b4b84c07ed9c7b628293bb019c533f4556" + integrity sha512-g9OqnFJPktGu9NS0Ug3Pxz1JE3jeDceeVE4IrlxDrVmBXMA/GrBvpwjolWgl6jh97cMJyExdz62jIvPHV4256Q== + dependencies: + "@embroider/macros" "0.47.2" + broccoli-funnel "^3.0.5" + ember-cli-babel "^7.23.1" + "@emotion/babel-plugin@^11.11.0": version "11.11.0" resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz#c2d872b6a7767a9d176d007f5b31f7d504bb5d6c" @@ -7636,7 +7671,7 @@ "@tryghost/root-utils" "^0.3.24" debug "^4.3.1" -"@tryghost/elasticsearch@^3.0.13", "@tryghost/elasticsearch@^3.0.15": +"@tryghost/elasticsearch@^3.0.15": version "3.0.15" resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch/-/elasticsearch-3.0.15.tgz#d4be60b79155d95de063e17ea90ff0151a0a35d9" integrity sha512-LoDGpr04xuAOIfLDCIEvXT6jJCRA1OmJUpKV2vA8TqYvzbWdiLBhwg+RMZ1QYdHT1TvwUIjch0F1Np7wPizrrg== @@ -7666,16 +7701,7 @@ focus-trap "^6.7.2" postcss-preset-env "^7.3.1" -"@tryghost/errors@1.2.25": - version "1.2.25" - resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.25.tgz#9e1b715624dfd7dbde59a9fc196ebcb00d9c7553" - integrity sha512-fVZgnFu3QsEUVPyl+uFLK6X6JSN3m7l1pMl713SmhNrkFNFM3nG1sVeNiTg/Ru4N5qIJBBIefwrfRH80Ccy3oQ== - dependencies: - "@stdlib/utils-copy" "^0.0.7" - lodash "^4.17.21" - uuid "^9.0.0" - -"@tryghost/errors@1.2.26", "@tryghost/errors@^1.2.26", "@tryghost/errors@^1.2.3": +"@tryghost/errors@1.2.25", "@tryghost/errors@1.2.26", "@tryghost/errors@^1.2.26", "@tryghost/errors@^1.2.3": version "1.2.26" resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.26.tgz#0d0503a51e681998421548fbddbdd7376384c457" integrity sha512-s/eynvVUiAhHP0HB7CPQs7qH7Pm1quJ2iUMTCuH7HV8LqiGoQFNc21/5R4lRv+2Jt3yf69UPCs/6G+kAgZipNw== @@ -7700,12 +7726,12 @@ dependencies: lodash-es "^4.17.11" -"@tryghost/html-to-mobiledoc@2.0.40": - version "2.0.40" - resolved "https://registry.yarnpkg.com/@tryghost/html-to-mobiledoc/-/html-to-mobiledoc-2.0.40.tgz#5ec7117dd34bea856d22080050cbf0d94ef6b1a9" - integrity sha512-z2dfhBmgMDxIhPIPSmQYrlI8LAnuJkINFHpy628yLvtEl1skPO3zK9/pejK+PjgRiJTwMkRb9HOtcH0d2j4qOQ== +"@tryghost/html-to-mobiledoc@2.0.41": + version "2.0.41" + resolved "https://registry.yarnpkg.com/@tryghost/html-to-mobiledoc/-/html-to-mobiledoc-2.0.41.tgz#d1860f26b26934e729e1aa99a640eb56a36d17f6" + integrity sha512-Gnae7igk9bYp4CpxL8ePa2heB/cnPCTimEO0466XTzkg9jFSjFg5zLC+fOHscu66ICEI3YvYdnqbsPtmdHfRyg== dependencies: - "@tryghost/kg-parser-plugins" "^3.0.40" + "@tryghost/kg-parser-plugins" "^3.0.41" "@tryghost/mobiledoc-kit" "^0.12.4-ghost.1" jsdom "^22.0.0" @@ -7714,7 +7740,7 @@ resolved "https://registry.yarnpkg.com/@tryghost/http-cache-utils/-/http-cache-utils-0.1.11.tgz#9b09921828f4772ac26c6d55b438a59e776e2b04" integrity sha512-PbUfViKtY0mxzOpC5Pdkx26R4jcYfWCvSWiTNIW2OG2k1CtE83nIRD/AanIcNMXxrRNnT/hdG9Yu3+gOhEqpmA== -"@tryghost/http-stream@^0.1.22", "@tryghost/http-stream@^0.1.25": +"@tryghost/http-stream@^0.1.25": version "0.1.25" resolved "https://registry.yarnpkg.com/@tryghost/http-stream/-/http-stream-0.1.25.tgz#cbe87996c67a2814c4a6706cd7e445a2b069246e" integrity sha512-aeuGSvoXS1rjY+LupkqzJ9osKEkouzs/LrVqvOe7x9b/c8VUWIh6SrQ2KegKXtkvBggI8dBCH39bJiheZea9/Q== @@ -7742,25 +7768,20 @@ "@tryghost/errors" "^1.2.26" jest-snapshot "^29.0.0" -"@tryghost/kg-card-factory@4.0.14": - version "4.0.14" - resolved "https://registry.yarnpkg.com/@tryghost/kg-card-factory/-/kg-card-factory-4.0.14.tgz#4fdbd7e45926f26c1b96c9f6315e9294e576cb4c" - integrity sha512-riIhtlHJhspvwf+9JATawIayNqzIdaZE3DEXoRwQF4Cbdyk3ksuNJ+w4iBo7cvSbQg6s30TZpjFHQ21W1AROzg== +"@tryghost/kg-card-factory@4.0.15": + version "4.0.15" + resolved "https://registry.yarnpkg.com/@tryghost/kg-card-factory/-/kg-card-factory-4.0.15.tgz#9f5cd81add5a35b05b7502846eb6369aadfaf4af" + integrity sha512-E4lLTAbuT/qAwa08nNLe/6l+G5zFCq4/RLjO3nIoX8aivEAJ2sGFzpXlr3txY3tTowoaXI5q+GsifboY4R5QhQ== "@tryghost/kg-clean-basic-html@3.0.40", "@tryghost/kg-clean-basic-html@^3.0.40": version "3.0.40" resolved "https://registry.yarnpkg.com/@tryghost/kg-clean-basic-html/-/kg-clean-basic-html-3.0.40.tgz#ff9fbcae37f659136673d38347a08ab8f39c13c0" integrity sha512-K8Q1Slg7E9oJHZ41Aqwqfxkaly0uJ0ygfdCFWVPCVCLMyAkzR0E04DoWXO+T7sZRuTOk80yi1TyyMIKN1Ylfag== -"@tryghost/kg-clean-basic-html@^3.0.39": - version "3.0.39" - resolved "https://registry.yarnpkg.com/@tryghost/kg-clean-basic-html/-/kg-clean-basic-html-3.0.39.tgz#aedfa732e8ad85846d673352f0b8e4b519ab9638" - integrity sha512-47n/D1PrWoJgRP3R62fnJeVP7YEojnlm9Sf7vGKXG2wXIsxgwhBBI6r7D7euB/t3OsRrTp5t1LMksNwoyQoO0g== - -"@tryghost/kg-converters@0.0.21": - version "0.0.21" - resolved "https://registry.yarnpkg.com/@tryghost/kg-converters/-/kg-converters-0.0.21.tgz#1e66ab6b199b296b4d4e71fd6c7e55e757b383da" - integrity sha512-t7ZXlUQITz3kXcNxyPUsCDX47mkvnjgpcB14Q44P1iwJYu8Gp5+i6BtoH6xHVYatJp0uEDEhKLMZKMjzNbi7mw== +"@tryghost/kg-converters@0.0.22": + version "0.0.22" + resolved "https://registry.yarnpkg.com/@tryghost/kg-converters/-/kg-converters-0.0.22.tgz#3f95d9e71d2b5fa1083a45119cf22a8e755471c3" + integrity sha512-wxvlgRJuuskFu7zPOMQM6gAIk4R9I3gGKknM6oOvFCX2xi1Vlv2yO1U5786v2d+05ACN9SIj3fkg7Fe9WjC2tw== dependencies: lodash "^4.17.21" @@ -7769,12 +7790,12 @@ resolved "https://registry.yarnpkg.com/@tryghost/kg-default-atoms/-/kg-default-atoms-4.0.3.tgz#a565a08ee55736065154f435d51b392f9a15455d" integrity sha512-EZ43abMvUr7cV5aAD4w7OVUOtaGdfj4HpvQRkZkAqB7/S4prRl7dWIlatxiYX379AXQ+hjI+cSrw5UV0yHaRhA== -"@tryghost/kg-default-cards@9.1.8": - version "9.1.8" - resolved "https://registry.yarnpkg.com/@tryghost/kg-default-cards/-/kg-default-cards-9.1.8.tgz#96100ffe923fab98de5b2403ae06d53bc4d2610c" - integrity sha512-zwopCvpcBb6YgbxfT5h/9zetntIVXJaoJFVYSvpONH5EIXA1sG76PdFnboZCigOIYAaFBm1jM16ogat9/wL1Jw== +"@tryghost/kg-default-cards@9.1.9": + version "9.1.9" + resolved "https://registry.yarnpkg.com/@tryghost/kg-default-cards/-/kg-default-cards-9.1.9.tgz#46388d46ea9b05e001958116c93bf0e7720f65e6" + integrity sha512-VhhgwOKSfeBep0LlzIIqh2k7LIuaHkiD/4t75WKp7hG4tNhWj+NYMb0vQDnJtoVnNfeNVjor1zEAnDoHzf4rFQ== dependencies: - "@tryghost/kg-markdown-html-renderer" "^6.0.14" + "@tryghost/kg-markdown-html-renderer" "^6.0.15" "@tryghost/string" "^0.2.0" "@tryghost/url-utils" "^4.0.0" handlebars "^4.7.6" @@ -7839,21 +7860,6 @@ lexical "^0.12.2" prettier "^3.0.0" -"@tryghost/kg-markdown-html-renderer@^6.0.14": - version "6.0.14" - resolved "https://registry.yarnpkg.com/@tryghost/kg-markdown-html-renderer/-/kg-markdown-html-renderer-6.0.14.tgz#eef03122e0a4919d370398c02727300cd93f2988" - integrity sha512-Cnxi5Ucn3o98o0pkJAVcJ2+h8lPf9uLi0x3Hq0INJV79f2fch28ILW6wQCbF052j52btFCf58a5dJBT1uqtiEg== - dependencies: - "@tryghost/kg-utils" "^1.0.22" - markdown-it "^13.0.0" - markdown-it-footnote "^3.0.3" - markdown-it-image-lazy-loading "^1.1.0" - markdown-it-lazy-headers "^0.1.3" - markdown-it-mark "^3.0.0" - markdown-it-sub "^1.0.0" - markdown-it-sup "^1.0.0" - semver "^7.3.5" - "@tryghost/kg-markdown-html-renderer@^6.0.15": version "6.0.15" resolved "https://registry.yarnpkg.com/@tryghost/kg-markdown-html-renderer/-/kg-markdown-html-renderer-6.0.15.tgz#ff314cad10d17ef87c201471066e158986c524d1" @@ -7869,28 +7875,21 @@ markdown-it-sup "^1.0.0" semver "^7.3.5" -"@tryghost/kg-mobiledoc-html-renderer@6.0.14": - version "6.0.14" - resolved "https://registry.yarnpkg.com/@tryghost/kg-mobiledoc-html-renderer/-/kg-mobiledoc-html-renderer-6.0.14.tgz#6cf06c29c99dc017946dd5bf1f7470cf12638cb6" - integrity sha512-gru9sCZPiOSgCGSCI9i1LEXxkpOJBmEuEVb0RUzOA+ftzPDfPiYCpSjyy4ykJ7ZWxbAZyBgDqiuBEguE1e9/mg== +"@tryghost/kg-mobiledoc-html-renderer@6.0.15": + version "6.0.15" + resolved "https://registry.yarnpkg.com/@tryghost/kg-mobiledoc-html-renderer/-/kg-mobiledoc-html-renderer-6.0.15.tgz#17fe6bb92393e0f559b9f45dd51320147ed032a3" + integrity sha512-CbbnkWyxmM0T4gyKKBvPWrhG+HV3CY/KhOKnzbIGmzOWOaFJw96MiJL0V8Sfnq0nu0bwKoD/2LGKn0RcAHOdFQ== dependencies: - "@tryghost/kg-utils" "^1.0.22" + "@tryghost/kg-utils" "^1.0.23" mobiledoc-dom-renderer "^0.7.0" simple-dom "^1.4.0" -"@tryghost/kg-parser-plugins@^3.0.40": - version "3.0.40" - resolved "https://registry.yarnpkg.com/@tryghost/kg-parser-plugins/-/kg-parser-plugins-3.0.40.tgz#0c3ac1c8911fbc53905f2a9d418b885986927605" - integrity sha512-OlFm8+jqV1YvlPTXRY21luqyCna0ZwMjFK+e8i0Kku9/wIydPyMqHC7osggfeGW6Z657F7ixMFSn97EGnM7Ymw== +"@tryghost/kg-parser-plugins@^3.0.41": + version "3.0.41" + resolved "https://registry.yarnpkg.com/@tryghost/kg-parser-plugins/-/kg-parser-plugins-3.0.41.tgz#1537df18116548fe18c7b36c22cf9960b88427f7" + integrity sha512-h90pIf0islXYw8acXGc/5D6/wV6vGQ4TxhNMrAcpmj6Wq02c9wyvzfl82H3N7JG0yxUWco4u8zSg1/4fGiZpfA== dependencies: - "@tryghost/kg-clean-basic-html" "^3.0.39" - -"@tryghost/kg-utils@^1.0.22": - version "1.0.22" - resolved "https://registry.yarnpkg.com/@tryghost/kg-utils/-/kg-utils-1.0.22.tgz#bb24bcd7c97e5b2c46221d4a383160ea37926af5" - integrity sha512-glHSKw3+W6IeT1TIXJQuRXhlJhFIeSwRbbvFSG+3sSikeOHAR1boKXWeKRRnaGAwqOvJFvcwSD89BOhA7DNXGg== - dependencies: - semver "^7.3.5" + "@tryghost/kg-clean-basic-html" "^3.0.40" "@tryghost/kg-utils@^1.0.23": version "1.0.23" @@ -7913,24 +7912,7 @@ lodash "^4.17.21" luxon "^1.26.0" -"@tryghost/logging@2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.4.5.tgz#aa8d67ae6904c89f46fcc9b7226d579e8b0ce9f6" - integrity sha512-QDkgxWs5jFOWj5Gyf4RtGddwvjaiQtJNmvWZaPcwKy/Hii7I4EEHWSslLX4Y482u5nvgHtnyzynSNUYWwIzGWw== - dependencies: - "@tryghost/bunyan-rotating-filestream" "^0.0.7" - "@tryghost/elasticsearch" "^3.0.13" - "@tryghost/http-stream" "^0.1.22" - "@tryghost/pretty-stream" "^0.1.19" - "@tryghost/root-utils" "^0.3.23" - bunyan "^1.8.15" - bunyan-loggly "^1.4.2" - fs-extra "^10.0.0" - gelf-stream "^1.1.1" - json-stringify-safe "^5.0.1" - lodash "^4.17.21" - -"@tryghost/logging@2.4.8", "@tryghost/logging@^2.4.7": +"@tryghost/logging@2.4.5", "@tryghost/logging@2.4.8", "@tryghost/logging@^2.4.7": version "2.4.8" resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.4.8.tgz#a9e9abdbec823f0c6a009aa2f6847ce454b35475" integrity sha512-/pIeTcw9jpqWJ5/VyUn5sa3rsUxUHortykB4oYd5vKr16KgnrVOuGPCg4JqmdGfz2zrkgKaGd9cAsTNE++0Deg== @@ -8019,7 +8001,7 @@ chalk "^4.1.0" sywac "^1.3.0" -"@tryghost/pretty-stream@^0.1.19", "@tryghost/pretty-stream@^0.1.20": +"@tryghost/pretty-stream@^0.1.20": version "0.1.20" resolved "https://registry.yarnpkg.com/@tryghost/pretty-stream/-/pretty-stream-0.1.20.tgz#cccb2173cde85f450895777edf79d94cb712db74" integrity sha512-2fWRvTUrnbD/AnDChyZ0ZwUWdqRg2dsoa+DZxfH9hJNAwCDAMgp1qVEoOCwMMB1YYDWKKsYM/i+xoxDueMwyLA== @@ -8045,7 +8027,7 @@ got "13.0.0" lodash "^4.17.21" -"@tryghost/root-utils@0.3.24", "@tryghost/root-utils@^0.3.23", "@tryghost/root-utils@^0.3.24": +"@tryghost/root-utils@0.3.24", "@tryghost/root-utils@^0.3.24": version "0.3.24" resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.3.24.tgz#91653fbadc882fb8510844f163a2231c87f30fab" integrity sha512-EzYM3dR/3xyvJHm37RumiIzeGEBRwnnQtQzswXpzn46Rooz7PA7NSjUbLZ8j2K3t0ee+CsPNuyzmzZl+Ih1P2g== @@ -14928,7 +14910,7 @@ ember-auto-import@2.6.3, "ember-auto-import@^1.12.1 || ^2.4.3", ember-auto-impor typescript-memoize "^1.0.0-alpha.3" walk-sync "^3.0.0" -ember-auto-import@^1.11.3, ember-auto-import@^1.12.0: +ember-auto-import@^1.11.2, ember-auto-import@^1.11.3, ember-auto-import@^1.12.0: version "1.12.2" resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.2.tgz#cc7298ee5c0654b0249267de68fb27a2861c3579" integrity sha512-gLqML2k77AuUiXxWNon1FSzuG1DV7PEPpCLCU5aJvf6fdL6rmFfElsZRh+8ELEB/qP9dT+LHjNEunVzd2dYc8A== @@ -14963,7 +14945,25 @@ ember-auto-import@^1.11.3, ember-auto-import@^1.12.0: walk-sync "^0.3.3" webpack "^4.43.0" -ember-basic-dropdown@6.0.2, ember-basic-dropdown@^3.0.11, ember-basic-dropdown@^6.0.0: +ember-basic-dropdown@^3.0.11: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-3.1.0.tgz#47c292de890d1958057736c00b8eb2b8017d530b" + integrity sha512-UISvgJHfiJ8FeXqH8ZN+NmoImN8p6Sb+85qlEv853hLuEfEYnFUqLNhea8nNl9CpFqcD3yU4dKbhYtc6nB39aQ== + dependencies: + "@ember/render-modifiers" "^2.0.0" + "@embroider/macros" "^0.47.2" + "@embroider/util" "^0.47.2" + "@glimmer/component" "^1.0.4" + "@glimmer/tracking" "^1.0.4" + ember-cli-babel "^7.26.6" + ember-cli-htmlbars "^6.0.0" + ember-cli-typescript "^4.2.1" + ember-element-helper "^0.5.5" + ember-maybe-in-element "^2.0.3" + ember-style-modifier "^0.7.0" + ember-truth-helpers "^2.1.0 || ^3.0.0" + +ember-basic-dropdown@^6.0.0: version "6.0.2" resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-6.0.2.tgz#af47dbd544c605cf9cbc62225185616356aeef52" integrity sha512-JgI/cy7eS/Y2WoQl7B2Mko/1aFTAlxr5d+KpQeH7rBKOFml7IQtLvhiDQrpU/FLkrQ9aLNEJtzwtDZV1xQxAKA== @@ -15604,6 +15604,17 @@ ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-co fs-extra "^9.1.0" semver "^5.4.1" +ember-compatibility-helpers@^1.2.4: + version "1.2.7" + resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.7.tgz#b4f138bba844f8f38f0b8f4d7e928841cd5e6591" + integrity sha512-BtkjulweiXo9c3yVWrtexw2dTmBrvavD/xixNC6TKOBdrixUwU+6nuOO9dufDWsMxoid7MvtmDpzc9+mE8PdaA== + dependencies: + babel-plugin-debug-macros "^0.2.0" + ember-cli-version-checker "^5.1.1" + find-up "^5.0.0" + fs-extra "^9.1.0" + semver "^5.4.1" + ember-composable-helpers@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-5.0.0.tgz#055bab3a3e234ab2917499b1465e968c253ca885" @@ -15718,7 +15729,7 @@ ember-drag-drop@0.4.8: dependencies: ember-cli-babel "^6.6.0" -ember-element-helper@^0.5.0: +ember-element-helper@^0.5.0, ember-element-helper@^0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/ember-element-helper/-/ember-element-helper-0.5.5.tgz#4a9ecb4dce57ee7f5ceb868a53c7b498c729f056" integrity sha512-Tu3hsI+/mjHBUvw62Qi+YDZtKkn59V66CjwbgfNTZZ7aHf4gFm1ow4zJ4WLnpnie8p9FvOmIUxwl5HvgPJIcFA== @@ -15829,7 +15840,7 @@ ember-in-element-polyfill@^1.0.1: ember-cli-htmlbars "^5.3.1" ember-cli-version-checker "^5.1.2" -ember-in-viewport@4.1.0, ember-in-viewport@~3.10.2: +ember-in-viewport@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-4.1.0.tgz#a9359a1e4a99d9d6ab32e926749dc131084ed896" integrity sha512-3y6qWXuJPPc6vX2GfxWgtr+sDjb+bdZF9babstr0lTd8t8c1b42gJ13GaJqlylZIyZz2dEXFCimX9WAeudPv9g== @@ -15843,6 +15854,18 @@ ember-in-viewport@4.1.0, ember-in-viewport@~3.10.2: intersection-observer-admin "~0.3.2" raf-pool "~0.1.4" +ember-in-viewport@~3.10.2: + version "3.10.3" + resolved "https://registry.yarnpkg.com/ember-in-viewport/-/ember-in-viewport-3.10.3.tgz#317472bb82bed11f7895821b799349c6a7406e81" + integrity sha512-hSX7p+G6hJjZaY2BAqzyuiMP7QIHzQ4g0+ZBnEwAa8GMbILFAtzPx5A4XEX8wY6dSzhHB9n9jkcWZdmaML6q8A== + dependencies: + ember-auto-import "^1.11.2" + ember-cli-babel "^7.26.3" + ember-modifier "^2.1.0" + fast-deep-equal "^2.0.1" + intersection-observer-admin "~0.3.2" + raf-pool "~0.1.4" + ember-infinity@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/ember-infinity/-/ember-infinity-2.3.0.tgz#73fe13883c212147bfba4f0b2fe8c8d2a96887d9" @@ -15945,7 +15968,20 @@ ember-modifier@4.1.0, "ember-modifier@^2.1.2 || ^3.0.0 || ^4.0.0", "ember-modifi ember-cli-normalize-entity-name "^1.0.0" ember-cli-string-utils "^1.1.0" -ember-modifier@^3.2.7: +ember-modifier@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-2.1.2.tgz#62d18faedf972dcd9d34f90d5321fbc943d139b1" + integrity sha512-3Lsu1fV1sIGa66HOW07RZc6EHISwKt5VA5AUnFss2HX6OTfpxTJ2qvPctt2Yt0XPQXJ4G6BQasr/F35CX7UGJA== + dependencies: + ember-cli-babel "^7.22.1" + ember-cli-normalize-entity-name "^1.0.0" + ember-cli-string-utils "^1.1.0" + ember-cli-typescript "^3.1.3" + ember-compatibility-helpers "^1.2.4" + ember-destroyable-polyfill "^2.0.2" + ember-modifier-manager-polyfill "^1.2.0" + +ember-modifier@^3.0.0, ember-modifier@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.2.7.tgz#f2d35b7c867cbfc549e1acd8d8903c5ecd02ea4b" integrity sha512-ezcPQhH8jUfcJQbbHji4/ZG/h0yyj1jRDknfYue/ypQS8fM8LrGcCMo0rjDZLzL1Vd11InjNs3BD7BdxFlzGoA== @@ -16103,6 +16139,14 @@ ember-source@3.24.0: semver "^6.1.1" silent-error "^1.1.1" +ember-style-modifier@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-0.7.0.tgz#85b3dfd7e4bc2bd546df595f2dab4fb141cf7d87" + integrity sha512-iDzffiwJcb9j6gu3g8CxzZOTvRZ0BmLMEFl+uyqjiaj72VVND9+HbLyQRw1/ewPAtinhSktxxTTdwU/JO+stLw== + dependencies: + ember-cli-babel "^7.26.6" + ember-modifier "^3.0.0" + "ember-style-modifier@^0.8.0 || ^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-1.0.0.tgz#96e5d342a255d8c1cba1637779dbb1949322e139"