Rename emoji sheet to avoid caching issue (#7777)

diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index 84665a7e8029936a80cb143e14587b91a215213c..4fc32db8a4d5debd12de66c6fead3b2a9473ff9f 100644 (file)
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/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.png`;
+const backgroundImageFn = () => `${assetHost}/emoji/sheet_10.png`;
 const listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false;
 
 const categoriesSort = [

diff --git a/config/webpack/production.js b/config/webpack/production.js
index 1469a948f2838909a964f6bde1c3f53b09650c15..037a76a59206ee2d26706fcb5d842a2119483cbb 100644 (file)
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -92,7 +92,7 @@ module.exports = merge(sharedConfig, {
       },
       externals: [
         '/emoji/1f602.svg', // used for emoji picker dropdown
-        '/emoji/sheet.png', // used in emoji-mart
+        '/emoji/sheet_10.png', // used in emoji-mart
       ],
       excludes: [
         '**/*.gz',

diff --git a/public/emoji/sheet.png b/public/emoji/sheet_10.png
similarity index 100%
rename from public/emoji/sheet.png
rename to public/emoji/sheet_10.png