From a3f8aa110d94ae7c9aef648f683f206a90db4f6c Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Wed, 21 Feb 2024 16:36:04 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20explicit=20HTML=20entiti?= =?UTF-8?q?es=20being=20decoded=20when=20rendering=20HTML=20cards=20(#1972?= =?UTF-8?q?8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes ENG-608 - bumps Koenig rendering packages to include fix for HTML entities in HTML card content being decoded during rendering which could result in unexpected/broken output --- ghost/admin/package.json | 2 +- ghost/core/package.json | 6 +-- yarn.lock | 87 ++++++++++++++++++++++++++++------------ 3 files changed, 66 insertions(+), 29 deletions(-) diff --git a/ghost/admin/package.json b/ghost/admin/package.json index e7c67f09d1..4dad57780f 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -46,7 +46,7 @@ "@tryghost/helpers": "1.1.88", "@tryghost/kg-clean-basic-html": "4.0.3", "@tryghost/kg-converters": "1.0.1", - "@tryghost/koenig-lexical": "1.0.19", + "@tryghost/koenig-lexical": "1.0.20", "@tryghost/limit-service": "1.2.12", "@tryghost/members-csv": "0.0.0", "@tryghost/nql": "0.12.1", diff --git a/ghost/core/package.json b/ghost/core/package.json index 55a623633d..3ce490d72a 100644 --- a/ghost/core/package.json +++ b/ghost/core/package.json @@ -101,9 +101,9 @@ "@tryghost/kg-converters": "1.0.1", "@tryghost/kg-default-atoms": "5.0.1", "@tryghost/kg-default-cards": "10.0.2", - "@tryghost/kg-default-nodes": "1.0.8", - "@tryghost/kg-html-to-lexical": "1.0.9", - "@tryghost/kg-lexical-html-renderer": "1.0.8", + "@tryghost/kg-default-nodes": "1.0.9", + "@tryghost/kg-html-to-lexical": "1.0.10", + "@tryghost/kg-lexical-html-renderer": "1.0.9", "@tryghost/kg-mobiledoc-html-renderer": "7.0.1", "@tryghost/limit-service": "1.2.12", "@tryghost/link-redirects": "0.0.0", diff --git a/yarn.lock b/yarn.lock index d7edde7a06..04d526c142 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1852,6 +1852,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.0.0": + version "7.23.9" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7" + integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw== + dependencies: + regenerator-runtime "^0.14.0" + "@babel/runtime@^7.10.5", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.6", "@babel/runtime@^7.20.6", "@babel/runtime@^7.21.0", "@babel/runtime@^7.23.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.23.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885" @@ -3963,6 +3970,29 @@ resolved "https://registry.yarnpkg.com/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.17.0-16.27eb2449f178cd9fe1a4b892d732cc4795f75085.tgz#030f8a4448892c345b3c5c0558ca0ebf4642f3de" integrity sha512-zYz3rFwPB82mVlHGknAPdnSY/a308dhPOblxQLcZgZTDRtDXOE1MgxoRAys+jekwR4/bm3+rZDPs1xsFMsPZig== +"@probe.gl/bench@^4.0.6": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@probe.gl/bench/-/bench-4.0.6.tgz#1aacc78f747259e4522ad4c852145f2727b88fc6" + integrity sha512-uwveDPyMPaGo/5HcBiOFQHPzFEIfsjV2VoW2qAsVVr7+FHie5QVDh6jnipAYeFsk6RZLX7vskbjRX3aFWu5HxA== + dependencies: + "@babel/runtime" "^7.0.0" + "@probe.gl/log" "4.0.6" + +"@probe.gl/env@4.0.6": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-4.0.6.tgz#ea73bfb60ed862dd37654b833ca2e38160d53f8b" + integrity sha512-nF7/LrBgp5YU2va+7pgKRHbh22zK8OIUhVw/N1O9pqM9AbifIGwoi0rFN5QIO4bxAvxcC6iUutgLQq5Y5yRr8A== + dependencies: + "@babel/runtime" "^7.0.0" + +"@probe.gl/log@4.0.6": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@probe.gl/log/-/log-4.0.6.tgz#820808bb958b9ec4df588ade684bed60ce2195ff" + integrity sha512-w4rESrMxLF+nsgxqBFUMlf/dFwOW3o+PDBzl5pAPpyhiYCUEwYCTgD4FwE/uguzpK1Q+ms3fDF7jSnoIqMR0fQ== + dependencies: + "@babel/runtime" "^7.0.0" + "@probe.gl/env" "4.0.6" + "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" @@ -7047,10 +7077,10 @@ lodash "^4.17.21" luxon "^3.0.0" -"@tryghost/kg-default-nodes@1.0.8", "@tryghost/kg-default-nodes@^1.0.8": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@tryghost/kg-default-nodes/-/kg-default-nodes-1.0.8.tgz#2c0ee6ea96134de131f3dc1d192ab8ef394dfb94" - integrity sha512-vUHV9vDcpo+eT+chMfZxhjxubmNcBi2xeDUwBff3z6BKGndjiWHxGGyJzaHJX4Hwmv+JNtbj6v8VhmeRMWOahw== +"@tryghost/kg-default-nodes@1.0.9", "@tryghost/kg-default-nodes@^1.0.9": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@tryghost/kg-default-nodes/-/kg-default-nodes-1.0.9.tgz#f07260c6484fb02a1f4d563b3146a78f778bd697" + integrity sha512-UY8Ybc+i00R0vqey2gX8S+/rSzQd4LkyerIFH6fUlPeNfAQlo4+Zlk/+jd0Y5mZQzD0GRMs3a2qdKmnupmxlig== dependencies: "@lexical/clipboard" "0.13.1" "@lexical/rich-text" "0.13.1" @@ -7064,21 +7094,21 @@ lodash "^4.17.21" luxon "^3.3.0" -"@tryghost/kg-default-transforms@^1.0.9": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@tryghost/kg-default-transforms/-/kg-default-transforms-1.0.9.tgz#3fecac4ee07e874fea9b416eddfedbc2b2e428a3" - integrity sha512-IaVKmmlFY6uXBI8PV/prptr/FzpvZJFyusM0P60MD6DhfHAccg3U3iouy1rkvPfwzPo0+xlVlxe/G8XVR/s6EQ== +"@tryghost/kg-default-transforms@^1.0.10": + version "1.0.10" + resolved "https://registry.yarnpkg.com/@tryghost/kg-default-transforms/-/kg-default-transforms-1.0.10.tgz#353c749cf6fb63fab86c9798d5f9471996e76d4e" + integrity sha512-Id95loZWJmaYlORL8+dGUSCbbW6+oWAsMQiTP5W2KDHRPI+U0pUSm9CJobuOKUMU3BICZtuPqtZ6nWVLVdJ4XQ== dependencies: "@lexical/list" "0.13.1" "@lexical/rich-text" "0.13.1" "@lexical/utils" "0.13.1" - "@tryghost/kg-default-nodes" "^1.0.8" + "@tryghost/kg-default-nodes" "^1.0.9" lexical "0.13.1" -"@tryghost/kg-html-to-lexical@1.0.9": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@tryghost/kg-html-to-lexical/-/kg-html-to-lexical-1.0.9.tgz#1393ec4ede596cf245613c2259a8a4a12a1e1610" - integrity sha512-8Y/NtJn6iWim1ixFvG2E9YNMN9duzpniREtPMeuXu5woJAqHoZOzbvRMS6wwBiEY38oFUzX3oLKJjPgdAwwuKA== +"@tryghost/kg-html-to-lexical@1.0.10": + version "1.0.10" + resolved "https://registry.yarnpkg.com/@tryghost/kg-html-to-lexical/-/kg-html-to-lexical-1.0.10.tgz#b22c76a38db312ccfa717519a8d00f222cb9441e" + integrity sha512-5mM2L40mPQGw9PXD3Utp+Onvn1YqwbsD7AerSVhKeb5TXWh+jB7xa/2D+czQanB2Y/COt2MXsOUUhbgQNg0ikw== dependencies: "@lexical/clipboard" "0.13.1" "@lexical/headless" "0.13.1" @@ -7086,15 +7116,15 @@ "@lexical/link" "0.13.1" "@lexical/list" "0.13.1" "@lexical/rich-text" "0.13.1" - "@tryghost/kg-default-nodes" "^1.0.8" - "@tryghost/kg-default-transforms" "^1.0.9" + "@tryghost/kg-default-nodes" "^1.0.9" + "@tryghost/kg-default-transforms" "^1.0.10" jsdom "^23.0.0" lexical "0.13.1" -"@tryghost/kg-lexical-html-renderer@1.0.8": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@tryghost/kg-lexical-html-renderer/-/kg-lexical-html-renderer-1.0.8.tgz#8812189bdddc86f741cecfda8a43f138165a63b3" - integrity sha512-5g/zvKcaip/g2t/B5ckgI28uQ9NV1E+fuH/jGbM98Vium8f5BBu76Hb7bBmu6081a07rim5VAcRoWUSZDA1Puw== +"@tryghost/kg-lexical-html-renderer@1.0.9": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@tryghost/kg-lexical-html-renderer/-/kg-lexical-html-renderer-1.0.9.tgz#df5a8493789101611fc2ce8fd06cb6cc2a5d4304" + integrity sha512-BC9ygDxq+41jU2geYcSLBm5/a4HGZCiHToj/2R+bh4bjQD0GH0PNdBg4c6+AmKO1jLtuz4DfPy4uYP+x0wFrkA== dependencies: "@lexical/clipboard" "0.13.1" "@lexical/code" "0.13.1" @@ -7102,7 +7132,7 @@ "@lexical/link" "0.13.1" "@lexical/list" "0.13.1" "@lexical/rich-text" "0.13.1" - "@tryghost/kg-default-nodes" "^1.0.8" + "@tryghost/kg-default-nodes" "^1.0.9" jsdom "^23.0.0" lexical "0.13.1" prettier "^3.0.0" @@ -7145,10 +7175,10 @@ dependencies: semver "^7.3.5" -"@tryghost/koenig-lexical@1.0.19": - version "1.0.19" - resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.0.19.tgz#11d8f87d60f257e2c288c16a47a1eb4d777e1a28" - integrity sha512-6f9s5l43DFH1Cz9HdNVQ3hOmMENuNUjr2rELEe281pZoziH26byHkSeSLwtl55uD/1zCJPGUor7qzmBnVIAKqA== +"@tryghost/koenig-lexical@1.0.20": + version "1.0.20" + resolved "https://registry.yarnpkg.com/@tryghost/koenig-lexical/-/koenig-lexical-1.0.20.tgz#78b907f100287d8554cce2b1078bd63883542b67" + integrity sha512-bBWq/9u6y8qyogIv9Mv8OkIsyaGA+xXdveuiB+0UD6GvKon1bKHehdF34lZArjD09qGw0lNRZ6pfL01AZ5TShw== "@tryghost/limit-service@1.2.12", "@tryghost/limit-service@^1.2.10": version "1.2.12" @@ -18594,6 +18624,13 @@ html-validate@8.9.1: prompts "^2.0.0" semver "^7.0.0" +html5parser@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html5parser/-/html5parser-2.0.2.tgz#dd504884761e024e682e1535ee9b5b997cc47293" + integrity sha512-L0y+IdTVxHsovmye8MBtFgBvWZnq1C9WnI/SmJszxoQjmUH1psX2uzDk21O5k5et6udxdGjwxkbmT9eVRoG05w== + dependencies: + tslib "^2.2.0" + htmlparser2@^3.10.1, htmlparser2@^3.9.1: version "3.10.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" @@ -29591,7 +29628,7 @@ tslib@^1.11.1, tslib@^1.13.0, tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0: +tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==