Node.js based forum software built for the modern web
feat: upgrade to fa7
Barış Soner Uşaklı4eec1d764253
diff --git a/install/package.json b/install/package.jsonindex 6ce1f03da3..296a6089a8 100644--- a/install/package.json+++ b/install/package.json@@ -32,7 +32,7 @@"@fontsource-utils/scss": "0.2.2","@fontsource/inter": "5.2.8","@fontsource/poppins": "5.2.7",- "@fortawesome/fontawesome-free": "6.7.2",+ "@fortawesome/fontawesome-free": "7.2.0","@isaacs/ttlcache": "2.1.5","@json2csv/node": "7.0.6","@nodebb/spider-detector": "2.0.3",@@ -154,6 +154,7 @@"tough-cookie": "6.0.1","undici": "8.3.0","validator": "13.15.35",+ "wawoff2": "2.0.1","webpack": "5.107.2","webpack-merge": "6.0.1","winston": "3.19.0",diff --git a/public/scss/admin/admin.scss b/public/scss/admin/admin.scssindex f58af12f41..1e7328fd24 100644--- a/public/scss/admin/admin.scss+++ b/public/scss/admin/admin.scss@@ -1,3 +1,6 @@+@use "fontawesome/scss/variables" as fa-vars;+@use 'fontawesome/scss/solid' as fa-solid;+@import "fonts";@import "mixins";@import "common";@@ -207,7 +210,7 @@ body {background-color: $success;i {- @include fa-icon-solid($fa-var-check);+ @include fa-solid.icon(fa-vars.$var-check);}}}\ No newline at end of filediff --git a/public/scss/fontawesome/loader.scss b/public/scss/fontawesome/loader.scssindex 81700f154d..0f5e91aa83 100644--- a/public/scss/fontawesome/loader.scss+++ b/public/scss/fontawesome/loader.scss@@ -1,4 +1,7 @@-$fa-font-path: "./fontawesome/webfonts";-@import "fontawesome";-@import "v4-shims";+@use "fontawesome/scss/variables" with (+ $font-path: "./fontawesome/webfonts"+);++@use "fontawesome/scss/fontawesome";+@use "fontawesome/scss/v4-shims";@import "nodebb-shims";\ No newline at end of filediff --git a/public/scss/fontawesome/nodebb-shims.scss b/public/scss/fontawesome/nodebb-shims.scssindex 04add18cd8..f315a58c45 100644--- a/public/scss/fontawesome/nodebb-shims.scss+++ b/public/scss/fontawesome/nodebb-shims.scss@@ -1,312 +1,33 @@// NodeBB backwards compatibility shims+@use "fontawesome/scss/variables" as fa-v;+@font-face {font-family: 'FontAwesome';font-style: normal;font-weight: 400;- font-display: $fa-font-display;- src: url('#{$fa-font-path}/fa-solid-900.woff2');- src: url('#{$fa-font-path}/fa-solid-900.woff2') format('woff2'),- url('#{$fa-font-path}/fa-solid-900.ttf') format('truetype');+ font-display: fa-v.$font-display;+ src: url('#{fa-v.$font-path}/fa-solid-900.woff2');+ src: url('#{fa-v.$font-path}/fa-solid-900.woff2') format('woff2'),+ url('#{fa-v.$font-path}/fa-solid-900.ttf') format('truetype');}@font-face {font-family: 'FontAwesome';font-style: normal;font-weight: 400;- font-display: $fa-font-display;- src: url('#{$fa-font-path}/fa-brands-400.woff2');- src: url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),- url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype');+ font-display: fa-v.$font-display;+ src: url('#{fa-v.$font-path}/fa-brands-400.woff2');+ src: url('#{fa-v.$font-path}/fa-brands-400.woff2') format('woff2'),+ url('#{fa-v.$font-path}/fa-brands-400.ttf') format('truetype');}@font-face {font-family: 'FontAwesome';font-style: normal;font-weight: 400;- font-display: $fa-font-display;- src: url('#{$fa-font-path}/fa-regular-400.woff2');- src: url('#{$fa-font-path}/fa-regular-400.woff2') format('woff2'),- url('#{$fa-font-path}/fa-regular-400.ttf') format('truetype');+ font-display: fa-v.$font-display;+ src: url('#{fa-v.$font-path}/fa-regular-400.woff2');+ src: url('#{fa-v.$font-path}/fa-regular-400.woff2') format('woff2'),+ url('#{fa-v.$font-path}/fa-regular-400.ttf') format('truetype');}---$fa-var-address-book-o: $fa-var-address-book;-$fa-var-address-card-o: $fa-var-address-card;-$fa-var-area-chart: $fa-var-chart-area;-$fa-var-arrow-circle-o-down: $fa-var-arrow-alt-circle-down;-$fa-var-arrow-circle-o-left: $fa-var-arrow-alt-circle-left;-$fa-var-arrow-circle-o-right: $fa-var-arrow-alt-circle-right;-$fa-var-arrow-circle-o-up: $fa-var-arrow-alt-circle-up;-$fa-var-arrows: $fa-var-arrows-alt;-$fa-var-arrows-alt: $fa-var-expand-arrows-alt;-$fa-var-arrows-h: $fa-var-arrows-alt-h;-$fa-var-arrows-v: $fa-var-arrows-alt-v;-$fa-var-asl-interpreting: $fa-var-american-sign-language-interpreting;-$fa-var-automobile: $fa-var-car;-$fa-var-bank: $fa-var-university;-$fa-var-bar-chart: $fa-var-chart-bar;-$fa-var-bar-chart-o: $fa-var-chart-bar;-$fa-var-bathtub: $fa-var-bath;-$fa-var-battery: $fa-var-battery-full;-$fa-var-battery-0: $fa-var-battery-empty;-$fa-var-battery-1: $fa-var-battery-quarter;-$fa-var-battery-2: $fa-var-battery-half;-$fa-var-battery-3: $fa-var-battery-three-quarters;-$fa-var-battery-4: $fa-var-battery-full;-$fa-var-bell-o: $fa-var-bell;-$fa-var-bell-slash-o: $fa-var-bell-slash;-$fa-var-bitbucket-square: $fa-var-bitbucket;-$fa-var-bitcoin: $fa-var-btc;-$fa-var-bookmark-o: $fa-var-bookmark;-$fa-var-building-o: $fa-var-building;-$fa-var-cab: $fa-var-taxi;-$fa-var-calendar: $fa-var-calendar-alt;-$fa-var-calendar-check-o: $fa-var-calendar-check;-$fa-var-calendar-minus-o: $fa-var-calendar-minus;-$fa-var-calendar-o: $fa-var-calendar;-$fa-var-calendar-plus-o: $fa-var-calendar-plus;-$fa-var-calendar-times-o: $fa-var-calendar-times;-$fa-var-caret-square-o-down: $fa-var-caret-square-down;-$fa-var-caret-square-o-left: $fa-var-caret-square-left;-$fa-var-caret-square-o-right: $fa-var-caret-square-right;-$fa-var-caret-square-o-up: $fa-var-caret-square-up;-$fa-var-cc: $fa-var-closed-captioning;-$fa-var-chain: $fa-var-link;-$fa-var-chain-broken: $fa-var-unlink;-$fa-var-check-circle-o: $fa-var-check-circle;-$fa-var-check-square-o: $fa-var-check-square;-$fa-var-circle-o: $fa-var-circle;-$fa-var-circle-o-notch: $fa-var-circle-notch;-$fa-var-circle-thin: $fa-var-circle;-$fa-var-clock-o: $fa-var-clock;-$fa-var-close: $fa-var-times;-$fa-var-cloud-download: $fa-var-cloud-download-alt;-$fa-var-cloud-upload: $fa-var-cloud-upload-alt;-$fa-var-cny: $fa-var-yen-sign;-$fa-var-code-fork: $fa-var-code-branch;-$fa-var-comment-o: $fa-var-comment;-$fa-var-commenting: $fa-var-comment-dots;-$fa-var-commenting-o: $fa-var-comment-dots;-$fa-var-comments-o: $fa-var-comments;-$fa-var-credit-card-alt: $fa-var-credit-card;-$fa-var-cutlery: $fa-var-utensils;-$fa-var-dashboard: $fa-var-tachometer-alt;-$fa-var-deafness: $fa-var-deaf;-$fa-var-dedent: $fa-var-outdent;-$fa-var-diamond: $fa-var-gem;-$fa-var-dollar: $fa-var-dollar-sign;-$fa-var-dot-circle-o: $fa-var-dot-circle;-$fa-var-drivers-license: $fa-var-id-card;-$fa-var-drivers-license-o: $fa-var-id-card;-$fa-var-eercast: $fa-var-sellcast;-$fa-var-envelope-o: $fa-var-envelope;-$fa-var-envelope-open-o: $fa-var-envelope-open;-$fa-var-eur: $fa-var-euro-sign;-$fa-var-euro: $fa-var-euro-sign;-$fa-var-exchange: $fa-var-exchange-alt;-$fa-var-external-link: $fa-var-external-link-alt;-$fa-var-external-link-square: $fa-var-external-link-square-alt;-$fa-var-eyedropper: $fa-var-eye-dropper;-$fa-var-fa: $fa-var-font-awesome;-$fa-var-facebook: $fa-var-facebook-f;-$fa-var-facebook-official: $fa-var-facebook;-$fa-var-feed: $fa-var-rss;-$fa-var-file-archive-o: $fa-var-file-archive;-$fa-var-file-audio-o: $fa-var-file-audio;-$fa-var-file-code-o: $fa-var-file-code;-$fa-var-file-excel-o: $fa-var-file-excel;-$fa-var-file-image-o: $fa-var-file-image;-$fa-var-file-movie-o: $fa-var-file-video;-$fa-var-file-o: $fa-var-file;-$fa-var-file-pdf-o: $fa-var-file-pdf;-$fa-var-file-photo-o: $fa-var-file-image;-$fa-var-file-picture-o: $fa-var-file-image;-$fa-var-file-powerpoint-o: $fa-var-file-powerpoint;-$fa-var-file-sound-o: $fa-var-file-audio;-$fa-var-file-text: $fa-var-file-alt;-$fa-var-file-text-o: $fa-var-file-alt;-$fa-var-file-video-o: $fa-var-file-video;-$fa-var-file-word-o: $fa-var-file-word;-$fa-var-file-zip-o: $fa-var-file-archive;-$fa-var-files-o: $fa-var-copy;-$fa-var-flag-o: $fa-var-flag;-$fa-var-flash: $fa-var-bolt;-$fa-var-floppy-o: $fa-var-save;-$fa-var-folder-o: $fa-var-folder;-$fa-var-folder-open-o: $fa-var-folder-open;-$fa-var-frown-o: $fa-var-frown;-$fa-var-futbol-o: $fa-var-futbol;-$fa-var-gbp: $fa-var-pound-sign;-$fa-var-ge: $fa-var-empire;-$fa-var-gear: $fa-var-cog;-$fa-var-gears: $fa-var-cogs;-$fa-var-gittip: $fa-var-gratipay;-$fa-var-glass: $fa-var-glass-martini;-$fa-var-google-plus: $fa-var-google-plus-g;-$fa-var-google-plus-circle: $fa-var-google-plus;-$fa-var-google-plus-official: $fa-var-google-plus;-$fa-var-group: $fa-var-users;-$fa-var-hand-grab-o: $fa-var-hand-rock;-$fa-var-hand-lizard-o: $fa-var-hand-lizard;-$fa-var-hand-o-down: $fa-var-hand-point-down;-$fa-var-hand-o-left: $fa-var-hand-point-left;-$fa-var-hand-o-right: $fa-var-hand-point-right;-$fa-var-hand-o-up: $fa-var-hand-point-up;-$fa-var-hand-paper-o: $fa-var-hand-paper;-$fa-var-hand-peace-o: $fa-var-hand-peace;-$fa-var-hand-pointer-o: $fa-var-hand-pointer;-$fa-var-hand-rock-o: $fa-var-hand-rock;-$fa-var-hand-scissors-o: $fa-var-hand-scissors;-$fa-var-hand-spock-o: $fa-var-hand-spock;-$fa-var-hand-stop-o: $fa-var-hand-paper;-$fa-var-handshake-o: $fa-var-handshake;-$fa-var-hard-of-hearing: $fa-var-deaf;-$fa-var-hdd-o: $fa-var-hdd;-$fa-var-header: $fa-var-heading;-$fa-var-heart-o: $fa-var-heart;-$fa-var-hospital-o: $fa-var-hospital;-$fa-var-hotel: $fa-var-bed;-$fa-var-hourglass-1: $fa-var-hourglass-start;-$fa-var-hourglass-2: $fa-var-hourglass-half;-$fa-var-hourglass-3: $fa-var-hourglass-end;-$fa-var-hourglass-o: $fa-var-hourglass;-$fa-var-id-card-o: $fa-var-id-card;-$fa-var-ils: $fa-var-shekel-sign;-$fa-var-inr: $fa-var-rupee-sign;-$fa-var-institution: $fa-var-university;-$fa-var-intersex: $fa-var-transgender;-$fa-var-jpy: $fa-var-yen-sign;-$fa-var-keyboard-o: $fa-var-keyboard;-$fa-var-krw: $fa-var-won-sign;-$fa-var-legal: $fa-var-gavel;-$fa-var-lemon-o: $fa-var-lemon;-$fa-var-level-down: $fa-var-level-down-alt;-$fa-var-level-up: $fa-var-level-up-alt;-$fa-var-life-bouy: $fa-var-life-ring;-$fa-var-life-buoy: $fa-var-life-ring;-$fa-var-life-saver: $fa-var-life-ring;-$fa-var-lightbulb-o: $fa-var-lightbulb;-$fa-var-line-chart: $fa-var-chart-line;-$fa-var-linkedin: $fa-var-linkedin-in;-$fa-var-linkedin-square: $fa-var-linkedin;-$fa-var-long-arrow-down: $fa-var-long-arrow-alt-down;-$fa-var-long-arrow-left: $fa-var-long-arrow-alt-left;-$fa-var-long-arrow-right: $fa-var-long-arrow-alt-right;-$fa-var-long-arrow-up: $fa-var-long-arrow-alt-up;-$fa-var-mail-forward: $fa-var-share;-$fa-var-mail-reply: $fa-var-reply;-$fa-var-mail-reply-all: $fa-var-reply-all;-$fa-var-map-marker: $fa-var-map-marker-alt;-$fa-var-map-o: $fa-var-map;-$fa-var-meanpath: $fa-var-font-awesome;-$fa-var-meh-o: $fa-var-meh;-$fa-var-minus-square-o: $fa-var-minus-square;-$fa-var-mobile: $fa-var-mobile-alt;-$fa-var-mobile-phone: $fa-var-mobile-alt;-$fa-var-money: $fa-var-money-bill-alt;-$fa-var-moon-o: $fa-var-moon;-$fa-var-mortar-board: $fa-var-graduation-cap;-$fa-var-navicon: $fa-var-bars;-$fa-var-newspaper-o: $fa-var-newspaper;-$fa-var-paper-plane-o: $fa-var-paper-plane;-$fa-var-paste: $fa-var-clipboard;-$fa-var-pause-circle-o: $fa-var-pause-circle;-$fa-var-pencil: $fa-var-pencil-alt;-$fa-var-pencil-square: $fa-var-pen-square;-$fa-var-pencil-square-o: $fa-var-edit;-$fa-var-photo: $fa-var-image;-$fa-var-picture-o: $fa-var-image;-$fa-var-pie-chart: $fa-var-chart-pie;-$fa-var-play-circle-o: $fa-var-play-circle;-$fa-var-plus-square-o: $fa-var-plus-square;-$fa-var-question-circle-o: $fa-var-question-circle;-$fa-var-ra: $fa-var-rebel;-$fa-var-refresh: $fa-var-sync;-$fa-var-remove: $fa-var-times;-$fa-var-reorder: $fa-var-bars;-$fa-var-repeat: $fa-var-redo;-$fa-var-resistance: $fa-var-rebel;-$fa-var-rmb: $fa-var-yen-sign;-$fa-var-rotate-left: $fa-var-undo;-$fa-var-rotate-right: $fa-var-redo;-$fa-var-rouble: $fa-var-ruble-sign;-$fa-var-rub: $fa-var-ruble-sign;-$fa-var-ruble: $fa-var-ruble-sign;-$fa-var-rupee: $fa-var-rupee-sign;-$fa-var-s15: $fa-var-bath;-$fa-var-scissors: $fa-var-cut;-$fa-var-send: $fa-var-paper-plane;-$fa-var-send-o: $fa-var-paper-plane;-$fa-var-share-square-o: $fa-var-share-square;-$fa-var-shekel: $fa-var-shekel-sign;-$fa-var-sheqel: $fa-var-shekel-sign;-$fa-var-shield: $fa-var-shield-alt;-$fa-var-sign-in: $fa-var-sign-in-alt;-$fa-var-sign-out: $fa-var-sign-out-alt;-$fa-var-signing: $fa-var-sign-language;-$fa-var-sliders: $fa-var-sliders-h;-$fa-var-smile-o: $fa-var-smile;-$fa-var-snowflake-o: $fa-var-snowflake;-$fa-var-soccer-ball-o: $fa-var-futbol;-$fa-var-sort-alpha-asc: $fa-var-sort-alpha-down;-$fa-var-sort-alpha-desc: $fa-var-sort-alpha-up;-$fa-var-sort-amount-asc: $fa-var-sort-amount-down;-$fa-var-sort-amount-desc: $fa-var-sort-amount-up;-$fa-var-sort-asc: $fa-var-sort-up;-$fa-var-sort-desc: $fa-var-sort-down;-$fa-var-sort-numeric-asc: $fa-var-sort-numeric-down;-$fa-var-sort-numeric-desc: $fa-var-sort-numeric-up;-$fa-var-spoon: $fa-var-utensil-spoon;-$fa-var-square-o: $fa-var-square;-$fa-var-star-half-empty: $fa-var-star-half;-$fa-var-star-half-full: $fa-var-star-half;-$fa-var-star-half-o: $fa-var-star-half;-$fa-var-star-o: $fa-var-star;-$fa-var-sticky-note-o: $fa-var-sticky-note;-$fa-var-stop-circle-o: $fa-var-stop-circle;-$fa-var-sun-o: $fa-var-sun;-$fa-var-support: $fa-var-life-ring;-$fa-var-tablet: $fa-var-tablet-alt;-$fa-var-tachometer: $fa-var-tachometer-alt;-$fa-var-television: $fa-var-tv;-$fa-var-thermometer: $fa-var-thermometer-full;-$fa-var-thermometer-0: $fa-var-thermometer-empty;-$fa-var-thermometer-1: $fa-var-thermometer-quarter;-$fa-var-thermometer-2: $fa-var-thermometer-half;-$fa-var-thermometer-3: $fa-var-thermometer-three-quarters;-$fa-var-thermometer-4: $fa-var-thermometer-full;-$fa-var-thumb-tack: $fa-var-thumbtack;-$fa-var-thumbs-o-down: $fa-var-thumbs-down;-$fa-var-thumbs-o-up: $fa-var-thumbs-up;-$fa-var-ticket: $fa-var-ticket-alt;-$fa-var-times-circle-o: $fa-var-times-circle;-$fa-var-times-rectangle: $fa-var-window-close;-$fa-var-times-rectangle-o: $fa-var-window-close;-$fa-var-toggle-down: $fa-var-caret-square-down;-$fa-var-toggle-left: $fa-var-caret-square-left;-$fa-var-toggle-right: $fa-var-caret-square-right;-$fa-var-toggle-up: $fa-var-caret-square-up;-$fa-var-trash: $fa-var-trash-alt;-$fa-var-trash-o: $fa-var-trash-alt;-$fa-var-try: $fa-var-lira-sign;-$fa-var-turkish-lira: $fa-var-lira-sign;-$fa-var-unsorted: $fa-var-sort;-$fa-var-usd: $fa-var-dollar-sign;-$fa-var-user-circle-o: $fa-var-user-circle;-$fa-var-user-o: $fa-var-user;-$fa-var-vcard: $fa-var-address-card;-$fa-var-vcard-o: $fa-var-address-card;-$fa-var-video-camera: $fa-var-video;-$fa-var-vimeo: $fa-var-vimeo-v;-$fa-var-volume-control-phone: $fa-var-phone-volume;-$fa-var-warning: $fa-var-exclamation-triangle;-$fa-var-wechat: $fa-var-weixin;-$fa-var-wheelchair-alt: $fa-var-accessible-icon;-$fa-var-window-close-o: $fa-var-window-close;-$fa-var-won: $fa-var-won-sign;-$fa-var-y-combinator-square: $fa-var-hacker-news;-$fa-var-yc: $fa-var-y-combinator;-$fa-var-yc-square: $fa-var-hacker-news;-$fa-var-yen: $fa-var-yen-sign;-$fa-var-youtube-play: $fa-var-youtube;diff --git a/public/scss/fontawesome/style-brands.scss b/public/scss/fontawesome/style-brands.scssindex 52da4901e0..da1731b5be 100644--- a/public/scss/fontawesome/style-brands.scss+++ b/public/scss/fontawesome/style-brands.scss@@ -1 +1 @@-@import "brands";\ No newline at end of file+@import "fontawesome/scss/brands";\ No newline at end of filediff --git a/public/scss/fontawesome/style-duotone.scss b/public/scss/fontawesome/style-duotone.scssindex e285cc86fa..f2527c733c 100644--- a/public/scss/fontawesome/style-duotone.scss+++ b/public/scss/fontawesome/style-duotone.scss@@ -1,2 +1,2 @@-@import "duotone";-@import "_duotone-icons";\ No newline at end of file+@import "fontawesome/scss/duotone";+@import "fontawesome/scss/_duotone-icons";\ No newline at end of filediff --git a/public/scss/fontawesome/style-light.scss b/public/scss/fontawesome/style-light.scssindex 989bcd0bc5..b68081fd7d 100644--- a/public/scss/fontawesome/style-light.scss+++ b/public/scss/fontawesome/style-light.scss@@ -1 +1 @@-@import "light";+@import "fontawesome/scss/light";diff --git a/public/scss/fontawesome/style-regular.scss b/public/scss/fontawesome/style-regular.scssindex b85bc17bf1..74b297a838 100644--- a/public/scss/fontawesome/style-regular.scss+++ b/public/scss/fontawesome/style-regular.scss@@ -1 +1 @@-@import "regular";+@import "fontawesome/scss/regular";diff --git a/public/scss/fontawesome/style-sharp-light.scss b/public/scss/fontawesome/style-sharp-light.scssindex bdf377c050..0d3597f769 100644--- a/public/scss/fontawesome/style-sharp-light.scss+++ b/public/scss/fontawesome/style-sharp-light.scss@@ -1 +1 @@-@import "sharp-light";+@import "fontawesome/scss/sharp-light";diff --git a/public/scss/fontawesome/style-sharp-regular.scss b/public/scss/fontawesome/style-sharp-regular.scssindex 4b9bf9a613..eda470fe1c 100644--- a/public/scss/fontawesome/style-sharp-regular.scss+++ b/public/scss/fontawesome/style-sharp-regular.scss@@ -1 +1 @@-@import "sharp-regular";+@import "fontawesome/scss/sharp-regular";diff --git a/public/scss/fontawesome/style-sharp-solid.scss b/public/scss/fontawesome/style-sharp-solid.scssindex ae01f10776..a15bffa49c 100644--- a/public/scss/fontawesome/style-sharp-solid.scss+++ b/public/scss/fontawesome/style-sharp-solid.scss@@ -1 +1 @@-@import "sharp-solid";+@import "fontawesome/scss/sharp-solid";diff --git a/public/scss/fontawesome/style-sharp.scss b/public/scss/fontawesome/style-sharp.scssindex 7f2ae6f020..3114d7d8af 100644--- a/public/scss/fontawesome/style-sharp.scss+++ b/public/scss/fontawesome/style-sharp.scss@@ -1,3 +1,3 @@-@import "sharp-light";-@import "sharp-regular";-@import "sharp-solid";+@import "fontawesome/scss/sharp-light";+@import "fontawesome/scss/sharp-regular";+@import "fontawesome/scss/sharp-solid";diff --git a/public/scss/fontawesome/style-solid.scss b/public/scss/fontawesome/style-solid.scssindex ad46ec9b0b..f78b4b2cde 100644--- a/public/scss/fontawesome/style-solid.scss+++ b/public/scss/fontawesome/style-solid.scss@@ -1 +1 @@-@import "solid";+@import "fontawesome/scss/solid";diff --git a/public/scss/fontawesome/style-thin.scss b/public/scss/fontawesome/style-thin.scssindex ebe25b67e3..453c9f5e9d 100644--- a/public/scss/fontawesome/style-thin.scss+++ b/public/scss/fontawesome/style-thin.scss@@ -1 +1 @@-@import "thin";+@import "fontawesome/scss/thin";diff --git a/src/categories/icon.js b/src/categories/icon.jsindex 8ce4da9253..ebfbacf839 100644--- a/src/categories/icon.js+++ b/src/categories/icon.js@@ -5,6 +5,7 @@ const fs = require('fs/promises');const nconf = require('nconf');const { default: satori } = require('satori');const sharp = require('sharp');+const wawoff2 = require('wawoff2');const utils = require('../utils');@@ -41,14 +42,18 @@ Icons.regenerate = async (cid) => {const { icon, color, bgColor } = await categories.getCategoryData(cid);const fontPaths = new Map(Object.entries({- regular: path.join(utils.getFontawesomePath(), 'webfonts/fa-regular-400.ttf'),- solid: path.join(utils.getFontawesomePath(), 'webfonts/fa-solid-900.ttf'),- }));- const fontBuffers = new Map(Object.entries({- regular: await fs.readFile(fontPaths.get('regular')),- solid: await fs.readFile(fontPaths.get('solid')),+ regular: path.join(utils.getFontawesomePath(), 'webfonts/fa-regular-400.woff2'),+ solid: path.join(utils.getFontawesomePath(), 'webfonts/fa-solid-900.woff2'),}));+ const fontBuffers = new Map();++ const regularWoff2 = await fs.readFile(fontPaths.get('regular'));+ const solidWoff2 = await fs.readFile(fontPaths.get('solid'));++ fontBuffers.set('regular', Buffer.from(await wawoff2.decompress(regularWoff2)));+ fontBuffers.set('solid', Buffer.from(await wawoff2.decompress(solidWoff2)));+// Retrieve unicode codepoint (hex) and weightlet metadata = await fs.readFile(path.join(utils.getFontawesomePath(), 'metadata/icon-families.json'), 'utf-8');metadata = JSON.parse(metadata); // needs try..catch wrapper@@ -79,12 +84,12 @@ Icons.regenerate = async (cid) => {width: 128,height: 128,fonts: [{- name: 'Font Awesome 6 Free',+ name: 'Font Awesome 7 Free',data: fontBuffers.get('regular'),weight: 400,style: 'normal',}, {- name: 'Font Awesome 6 Free',+ name: 'Font Awesome 7 Free',data: fontBuffers.get('solid'),weight: 900,style: 'normal',diff --git a/src/meta/css.js b/src/meta/css.jsindex 37ea0f35d8..e50541f8c2 100644--- a/src/meta/css.js+++ b/src/meta/css.js@@ -150,12 +150,28 @@ function getFontawesomeStyle() {async function copyFontAwesomeFiles() {await mkdirp(path.join(__dirname, '../../build/public/fontawesome/webfonts'));+ await mkdirp(path.join(__dirname, '../../build/public/fontawesome/scss'));+const fonts = await fs.promises.opendir(path.join(utils.getFontawesomePath(), '/webfonts'));const copyOperations = [];for await (const file of fonts) {if (file.isFile() && file.name.match(/\.(woff2|ttf|eot)?$/)) { // there shouldn't be any legacy eot files, but just in case we'll allow itcopyOperations.push(- fs.promises.copyFile(path.join(fonts.path, file.name), path.join(__dirname, '../../build/public/fontawesome/webfonts/', file.name))+ fs.promises.copyFile(+ path.join(fonts.path, file.name),+ path.join(__dirname, '../../build/public/fontawesome/webfonts/', file.name)+ )+ );+ }+ }+ const scssFiles = await fs.promises.opendir(path.join(utils.getFontawesomePath(), '/scss'));+ for await (const file of scssFiles) {+ if (file.isFile()) {+ copyOperations.push(+ fs.promises.copyFile(+ path.join(scssFiles.path, file.name),+ path.join(__dirname, '../../build/public/fontawesome/scss/', file.name)+ ));}}@@ -209,8 +225,7 @@ async function getBundleMetadata(target) {const paths = [path.join(__dirname, '../../node_modules'),path.join(__dirname, '../../public/scss'),- path.join(__dirname, '../../public/fontawesome/scss'),- path.join(utils.getFontawesomePath(), 'scss'),+ path.join(__dirname, '../../build/public'),];// Skin support