Merge pull request #902 from assetgraph/test/issue901

subsetFonts: Error out when encountering @font-face { unicode-range: ... }
assetgraph · Jul 16, 2018 · 4b835e0 · 4b835e0
2 parents 4b2e51a + b2f30cd
commit 4b835e0
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 0 deletions.
diff --git a/lib/transforms/subsetFonts.js b/lib/transforms/subsetFonts.js
@@ -575,6 +575,19 @@ module.exports = ({
       });
 
       if (accumulatedFontFaceDeclarations.length > 0) {
+        const seenFontFaceCombos = new Set();
+        for (const fontFace of accumulatedFontFaceDeclarations) {
+          const key = `${fontFace['font-family']}/${fontFace['font-style']}/${
+            fontFace['font-weight']
+          }}`;
+          if (seenFontFaceCombos.has(key)) {
+            throw new Error(
+              'Multiple @font-face with the same font-family/font-style/font-weight (maybe with different unicode-range?) are not supported'
+            );
+          }
+          seenFontFaceCombos.add(key);
+        }
+
         const textByProps = getTextByFontProperties(
           htmlAsset,
           memoizedGetCssRulesByProperty

diff --git a/test/transforms/subsetFonts.js b/test/transforms/subsetFonts.js
@@ -2810,6 +2810,28 @@ describe('transforms/subsetFonts', function() {
         });
     });
 
+    it('should error out on multiple @font-face declarations with the same family/weight/style/stretch', async function() {
+      httpception();
+
+      const assetGraph = new AssetGraph({
+        root: pathModule.resolve(
+          __dirname,
+          '../../testdata/transforms/subsetFonts/woff2-original/'
+        )
+      });
+      await assetGraph.loadAssets('index.html');
+      await assetGraph.populate({
+        followRelations: {
+          crossorigin: false
+        }
+      });
+      await expect(
+        assetGraph.subsetFonts(),
+        'to be rejected with',
+        'subsetFonts transform: Multiple @font-face with the same font-family/font-style/font-weight (maybe with different unicode-range?) are not supported'
+      );
+    });
+
     it('should emit a warning when subsetting invalid fonts', function() {
       httpception();
 

diff --git a/testdata/transforms/subsetFonts/woff2-original/BngRUXZYTXPIvIBgJJSb6u9mxLCGwR2oefDo.woff2 b/testdata/transforms/subsetFonts/woff2-original/BngRUXZYTXPIvIBgJJSb6u9mxLCGwR2oefDo.woff2
diff --git a/testdata/transforms/subsetFonts/woff2-original/BngRUXZYTXPIvIBgJJSb6u9mxLCIwR2oefDofMY.woff2 b/testdata/transforms/subsetFonts/woff2-original/BngRUXZYTXPIvIBgJJSb6u9mxLCIwR2oefDofMY.woff2
diff --git a/testdata/transforms/subsetFonts/woff2-original/index.html b/testdata/transforms/subsetFonts/woff2-original/index.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html><head>
+<style>
+  /* latin-ext */
+  @font-face {
+    font-family: 'Roboto Slab';
+    font-style: normal;
+    font-weight: 300;
+    src: local('Roboto Slab Light'), local('RobotoSlab-Light'),
+      url(BngRUXZYTXPIvIBgJJSb6u9mxLCIwR2oefDofMY.woff2)
+        format('woff2');
+    unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
+      U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+  }
+  /* latin */
+  @font-face {
+    font-family: 'Roboto Slab';
+    font-style: normal;
+    font-weight: 300;
+    src: local('Roboto Slab Light'), local('RobotoSlab-Light'),
+      url(BngRUXZYTXPIvIBgJJSb6u9mxLCGwR2oefDo.woff2)
+        format('woff2');
+    unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+      U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215,
+      U+FEFF, U+FFFD;
+  }
+  * {
+    font-family: Roboto Slab;
+  }
+</style>
+</head>
+<body>
+  <p>Hello, world!</p>
+</body></html>