subfont 6.5.0 → 6.8.0

package/CHANGELOG.md

@@ -1,4 +1,33 @@
-### v6.4.2 (2022-06-13)
+### v6.8.0 (2022-07-28)
+
+- [Update assetgraph to ^7.8.1](https://github.com/Munter/subfont/commit/888a97912f98bd937a53b7bec0f39d50ddc96023) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+- [Don't leave stylesheets behind that only contain comments after removing @font-face rules from them https:\/\/github.com\/Munter\/subfont\/issues\/160\#issuecomment-1194672752](https://github.com/Munter/subfont/commit/3dfd9dfbbe5071b94eb52ac216796bc7c0554078) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+
+### v6.7.0 (2022-07-24)
+
+- [Update subset-font to ^1.5.0](https://github.com/Munter/subfont/commit/ba79ef6db81cedfd0e52672b530ca3afddd68a94) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+- [Fix warning about missing glyphs for BMP chars](https://github.com/Munter/subfont/commit/5ba0168f35bfef33f9bb9cc8a6d64de8fa1d5585) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+- [Fix CHANGELOG generation in preversion script](https://github.com/Munter/subfont/commit/3ea696f8c336c6072411c9817c0c2f5b8d8d61b9) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+
+### v6.6.1 (2022-07-09)
+
+- [ugrvw](https://github.com/Munter/subfont/commit/5ccb873025f9790faf65641551df1a7e65fbfdbf) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+- [Fix CHANGELOG https:\/\/github.com\/Munter\/subfont\/commit\/5365689a5a925304a158fddef2b6af702857371c\#r78084394](https://github.com/Munter/subfont/commit/d42c7a2cffd33662d42d4532c45cb8b90080f128) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+- [Expect browserslist to only prescribe woff I guess the browser features + usage statistics finally changed so woff isn't needed](https://github.com/Munter/subfont/commit/b70db9b769955cabbda2f2a76f2e7758f9968ec7) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+- [Tests: Tolerate u+ in unicode-range \(I guess an in-range dep changed\)](https://github.com/Munter/subfont/commit/92a7871457246b64a997c0bffd9bb2766655d811) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+
+### v6.6.0 (2022-07-09)
+
+#### Pull requests
+
+- [#162](https://github.com/Munter/subfont/pull/162) update changelog with proper version for 6.5.0 ([Jacob Lamont](mailto:cob@jacoblamont.com))
+
+#### Commits to master
+
+- [Fix extractReferencedCustomPropertyNames when there's a default value](https://github.com/Munter/subfont/commit/506375504384c1c292348427e98213482aadcae0) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+- [Update font-tracer to ^3.2.0](https://github.com/Munter/subfont/commit/5028f72482be20a72a1301c4218820f89a950bdf) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+
+### v6.5.0 (2022-06-13)
 
 - [#161](https://github.com/Munter/subfont/pull/161) Add support for specifying additional characters to include in the subsets ([Andreas Lind](mailto:andreas.lind@workday.com), [Andreas Lind](mailto:andreaslindpetersen@gmail.com))
 

package/lib/extractReferencedCustomPropertyNames.js

@@ -7,7 +7,7 @@ function extractReferencedCustomPropertyNames(cssValue) {
     if (
       node.type === 'function' &&
       node.value === 'var' &&
-      node.nodes.length === 1 &&
+      node.nodes.length >= 1 &&
       node.nodes[0].type === 'word' &&
       /^--/.test(node.nodes[0].value)
     ) {

package/lib/subsetFonts.js

@@ -568,6 +568,12 @@ function getCodepoints(text) {
   return codepoints;
 }
 
+function cssAssetIsEmpty(cssAsset) {
+  return cssAsset.parseTree.nodes.every(
+    (node) => node.type === 'comment' && !node.text.startsWith('!')
+  );
+}
+
 async function subsetFonts(
   assetGraph,
   {
@@ -917,7 +923,7 @@ async function subsetFonts(
   if (missingGlyphsErrors.length) {
     const errorLog = missingGlyphsErrors.map(
       ({ char, fontUsage, location }) =>
-        `- \\u{${char.charCodeAt(0).toString(16)}} (${char}) in font-family '${
+        `- \\u{${char.codePointAt(0).toString(16)}} (${char}) in font-family '${
           fontUsage.props['font-family']
         }' (${fontUsage.props['font-weight']}/${
           fontUsage.props['font-style']
@@ -1252,8 +1258,9 @@ These glyphs are used on your site, but they don't exist in the font you applied
     cssAsset.markDirty();
     maybeEmptyCssAssets.add(cssAsset);
   }
+
   for (const cssAsset of maybeEmptyCssAssets) {
-    if (cssAsset.isEmpty) {
+    if (cssAssetIsEmpty(cssAsset)) {
       for (const incomingRelation of cssAsset.incomingRelations) {
         incomingRelation.detach();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "subfont",
-  "version": "6.5.0",
+  "version": "6.8.0",
   "description": "Speeds up your pages initial paint by automatically subsetting local or Google fonts and loading them optimally",
   "engines": {
     "node": ">=10.0.0"
@@ -10,7 +10,7 @@
     "test": "mocha && npm run lint",
     "travis": "npm run coverage && npm run lint",
     "coverage": "nyc --reporter=lcov --reporter=text -- mocha",
-    "preversion": "offline-github-changelog --next=${npm_package_version} > CHANGELOG.md && git add CHANGELOG.md"
+    "preversion": "offline-github-changelog --next=${npm_new_version} > CHANGELOG.md && git add CHANGELOG.md"
   },
   "bin": {
     "subfont": "lib/cli.js"
@@ -47,14 +47,14 @@
   "homepage": "https://github.com/Munter/subfont#readme",
   "dependencies": {
     "@gustavnikolaj/async-main-wrap": "^3.0.1",
-    "assetgraph": "^7.2.0",
+    "assetgraph": "^7.8.1",
     "browserslist": "^4.13.0",
     "css-font-parser": "^0.3.0",
     "css-font-weight-names": "^0.2.1",
     "css-list-helpers": "^2.0.0",
     "font-family-papandreou": "^0.2.0-patch2",
     "font-snapper": "^1.2.0",
-    "font-tracer": "^3.1.0",
+    "font-tracer": "^3.2.0",
     "fontkit": "^1.8.0",
     "fontverter": "^2.0.0",
     "gettemporaryfilepath": "^1.0.1",
@@ -66,7 +66,7 @@
     "pretty-bytes": "^5.1.0",
     "puppeteer-core": "^8.0.0",
     "specificity": "^0.4.1",
-    "subset-font": "^1.4.0",
+    "subset-font": "^1.5.0",
     "urltools": "^0.4.1",
     "yargs": "^15.4.0"
   },