Merge branch 'ph/revertEmojiUpgrade' into 'master'

Revert "Merge branch 'ph/15744/reorderEmojiMenu' into 'master'"

See merge request gitlab-org/gitlab!56836

Gemfile

@@ -293,7 +293,7 @@ gem 'autoprefixer-rails', '10.2.0.0'
 gem 'terser', '1.0.2'
 
 gem 'addressable', '~> 2.7'
-gem 'gemojione', '~> 4.3.3'
+gem 'gemojione', '~> 3.3'
 gem 'gon', '~> 6.2'
 gem 'request_store', '~> 1.5'
 gem 'base32', '~> 0.3.0'

Gemfile.lock

@@ -412,7 +412,7 @@ GEM
       ruby-progressbar (~> 1.4)
     fuzzyurl (0.9.0)
     gemoji (3.0.1)
-    gemojione (4.3.3)
+    gemojione (3.3.0)
       json
     get_process_mem (0.2.5)
       ffi (~> 1.0)
@@ -1414,7 +1414,7 @@ DEPENDENCIES
   fog-rackspace (~> 0.1.1)
   fugit (~> 1.2.1)
   fuubar (~> 2.2.0)
-  gemojione (~> 4.3.3)
+  gemojione (~> 3.3)
   gettext (~> 3.3)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)

app/assets/javascripts/emoji/constants.js

@@ -3,10 +3,10 @@ export const FREQUENTLY_USED_COOKIE_KEY = 'frequently_used_emojis';
 
 export const CATEGORY_ICON_MAP = {
   [FREQUENTLY_USED_KEY]: 'history',
+  activity: 'dumbbell',
   people: 'smiley',
   nature: 'nature',
   food: 'food',
-  activity: 'dumbbell',
   travel: 'car',
   objects: 'object',
   symbols: 'heart',

app/assets/javascripts/emoji/index.js

@@ -8,7 +8,7 @@ let emojiMap = null;
 let validEmojiNames = null;
 export const FALLBACK_EMOJI_KEY = 'grey_question';
 
-export const EMOJI_VERSION = '2';
+export const EMOJI_VERSION = '1';
 
 const isLocalStorageAvailable = AccessorUtilities.isLocalStorageAccessSafe();
 

app/assets/javascripts/emoji/support/unicode_support_map.js

 import AccessorUtilities from '../../lib/utils/accessor';
 
-const GL_EMOJI_VERSION = '0.3.0';
+const GL_EMOJI_VERSION = '0.2.0';
 
 const unicodeSupportTestMap = {
   // man, student (emojione does not have any of these yet), http://emojipedia.org/emoji-zwj-sequences/
@@ -25,8 +25,6 @@ const unicodeSupportTestMap = {
     // angel_tone5
     '\u{1F47C}\u{1F3FF}',
   ],
-  // star_struck, http://emojipedia.org/unicode-9.0/
-  '10.0': '\u{1F929}',
   // rofl, http://emojipedia.org/unicode-9.0/
   '9.0': '\u{1F923}',
   // metal, http://emojipedia.org/unicode-8.0/

lib/gitlab/emoji.rb

@@ -8,13 +8,6 @@ module Gitlab
       Gemojione.index.instance_variable_get(:@emoji_by_name)
     end
 
-    def emojis_by_category
-      Gemojione::Categories.all.values.flatten.flat_map do |emoji|
-        tone_emojis = (1..5).map { |i| Gemojione.index.find_by_name("#{emoji['name']}_tone#{i}") }
-        [emoji] + tone_emojis.compact
-      end
-    end
-
     def emojis_by_moji
       Gemojione.index.instance_variable_get(:@emoji_by_moji)
     end

lib/tasks/gemojione.rake

 # frozen_string_literal: true
 
-EMOJI_VERSION = "2"
-
 namespace :gemojione do
   desc 'Generates Emoji SHA256 digests'
 
   task aliases: ['yarn:check', 'environment'] do
     require 'json'
 
-    aliases = {
-      basketball_player: "man_bouncing_ball",
-      basketball_player_tone1: "man_bouncing_ball_tone1",
-      basketball_player_tone2: "man_bouncing_ball_tone2",
-      basketball_player_tone3: "man_bouncing_ball_tone3",
-      basketball_player_tone4: "man_bouncing_ball_tone4",
-      basketball_player_tone5: "man_bouncing_ball_tone5"
-    }
+    aliases = {}
 
     index_file = File.join(Rails.root, 'fixtures', 'emojis', 'index.json')
     index = Gitlab::Json.parse(File.read(index_file))
@@ -45,9 +36,7 @@ namespace :gemojione do
     resultant_emoji_map = {}
     resultant_emoji_map_new = {}
 
-    Gitlab::Emoji.emojis_by_category.each do |emoji_hash|
-      name = emoji_hash['name']
-
+    Gitlab::Emoji.emojis.each do |name, emoji_hash|
       # Ignore aliases
       unless Gitlab::Emoji.emojis_aliases.key?(name)
         fpath = File.join(dir, "#{emoji_hash['unicode']}.png")
@@ -85,7 +74,7 @@ namespace :gemojione do
       handle.write(Gitlab::Json.pretty_generate(resultant_emoji_map))
     end
 
-    out_new = File.join(Rails.root, 'public', '-', 'emojis', EMOJI_VERSION, 'emojis.json')
+    out_new = File.join(Rails.root, 'public', '-', 'emojis', '1', 'emojis.json')
     File.open(out_new, 'w') do |handle|
       handle.write(Gitlab::Json.pretty_generate(resultant_emoji_map_new))
     end
@@ -112,21 +101,22 @@ namespace :gemojione do
 
     # Update these values to the width and height of the spritesheet when
     # new emoji are added.
-    SPRITESHEET_WIDTH = 1080
-    SPRITESHEET_HEIGHT = 1060
+    SPRITESHEET_WIDTH = 860
+    SPRITESHEET_HEIGHT = 840
 
     # Set up a map to rename image files
     emoji_unicode_string_to_name_map = {}
     Gitlab::Emoji.emojis.each do |name, emoji_hash|
       # Ignore aliases
       unless Gitlab::Emoji.emojis_aliases.key?(name)
-        emoji_unicode_string_to_name_map[emoji_hash['unicode'].downcase] = name
+        emoji_unicode_string_to_name_map[emoji_hash['unicode']] = name
       end
     end
 
     # Copy the Gemojione assets to the temporary folder for renaming
-    emoji_dir = "public/-/emojis/#{EMOJI_VERSION}"
+    emoji_dir = "app/assets/images/emoji"
     FileUtils.rm_rf(emoji_dir)
+    FileUtils.mkdir_p(emoji_dir, mode: 0700)
     FileUtils.cp_r(File.join(Gemojione.images_path, '.'), emoji_dir)
     Dir[File.join(emoji_dir, "**/*.png")].each do |png|
       image_path = png
@@ -143,7 +133,7 @@ namespace :gemojione do
         end
       end
 
-      style_path = Rails.root.join(*%w(app assets stylesheets emoji_sprites.scss))
+      style_path = Rails.root.join(*%w(app assets stylesheets framework emoji_sprites.scss))
 
       # Combine the resized assets into a packed sprite and re-generate the SCSS
       SpriteFactory.cssurl = "image-url('$IMAGE')"
@@ -175,17 +165,15 @@ namespace :gemojione do
           height: #{SIZE}px;
           width: #{SIZE}px;
 
-          /* stylelint-disable media-feature-name-no-vendor-prefix */
           @media only screen and (-webkit-min-device-pixel-ratio: 2),
-            only screen and (min--moz-device-pixel-ratio: 2),
-            only screen and (-o-min-device-pixel-ratio: 2/1),
-            only screen and (min-device-pixel-ratio: 2),
-            only screen and (min-resolution: 192dpi),
-            only screen and (min-resolution: 2dppx) {
+                 only screen and (min--moz-device-pixel-ratio: 2),
+                 only screen and (-o-min-device-pixel-ratio: 2/1),
+                 only screen and (min-device-pixel-ratio: 2),
+                 only screen and (min-resolution: 192dpi),
+                 only screen and (min-resolution: 2dppx) {
             background-image: image-url('emoji@2x.png');
             background-size: #{SPRITESHEET_WIDTH}px #{SPRITESHEET_HEIGHT}px;
           }
-          /* stylelint-enable media-feature-name-no-vendor-prefix */
         }
         CSS
       end

package.json

@@ -101,7 +101,7 @@
     "dropzone": "^4.2.0",
     "editorconfig": "^0.15.3",
     "emoji-regex": "^7.0.3",
-    "emoji-unicode-version": "^0.3.0",
+    "emoji-unicode-version": "^0.2.1",
     "exports-loader": "^0.7.0",
     "fast-mersenne-twister": "1.0.2",
     "file-loader": "^5.1.0",