From f72f58f3f9de51db8535bb7809170fb2ca4ae2b6 Mon Sep 17 00:00:00 2001
From: Jack <jack@monkeytype.com>
Date: Fri, 7 Jun 2024 13:51:32 +0200
Subject: [PATCH] fix: font awesome regular not working (Miodec, fehmer)
 (#5477)

!nuf
---
 frontend/scripts/fontawesome.mjs       | 83 ++++++++++++++------------
 frontend/src/styles/fontawesome-5.scss | 31 +++++++---
 frontend/src/styles/fontawesome-6.scss | 31 +++++++---
 frontend/src/styles/inputs.scss        |  2 +-
 frontend/src/styles/test.scss          |  2 +-
 5 files changed, 96 insertions(+), 53 deletions(-)

diff --git a/frontend/scripts/fontawesome.mjs b/frontend/scripts/fontawesome.mjs
index a4f7f77eb..739c04b0c 100644
--- a/frontend/scripts/fontawesome.mjs
+++ b/frontend/scripts/fontawesome.mjs
@@ -1,39 +1,42 @@
 import * as fs from "fs";
 import * as path from "path";
 
+const iconSet = {
+  solid: parseIcons("solid"),
+  regular: parseIcons("regular"),
+  brands: parseIcons("brands"),
+};
 /**
  * Map containing reserved classes by module
  */
 const modules2 = {
-  solid: [], //leave empty
-  brands: detectBrands(),
-  animated: ["fa-spin", "fa-pulse"],
-  "bordererd-pulled": ["fa-border", "fa-pull-left", "fa-pull-right"],
-  "fixed-width": ["fa-fw"],
+  animated: ["spin", "pulse"],
+  "bordererd-pulled": ["border", "pull-left", "pull-right"],
+  "fixed-width": ["fw"],
   larger: [
-    "fw-lg",
-    "fw-xs",
-    "fw-sm",
-    "fa-1x",
-    "fa-2x",
-    "fa-3x",
-    "fa-4x",
-    "fa-5x",
-    "fa-6x",
-    "fa-7x",
-    "fa-8x",
-    "fa-9x",
-    "fa-10x",
+    "lg",
+    "xs",
+    "sm",
+    "1x",
+    "2x",
+    "3x",
+    "4x",
+    "5x",
+    "6x",
+    "7x",
+    "8x",
+    "9x",
+    "10x",
   ],
   "rotated-flipped": [
-    "fa-rotate-90",
-    "fa-rotate-180",
-    "fa-rotate-270",
-    "fa-flip-horizontal",
-    "fa-flip-vertical",
-    "fa-flip-both",
+    "rotate-90",
+    "rotate-180",
+    "rotate-270",
+    "flip-horizontal",
+    "flip-vertical",
+    "flip-both",
   ],
-  stacked: ["fa-stack", "fa-stack-1x", "fa-stack-2x", "fa-inverse"],
+  stacked: ["stack", "stack-1x", "stack-2x", "inverse"],
 };
 
 /**
@@ -74,21 +77,25 @@ export function getFontawesomeConfig(debug = false) {
     if (matches) {
       matches.forEach((match) => {
         const [icon] = match.split(" ");
-        usedClassesSet.add(icon);
+        usedClassesSet.add(icon.substring(3));
       });
     }
   }
 
   const usedClasses = new Array(...usedClassesSet).sort();
   const allModuleClasses = Object.values(modules2).flatMap((it) => it);
+  const icons = usedClasses.filter((it) => !allModuleClasses.includes(it));
 
-  const solid = usedClasses
-    .filter((it) => !allModuleClasses.includes(it))
-    .map((it) => it.substring(3));
+  const solid = icons.filter((it) => iconSet.solid.includes(it));
+  const regular = icons.filter((it) => iconSet.regular.includes(it));
+  const brands = usedClasses.filter((it) => iconSet.brands.includes(it));
 
-  const brands = usedClasses
-    .filter((it) => modules2.brands.includes(it))
-    .map((it) => it.substring(3));
+  const leftOvers = icons.filter(
+    (it) => !(solid.includes(it) || regular.includes(it) || brands.includes(it))
+  );
+  if (leftOvers.length !== 0) {
+    throw new Error("unknown icons: " + leftOvers);
+  }
 
   if (debug === true) {
     console.debug(
@@ -103,6 +110,7 @@ export function getFontawesomeConfig(debug = false) {
     console.debug(
       "Here is your config: \n",
       JSON.stringify({
+        regular,
         solid,
         brands,
       })
@@ -111,6 +119,7 @@ export function getFontawesomeConfig(debug = false) {
   }
 
   return {
+    regular,
     solid,
     brands,
   };
@@ -138,11 +147,11 @@ function findAllFiles(dir, filter = (filename) => true) {
     }, []);
 }
 
-function detectBrands() {
-  const brandFile = fs
-    .readFileSync("node_modules/@fortawesome/fontawesome-free/js/brands.js")
+function parseIcons(iconSet) {
+  const file = fs
+    .readFileSync(`node_modules/@fortawesome/fontawesome-free/js/${iconSet}.js`)
     .toString();
-  return brandFile
+  return file
     .match(/\"(.*)\"\: \[.*\],/g)
-    .map((it) => "fa-" + it.substring(1, it.indexOf(":") - 1));
+    .map((it) => it.substring(1, it.indexOf(":") - 1));
 }
diff --git a/frontend/src/styles/fontawesome-5.scss b/frontend/src/styles/fontawesome-5.scss
index e8847d372..b42b570c2 100644
--- a/frontend/src/styles/fontawesome-5.scss
+++ b/frontend/src/styles/fontawesome-5.scss
@@ -10,7 +10,7 @@
 @import "node_modules/@fortawesome/fontawesome-free/scss/_rotated-flipped.scss"; //fa-rotate-90
 
 @font-face {
-  font-family: "Font Awesome 5 Free";
+  font-family: "Font Awesome";
   font-display: block;
   font-weight: 900;
   @if variable-exists(fontAwesomeOverride) {
@@ -20,14 +20,35 @@
   }
 }
 
+@font-face {
+  font-family: "Font Awesome";
+  font-display: block;
+  font-weight: 400;
+  @if variable-exists(fontAwesomeOverride) {
+    src: url("#{$fontAwesomeOverride}/fa-regular-400.woff2") format("woff2");
+  } @else {
+    src: url("/webfonts-generated/fa-regular-400.woff2") format("woff2");
+  }
+}
+
 .fa,
 .fas {
-  font-family: "Font Awesome 5 Free";
+  font-family: "Font Awesome";
   font-weight: 900;
 }
 
+.far {
+  font-family: "Font Awesome";
+  font-weight: 400;
+}
+
+.fab {
+  font-family: "Font Awesome Brands";
+  font-weight: 400;
+}
+
 @font-face {
-  font-family: "Font Awesome 5 Brands";
+  font-family: "Font Awesome Brands";
   font-display: block;
   font-weight: 400;
   @if variable-exists(fontAwesomeOverride) {
@@ -36,9 +57,5 @@
     src: url("/webfonts-generated/fa-brands-400.woff2") format("woff2");
   }
 }
-.fab {
-  font-family: "Font Awesome 5 Brands";
-  font-weight: 400;
-}
 
 @import "node_modules/@fortawesome/fontawesome-free/scss/_icons.scss";
diff --git a/frontend/src/styles/fontawesome-6.scss b/frontend/src/styles/fontawesome-6.scss
index cff3837a6..f1c42e6ab 100644
--- a/frontend/src/styles/fontawesome-6.scss
+++ b/frontend/src/styles/fontawesome-6.scss
@@ -14,7 +14,7 @@
 @import "node_modules/@fortawesome/fontawesome-free/scss/_rotated-flipped.scss"; //fa-rotate-90
 
 @font-face {
-  font-family: "Font Awesome 6 Free";
+  font-family: "Font Awesome";
   font-display: block;
   font-weight: 900;
   @if variable-exists(fontAwesomeOverride) {
@@ -24,14 +24,35 @@
   }
 }
 
+@font-face {
+  font-family: "Font Awesome";
+  font-display: block;
+  font-weight: 400;
+  @if variable-exists(fontAwesomeOverride) {
+    src: url("#{$fontAwesomeOverride}/fa-regular-400.woff2") format("woff2");
+  } @else {
+    src: url("/webfonts-generated/fa-regular-400.woff2") format("woff2");
+  }
+}
+
 .fa,
 .fas {
-  font-family: "Font Awesome 6 Free";
+  font-family: "Font Awesome";
   font-weight: 900;
 }
 
+.far {
+  font-family: "Font Awesome";
+  font-weight: 400;
+}
+
+.fab {
+  font-family: "Font Awesome Brands";
+  font-weight: 400;
+}
+
 @font-face {
-  font-family: "Font Awesome 6 Brands";
+  font-family: "Font Awesome Brands";
   font-display: block;
   font-weight: 400;
   @if variable-exists(fontAwesomeOverride) {
@@ -40,10 +61,6 @@
     src: url("/webfonts-generated/fa-brands-400.woff2") format("woff2");
   }
 }
-.fab {
-  font-family: "Font Awesome 6 Brands";
-  font-weight: 400;
-}
 
 @each $name in $fontawesomeSolid {
   $icon: map.get($fa-icons, $name);
diff --git a/frontend/src/styles/inputs.scss b/frontend/src/styles/inputs.scss
index de481d951..3d38c41b4 100644
--- a/frontend/src/styles/inputs.scss
+++ b/frontend/src/styles/inputs.scss
@@ -87,7 +87,7 @@ input[type="checkbox"] {
   transition: background 0.125s;
   flex-shrink: 0;
   &:after {
-    font-family: "Font Awesome 5 Free";
+    font-family: "Font Awesome";
     content: "\f00c";
     top: 0;
     left: 0;
diff --git a/frontend/src/styles/test.scss b/frontend/src/styles/test.scss
index 01e433ad4..feee0ce2c 100644
--- a/frontend/src/styles/test.scss
+++ b/frontend/src/styles/test.scss
@@ -353,7 +353,7 @@
   }
 
   &.lastbeforenewline::after {
-    font-family: "Font Awesome 5 Free";
+    font-family: "Font Awesome";
     font-weight: 600;
     content: "\f107";
     margin-left: 0.5rem;