subfont 6.12.1 → 6.12.2

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+### v6.12.2 (2022-11-02)
+
+- [Be resilient when an insertion point cannot be found for subfont's preloads and stylesheets Fixes assetgraph\/assetgraph\#1251](https://github.com/Munter/subfont/commit/75beca70fb6cf696cf958326d8ea65b31d125b71) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+
 ### v6.12.1 (2022-09-11)
 
 - [Map font-style: oblique to font-variation-settings: slnt -14](https://github.com/Munter/subfont/commit/ea96284729e0d100fcb87d09c63979641439b169) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))

package/lib/subsetFonts.js

@@ -1251,10 +1251,27 @@ async function subsetFonts(
     fontUsages,
     accumulatedFontFaceDeclarations,
   } of htmlOrSvgAssetTextsWithProps) {
-    const insertionPoint = assetGraph.findRelations({
+    let insertionPoint = assetGraph.findRelations({
       type: `${htmlOrSvgAsset.type}Style`,
       from: htmlOrSvgAsset,
     })[0];
+
+    // Hackingly deal with the original stylesheet being located inside <noscript>
+    // https://github.com/assetgraph/assetgraph/issues/1251
+    if (!insertionPoint && htmlOrSvgAsset.type === 'Html') {
+      for (const htmlNoScript of assetGraph.findRelations({
+        type: 'HtmlNoscript',
+        from: htmlOrSvgAsset,
+      })) {
+        if (
+          assetGraph.findRelations({ from: htmlNoScript.to, type: 'HtmlStyle' })
+            .length > 0
+        ) {
+          insertionPoint = htmlNoScript;
+          break;
+        }
+      }
+    }
     const subsetFontUsages = fontUsages.filter(
       (fontUsage) => fontUsage.subsets
     );
@@ -1291,19 +1308,20 @@ async function subsetFonts(
 
     if (unsubsettedFontUsagesToPreload.length > 0) {
       // Insert <link rel="preload">
-      unsubsettedFontUsagesToPreload.map((fontUsage) => {
+      for (const fontUsage of unsubsettedFontUsagesToPreload) {
         // Always preload unsubsetted font files, they might be any format, so can't be clever here
-        return htmlOrSvgAsset.addRelation(
+        const preloadRelation = htmlOrSvgAsset.addRelation(
           {
             type: 'HtmlPreloadLink',
             hrefType,
             to: fontUsage.fontUrl,
             as: 'font',
           },
-          'before',
+          insertionPoint ? 'before' : 'firstInHead',
           insertionPoint
         );
-      });
+        insertionPoint = insertionPoint || preloadRelation;
+      }
     }
 
     if (subsetFontUsages.length === 0) {
@@ -1433,16 +1451,17 @@ async function subsetFonts(
         // - https://caniuse.com/#search=preload
 
         if (htmlOrSvgAsset.type === 'Html') {
-          htmlOrSvgAsset.addRelation(
+          const htmlPreloadLink = htmlOrSvgAsset.addRelation(
             {
               type: 'HtmlPreloadLink',
               hrefType,
               to: fontAsset,
               as: 'font',
             },
-            'before',
+            insertionPoint ? 'before' : 'firstInHead',
             insertionPoint
           );
+          insertionPoint = insertionPoint || htmlPreloadLink;
         }
       }
     }
@@ -1453,9 +1472,10 @@ async function subsetFonts(
           inlineCss || htmlOrSvgAsset.type === 'Svg' ? 'inline' : hrefType,
         to: cssAsset,
       },
-      'before',
+      insertionPoint ? 'before' : 'firstInHead',
       insertionPoint
     );
+    insertionPoint = insertionPoint || cssRelation;
 
     if (!omitFallbacks && inlineCss && unusedVariantsCss) {
       // The fallback CSS for unused variants needs to go into its own stylesheet after the crude version of the JS-based preload "polyfill"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "subfont",
-  "version": "6.12.1",
+  "version": "6.12.2",
   "description": "Speeds up your pages initial paint by automatically subsetting local or Google fonts and loading them optimally",
   "engines": {
     "node": ">=10.0.0"