From 01df34b9dbe03bccf509fdf3147a657c72efe6e0 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 15 Jan 2024 22:16:26 +0100
Subject: [PATCH] Remove bypass and use use glitch-soc's theming system for
 inert.css

---
 app/javascript/{packs => core}/inert.js | 0
 app/javascript/core/theme.yml           | 3 +++
 app/views/layouts/application.html.haml | 2 +-
 config/webpack/shared.js                | 6 +-----
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename app/javascript/{packs => core}/inert.js (100%)

diff --git a/app/javascript/packs/inert.js b/app/javascript/core/inert.js
similarity index 100%
rename from app/javascript/packs/inert.js
rename to app/javascript/core/inert.js
diff --git a/app/javascript/core/theme.yml b/app/javascript/core/theme.yml
index 1b2bfb98f1..f6f653c0a9 100644
--- a/app/javascript/core/theme.yml
+++ b/app/javascript/core/theme.yml
@@ -10,6 +10,9 @@ pack:
   embed: embed.js
   error:
   home:
+  inert:
+    filename: inert.js
+    stylesheet: true
   mailer:
     filename: mailer.js
     stylesheet: true
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index dd4a79bfbd..674d395118 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -29,7 +29,7 @@
     = javascript_pack_tag 'common', crossorigin: 'anonymous'
 
     -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
-    = stylesheet_pack_tag 'inert', media: 'all', id: 'inert-style'
+    = stylesheet_pack_tag 'core/inert', media: 'all', id: 'inert-style'
 
     - if @theme
       - if @theme[:supported_locales].include? I18n.locale.to_s
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index e21330b260..bf1b006b0a 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -54,11 +54,7 @@ const entries = Object.assign(
 
 
 module.exports = {
-  entry: {
-    ...entries,
-    // this is cursed, but bypass glitch-soc's theming system for this one
-    inert: './app/javascript/packs/inert.js',
-  },
+  entry: entries,
 
   output: {
     filename: 'js/[name]-[chunkhash].js',