From 069c32e700a4c29f5e00d9b328a421a0e38b0c17 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 5 Dec 2023 10:47:14 -0800 Subject: [PATCH 1/3] build: hint node-version to 20 LTS --- .node-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .node-version diff --git a/.node-version b/.node-version new file mode 100644 index 0000000..f3f52b4 --- /dev/null +++ b/.node-version @@ -0,0 +1 @@ +20.9.0 From 0b49b67f3450c30ec85a8340248965affaff2bf2 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 5 Dec 2023 11:04:46 -0800 Subject: [PATCH 2/3] WIP: support Node 20 --- Makefile | 2 +- package.json | 14 +++++++------- was.package.json | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index ff7a5d5..3b4a7a4 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ all: - npm update && node-gyp configure && node-gyp rebuild --msvs_version=auto + npm update && ./node_modules/.bin/node-gyp configure && ./node_modules/.bin/node-gyp rebuild --msvs_version=auto clean: rm -rf build diff --git a/package.json b/package.json index 2ddace1..786dea8 100644 --- a/package.json +++ b/package.json @@ -53,16 +53,16 @@ "url": "https://github.com/Wandalen/BufferFromFile/issues" }, "dependencies": { - "wbasenodejscpp": "latest", - "node-gyp": "^9.3.1", - "@mapbox/node-pre-gyp": "1.0.9" + "@mapbox/node-pre-gyp": "^1.0.11", + "node-gyp": "^10.0.1", + "wbasenodejscpp": "latest" }, "devDependencies": { - "wTools": "latest", - "wTesting": "latest", - "wprocess": "latest", + "eslint": "7.32.0", "node-pre-gyp-github": "1.4.4", - "eslint": "7.32.0" + "wprocess": "latest", + "wTesting": "latest", + "wTools": "latest" }, "gypfile": false, "keywords": [ diff --git a/was.package.json b/was.package.json index a8d5079..630830c 100644 --- a/was.package.json +++ b/was.package.json @@ -53,9 +53,9 @@ "url": "https://github.com/Wandalen/BufferFromFile/issues" }, "dependencies": { - "wbasenodejscpp": "", - "node-gyp": "9.0.0", - "@mapbox/node-pre-gyp": "1.0.9" + "@mapbox/node-pre-gyp": "^1.0.11", + "node-gyp": "^10.0.1", + "wbasenodejscpp": "" }, "devDependencies": { "wTools": "", From 04c8ea577e01b7f40ba631b43124cc84bdc01a00 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Tue, 5 Dec 2023 11:23:15 -0800 Subject: [PATCH 3/3] moar --- binding.gyp | 2 +- package.json | 3 +++ was.package.json | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/binding.gyp b/binding.gyp index cdb3874..976e025 100644 --- a/binding.gyp +++ b/binding.gyp @@ -23,7 +23,7 @@ [ 'OS=="mac"', { "xcode_settings": { - + 'CLANG_CXX_LANGUAGE_STANDARD': 'c++17', 'OTHER_CPLUSPLUSFLAGS' : [ '-std=c++1y','-stdlib=libc++','-mavx','-O3','-Wno-tautological-undefined-compare','-Wno-null-dereference','-Fno-delete-null-pointer-checks','-fno-delete-null-pointer-checks' ], 'OTHER_LDFLAGS' : [ '-stdlib=libc++' ], 'MACOSX_DEPLOYMENT_TARGET': '10.14', diff --git a/package.json b/package.json index 786dea8..c9ad874 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,9 @@ "wTesting": "latest", "wTools": "latest" }, + "overrides": { + "nan": "^2.18.0" + }, "gypfile": false, "keywords": [ "wTools", diff --git a/was.package.json b/was.package.json index 630830c..a8d5079 100644 --- a/was.package.json +++ b/was.package.json @@ -53,9 +53,9 @@ "url": "https://github.com/Wandalen/BufferFromFile/issues" }, "dependencies": { - "@mapbox/node-pre-gyp": "^1.0.11", - "node-gyp": "^10.0.1", - "wbasenodejscpp": "" + "wbasenodejscpp": "", + "node-gyp": "9.0.0", + "@mapbox/node-pre-gyp": "1.0.9" }, "devDependencies": { "wTools": "",