From 1a4e952580911afe7640c63160becc9843163840 Mon Sep 17 00:00:00 2001 From: TimelordUK Date: Sun, 13 Oct 2024 13:33:51 +0100 Subject: [PATCH 1/2] elec32 --- .binding.gyp.un~ | Bin 0 -> 12857 bytes .package.json.un~ | Bin 0 -> 6465 bytes binding.gyp | 4 +- binding.gyp~ | 190 ++++++++++++++++++++++++++++++++++++++++++++++ package-lock.json | 131 +++++++++++++++++++++----------- package.json | 18 ++--- 6 files changed, 289 insertions(+), 54 deletions(-) create mode 100644 .binding.gyp.un~ create mode 100644 .package.json.un~ create mode 100644 binding.gyp~ diff --git a/.binding.gyp.un~ b/.binding.gyp.un~ new file mode 100644 index 0000000000000000000000000000000000000000..589d3096c5ad6db5850b8a24f4cb4f3662098b30 GIT binary patch literal 12857 zcmeI2J8aWH7{?tqX~X+bC@e@;kO);$T96PTf{mG_z=BW|oW!xnizEz4EUYYS3|&|l zpwL8s#0Uj;#0FEvf|z&-bzlnL|6-?KTRSf}$wGJ1^*-CNd;0(WcfRx8CA)P0V)6@ADUmexAOZ=`_sbB$%UU^PoKY=Y94M~|FF9B?m_5+rfDxJ&l;Oj%*+=vRy}Q2 zt1%;G#AfP^Z0f9;NE|;EOVTZSDJLk0C?BMZgwoBLrN1qNaW$%?-{UGJy;F$4xKySr zZf;W&k77Si;lEVC(wk2O4ozEy>l7ssb0xmHPd$4EZ)fG()mg;o2%97R__bA zC2tpV^<0B~<3!W(E6J0$g{M&QG0JX&zm%t3HKdpQJoUuSQvtRVEEHzS!CuNzOc1#t zS?XD@ZtAh0rGnc@!9fwG8r-EE#RQQX_H)#tpQ8f%)`Nk@nP@PVG87X;Zb*iDF1o0Y z_ekoIpP_;}ih_S8m}c;n@)Hw8ZfNPPX0KOX)6Y-Unq6)L)l@K1lnDoeDN`{)Y3A~z&YwR&|_zSF$`cT=#?Rwf(lr7Xn+ksJ22l<#yexGz39 zXggC4?oy6og2)Z~Im&ms7ub;$477vtHb*#^OBu=$Lw-Sq>P+|a|75xc|LkPC!CUTX zj;0o3m@-mAOMmf=kD~U_f0?B0F2oGG7UwL5fZ{GzVGveSnILjQqWZlT)nj}T--&%! zSZRUPfeMJbS;YZZL1lu-4GHQG0d=g?^>1vdGebb_G6h3C$W7o2rZJpQ-7i#-nJj(z zRj-CRO!s?Yu1nRW=vEzs6;)Ra=_OHJ7F5IDEp>qI*WKU3paSAPR(AkZP?;cdLxTG2 zFPrMD2UQT!<V!Acks2y*r1)RptC%v?<%YD=+7e8o-b_bpr~v3Dyj?L|!Z~qX4U=4HWR*1d wZ40Q*e(jCl9yI3@5nsH-mtCw9sMP^kR5m@g-*VGK{)vchs}J6e`Y(%r0FDkvO8@`> literal 0 HcmV?d00001 diff --git a/.package.json.un~ b/.package.json.un~ new file mode 100644 index 0000000000000000000000000000000000000000..96f905f2171cc9393cb5a4edd1153288dbe2a388 GIT binary patch literal 6465 zcmeI0&r2IY6vt;{ObZHyp6qQ1-gJlES)L-8O89=!Mi`@XZ8&192o8gOqjFgxGOB=fRwKJ)hNybX80Em!Av|FYc8 zi(kj1Z>p)E7Q!;EU@M)DLrjO!kqevjLpf|oQ%!MlAcDwNHj}qL}F^y7f?$I z|38TDB%u2ilDjpo9mU;s4qtKC{Zy}od&Nm|><4nJN3BEkIaL(2y0Wd2AB8+d9kzCg zQ7XBpQCAFwG&+G#k5trDYRF!m-UC}B-*44&Fm^LW)4!)mYlsa3$2+gPZxXvd{$qc% zHb&{QVjXM`QPl<9Th_HVGH;3XyENA4E$jNJ(Dzx8cocM?4z%;eiUNC}?xN3zb;C26 zNJ9NS4RssVb+Xex?UDUh2iwEOGJ<={y5W#)C9(dH#<~sbgRtI~;dg{}pj|MQ6WHsN z--dO=G1*9Zc^WcNrzpcdQq|eIeWj&$R{4~#w9U*NoIf+x6nnsOZ#X1dN!;htxL@d= zx!a?hUPn2Jl&0e(r-?l<*QYpGVQc|lFY&=<@$f>Hg|Ht^!`_Db0mFSVmG8y98S1gX h*aMdPEKzTpJLcYr4keRmjt%z%bKjQMcftPR@E?t&5Jdn0 literal 0 HcmV?d00001 diff --git a/binding.gyp b/binding.gyp index d7650cbc..d0af0e52 100644 --- a/binding.gyp +++ b/binding.gyp @@ -9,13 +9,13 @@ }, 'OS=="linux"', { 'variables': { - "cflags_cpp" : "-std=c++17", + "cflags_cpp" : "-std=c++20", 'arch%': ' [" + "'/opt/microsoft/' + x +'/include/'" + " ," + "'/usr/local/opt/' + x + '/include/'" + " ," + "'/usr/local/opt/' + x + '/include/' + x + '/'" + " ," + "'/opt/homebrew/include/' + x + '/'" + " ," + "'/home/linuxbrew/.linuxbrew/include/'" + "])" + ".flatMap(y => y)" + ".filter(z => require('fs').existsSync(z))" + ".join(' ')" + "\")" + ], + # set fo + # the link folders available -L/usr/local/lib -L/usr/lib -L. + 'link_path%': [ + " require('fs')" + ".existsSync(x))" + ".map(x => '-L'+ x)" + ".join(' ')" + "\")" + ], # set for macos based on silicon + + # enumerate the cpp src files rather than name them. + 'fileset%': [ + " x.endsWith('<(ext)'))" + ".map(f => 'src/'+f)" + ".join(' ')" + "\")" + ] + }, + + 'sources' : [ + "=10" @@ -1161,10 +1161,11 @@ "dev": true }, "node_modules/@types/mocha": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.6.tgz", - "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", - "dev": true + "version": "10.0.9", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.9.tgz", + "integrity": "sha512-sicdRoWtYevwxjOHNMPTl3vSfJM6oyW8o1wXeI7uww6b6xHg8eBznQDNSGBCDJmsE8UMxP05JgZRtsKbTqt//Q==", + "dev": true, + "license": "MIT" }, "node_modules/@types/mochawesome": { "version": "6.2.4", @@ -1182,12 +1183,13 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.12.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.8.tgz", - "integrity": "sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==", + "version": "22.7.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", + "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==", "dev": true, + "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.19.2" } }, "node_modules/@types/responselike": { @@ -3142,11 +3144,12 @@ } }, "node_modules/electron": { - "version": "30.0.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.2.tgz", - "integrity": "sha512-zv7T+GG89J/hyWVkQsLH4Y/rVEfqJG5M/wOBIGNaDdqd8UV9/YZPdS7CuFeaIj0H9LhCt95xkIQNpYB/3svOkQ==", + "version": "32.2.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.0.tgz", + "integrity": "sha512-Xy82QBQrEiQysoxsv6lnhHAcWNNe6vV6QqH3OPFXhEj/T9oAsBHEhZuuYHINSSsUE7zRSj+J9sNwJYOjisT0Vw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "@electron/get": "^2.0.0", "@types/node": "^20.9.0", @@ -3624,6 +3627,16 @@ "dev": true, "license": "ISC" }, + "node_modules/electron/node_modules/@types/node": { + "version": "20.16.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.11.tgz", + "integrity": "sha512-y+cTCACu92FyA5fgQSAI8A1H429g7aSK2HsO7K4XYUWc4dY5IUz55JSDIYT6/VsOLfGy8vmvQYC2hfb0iF16Uw==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -6554,9 +6567,9 @@ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "node_modules/mocha": { - "version": "10.7.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.0.tgz", - "integrity": "sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==", + "version": "10.7.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", + "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", "dev": true, "license": "MIT", "dependencies": { @@ -6779,9 +6792,9 @@ "dev": true }, "node_modules/nan": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", - "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", + "version": "2.22.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", + "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", "license": "MIT" }, "node_modules/napi-build-utils": { @@ -6811,9 +6824,9 @@ "dev": true }, "node_modules/node-abi": { - "version": "3.65.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.65.0.tgz", - "integrity": "sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==", + "version": "3.68.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.68.0.tgz", + "integrity": "sha512-7vbj10trelExNjFSBm5kTvZXXa7pZyKWx9RCKIyqe6I9Ev3IzGpQoqBP3a+cOdxY+pWj6VkP28n/2wWysBHD/A==", "license": "MIT", "dependencies": { "semver": "^7.3.5" @@ -7507,9 +7520,9 @@ } }, "node_modules/nyc": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-17.0.0.tgz", - "integrity": "sha512-ISp44nqNCaPugLLGGfknzQwSwt10SSS5IMoPR7GLoMAyS18Iw5js8U7ga2VF9lYuMZ42gOHr3UddZw4WZltxKg==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-17.1.0.tgz", + "integrity": "sha512-U42vQ4czpKa0QdI1hu950XuNhYqgoM+ZF1HT+VuUHL9hPfDPVvNQyltmMqdE9bUHMVa+8yNbc3QKTj8zQhlVxQ==", "dev": true, "license": "ISC", "dependencies": { @@ -7520,7 +7533,7 @@ "decamelize": "^1.2.0", "find-cache-dir": "^3.2.0", "find-up": "^4.1.0", - "foreground-child": "^2.0.0", + "foreground-child": "^3.3.0", "get-package-type": "^0.1.0", "glob": "^7.1.6", "istanbul-lib-coverage": "^3.0.0", @@ -7590,6 +7603,36 @@ "node": ">=8" } }, + "node_modules/nyc/node_modules/foreground-child": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", + "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==", + "dev": true, + "license": "ISC", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/nyc/node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/nyc/node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -8912,9 +8955,9 @@ "optional": true }, "node_modules/sequelize": { - "version": "6.37.3", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.3.tgz", - "integrity": "sha512-V2FTqYpdZjPy3VQrZvjTPnOoLm0KudCRXfGWp48QwhyPPp2yW8z0p0sCYZd/em847Tl2dVxJJ1DR+hF+O77T7A==", + "version": "6.37.4", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.37.4.tgz", + "integrity": "sha512-+8B0p00EKmxJpwwruDI0drxh4wNSC0YB9pVhOajRzfMI+uIDi5V7rJPC8RTTkLmKUoAIatJZn6lW9gj6bmmYKQ==", "dev": true, "funding": [ { @@ -8922,6 +8965,7 @@ "url": "https://opencollective.com/sequelize" } ], + "license": "MIT", "dependencies": { "@types/debug": "^4.1.8", "@types/validator": "^13.7.17", @@ -9818,9 +9862,9 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -9848,10 +9892,11 @@ } }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "dev": true, + "license": "MIT" }, "node_modules/unique-filename": { "version": "3.0.0", diff --git a/package.json b/package.json index 69d99dac..a4440115 100644 --- a/package.json +++ b/package.json @@ -61,29 +61,29 @@ } }, "dependencies": { - "nan": "^2.20.0", - "node-abi": "^3.65.0", + "nan": "^2.22.0", + "node-abi": "^3.68.0", "prebuild-install": "^7.1.2" }, "devDependencies": { "@types/chai": "^4.3.10", "@types/chai-as-promised": "^7.1.8", - "@types/mocha": "^10.0.6", + "@types/mocha": "^10.0.9", "@types/mochawesome": "^6.2.4", - "@types/node": "^20.12.8", + "@types/node": "^22.7.5", "@types/sequelize": "^4.28.20", "chai-as-promised": "^7.1.1", - "electron": "^30.0.2", + "electron": "^32.2.0", "electron-rebuild": "^3.2.9", "env-cmd": "^10.1.0", "minimist": "^1.2.8", - "mocha": "^10.7.0", + "mocha": "^10.7.3", "mochawesome": "^7.1.3", "node-gyp": "^10.2.0", - "nyc": "^17.0.0", + "nyc": "^17.1.0", "prebuild": "^13.0.1", - "sequelize": "^6.37.3", - "typescript": "^5.5.4", + "sequelize": "^6.37.4", + "typescript": "^5.6.3", "@typescript-eslint/eslint-plugin": "^6.11.0", "@typescript-eslint/parser": "^6.11.0", "eslint": "^8.53.0", From b1fff0da18c0840c9c368fed26842a7453239edf Mon Sep 17 00:00:00 2001 From: TimelordUK Date: Sun, 13 Oct 2024 14:11:35 +0100 Subject: [PATCH 2/2] update packages support elec32 --- binding.gyp | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/binding.gyp b/binding.gyp index d0af0e52..7b5dcdc0 100644 --- a/binding.gyp +++ b/binding.gyp @@ -4,7 +4,7 @@ 'OS=="mac"', { 'variables': { 'arch%': '&1", "bench-columns": "node dist/test/env/cmd-test.js -t benchmark --table=syscolumns --repeats=5 --delay=5000 2>&1",