diff --git a/app/soapbox/features/compose/components/emoji_picker_dropdown.js b/app/soapbox/features/compose/components/emoji_picker_dropdown.js index 27aae71a9..04fb5c6ce 100644 --- a/app/soapbox/features/compose/components/emoji_picker_dropdown.js +++ b/app/soapbox/features/compose/components/emoji_picker_dropdown.js @@ -28,7 +28,7 @@ const messages = defineMessages({ const assetHost = process.env.CDN_HOST || ''; let EmojiPicker, Emoji; // load asynchronously -const backgroundImageFn = () => `${assetHost}/emoji/sheet_10.png`; +const backgroundImageFn = () => `${assetHost}/emoji/sheet_13.png`; const listenerOptions = supportsPassiveEvents ? { passive: true } : false; const categoriesSort = [ diff --git a/package.json b/package.json index a3c572901..9988683ce 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "cssnano": "^4.1.10", "detect-passive-events": "^2.0.0", "dotenv": "^8.0.0", - "emoji-datasource": "4.0.4", + "emoji-datasource": "5.0.0", "emoji-mart": "^3.0.1", "es6-symbol": "^3.1.1", "escape-html": "^1.0.3", diff --git a/webpack/development.js b/webpack/development.js index 7fbde09c7..396ff7519 100644 --- a/webpack/development.js +++ b/webpack/development.js @@ -21,7 +21,6 @@ const backendEndpoints = [ '/auth/password', '/.well-known/webfinger', '/static', - '/emoji', '/main/ostatus', '/ostatus_subscribe', ]; diff --git a/webpack/production.js b/webpack/production.js index 808b754c7..e059525d8 100644 --- a/webpack/production.js +++ b/webpack/production.js @@ -62,7 +62,7 @@ module.exports = merge(sharedConfig, { }, externals: [ '/emoji/1f602.svg', // used for emoji picker dropdown - '/emoji/sheet_10.png', // used in emoji-mart + '/emoji/sheet_13.png', // used in emoji-mart ], excludes: [ '**/*.gz', diff --git a/webpack/shared.js b/webpack/shared.js index 2feeec89e..540af95f8 100644 --- a/webpack/shared.js +++ b/webpack/shared.js @@ -99,7 +99,7 @@ module.exports = { to: join(__dirname, '../static/emoji'), }, { from: join(__dirname, '../node_modules/emoji-datasource/img/twitter/sheets/32.png'), - to: join(__dirname, '../static/emoji/sheet_10.png'), + to: join(__dirname, '../static/emoji/sheet_13.png'), }], options: { concurrency: 100, diff --git a/yarn.lock b/yarn.lock index 0b4a1211a..5ac4baf91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4973,10 +4973,10 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -emoji-datasource@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-4.0.4.tgz#516b9ab2f34569e468e4e3753a34a47a0b2b5aa3" - integrity sha1-UWuasvNFaeRo5ON1OjSkegsrWqM= +emoji-datasource@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-5.0.0.tgz#1522fdba3c52223a1cf5a1c1fc282935400eaa06" + integrity sha512-LuvLWFnxznTH++GytEzpzOPUo1SB+6CUFqIlVETJJ3x9fpyMCKFfyqberbhMLOpT1qcNe+km+zoyBeUSC3u5Rw== emoji-mart@^3.0.1: version "3.0.1"