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)

diff --git a/docs/data/docs.json b/docs/data/docs.json
index 03bb035743bd83a46986a865fbf0970d5e7ef5f9..1f21646f91cbf79899a42b5e9d20ab850c5259fc 100644 (file)
--- 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 ce831ac90ac9071fef4dea2c3ce82af206de153f..c9be14465d2a154e274c0b1034e69328d7dda7d9 100644 (file)
--- 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 88cbe2515919ba0ffa27cb16225ef909077c794b..39dadef62490c02ec9bcf64b7f49e78da97cbc52 100644 (file)
--- 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 62cb0a9c3f1cac0b354c784e826ad6f4ef4ed693..2783a513f7bb114f4a789d189969f81f9e54b13c 100644 (file)
--- 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 13c4bbc297a53ad7e71d3360c30b07143931cc67..10b020a0cb18dba1c64fa194725ecd241fef181b 100644 (file)
--- 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},
        } {