From 18560272193e34c48ff095aee3985ae70318b97a Mon Sep 17 00:00:00 2001 From: Salvatore Previti Date: Fri, 9 Jun 2023 00:50:55 +0100 Subject: [PATCH] fix versions --- .github/workflows/ci.yml | 2 +- .github/workflows/publish.yml | 2 +- README.md | 2 +- node-pre-gyp.js | 17 ++++---- package-lock.json | 76 +++++++++++++++++------------------ package.json | 6 +-- scripts/prebuild-local.js | 2 +- 7 files changed, 53 insertions(+), 54 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7d9e41..f598a93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: needs: test strategy: matrix: - node-version: ["12.13.0", "14.13.0", "16.14.0", "18.1.0", "20.0.0"] + node-version: ["12.20.0", "14.13.0", "16.14.0", "18.1.0", "20.3.0"] os: [ubuntu-latest, macos-latest, windows-2019] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d17be42..0dbaee4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -24,7 +24,7 @@ jobs: needs: test strategy: matrix: - node-version: ["12.13.0", "14.13.0", "16.14.0", "18.1.0", "20.0.0"] + node-version: ["12.20.0", "14.13.0", "16.14.0", "18.1.0", "20.3.0"] os: [ubuntu-20.04, windows-2019, macos-latest] runs-on: ${{ matrix.os }} steps: diff --git a/README.md b/README.md index c33eb4b..b598ae5 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you want to contribute and submit a pull request, use the master branch. ## Supported node versions -Node 12.13+, 14.13+, 16.14+, 18+, 20+ are currently supported. +Node 12.20+, 14.13+, 16.14+, 18+, 20+ are currently supported. Node 8 and 10 support was dropped in release 2.0 diff --git a/node-pre-gyp.js b/node-pre-gyp.js index 75803aa..a1a6d0e 100644 --- a/node-pre-gyp.js +++ b/node-pre-gyp.js @@ -40,20 +40,19 @@ if (customRebuildIdx <= 0) { const main = async () => { console.log("* rebuild..."); + let glibc; try { // eslint-disable-next-line node/no-unsupported-features/node-builtins const header = process.report.getReport().header; - const glibc = header.glibcVersionRuntime; - console.log("versions:", { - node: process.version, - v8: process.versions.v8, - glibc, - }); - - console.log(`* v8 version: ${header.v8Version}`); - console.log(`* node version: ${header.nodeVersion}`); + glibc = header.glibcVersionRuntime; } catch {} + console.log("versions:", { + node: process.version, + v8: process.versions.v8, + glibc: glibc || null, + }); + console.time("rebuild"); await forkAsync(__filename, ["rebuild"]); console.log(); diff --git a/package-lock.json b/package-lock.json index 977ab85..34dd6ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@mapbox/node-pre-gyp": "^1.0.10" }, "devDependencies": { - "@balsamic/eslint-config": "^0.4.1", + "@balsamic/eslint-config": "^0.4.3", "@octokit/rest": "^19.0.11", "@types/chai": "^4.3.5", "@types/chai-as-promised": "^7.1.5", @@ -39,10 +39,10 @@ "ts-node": "^10.9.1", "tslib": "^2.5.3", "typedoc": "^0.24.8", - "typescript": "^5.1.3" + "typescript": "5.0.4" }, "engines": { - "node": ">=12.13.0" + "node": ">=12.20.0" }, "optionalDependencies": { "node-gyp": "^9.3.1" @@ -57,9 +57,9 @@ } }, "node_modules/@balsamic/eslint-config": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@balsamic/eslint-config/-/eslint-config-0.4.1.tgz", - "integrity": "sha512-ZOK71PMR+n7Ztr3lbD4yUJmHWAtHsWWBhRta3jrL05wmCjSMhiqDtevPFcO8sXP+vay3pcVUnIKFCcUwqFK85g==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@balsamic/eslint-config/-/eslint-config-0.4.3.tgz", + "integrity": "sha512-wyoYqu1VHHMCsDuHQJDPM1ruCDyPsE4WgFRGAbyl6f6VZGaEFCwHeqOjHR7m6RPe8X2ukvu3L/Xe15cOtlimfw==", "dev": true, "dependencies": { "chalk": "^4.1.2" @@ -68,16 +68,16 @@ "balsamic-eslint": "scripts/main.js" }, "engines": { - "node": ">=16.0.0" + "node": ">=12.20.0" }, "peerDependencies": { - "@types/node": ">=18.15.11", - "@typescript-eslint/eslint-plugin": ">=5.57.0", - "@typescript-eslint/parser": ">=5.57.0", - "eslint": ">=8.37.0", + "@types/node": ">=20.2.5", + "@typescript-eslint/eslint-plugin": ">=5.59.9", + "@typescript-eslint/parser": ">=5.59.9", + "eslint": ">=8.42.0", "eslint-plugin-json": ">=3.1.0", "eslint-plugin-node": ">=11.1.0", - "typescript": ">=5.0.3" + "typescript": ">=5.0.4" } }, "node_modules/@cspotcode/source-map-support": { @@ -108,9 +108,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz", - "integrity": "sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz", + "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" @@ -2213,7 +2213,7 @@ "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^14.18.0 || ^16.14.0 || >=18.1.0" + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" @@ -4947,9 +4947,9 @@ } }, "node_modules/rxjs": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz", - "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, "dependencies": { "tslib": "^2.1.0" @@ -5044,9 +5044,9 @@ } }, "node_modules/shiki": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.1.tgz", - "integrity": "sha512-+Jz4nBkCBe0mEDqo1eKRcCdjRtrCjozmcbTUjbPTX7OOJfEbTZzlUWlZtGe3Gb5oV1/jnojhG//YZc3rs9zSEw==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.14.2.tgz", + "integrity": "sha512-ltSZlSLOuSY0M0Y75KA+ieRaZ0Trf5Wl3gutE7jzLuIcWxLp5i/uEnLoQWNvgKXQ5OMpGkJnVMRLAuzjc0LJ2A==", "dev": true, "dependencies": { "ansi-sequence-parser": "^1.1.0", @@ -5182,9 +5182,9 @@ } }, "node_modules/string-argv": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", - "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", + "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", "dev": true, "engines": { "node": ">=0.6.19" @@ -5220,9 +5220,9 @@ } }, "node_modules/string-width/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", "dev": true, "dependencies": { "ansi-regex": "^6.0.1" @@ -5561,9 +5561,9 @@ } }, "node_modules/typedoc/node_modules/minimatch": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.0.tgz", - "integrity": "sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", + "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" @@ -5576,16 +5576,16 @@ } }, "node_modules/typescript": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz", - "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", + "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=14.17" + "node": ">=12.20" } }, "node_modules/unbox-primitive": { @@ -5882,9 +5882,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.2.tgz", - "integrity": "sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", + "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", "dev": true, "engines": { "node": ">= 14" diff --git a/package.json b/package.json index 81db11c..6873c2f 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "url": "git+https://github.com/SalvatorePreviti/roaring-node.git" }, "engines": { - "node": ">=12.13.0" + "node": ">=12.20.0" }, "main": "index.js", "types": "index.d.ts", @@ -81,7 +81,7 @@ "node-gyp": "^9.3.1" }, "devDependencies": { - "@balsamic/eslint-config": "^0.4.1", + "@balsamic/eslint-config": "^0.4.3", "@octokit/rest": "^19.0.11", "@types/chai": "^4.3.5", "@types/chai-as-promised": "^7.1.5", @@ -107,7 +107,7 @@ "ts-node": "^10.9.1", "tslib": "^2.5.3", "typedoc": "^0.24.8", - "typescript": "^5.1.3" + "typescript": "5.0.4" }, "gypfile": true, "roaring_version": "1.1.5" diff --git a/scripts/prebuild-local.js b/scripts/prebuild-local.js index 842031c..8c6ec55 100755 --- a/scripts/prebuild-local.js +++ b/scripts/prebuild-local.js @@ -14,7 +14,7 @@ const { spawnAsync, mergeDirs, runMain, ROOT_FOLDER, forkAsync } = require("./li const { startPublishAssets } = require("./node-pre-gyp-publish"); -const NODE_VERSIONS = ["12.13.0", "14.13.0", "16.14.0", "18.1.0", "20.0.0"]; +const NODE_VERSIONS = ["12.20.0", "14.13.0", "16.14.0", "18.1.0", "20.3.0"]; const NATIVE_DIR = path.resolve(ROOT_FOLDER, "native"); const STAGE_DIR = path.resolve(ROOT_FOLDER, "build/stage");