From c466b88c998bc99e5d26e41cb67d87e1d4b976f5 Mon Sep 17 00:00:00 2001 From: Jamie Tanna Date: Sat, 5 Oct 2019 19:08:45 +0100 Subject: [PATCH] deps: Upgrade to latest version of emoji dependency To add support for new emojis in Hugo, we need to upgrade our internal dependency on the emoji package. Note that we also need to update our tests, as the underlying emoji that is rendered has changed. Follow-up to #6391. (170f18d9352d39213170dd9d5e947eb45854c84b and 2df5d202c6fc6eb18ee0b259c3dd1156094947c5) --- docs/data/docs.json | 2 +- go.mod | 2 +- go.sum | 2 ++ tpl/transform/init.go | 2 +- tpl/transform/transform_test.go | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/data/docs.json b/docs/data/docs.json index 03bb0357..1f21646f 100644 --- a/docs/data/docs.json +++ b/docs/data/docs.json @@ -4109,7 +4109,7 @@ "Examples": [ [ "{{ \"I :heart: Hugo\" | emojify }}", - "I ❤️ Hugo" + "I ❤ Hugo" ] ] }, diff --git a/go.mod b/go.mod index ce831ac9..c9be1446 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/google/go-cmp v0.3.1 github.com/gorilla/websocket v1.4.0 github.com/jdkato/prose v1.1.0 - github.com/kyokomi/emoji v1.5.1 + github.com/kyokomi/emoji v2.1.0+incompatible github.com/magefile/mage v1.4.0 github.com/magiconair/properties v1.8.1 // indirect github.com/markbates/inflect v1.0.0 diff --git a/go.sum b/go.sum index 88cbe251..39dadef6 100644 --- a/go.sum +++ b/go.sum @@ -205,6 +205,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kyokomi/emoji v1.5.1 h1:qp9dub1mW7C4MlvoRENH6EAENb9skEFOvIEbp1Waj38= github.com/kyokomi/emoji v1.5.1/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA= +github.com/kyokomi/emoji v2.1.0+incompatible h1:+DYU2RgpI6OHG4oQkM5KlqD3Wd3UPEsX8jamTo1Mp6o= +github.com/kyokomi/emoji v2.1.0+incompatible/go.mod h1:mZ6aGCD7yk8j6QY6KICwnZ2pxoszVseX1DNoGtU2tBA= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/magefile/mage v1.4.0 h1:RI7B1CgnPAuu2O9lWszwya61RLmfL0KCdo+QyyI/Bhk= github.com/magefile/mage v1.4.0/go.mod h1:IUDi13rsHje59lecXokTfGX0QIzO45uVPlXnJYsXepA= diff --git a/tpl/transform/init.go b/tpl/transform/init.go index 62cb0a9c..2783a513 100644 --- a/tpl/transform/init.go +++ b/tpl/transform/init.go @@ -32,7 +32,7 @@ func init() { ns.AddMethodMapping(ctx.Emojify, []string{"emojify"}, [][2]string{ - {`{{ "I :heart: Hugo" | emojify }}`, `I ❤️ Hugo`}, + {`{{ "I :heart: Hugo" | emojify }}`, `I ❤ Hugo`}, }, ) diff --git a/tpl/transform/transform_test.go b/tpl/transform/transform_test.go index 13c4bbc2..10b020a0 100644 --- a/tpl/transform/transform_test.go +++ b/tpl/transform/transform_test.go @@ -40,7 +40,7 @@ func TestEmojify(t *testing.T) { expect interface{} }{ {":notamoji:", template.HTML(":notamoji:")}, - {"I :heart: Hugo", template.HTML("I ❤️ Hugo")}, + {"I :heart: Hugo", template.HTML("I ❤ Hugo")}, // errors {tstNoStringer{}, false}, } { -- 2.30.2