From cba7158085d0f8a2317e2fc00cb0f9bdb67b2eff Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 4 Jan 2023 18:38:45 +0100
Subject: [PATCH] Fix prettifier/lint issues (#2066)

* Add glitch-soc locale files to prettierignore

* Run prettier on theme.yml

* Add glitch-soc emoji_map.json to .prettierignore

* Run prettier on config/i18n-tasks.yml
---
 .prettierignore                           | 7 +++++++
 app/javascript/flavours/glitch/theme.yml  | 8 ++++----
 app/javascript/flavours/vanilla/theme.yml | 8 ++++----
 config/i18n-tasks.yml                     | 5 ++++-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.prettierignore b/.prettierignore
index f72354a42..dc8c53693 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -70,3 +70,10 @@ docker-compose.override.yml
 # Ignore locale files
 /app/javascript/mastodon/locales
 /config/locales
+
+# Ignore glitch-soc locale files
+/app/javascript/flavours/glitch/locales
+/config/locales-glitch
+
+# Ignore glitch-soc emoji map file
+/app/javascript/flavours/glitch/features/emoji/emoji_map.json
diff --git a/app/javascript/flavours/glitch/theme.yml b/app/javascript/flavours/glitch/theme.yml
index 181128746..2a2cf30b5 100644
--- a/app/javascript/flavours/glitch/theme.yml
+++ b/app/javascript/flavours/glitch/theme.yml
@@ -12,10 +12,10 @@ pack:
   home:
     filename: packs/home.js
     preload:
-    - flavours/glitch/async/compose
-    - flavours/glitch/async/getting_started
-    - flavours/glitch/async/home_timeline
-    - flavours/glitch/async/notifications
+      - flavours/glitch/async/compose
+      - flavours/glitch/async/getting_started
+      - flavours/glitch/async/home_timeline
+      - flavours/glitch/async/notifications
   mailer:
   modal:
   public: packs/public.js
diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml
index 5cb76b721..3f0b27899 100644
--- a/app/javascript/flavours/vanilla/theme.yml
+++ b/app/javascript/flavours/vanilla/theme.yml
@@ -12,10 +12,10 @@ pack:
   home:
     filename: application.js
     preload:
-    - features/getting_started
-    - features/compose
-    - features/home_timeline
-    - features/notifications
+      - features/getting_started
+      - features/compose
+      - features/home_timeline
+      - features/notifications
   mailer:
   modal:
   public: public.js
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 3f3f6f248..334511efe 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -8,7 +8,10 @@ data:
     - config/locales-glitch/*.%{locale}.yml
 
   write:
-    - ['{devise, simple_form, doorkeeper}.*', 'config/locales-glitch/\1.%{locale}.yml']
+    - [
+        '{devise, simple_form, doorkeeper}.*',
+        'config/locales-glitch/\1.%{locale}.yml',
+      ]
     - config/locales-glitch/%{locale}.yml
 
   external: