From 58eef2d319b90725bab9fd44ffafbdbb4bbe6760 Mon Sep 17 00:00:00 2001 From: Mengying Fan Date: Tue, 10 Jun 2025 17:02:02 +0300 Subject: [PATCH 01/26] Move prebuildify to dev dependencies --- package-lock.json | 88 ++++++++++++++++++++++++++++++++++++----------- package.json | 6 ++-- 2 files changed, 71 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index f1d5fc00c..0c42e4ab5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,8 +13,7 @@ "glob": "^7.1.6", "minimist": "^1.2.5", "node-addon-api": "^2.0.1", - "node-gyp-build": "^4.6.0", - "prebuildify": "^5.0.1" + "node-gyp-build": "^4.6.0" }, "bin": { "build-glyphs": "bin/build-glyphs", @@ -27,6 +26,7 @@ "mkdirp": "^0.5.1", "node-gyp": "^9.3.1", "pbf": "^1.3.5", + "prebuildify": "^5.0.1", "protocol-buffers": "^4.1.0", "tape": "^4.2.2" } @@ -233,6 +233,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, "funding": [ { "type": "github", @@ -262,6 +263,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -272,6 +274,7 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, "funding": [ { "type": "github", @@ -426,7 +429,8 @@ "node_modules/chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true }, "node_modules/clean-stack": { "version": "2.2.0", @@ -542,6 +546,7 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, "dependencies": { "once": "^1.4.0" } @@ -638,6 +643,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/execspawn/-/execspawn-1.0.1.tgz", "integrity": "sha512-s2k06Jy9i8CUkYe0+DxRlvtkZoOkwwfhB+Xxo5HGUtrISVW2m98jO2tr67DGRFxZwkjQqloA3v/tNtjhBRBieg==", + "dev": true, "dependencies": { "util-extend": "^1.0.1" } @@ -654,7 +660,8 @@ "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true }, "node_modules/fs-minipass": { "version": "2.1.0", @@ -922,7 +929,8 @@ "node_modules/ieee754": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", + "dev": true }, "node_modules/imurmurhash": { "version": "0.1.4", @@ -1230,6 +1238,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -1394,7 +1403,8 @@ "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "dev": true }, "node_modules/ms": { "version": "2.1.2", @@ -1415,6 +1425,7 @@ "version": "3.33.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz", "integrity": "sha512-7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog==", + "dev": true, "dependencies": { "semver": "^7.3.5" }, @@ -1480,6 +1491,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz", "integrity": "sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==", + "dev": true, "dependencies": { "path-key": "^3.0.0" }, @@ -1570,6 +1582,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, "engines": { "node": ">=8" } @@ -1597,6 +1610,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/prebuildify/-/prebuildify-5.0.1.tgz", "integrity": "sha512-vXpKLfIEsDCqMJWVIoSrUUBJQIuAk9uHAkLiGJuTdXdqKSJ10sHmWeuNCDkIoRFTV1BDGYMghHVmDFP8NfkA2Q==", + "dev": true, "dependencies": { "execspawn": "^1.0.1", "minimist": "^1.2.5", @@ -1666,6 +1680,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -1691,6 +1706,7 @@ "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -1784,7 +1800,8 @@ "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true }, "node_modules/safe-regex-test": { "version": "1.0.0", @@ -1817,6 +1834,7 @@ "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, "dependencies": { "lru-cache": "^6.0.0" }, @@ -1925,6 +1943,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -2051,6 +2070,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "dev": true, "dependencies": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", @@ -2062,6 +2082,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dev": true, "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -2175,12 +2196,14 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true }, "node_modules/util-extend": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", - "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==" + "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==", + "dev": true }, "node_modules/uuid": { "version": "8.0.0", @@ -2284,7 +2307,8 @@ "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } }, "dependencies": { @@ -2445,7 +2469,8 @@ "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true }, "benchmark": { "version": "1.0.0", @@ -2457,6 +2482,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "dev": true, "requires": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -2467,6 +2493,7 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "dev": true, "requires": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -2584,7 +2611,8 @@ "chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true }, "clean-stack": { "version": "2.2.0", @@ -2677,6 +2705,7 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, "requires": { "once": "^1.4.0" } @@ -2754,6 +2783,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/execspawn/-/execspawn-1.0.1.tgz", "integrity": "sha512-s2k06Jy9i8CUkYe0+DxRlvtkZoOkwwfhB+Xxo5HGUtrISVW2m98jO2tr67DGRFxZwkjQqloA3v/tNtjhBRBieg==", + "dev": true, "requires": { "util-extend": "^1.0.1" } @@ -2770,7 +2800,8 @@ "fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true }, "fs-minipass": { "version": "2.1.0", @@ -2978,7 +3009,8 @@ "ieee754": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", + "dev": true }, "imurmurhash": { "version": "0.1.4", @@ -3196,6 +3228,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, "requires": { "yallist": "^4.0.0" } @@ -3324,7 +3357,8 @@ "mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", - "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "dev": true }, "ms": { "version": "2.1.2", @@ -3342,6 +3376,7 @@ "version": "3.33.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz", "integrity": "sha512-7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog==", + "dev": true, "requires": { "semver": "^7.3.5" } @@ -3387,6 +3422,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz", "integrity": "sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==", + "dev": true, "requires": { "path-key": "^3.0.0" } @@ -3452,7 +3488,8 @@ "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true }, "path-parse": { "version": "1.0.7", @@ -3474,6 +3511,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/prebuildify/-/prebuildify-5.0.1.tgz", "integrity": "sha512-vXpKLfIEsDCqMJWVIoSrUUBJQIuAk9uHAkLiGJuTdXdqKSJ10sHmWeuNCDkIoRFTV1BDGYMghHVmDFP8NfkA2Q==", + "dev": true, "requires": { "execspawn": "^1.0.1", "minimist": "^1.2.5", @@ -3534,6 +3572,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -3555,6 +3594,7 @@ "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -3627,7 +3667,8 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true }, "safe-regex-test": { "version": "1.0.0", @@ -3657,6 +3698,7 @@ "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, "requires": { "lru-cache": "^6.0.0" } @@ -3741,6 +3783,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -3863,6 +3906,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "dev": true, "requires": { "chownr": "^1.1.1", "mkdirp-classic": "^0.5.2", @@ -3874,6 +3918,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dev": true, "requires": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -3945,12 +3990,14 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true }, "util-extend": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", - "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==" + "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==", + "dev": true }, "uuid": { "version": "8.0.0", @@ -4033,7 +4080,8 @@ "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } } diff --git a/package.json b/package.json index af7a31368..9092cf1a7 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,7 @@ "glob": "^7.1.6", "minimist": "^1.2.5", "node-addon-api": "^2.0.1", - "node-gyp-build": "^4.6.0", - "prebuildify": "^5.0.1" + "node-gyp-build": "^4.6.0" }, "devDependencies": { "@mapbox/cloudfriend": "^5.1.1", @@ -38,7 +37,8 @@ "node-gyp": "^9.3.1", "pbf": "^1.3.5", "protocol-buffers": "^4.1.0", - "tape": "^4.2.2" + "tape": "^4.2.2", + "prebuildify": "^5.0.1" }, "bin": { "build-glyphs": "./bin/build-glyphs", From 9bacb7983f3d11a31b49363e73fe211063ba2f8e Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 17:05:45 +0300 Subject: [PATCH 02/26] Changelog --- CHANGELOG.md | 42 ++++++++++++++++++++++++------------------ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2224d39f..4faaefa21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,23 @@ -# 0.7.2 +# CHANGELOG + +## 0.7.3 + +- Moves `prebuildify` to dev dependencies. [#193](https://github.com/mapbox/node-fontnik/pull/193) + +## 0.7.2 - Removes `node-pre-gyp` in favor of `prebuildify` to package binaries. [#184](https://github.com/mapbox/node-fontnik/pull/184) -# 0.7.1 +## 0.7.1 - Fixes issue with `point-in-polygon` algorithm being used in `sdf-glyph-foundary` -# 0.7.0 +## 0.7.0 - Adds node v16 support - Updates vulnerable dependencies -# 0.6.0 +## 0.6.0 - Adds node v12 and v14 support - Dropped node v4 and v6 support @@ -20,17 +26,17 @@ - Requires c++14 compatible compiler - Binaries are published using clang++ 10.0.0 -# 0.5.2 +## 0.5.2 - Adds .npmignore to keep downstream node_modules small. -# 0.5.1 +## 0.5.1 - Stopped bundling node-pre-gyp - Added support for node v8 and v10 - Various performance optimizations and safety checks -# 0.5.0 +## 0.5.0 - Fixed crash on font with null family name - Optimized the code to reduce memory allocations @@ -43,50 +49,50 @@ - Upgraded from protobuf 2.6.1 -> 3.2.0 - Moved coverage reporting to codecov.io -# 0.4.8 +## 0.4.8 - Bundles `mkdirp` to avoid an npm@2 bug when using `bundledDependencies` with `devDependencies`. -# 0.4.7 +## 0.4.7 - Upgrades to a modern version of Mason. -# 0.4.6 +## 0.4.6 - Adds prepublish `npm ls` script to prevent publishing without `bundledDependencies`. -# 0.4.5 +## 0.4.5 - Fixes Osaka range segfault. -# 0.4.4 +## 0.4.4 - Fix initialization of `queue-async` in `bin/build-glyphs`. -# 0.4.3 +## 0.4.3 - Handle `ft_face->style_name` null value in `RangeAsync`. -# 0.4.2 +## 0.4.2 - Handle `ft_face->style_name` null value in `LoadAsync`. -# 0.4.1 +## 0.4.1 - Publish Node.js v5.x binaries. - Autopublish binaries on git tags. -# 0.4.0 +## 0.4.0 - Fixes bounds for short ranges. - Fixes Travis binary publishing. - Adds Node.js v4.x support. -# 0.2.6 +## 0.2.6 - Truncate at Unicode point 65535 (0xFFFF) instead of 65533. -# 0.2.3 +## 0.2.3 - Calling .codepoints() on an invalid font will throw a JavaScript error rather than running into an abort trap. diff --git a/package-lock.json b/package-lock.json index 0c42e4ab5..e20846d19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "fontnik", - "version": "0.7.2", + "version": "0.7.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "fontnik", - "version": "0.7.2", + "version": "0.7.3", "hasInstallScript": true, "dependencies": { "d3-queue": "^3.0.7", diff --git a/package.json b/package.json index 9092cf1a7..9edd9e02c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fontnik", - "version": "0.7.2", + "version": "0.7.3", "description": "A library that delivers a range of glyphs rendered as SDFs (signed distance fields) in a protobuf.", "keywords": [ "font", From f7f6f468730b269879d46d1855cf95009aad0776 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 17:05:55 +0300 Subject: [PATCH 03/26] Bumo ubuntu --- .github/workflows/builds.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 324c91f27..91429fbfc 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -20,7 +20,7 @@ jobs: - name: linux architecture: x86-64 - host: ubuntu-20.04 + host: ubuntu-22.04 name: ${{ matrix.os.name }}-${{ matrix.os.architecture }}-node${{ matrix.node }}-${{ matrix.build_type }} test steps: @@ -38,7 +38,7 @@ jobs: npm test asan-build-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 name: ASAN toolset test env: BUILDTYPE: debug @@ -63,7 +63,7 @@ jobs: unset LD_PRELOAD g-build-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 name: G++ build test env: BUILDTYPE: debug @@ -96,7 +96,7 @@ jobs: - name: linux architecture: x86-64 - host: ubuntu-20.04 + host: ubuntu-22.04 steps: - uses: actions/checkout@v3 From b6e195bdc85da3c8068f2ae58ae797e979be080b Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 17:23:37 +0300 Subject: [PATCH 04/26] Bump MacOS runners --- .github/workflows/builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 91429fbfc..a98e74cca 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,7 +16,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-10.15 + host: macos-latest - name: linux architecture: x86-64 @@ -92,7 +92,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-10.15 + host: macos-latest - name: linux architecture: x86-64 From bbb31c9104d23237c7838f597df0cdc1961472e1 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 17:25:33 +0300 Subject: [PATCH 05/26] Macos 13 --- .github/workflows/builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index a98e74cca..61e770775 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,7 +16,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-latest + host: macos-13 - name: linux architecture: x86-64 @@ -92,7 +92,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-latest + host: macos-13 - name: linux architecture: x86-64 From 64e4c1efa5dd96e9842b86709b67e9f67d941dd7 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 17:27:21 +0300 Subject: [PATCH 06/26] MacOS 12? --- .github/workflows/builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 61e770775..daccb122b 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,7 +16,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-13 + host: macos-12 - name: linux architecture: x86-64 @@ -92,7 +92,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-13 + host: macos-12 - name: linux architecture: x86-64 From 962045bb5debd9b3d3f3fd226bb88120b7b70a2c Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 17:50:44 +0300 Subject: [PATCH 07/26] Install python too --- .github/workflows/builds.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index daccb122b..8bfc80512 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -25,6 +25,11 @@ jobs: name: ${{ matrix.os.name }}-${{ matrix.os.architecture }}-node${{ matrix.node }}-${{ matrix.build_type }} test steps: - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + if: matrix.os.name == 'darwin' + with: + python-version: '3.11' + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} @@ -100,6 +105,11 @@ jobs: steps: - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + if: matrix.os.name == 'darwin' + with: + python-version: '3.11' + - uses: actions/setup-node@v3 with: node-version: "16" From c6810d59dd2cc6b9a99ee8fc98898d7ab48113ba Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 19:00:43 +0300 Subject: [PATCH 08/26] MacOS 13 --- .github/workflows/builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 8bfc80512..16559d09d 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -16,7 +16,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-12 + host: macos-13 - name: linux architecture: x86-64 @@ -97,7 +97,7 @@ jobs: os: - name: darwin architecture: x86-64 - host: macos-12 + host: macos-13 - name: linux architecture: x86-64 From 4fece2ec8081e29e9a3b8915f034b7aa15ef8215 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 19:04:36 +0300 Subject: [PATCH 09/26] Node 16 --- .github/workflows/builds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 16559d09d..ca8149809 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os.host }} strategy: matrix: - node: [14, 16, 18] + node: [16, 18] build_type: ["debug", "release"] os: - name: darwin @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "14" + node-version: "16" - name: Test run: | From 342ccd149671458f589361fb891b47c201e6eecd Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 19:29:28 +0300 Subject: [PATCH 10/26] Update gyp --- .github/workflows/builds.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index ca8149809..6ae767025 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -37,6 +37,7 @@ jobs: - name: Test run: | npm ci + npm install node-gyp@latest ./scripts/setup.sh --config local.env source local.env make ${{ matrix.build_type }} @@ -116,6 +117,7 @@ jobs: - name: Build run: | + npm install node-gyp@latest ./scripts/setup.sh --config local.env source local.env make release From 9738c780fbf253fe3a2a3b906af397acffa5be8c Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 19:35:36 +0300 Subject: [PATCH 11/26] Add standard defines --- src/node_fontnik.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/node_fontnik.cpp b/src/node_fontnik.cpp index 860c57bcc..5a2ab7daa 100644 --- a/src/node_fontnik.cpp +++ b/src/node_fontnik.cpp @@ -1,6 +1,7 @@ // fontnik #include "glyphs.hpp" #include +#include //#include namespace node_fontnik { From 6c269f5fee250301796c36874555102fa51130d2 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 19:40:39 +0300 Subject: [PATCH 12/26] More includes --- src/glyphs.cpp | 2 ++ src/glyphs.hpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/glyphs.cpp b/src/glyphs.cpp index 2437e3ae8..5eac75fd3 100644 --- a/src/glyphs.cpp +++ b/src/glyphs.cpp @@ -1,4 +1,6 @@ // fontnik +#include +#include #include "glyphs.hpp" #include #include diff --git a/src/glyphs.hpp b/src/glyphs.hpp index 33078736a..6b06a5d1c 100644 --- a/src/glyphs.hpp +++ b/src/glyphs.hpp @@ -1,5 +1,7 @@ #pragma once +#include +#include #include #include From 3975e4b30eb1fd45e0c0294bd2768e4aa20e2ff3 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 19:45:22 +0300 Subject: [PATCH 13/26] Update LLVM --- scripts/setup.sh | 2 +- src/glyphs.cpp | 2 -- src/glyphs.hpp | 2 -- src/node_fontnik.cpp | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index dc0ab06a3..b9a94927b 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -4,7 +4,7 @@ set -eu set -o pipefail export MASON_RELEASE="${MASON_RELEASE:-master}" -export MASON_LLVM_RELEASE="${MASON_LLVM_RELEASE:-10.0.0}" +export MASON_LLVM_RELEASE="${MASON_LLVM_RELEASE:-14.0.6}" PLATFORM=$(uname | tr A-Z a-z) if [[ ${PLATFORM} == 'darwin' ]]; then diff --git a/src/glyphs.cpp b/src/glyphs.cpp index 5eac75fd3..2437e3ae8 100644 --- a/src/glyphs.cpp +++ b/src/glyphs.cpp @@ -1,6 +1,4 @@ // fontnik -#include -#include #include "glyphs.hpp" #include #include diff --git a/src/glyphs.hpp b/src/glyphs.hpp index 6b06a5d1c..33078736a 100644 --- a/src/glyphs.hpp +++ b/src/glyphs.hpp @@ -1,7 +1,5 @@ #pragma once -#include -#include #include #include diff --git a/src/node_fontnik.cpp b/src/node_fontnik.cpp index 5a2ab7daa..860c57bcc 100644 --- a/src/node_fontnik.cpp +++ b/src/node_fontnik.cpp @@ -1,7 +1,6 @@ // fontnik #include "glyphs.hpp" #include -#include //#include namespace node_fontnik { From aef548d65708ce61aa6b83329ebeada8eb518401 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 21:23:03 +0300 Subject: [PATCH 14/26] LLVM 12 --- scripts/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index b9a94927b..2ba49f3b4 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -4,7 +4,7 @@ set -eu set -o pipefail export MASON_RELEASE="${MASON_RELEASE:-master}" -export MASON_LLVM_RELEASE="${MASON_LLVM_RELEASE:-14.0.6}" +export MASON_LLVM_RELEASE="${MASON_LLVM_RELEASE:-12.0.1}" PLATFORM=$(uname | tr A-Z a-z) if [[ ${PLATFORM} == 'darwin' ]]; then From d01cad0d308f61b3c0e0114aaea5aef4dc3ca187 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 21:25:29 +0300 Subject: [PATCH 15/26] env --- .github/workflows/builds.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 6ae767025..efa8beb1c 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -42,6 +42,9 @@ jobs: source local.env make ${{ matrix.build_type }} npm test + env: + CC: "clang" + CXX: "clang++" asan-build-test: runs-on: ubuntu-22.04 @@ -89,6 +92,10 @@ jobs: source local.env make ${BUILDTYPE} npm test + npm test + env: + CC: "clang" + CXX: "clang++" build: needs: [test, asan-build-test, g-build-test] From e23125dd87123fefa3343e7be5af55f9aec126fe Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 22:18:06 +0300 Subject: [PATCH 16/26] Only mac gyp --- .github/workflows/builds.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index efa8beb1c..e0d2a01bf 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -34,6 +34,10 @@ jobs: with: node-version: ${{ matrix.node }} + - name: Gyp + if: matrix.os.name == 'darwin' + run: npm install node-gyp@latest + - name: Test run: | npm ci @@ -122,9 +126,12 @@ jobs: with: node-version: "16" + - name: Gyp + if: matrix.os.name == 'darwin' + run: npm install node-gyp@latest + - name: Build run: | - npm install node-gyp@latest ./scripts/setup.sh --config local.env source local.env make release From ac7356af17e3ed62e62880ce91756f7afe02161b Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 22:22:56 +0300 Subject: [PATCH 17/26] Fixed the Mason repository 403 error by adding support for using the system toolchain when MASON_LLVM_RELEASE="system" is set in the CI environment. --- .github/workflows/builds.yml | 2 ++ scripts/setup.sh | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index e0d2a01bf..c73112190 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -49,6 +49,7 @@ jobs: env: CC: "clang" CXX: "clang++" + MASON_LLVM_RELEASE: "system" asan-build-test: runs-on: ubuntu-22.04 @@ -100,6 +101,7 @@ jobs: env: CC: "clang" CXX: "clang++" + MASON_LLVM_RELEASE: "system" build: needs: [test, asan-build-test, g-build-test] diff --git a/scripts/setup.sh b/scripts/setup.sh index 2ba49f3b4..ec839c74a 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -4,7 +4,7 @@ set -eu set -o pipefail export MASON_RELEASE="${MASON_RELEASE:-master}" -export MASON_LLVM_RELEASE="${MASON_LLVM_RELEASE:-12.0.1}" +export MASON_LLVM_RELEASE="${MASON_LLVM_RELEASE:-10.0.0}" PLATFORM=$(uname | tr A-Z a-z) if [[ ${PLATFORM} == 'darwin' ]]; then @@ -44,6 +44,9 @@ function run() { elif [[ -d ${GLOBAL_CLANG} ]]; then echo "Detected '${GLOBAL_CLANG}/bin/clang++', using it" local llvm_toolchain_dir=${GLOBAL_CLANG} + elif [[ "${MASON_LLVM_RELEASE}" == "system" ]]; then + echo "Using system clang++ instead of downloading custom toolchain" + llvm_toolchain_dir="/usr" elif [[ ! -d ${llvm_toolchain_dir} ]]; then BINARY="${MASON_URL}/clang++/${MASON_LLVM_RELEASE}.tar.gz" echo "Downloading ${BINARY}" From bf84001ec30fdd111f65cd000b71ce401e36f295 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 22:29:13 +0300 Subject: [PATCH 18/26] Fix gpp --- .github/workflows/builds.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index c73112190..b3ec00b0d 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -97,11 +97,6 @@ jobs: source local.env make ${BUILDTYPE} npm test - npm test - env: - CC: "clang" - CXX: "clang++" - MASON_LLVM_RELEASE: "system" build: needs: [test, asan-build-test, g-build-test] From f4d630a4c5b0365f7fa37cf478fcdf140d293d44 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 22:53:32 +0300 Subject: [PATCH 19/26] Bump upload artifacts --- .github/workflows/builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index b3ec00b0d..344caf92b 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -137,7 +137,7 @@ jobs: run: npm run prebuildify -- --platform=${{ matrix.os.name }} --arch=x64 # Upload the end-user binary artifact - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: prebuilds path: prebuilds From db335dde27ab03be124d7069be29fca7a0206748 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 23:16:00 +0300 Subject: [PATCH 20/26] Why no ci build? --- .github/workflows/builds.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 344caf92b..1f5d9ab92 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -129,6 +129,7 @@ jobs: - name: Build run: | + npm ci ./scripts/setup.sh --config local.env source local.env make release From 62afa3903755956febc12bcdcb5e6c5532296741 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Tue, 1 Jul 2025 23:16:26 +0300 Subject: [PATCH 21/26] Bump node --- .github/workflows/builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 1f5d9ab92..c06167ea2 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -88,7 +88,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "14" + node-version: "16" - name: Test run: | From f137d1008d78185a7ef38b2c971565bf73c11dda Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Wed, 2 Jul 2025 08:35:20 +0300 Subject: [PATCH 22/26] Unify settings --- .github/workflows/builds.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index c06167ea2..dfcfc88ed 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -6,6 +6,13 @@ on: pull_request: branches: [master] +env: + CC: clang + CXX: clang++ + MASON_LLVM_RELEASE: system + PYTHON_VERSION: 3.11 + NODE_VERSION: 16 + jobs: test: runs-on: ${{ matrix.os.host }} @@ -25,15 +32,14 @@ jobs: name: ${{ matrix.os.name }}-${{ matrix.os.architecture }}-node${{ matrix.node }}-${{ matrix.build_type }} test steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - if: matrix.os.name == 'darwin' - with: - python-version: '3.11' - - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node }} + - uses: actions/setup-python@v4 + if: matrix.os.name == 'darwin' + with: + python-version: ${{ env.PYTHON_VERSION }} - name: Gyp if: matrix.os.name == 'darwin' run: npm install node-gyp@latest @@ -46,10 +52,6 @@ jobs: source local.env make ${{ matrix.build_type }} npm test - env: - CC: "clang" - CXX: "clang++" - MASON_LLVM_RELEASE: "system" asan-build-test: runs-on: ubuntu-22.04 @@ -61,7 +63,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: ${{ env.NODE_VERSION }} - name: Test run: | @@ -88,7 +90,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: ${{ env.NODE_VERSION }} - name: Test run: | @@ -114,15 +116,14 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - if: matrix.os.name == 'darwin' - with: - python-version: '3.11' - - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: ${{ env.NODE_VERSION }} + - uses: actions/setup-python@v4 + if: matrix.os.name == 'darwin' + with: + python-version: ${{ env.PYTHON_VERSION }} - name: Gyp if: matrix.os.name == 'darwin' run: npm install node-gyp@latest From d35af07e85f87f5538311587221045c83b93bd32 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Wed, 2 Jul 2025 08:43:52 +0300 Subject: [PATCH 23/26] Overwrite --- .github/workflows/builds.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index dfcfc88ed..54b72480c 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -143,4 +143,5 @@ jobs: with: name: prebuilds path: prebuilds + overwrite: true retention-days: 14 From 526b151682fb951ef04232f12db43c2c5abda438 Mon Sep 17 00:00:00 2001 From: AlexanderBelokon Date: Wed, 2 Jul 2025 08:45:14 +0300 Subject: [PATCH 24/26] Name artifact --- .github/workflows/builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 54b72480c..59a1cc163 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -141,7 +141,7 @@ jobs: # Upload the end-user binary artifact - uses: actions/upload-artifact@v4 with: - name: prebuilds + name: prebuilds-${{ matrix.os.name }}-${{ matrix.os.architecture }} path: prebuilds overwrite: true retention-days: 14 From 384c615d78e9dc20334e14ec0681696f605c1104 Mon Sep 17 00:00:00 2001 From: Mengying Fan Date: Thu, 3 Jul 2025 13:43:00 +0300 Subject: [PATCH 25/26] dev --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e20846d19..681810349 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "fontnik", - "version": "0.7.3", + "version": "0.7.4-dev.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "fontnik", - "version": "0.7.3", + "version": "0.7.4-dev.0", "hasInstallScript": true, "dependencies": { "d3-queue": "^3.0.7", diff --git a/package.json b/package.json index 9edd9e02c..6399a3de5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fontnik", - "version": "0.7.3", + "version": "0.7.4-dev.0", "description": "A library that delivers a range of glyphs rendered as SDFs (signed distance fields) in a protobuf.", "keywords": [ "font", From 286111c4034b86ef4681e3e40f779826fbf70295 Mon Sep 17 00:00:00 2001 From: Mengying Fan Date: Thu, 3 Jul 2025 13:55:20 +0300 Subject: [PATCH 26/26] fix folders --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 681810349..cc9a51f49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "fontnik", - "version": "0.7.4-dev.0", + "version": "0.7.4-dev.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "fontnik", - "version": "0.7.4-dev.0", + "version": "0.7.4-dev.1", "hasInstallScript": true, "dependencies": { "d3-queue": "^3.0.7", diff --git a/package.json b/package.json index 6399a3de5..a37708e2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fontnik", - "version": "0.7.4-dev.0", + "version": "0.7.4-dev.1", "description": "A library that delivers a range of glyphs rendered as SDFs (signed distance fields) in a protobuf.", "keywords": [ "font",