ttf2woff2 6.0.0 → 7.0.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [7.0.0](https://github.com/nfroidure/ttf2woff2/compare/v6.0.1...v7.0.0) (2025-05-22)
+
+
+### Bug Fixes
+
+* **ci:** add Node 22 and 23 to test matrix ([d335554](https://github.com/nfroidure/ttf2woff2/commit/d335554ad4679c4d508cb69141dba67de2bbcce5))
+* **core:** fix TS errors ([7535aa1](https://github.com/nfroidure/ttf2woff2/commit/7535aa1288f9cb24be3e7026926b2b5973cbde20))
+
+
+
+## [6.0.1](https://github.com/nfroidure/ttf2woff2/compare/v6.0.0...v6.0.1) (2024-07-20)
+
+
+### Bug Fixes
+
+* **ci:** fix CI runs ([4650b51](https://github.com/nfroidure/ttf2woff2/commit/4650b511a725a7f18128a0b3a691146cb40387d0))
+* **core:** fix native bindings import ([420930f](https://github.com/nfroidure/ttf2woff2/commit/420930f8f2776904753d197a1f93263b1b68d66f))
+
+
+
 # [6.0.0](https://github.com/nfroidure/ttf2woff2/compare/v5.0.0...v6.0.0) (2024-07-20)
 
 

package/README.md

@@ -45,6 +45,32 @@ const input = await readFile('font.ttf');
 await writeFile('font.woff2', ttf2woff2(input));
 ```
 
+## Development
+
+To build the binary, clone the repository and run the following:
+
+```
+## Setup (works for Ubuntu/Linux, may be different on other OS)
+apt-get install make g++
+
+## Actual build
+npm i
+npm run configure
+npm run make
+```
+
+To build the Emscripten fallback, install [Emscripten](https://emscripten.org/) and run:
+
+```
+npm run emcc
+```
+
+Finally the build can be tested:
+```sh
+npm run build
+npm t
+```
+
 ## Contributing
 
 Feel free to push your code if you agree with publishing under the MIT license.

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-declare let ttf2woff2: undefined | ((input: Buffer) => Buffer);
+declare const ttf2woff2: any;
 declare const _default: NonNullable<typeof ttf2woff2>;
 export default _default;

package/dist/index.js

@@ -1,30 +1,29 @@
 import { YError, printStackTrace } from 'yerror';
 import debug from 'debug';
 import { env } from 'node:process';
+import bindings from 'bindings';
+import ttf2woff2Loader from '../jssrc/index.js';
 const doDebug = debug('ttf2woff2');
-let ttf2woff2 = undefined;
-if (!env.TTF2WOFF2_VERSION ||
-    env.TTF2WOFF2_VERSION?.toLowerCase() === 'native') {
-    try {
-        ttf2woff2 = (await import('bindings'))('addon.node').convert;
-        doDebug('✅ Using native version.');
-    }
-    catch (err) {
-        doDebug('❌ Could not load the native version.', printStackTrace(err));
+const ttf2woff2 = getExecutable();
+function getExecutable() {
+    if (!env.TTF2WOFF2_VERSION || env.TTF2WOFF2_VERSION?.toLowerCase() === 'native') {
+        try {
+            doDebug('✅ Using native version.');
+            return bindings.default('addon.node').convert;
+        }
+        catch (err) {
+            doDebug('❌ Could not load the native version.', printStackTrace(err));
+        }
     }
-}
-if (!env.TTF2WOFF2_VERSION || env.TTF2WOFF2_VERSION?.toLowerCase() === 'wasm') {
-    if (!ttf2woff2) {
+    if (!env.TTF2WOFF2_VERSION || env.TTF2WOFF2_VERSION?.toLowerCase() === 'wasm') {
         try {
-            ttf2woff2 = (await import('../jssrc/index.js')).default;
             doDebug('✅ Using WASM version.');
+            return ttf2woff2Loader;
         }
         catch (err) {
             doDebug('❌ Could not load the WASM version.', printStackTrace(err));
         }
     }
-}
-if (!ttf2woff2) {
     throw new YError('E_UNABLE_TO_LOAD_TTF2WOFF2', env.TTF2WOFF2_VERSION);
 }
 export default ttf2woff2;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;AACnC,IAAI,SAAS,GAA4C,SAAS,CAAC;AAEnE,IACE,CAAC,GAAG,CAAC,iBAAiB;IACtB,GAAG,CAAC,iBAAiB,EAAE,WAAW,EAAE,KAAK,QAAQ,EACjD,CAAC;IACD,IAAI,CAAC;QACH,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;QAC7D,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACrC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CACL,sCAAsC,EACtC,eAAe,CAAC,GAAY,CAAC,CAC9B,CAAC;IACJ,CAAC;AACH,CAAC;AAED,IAAI,CAAC,GAAG,CAAC,iBAAiB,IAAI,GAAG,CAAC,iBAAiB,EAAE,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;IAC9E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,IAAI,CAAC;YACH,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC;YACxD,OAAO,CAAC,uBAAuB,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CACL,oCAAoC,EACpC,eAAe,CAAC,GAAY,CAAC,CAC9B,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,IAAI,CAAC,SAAS,EAAE,CAAC;IACf,MAAM,IAAI,MAAM,CAAC,4BAA4B,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;AACxE,CAAC;AAED,eAAe,SAA0C,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,QAAQ,MAAM,UAAU,CAAA;AAC/B,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAEhD,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;AACnC,MAAM,SAAS,GAAG,aAAa,EAAE,CAAC;AAElC,SAAS,aAAa;IACpB,IAAI,CAAC,GAAG,CAAC,iBAAiB,IAAI,GAAG,CAAC,iBAAiB,EAAE,WAAW,EAAE,KAAK,QAAQ,EAAE,CAAC;QAChF,IAAI,CAAC;YACH,OAAO,CAAC,yBAAyB,CAAC,CAAC;YACnC,OAAO,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;QAChD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,sCAAsC,EAAE,eAAe,CAAC,GAAY,CAAC,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,iBAAiB,IAAI,GAAG,CAAC,iBAAiB,EAAE,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;QAC9E,IAAI,CAAC;YACH,OAAO,CAAC,uBAAuB,CAAC,CAAC;YACjC,OAAO,eAAe,CAAC;QACzB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,oCAAoC,EAAE,eAAe,CAAC,GAAY,CAAC,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAED,MAAM,IAAI,MAAM,CAAC,4BAA4B,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAC;AACxE,CAAC;AAED,eAAe,SAA0C,CAAC"}

package/package.json

@@ -25,7 +25,7 @@
     }
   },
   "name": "ttf2woff2",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "description": "Convert TTF files to WOFF2 ones.",
   "main": "dist/index.js",
   "browser": "jssrc/index.js",
@@ -81,32 +81,32 @@
   "dependencies": {
     "bindings": "^1.5.0",
     "bufferstreams": "^4.0.0",
-    "debug": "^4.3.5",
-    "nan": "^2.20.0",
-    "node-gyp": "^10.2.0",
+    "debug": "^4.4.1",
+    "nan": "^2.22.2",
+    "node-gyp": "^11.2.0",
     "yerror": "^8.0.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.7.0",
-    "@swc/cli": "^0.4.0",
-    "@swc/core": "^1.6.13",
-    "@swc/helpers": "^0.5.12",
-    "@swc/jest": "^0.2.36",
-    "commitizen": "^4.3.0",
+    "@eslint/js": "^9.16.0",
+    "@swc/cli": "^0.5.2",
+    "@swc/core": "^1.10.0",
+    "@swc/helpers": "^0.5.15",
+    "@swc/jest": "^0.2.37",
+    "commitizen": "^4.3.1",
     "conventional-changelog-cli": "^5.0.0",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^9.7.0",
+    "eslint": "^9.16.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-jest": "^28.6.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-jest": "^28.9.0",
+    "eslint-plugin-prettier": "^5.2.1",
     "jest": "^29.7.0",
-    "metapak": "^6.0.1",
-    "metapak-nfroidure": "^18.2.0",
+    "metapak": "^6.0.2",
+    "metapak-nfroidure": "^19.0.1",
     "miniquery": "^1.1.2",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.2",
     "rimraf": "^6.0.1",
-    "typescript": "^5.5.3",
-    "typescript-eslint": "^7.16.0"
+    "typescript": "^5.7.2",
+    "typescript-eslint": "^8.17.0"
   },
   "bin": {
     "ttf2woff2": "bin/ttf2woff2.js"
@@ -192,6 +192,6 @@
     "prettierPath": null
   },
   "overrides": {
-    "eslint": "^9.7.0"
+    "eslint": "^9.16.0"
   }
 }

package/src/index.ts

@@ -1,40 +1,31 @@
 import { YError, printStackTrace } from 'yerror';
 import debug from 'debug';
 import { env } from 'node:process';
+import bindings from 'bindings'
+import ttf2woff2Loader from '../jssrc/index.js';
 
 const doDebug = debug('ttf2woff2');
-let ttf2woff2: undefined | ((input: Buffer) => Buffer) = undefined;
+const ttf2woff2 = getExecutable();
 
-if (
-  !env.TTF2WOFF2_VERSION ||
-  env.TTF2WOFF2_VERSION?.toLowerCase() === 'native'
-) {
-  try {
-    ttf2woff2 = (await import('bindings'))('addon.node').convert;
-    doDebug('✅ Using native version.');
-  } catch (err) {
-    doDebug(
-      '❌ Could not load the native version.',
-      printStackTrace(err as Error),
-    );
+function getExecutable() {
+  if (!env.TTF2WOFF2_VERSION || env.TTF2WOFF2_VERSION?.toLowerCase() === 'native') {
+    try {
+      doDebug('✅ Using native version.');
+      return bindings.default('addon.node').convert;
+    } catch (err) {
+      doDebug('❌ Could not load the native version.', printStackTrace(err as Error));
+    }
   }
-}
 
-if (!env.TTF2WOFF2_VERSION || env.TTF2WOFF2_VERSION?.toLowerCase() === 'wasm') {
-  if (!ttf2woff2) {
+  if (!env.TTF2WOFF2_VERSION || env.TTF2WOFF2_VERSION?.toLowerCase() === 'wasm') {
     try {
-      ttf2woff2 = (await import('../jssrc/index.js')).default;
       doDebug('✅ Using WASM version.');
+      return ttf2woff2Loader;
     } catch (err) {
-      doDebug(
-        '❌ Could not load the WASM version.',
-        printStackTrace(err as Error),
-      );
+      doDebug('❌ Could not load the WASM version.', printStackTrace(err as Error));
     }
   }
-}
 
-if (!ttf2woff2) {
   throw new YError('E_UNABLE_TO_LOAD_TTF2WOFF2', env.TTF2WOFF2_VERSION);
 }