From 5ba4275f73a13eebc7d055feeb58b82e05b65cc8 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 9 May 2022 17:39:38 -0500
Subject: [PATCH 1/2] Stop doing Tabler import hack, use our forked version
 from git

---
 package.json      |   2 +-
 webpack/shared.js | Bin 4634 -> 4448 bytes
 yarn.lock         |   7 +++----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 5d19be83b1..4e3608b97f 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "@sentry/browser": "^6.12.0",
     "@sentry/react": "^6.12.0",
     "@sentry/tracing": "^6.12.0",
-    "@tabler/icons": "^1.53.0",
+    "@tabler/icons": "https://gitlab.com/soapbox-pub/tabler-icons.git",
     "@tailwindcss/forms": "^0.4.0",
     "@tailwindcss/typography": "^0.5.1",
     "@testing-library/react": "^12.1.4",
diff --git a/webpack/shared.js b/webpack/shared.js
index 9dee79de1f612f398fee2810f2344e3464697b0c..fb8308ee45b6816e9675f1682c9c3ebd9879e8e7 100644
GIT binary patch
delta 11
ScmbQG@<3@rhQMSc!5;t|T?D59

delta 192
zcmX|)OAdlC6h-HZSi*}jK@&o0{G>2)2QI->`haTTk+xzSxd>;j!X>#AZPa+j_nh;b
z+^3H=zA^^e5v|n<!OOitn>ZL`b(9Te2S+`40%;7LL3aaLuloivH#SgfgASCoSb1}a
z;Ip7>y&qi3nDfCx!CeP9tEgj=EmlR5^PDpwI2U3aEx%Z@`L#>1=*WyXOL|hc>qwnK
NCQ0FcnWr}yzuu$bKSlrm

diff --git a/yarn.lock b/yarn.lock
index 9445a64a81..cb9d3fb3fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1883,10 +1883,9 @@
     remark "^13.0.0"
     unist-util-find-all-after "^3.0.2"
 
-"@tabler/icons@^1.53.0":
-  version "1.53.0"
-  resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-1.53.0.tgz#51536e01b343cfaf26b701df306b2c0369769e3c"
-  integrity sha512-Skk1BqXEOEhiRsXJgZBYtjFa/+4dMSFA5UyzTUW20oyyUSd3iizhEWrYt0jT87iFu771gWoqVV2/OGobBcGjgQ==
+"@tabler/icons@https://gitlab.com/soapbox-pub/tabler-icons.git":
+  version "1.68.0"
+  resolved "https://gitlab.com/soapbox-pub/tabler-icons.git#20e43498bdc0f38f75f176ef1a6526ca76c9172e"
 
 "@tailwindcss/forms@^0.4.0":
   version "0.4.0"

From 660c098166ca2253a56a28f8432b1ae28a47f42f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 9 May 2022 17:57:15 -0500
Subject: [PATCH 2/2] Allow custom module imports

---
 custom/modules/.gitkeep |   0
 webpack/rules/assets.js | Bin 2021 -> 2077 bytes
 webpack/shared.js       | Bin 4448 -> 4484 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 custom/modules/.gitkeep

diff --git a/custom/modules/.gitkeep b/custom/modules/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/webpack/rules/assets.js b/webpack/rules/assets.js
index 1b291ae0cf5592f6c20bb2ad7ec36fb8f68bd918..e0a14c250075f09472581871973a7510ae4c1c83 100644
GIT binary patch
delta 57
zcmaFLKUZMGI=0DTO#GAm83iUEXX6!BP$)_*&d(`J)lg3^EiTE=Ro78apS*`nVsa^?
N#$+$H+Q}vCg#a905_SLp

delta 27
gcmbO$@RWbUI=0EbStTc*W#gT!&ejfQuVF6)0G<pA&j0`b

diff --git a/webpack/shared.js b/webpack/shared.js
index fb8308ee45b6816e9675f1682c9c3ebd9879e8e7..326981b8bbd37bc249b917c4377f3b3741ac2cef 100644
GIT binary patch
delta 34
pcmaE$)S|pWQ9x8ZxwN<>KUZBxK|MD=r8FnCSY1<RvygxvBLK(%3Y7o=

delta 12
TcmZosexS5LQDC#HfITAs9k>J2