From 374f7744a52fa3e301b5ea73e40f936e93249e4e Mon Sep 17 00:00:00 2001
From: axolotle <nchesnais@mailoo.org>
Date: Fri, 24 Mar 2023 21:49:10 +0100
Subject: [PATCH] switch to @fontsource packages

---
 app/package.json       |  4 ++--
 app/src/scss/font.scss | 36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/package.json b/app/package.json
index 1eb9cba1..b5ad388a 100644
--- a/app/package.json
+++ b/app/package.json
@@ -12,11 +12,11 @@
     "i18n:en": "./node_modules/@vue/cli-service/bin/vue-cli-service.js i18n:report --src './src/**/*.?(js|vue)' --locales './src/i18n/locales/en.json'"
   },
   "dependencies": {
+    "@fontsource/fira-code": "^4.5.13",
+    "@fontsource/firago": "^4.5.3",
     "bootstrap-vue": "^2.22.0",
     "core-js": "^3.29.1",
     "date-fns": "^2.29.3",
-    "firacode": "^5.2.0",
-    "fontsource-firago": "^3.1.5",
     "fork-awesome": "^1.2.0",
     "simple-evaluate": "^1.4.6",
     "vue": "^2.7.14",
diff --git a/app/src/scss/font.scss b/app/src/scss/font.scss
index 797cbe32..fffe9854 100644
--- a/app/src/scss/font.scss
+++ b/app/src/scss/font.scss
@@ -11,8 +11,8 @@
   font-family: 'FiraGO';
   src:
     local('FiraGO ExtraLight Italic'),
-    url('~fontsource-firago/files/firago-all-200-italic.woff2') format('woff2'),
-    url('~fontsource-firago/files/firago-all-200-italic.woff') format('woff');
+    url('~@fontsource/firago/files/firago-all-200-italic.woff2') format('woff2'),
+    url('~@fontsource/firago/files/firago-all-200-italic.woff') format('woff');
   font-weight: 200;
   font-style: italic;
   font-display: swap;
@@ -22,8 +22,8 @@
   font-family: 'FiraGO';
   src:
     local('FiraGO ExtraLight'),
-    url('~fontsource-firago/files/firago-all-200-normal.woff2') format('woff2'),
-    url('~fontsource-firago/files/firago-all-200-normal.woff') format('woff');
+    url('~@fontsource/firago/files/firago-all-200-normal.woff2') format('woff2'),
+    url('~@fontsource/firago/files/firago-all-200-normal.woff') format('woff');
   font-weight: 200;
   font-style: normal;
   font-display: swap;
@@ -33,8 +33,8 @@
   font-family: 'FiraGO';
   src:
     local('FiraGO Italic'),
-    url('~fontsource-firago/files/firago-all-400-italic.woff2') format('woff2'),
-    url('~fontsource-firago/files/firago-all-400-italic.woff') format('woff');
+    url('~@fontsource/firago/files/firago-all-400-italic.woff2') format('woff2'),
+    url('~@fontsource/firago/files/firago-all-400-italic.woff') format('woff');
   font-weight: 400;
   font-style: italic;
   font-display: swap;
@@ -44,8 +44,8 @@
   font-family: 'FiraGO';
   src:
     local('FiraGO Regular'),
-    url('~fontsource-firago/files/firago-all-400-normal.woff2') format('woff2'),
-    url('~fontsource-firago/files/firago-all-400-normal.woff') format('woff');
+    url('~@fontsource/firago/files/firago-all-400-normal.woff2') format('woff2'),
+    url('~@fontsource/firago/files/firago-all-400-normal.woff') format('woff');
   font-weight: 400;
   font-style: normal;
   font-display: swap;
@@ -55,8 +55,8 @@
   font-family: 'FiraGO';
   src:
     local('FiraGO Medium Italic'),
-    url('~fontsource-firago/files/firago-all-500-italic.woff2') format('woff2'),
-    url('~fontsource-firago/files/firago-all-500-italic.woff') format('woff');
+    url('~@fontsource/firago/files/firago-all-500-italic.woff2') format('woff2'),
+    url('~@fontsource/firago/files/firago-all-500-italic.woff') format('woff');
   font-weight: 500;
   font-style: italic;
   font-display: swap;
@@ -66,8 +66,8 @@
   font-family: 'FiraGO';
   src:
     local('FiraGO Medium'),
-    url('~fontsource-firago/files/firago-all-500-normal.woff2') format('woff2'),
-    url('~fontsource-firago/files/firago-all-500-normal.woff') format('woff');
+    url('~@fontsource/firago/files/firago-all-500-normal.woff2') format('woff2'),
+    url('~@fontsource/firago/files/firago-all-500-normal.woff') format('woff');
   font-weight: 500;
   font-style: normal;
   font-display: swap;
@@ -77,8 +77,8 @@
   font-family: 'FiraGO';
   src:
     local('FiraGO Bold Italic'),
-    url('~fontsource-firago/files/firago-all-700-italic.woff2') format('woff2'),
-    url('~fontsource-firago/files/firago-all-700-italic.woff') format('woff');
+    url('~@fontsource/firago/files/firago-all-700-italic.woff2') format('woff2'),
+    url('~@fontsource/firago/files/firago-all-700-italic.woff') format('woff');
   font-weight: 700;
   font-style: italic;
   font-display: swap;
@@ -88,8 +88,8 @@
   font-family: 'FiraGO';
   src:
     local('FiraGO Bold'),
-    url('~fontsource-firago/files/firago-all-700-normal.woff2') format('woff2'),
-    url('~fontsource-firago/files/firago-all-700-normal.woff') format('woff');
+    url('~@fontsource/firago/files/firago-all-700-normal.woff2') format('woff2'),
+    url('~@fontsource/firago/files/firago-all-700-normal.woff') format('woff');
   font-weight: 700;
   font-style: normal;
   font-display: swap;
@@ -107,8 +107,8 @@
   font-family: 'Fira Code';
   src:
     local('Fira Code Regular'),
-    url('~firacode/distr/woff2/FiraCode-Regular.woff2') format('woff2'),
-    url('~firacode/distr/woff/FiraCode-Regular.woff') format('woff');
+    // url('~@fontsource/fira-code/files/fira-code-all-400-normal.woff2') format('woff2'),
+    url('~@fontsource/fira-code/files/fira-code-all-400-normal.woff') format('woff');
   font-weight: 400;
   font-style: normal;
 }