Merge remote-tracking branch 'origin/nicpottier/fix-assets'

Author: nicpottier

assets/adt/fonts.css

@@ -1,14 +1,14 @@
 @font-face {
   font-family: 'Merriweather';
-  src: url('./fonts/Merriweather-VariableFont_opsz,wdth,wght.woff2') format('woff2');
+  src: url('./fonts/Merriweather-VariableFont.woff2') format('woff2');
   font-weight: 300 800;
   font-style: normal;
   font-display: swap;
 }
 
 @font-face {
   font-family: 'Merriweather';
-  src: url('./fonts/Merriweather-Italic-VariableFont_opsz,wdth,wght.woff2') format('woff2');
+  src: url('./fonts/Merriweather-Italic-VariableFont.woff2') format('woff2');
   font-weight: 300 800;
   font-style: italic;
   font-display: swap;

…Italic-VariableFont_opsz,wdth,wght.woff2 …s/Merriweather-Italic-VariableFont.woff2assets/adt/fonts/Merriweather-Italic-VariableFont_opsz,wdth,wght.woff2 renamed to assets/adt/fonts/Merriweather-Italic-VariableFont.woff2 assets/adt/fonts/Merriweather-Italic-VariableFont_opsz,wdth,wght.woff2 renamed to assets/adt/fonts/Merriweather-Italic-VariableFont.woff2

@@ -52,10 +52,10 @@ describe("renderPageHtml", () => {
     })
 
     expect(html).toContain(
-      '<link rel="preload" href="./assets/fonts/Merriweather-VariableFont_opsz,wdth,wght.woff2" as="font" type="font/woff2" crossorigin>',
+      '<link rel="preload" href="./assets/fonts/Merriweather-VariableFont.woff2" as="font" type="font/woff2" crossorigin>',
     )
     expect(html).toContain(
-      '<link rel="preload" href="./assets/fonts/Merriweather-Italic-VariableFont_opsz,wdth,wght.woff2" as="font" type="font/woff2" crossorigin>',
+      '<link rel="preload" href="./assets/fonts/Merriweather-Italic-VariableFont.woff2" as="font" type="font/woff2" crossorigin>',
     )
 
     // Preloads should appear before the fonts.css stylesheet

…eather-VariableFont_opsz,wdth,wght.woff2 …dt/fonts/Merriweather-VariableFont.woff2assets/adt/fonts/Merriweather-VariableFont_opsz,wdth,wght.woff2 renamed to assets/adt/fonts/Merriweather-VariableFont.woff2 assets/adt/fonts/Merriweather-VariableFont_opsz,wdth,wght.woff2 renamed to assets/adt/fonts/Merriweather-VariableFont.woff2

@@ -458,8 +458,8 @@ export function renderPageHtml(opts: RenderPageOptions): string {
     <title>${escapeHtml(opts.pageTitle)}</title>
     <meta name="title-id" content="${escapeAttr(opts.sectionId)}" />
     <meta name="page-section-id" content="${opts.pageIndex}" />
-    <link rel="preload" href="./assets/fonts/Merriweather-VariableFont_opsz,wdth,wght.woff2" as="font" type="font/woff2" crossorigin>
-    <link rel="preload" href="./assets/fonts/Merriweather-Italic-VariableFont_opsz,wdth,wght.woff2" as="font" type="font/woff2" crossorigin>
+    <link rel="preload" href="./assets/fonts/Merriweather-VariableFont.woff2" as="font" type="font/woff2" crossorigin>
+    <link rel="preload" href="./assets/fonts/Merriweather-Italic-VariableFont.woff2" as="font" type="font/woff2" crossorigin>
     <link href="./content/tailwind_output.css" rel="stylesheet">
     <link href="./assets/libs/fontawesome/css/all.min.css" rel="stylesheet">
     <link href="./assets/fonts.css" rel="stylesheet">