Use fira-code package with support for font-display

package-lock.json

@@ -8,12 +8,12 @@
       "name": "website",
       "version": "0.0.0",
       "dependencies": {
+        "@fontsource/fira-code": "^4.5.11",
         "@fortawesome/fontawesome-free": "6.2.0",
         "@ledge/is-ie-11": "7.0.0",
         "bulma": "0.9.4",
         "elevator.js": "1.0.1",
         "esbuild": "0.15.9",
-        "firacode": "6.2.0",
         "glightbox": "3.2.0",
         "htmx.org": "1.8.0",
         "lite-youtube-embed": "0.2.0",
@@ -136,6 +136,11 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@fontsource/fira-code": {
+      "version": "4.5.11",
+      "resolved": "https://registry.npmjs.org/@fontsource/fira-code/-/fira-code-4.5.11.tgz",
+      "integrity": "sha512-/o5QVmfPfkjlCGoWtrB66y4CtqeDPt9n8Ltz4VmFkLoO9Ov8L1thsbPbEQqKePUMJBVShnh9G448X36PCWlOYw=="
+    },
     "node_modules/@fortawesome/fontawesome-free": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz",
@@ -1500,11 +1505,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/firacode": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/firacode/-/firacode-6.2.0.tgz",
-      "integrity": "sha512-t5R3aO2BmhRXnYtKXbImLVNsILuCIbJ/XlDzBufjpi3il8P/CVdpWco83Ud3r2Tl0gitAmyP4o1fbJ52ozV1jw=="
-    },
     "node_modules/flat-cache": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
@@ -3933,6 +3933,11 @@
         "strip-json-comments": "^3.1.1"
       }
     },
+    "@fontsource/fira-code": {
+      "version": "4.5.11",
+      "resolved": "https://registry.npmjs.org/@fontsource/fira-code/-/fira-code-4.5.11.tgz",
+      "integrity": "sha512-/o5QVmfPfkjlCGoWtrB66y4CtqeDPt9n8Ltz4VmFkLoO9Ov8L1thsbPbEQqKePUMJBVShnh9G448X36PCWlOYw=="
+    },
     "@fortawesome/fontawesome-free": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz",
@@ -4846,11 +4851,6 @@
         "path-exists": "^4.0.0"
       }
     },
-    "firacode": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/firacode/-/firacode-6.2.0.tgz",
-      "integrity": "sha512-t5R3aO2BmhRXnYtKXbImLVNsILuCIbJ/XlDzBufjpi3il8P/CVdpWco83Ud3r2Tl0gitAmyP4o1fbJ52ozV1jw=="
-    },
     "flat-cache": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",

package.json

@@ -27,12 +27,12 @@
     "stylelint-config-standard-scss": "5.0.0"
   },
   "dependencies": {
+    "@fontsource/fira-code": "4.5.11",
     "@fortawesome/fontawesome-free": "6.2.0",
     "@ledge/is-ie-11": "7.0.0",
     "bulma": "0.9.4",
     "elevator.js": "1.0.1",
     "esbuild": "0.15.9",
-    "firacode": "6.2.0",
     "glightbox": "3.2.0",
     "htmx.org": "1.8.0",
     "lite-youtube-embed": "0.2.0",

scripts/copy-npm-contrib.sh

@@ -18,6 +18,7 @@ mkcontrib() {
 mkcontrib fontawesome node_modules/@fortawesome/fontawesome-free/{css,webfonts}
 mkcontrib elevator-js node_modules/elevator.js/demo/music/*
 mkcontrib shareon node_modules/shareon/dist/{shareon.iife.*,shareon.min.css*}
-mkcontrib fira-code node_modules/firacode/distr/{fira_code.css,woff2,woff}
+mkcontrib fira-code node_modules/@fontsource/fira-code/latin.css
+mkcontrib fira-code/files node_modules/@fontsource/fira-code/files/fira-code-latin-*
 mkcontrib htmx node_modules/htmx.org/dist/{htmx.min.js,ext}
 mkcontrib glightbox node_modules/glightbox/dist/css/glightbox.min.css

website/common/templates/base.html

@@ -24,7 +24,7 @@
 
     {% sri_static "css/base.css" %}
     {% sri_static "contrib/fontawesome/css/all.min.css" %}
-    {% sri_static "contrib/fira-code/fira_code.css" %}
+    {% sri_static "contrib/fira-code/latin.css" %}
 
     {% block extra_css %}{% endblock %}
   </head>