From b3bd9a8c6dd241ed16bf97711e9cba6e5ebe3f66 Mon Sep 17 00:00:00 2001
From: Simon Martens <simonmartens@mailbox.org>
Date: Sat, 27 Jan 2024 11:00:42 +0100
Subject: [PATCH] Disabled font inlinig, so the css can load quicker

---
 HaWeb/Views/Shared/_Head.cshtml    | 35 ++++++++++-----
 HaWeb/Views/Shared/_Scripts.cshtml |  2 +
 HaWeb/package-lock.json            | 71 ++++++++++++++++++++++++++++++
 HaWeb/vite.config.js               |  3 +-
 HaWeb/wwwroot/css/fonts.css        | 16 +++----
 HaWeb/wwwroot/css/site.css         |  1 -
 6 files changed, 105 insertions(+), 23 deletions(-)

diff --git a/HaWeb/Views/Shared/_Head.cshtml b/HaWeb/Views/Shared/_Head.cshtml
index a2a7e84..1169c87 100644
--- a/HaWeb/Views/Shared/_Head.cshtml
+++ b/HaWeb/Views/Shared/_Head.cshtml
@@ -9,19 +9,30 @@
     <link rel="preload" href="/fonts/LinLibertine_R_G.ttf" as="font" crossorigin/>
     <link rel="preload" href="/fonts/LinBiolinum_R_G.ttf" as="font" crossorigin/>
 -->
-
-@* Resources *@
-<link rel="preload" href="/img/subtlenet2.png" as="image" />
-@* We do not preload the fonts since they are embedded in the css by vite 
-<link rel="preload" href="/fonts/LinBiolinum_Rah.ttf" as="font" crossorigin/>
-<link rel="preload" href="/fonts/LinLibertine_Rah.ttf" as="font" crossorigin/>
-<link rel="preload" href="/fonts/LinLibertine_RIah.ttf" as="font" crossorigin/>
-<link rel="preload" href="/fonts/LinLibertine_RBah.ttf" as="font" crossorigin/> *@
+@* Scripts *@
+<script src="/js/mark.min.js" asp-append-version="true" defer></script>
+<script src="/js/htmx.min.js" asp-append-version="true" defer></script>
 
 @* Styles *@
+<link rel="stylesheet" href="/css/fonts.css" asp-append-version="true" />
 <link rel="stylesheet" href="/dist/style.css" asp-append-version="true" />
 
-@* Scripts *@
-<script src="/js/mark.min.js" asp-append-version="true"></script>
-<script src="/js/htmx.min.js" asp-append-version="true"></script>
-<script rel="preload" type="module" src="/dist/scripts.js" asp-append-version="true"></script>
\ No newline at end of file
+@* Resources *@
+@* We do not preload the graphics since they are embedded in the css by vite.
+We dont preload here, because we have 6 requests: 
+(0. html & favicon)
+1. mark 
+2. htmx
+3. fonts.css
+4. style.css
+5. scripts.js
+
+<link rel="preload" href="/img/subtlenet2.png" as="image" /> 
+<link rel="preload" href="/fonts/LinBiolinum_Rah.ttf" as="font"/>
+<link rel="preload" href="/fonts/LinBiolinum_RIah.ttf" as="font"/>
+<link rel="preload" href="/fonts/LinLibertine_Rah.ttf" as="font"/>
+<link rel="preload" href="/fonts/LinLibertine_RZah.ttf" as="font"/>
+<link rel="preload" href="/fonts/LinLibertine_RIah.ttf" as="font"/>
+<link rel="preload" href="/fonts/LinLibertine_RBah.ttf" as="font"/>
+ *@
+
diff --git a/HaWeb/Views/Shared/_Scripts.cshtml b/HaWeb/Views/Shared/_Scripts.cshtml
index 19bb73c..034afe2 100644
--- a/HaWeb/Views/Shared/_Scripts.cshtml
+++ b/HaWeb/Views/Shared/_Scripts.cshtml
@@ -1,3 +1,5 @@
+
+
 <script type="module">
     import { startup_default } from "/dist/scripts.js"
     startup_default();
diff --git a/HaWeb/package-lock.json b/HaWeb/package-lock.json
index a0522bb..cf52f19 100644
--- a/HaWeb/package-lock.json
+++ b/HaWeb/package-lock.json
@@ -8,6 +8,7 @@
       "name": "haweb",
       "version": "0.0.0",
       "devDependencies": {
+        "@laynezh/vite-plugin-lib-assets": "^0.5.14",
         "autoprefixer": "^10.4.7",
         "cssnano": "^5.1.11",
         "mark.js": "^8.11.1",
@@ -386,6 +387,17 @@
         "node": ">=12"
       }
     },
+    "node_modules/@laynezh/vite-plugin-lib-assets": {
+      "version": "0.5.14",
+      "resolved": "https://registry.npmjs.org/@laynezh/vite-plugin-lib-assets/-/vite-plugin-lib-assets-0.5.14.tgz",
+      "integrity": "sha512-6GDawvUde8BixyDx/MD6kXrgXyH9ETlVZJ7czRK15ojoDzki1orWKvDhOhmdEra/SUxleUDMmBqAI5m8uGtuMQ==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^4.0.0",
+        "loader-utils": "^3.2.1",
+        "mrmime": "^1.0.1"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1221,6 +1233,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/fast-glob": {
       "version": "3.2.11",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
@@ -1469,6 +1493,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/loader-utils": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
+      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.13.0"
+      }
+    },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -1521,6 +1554,15 @@
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
+    "node_modules/mrmime": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
+      "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/nanoid": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
@@ -2861,6 +2903,17 @@
       "dev": true,
       "optional": true
     },
+    "@laynezh/vite-plugin-lib-assets": {
+      "version": "0.5.14",
+      "resolved": "https://registry.npmjs.org/@laynezh/vite-plugin-lib-assets/-/vite-plugin-lib-assets-0.5.14.tgz",
+      "integrity": "sha512-6GDawvUde8BixyDx/MD6kXrgXyH9ETlVZJ7czRK15ojoDzki1orWKvDhOhmdEra/SUxleUDMmBqAI5m8uGtuMQ==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^4.0.0",
+        "loader-utils": "^3.2.1",
+        "mrmime": "^1.0.1"
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3418,6 +3471,12 @@
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "dev": true
     },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true
+    },
     "fast-glob": {
       "version": "3.2.11",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
@@ -3596,6 +3655,12 @@
       "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
       "dev": true
     },
+    "loader-utils": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
+      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+      "dev": true
+    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -3642,6 +3707,12 @@
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
+    "mrmime": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
+      "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
+      "dev": true
+    },
     "nanoid": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
diff --git a/HaWeb/vite.config.js b/HaWeb/vite.config.js
index a4904d7..4f58f1b 100644
--- a/HaWeb/vite.config.js
+++ b/HaWeb/vite.config.js
@@ -1,6 +1,5 @@
 import { resolve } from 'path';
 import { defineConfig } from 'vite';
-
 export default defineConfig({
 	build: {
 		lib: {
@@ -9,6 +8,6 @@ export default defineConfig({
 			fileName: 'scripts',
 			formats: ['es']
 		},
-        outDir: resolve(__dirname, 'wwwroot/dist/'),
+		outDir: resolve(__dirname, 'wwwroot/dist/'),
 	}
 });
\ No newline at end of file
diff --git a/HaWeb/wwwroot/css/fonts.css b/HaWeb/wwwroot/css/fonts.css
index 85368cf..2abaaa9 100644
--- a/HaWeb/wwwroot/css/fonts.css
+++ b/HaWeb/wwwroot/css/fonts.css
@@ -21,7 +21,7 @@
 
 @font-face {
     font-family: "Biolinum";
-    src: url("../fonts/LinBiolinum_Rah.ttf") format("truetype");
+    src: url("/fonts/LinBiolinum_Rah.ttf") format("truetype");
     font-display: swap;
     font-weight: normal;
     font-style: normal;
@@ -29,7 +29,7 @@
   
   @font-face {
     font-family: "Libertine";
-    src: url("../fonts/LinLibertine_Rah.ttf") format("truetype");
+    src: url("/fonts/LinLibertine_Rah.ttf") format("truetype");
     font-display: swap;
     font-weight: normal;
     font-style: normal;
@@ -37,7 +37,7 @@
   
   @font-face {
     font-family: "Biolinum";
-    src: url("../fonts/LinBiolinum_RIah.ttf") format("truetype");
+    src: url("/fonts/LinBiolinum_RIah.ttf") format("truetype");
     font-display: swap;
     font-weight: normal;
     font-style: italic;
@@ -45,7 +45,7 @@
   
   @font-face {
     font-family: "Biolinum";
-    src: url("../fonts/LinBiolinum_RBah.ttf") format("truetype");
+    src: url("/fonts/LinBiolinum_RBah.ttf") format("truetype");
     font-display: swap;
     font-weight: bold;
     font-style: normal;
@@ -53,7 +53,7 @@
   
   @font-face {
     font-family: "Libertine";
-    src: url("../fonts/LinLibertine_RIah.ttf") format("truetype");
+    src: url("/fonts/LinLibertine_RIah.ttf") format("truetype");
     font-display: swap;
     font-weight: normal;
     font-style: italic;
@@ -61,7 +61,7 @@
   
   @font-face {
     font-family: "Libertine";
-    src: url("../fonts/LinLibertine_RZah.ttf") format("truetype");
+    src: url("/fonts/LinLibertine_RZah.ttf") format("truetype");
     font-display: swap;
     font-weight: bold;
     font-style: normal;
@@ -69,8 +69,8 @@
   
   @font-face {
     font-family: "Playfair";
-    src: url("../fonts/PlayfairDisplay-VariableFont_wght.ttf") format("truetype");
+    src: url("/fonts/PlayfairDisplay-VariableFont_wght.ttf") format("truetype");
     font-display: swap;
     font-weight: normal;
     font-style: normal;
-  }
\ No newline at end of file
+  } 
\ No newline at end of file
diff --git a/HaWeb/wwwroot/css/site.css b/HaWeb/wwwroot/css/site.css
index 3b00a29..2ecbbfb 100644
--- a/HaWeb/wwwroot/css/site.css
+++ b/HaWeb/wwwroot/css/site.css
@@ -1,6 +1,5 @@
 @import "./tailwind.css";
 @import "./tailwind-extensions.css";
-@import "./fonts.css";
 @import "./icons.css";
 @import "./shared.css";
 @import "./tables.css";